-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New indexer #17
Open
NikhilSuresh24
wants to merge
124
commits into
master
Choose a base branch
from
new-indexer
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
New indexer #17
Changes from 119 commits
Commits
Show all changes
124 commits
Select commit
Hold shift + click to select a range
be2fc4a
I made the basis for a system that allows wheels to spin.
Krakavius 7904908
Completely rewrote the previous base for the intake rollers, added Mi…
Krakavius 8f96d64
make some packages
234b2ce
Slightly changed Intake.java and added Outtake.java
Krakavius 53260b2
get and initialize motors
951b761
Fixed Intake.java and Outtake.java to actually do something.
Krakavius f90fbaf
Merge branch 'master' into arm-movement-prototype
ff0bdf9
Merge branch 'master' into intakeroller
Krakavius ca3c3f2
make ArmMove command
e75fc1e
Added CANTalonEncoders for Arm (prototype)
lauwong 834e0b6
Merge branch 'master' into intakeroller
oldgalileo 76bbb2e
add xbox control
a018a78
Added CANTalonEncoders for Arm prototype
lauwong 4884a62
Changed the requests that I was able to.
Krakavius 19ddf97
update for talonSRX
b9f3ab3
Changed MilkIO to CubeIO.
Krakavius f74400e
Changed IntakeRollers/OuttakeRollers to RollersIntake/RollersOuttake,…
Krakavius eb7ca4e
Moved the roller variable to RobotMap.java, renamed some things to be…
Krakavius 9a26e3d
Replaced xbox arm control with joystick (joystick currently does not …
lauwong 889452c
add some joystick stuff
fe5384b
Added a different default command to CrateIO.java, added a RollersRes…
Krakavius 3d6656a
add more joystick stuff
1aacecc
Didn't do anything but git is making me commit before I can pull from…
lauwong af8a3c6
Completely redid RollersIntake and RollersOuttake, changed the way th…
Krakavius ad0f3a7
Added idle to initDefaultCommand() for Arm and hopefully fixed merge …
lauwong 8bdf2af
Merge conflicts fixed plz?
lauwong 303e849
AJ's requested changes for merge
lauwong 93b5a5a
Git still isn't letting me checkout to master ... :(
lauwong 5a8860c
Changed the speed of the rollers from 1.0/-1.0 to 0.5/-0.5
Krakavius 597f6fb
remove wrist motors
1102a4a
Added the class RollyBOI.java into subsystems
Krakavius 1093f11
Added RollyBOI-related stuff to RobotMap, and created the classes Ind…
Krakavius d671283
Added a new motor called 'ElbowMotorC'
Krakavius 105722d
add PositionSensorMotor to arm
1444934
remove commented out code
9d5c93f
Added arm in in robotmap and subsystems.
a9c1d92
Added arm set command.
7b2a734
Merge branch 'master' into arm-movement-prototype
ajnadel 506aba5
Fixed review comments.
ec06273
Fixed classpath.:
82f7984
Added documentation to RollersIntake, RollersOuttake, and CrateIO.
Krakavius 337d40b
Added javadocs for ArmSet
lauwong e9dd7f0
Merge branch 'master' into intakeroller
Krakavius abeb017
Changed ArmSet to ArmMove, added the command ArmBrakeSet and commandg…
Krakavius 391c92b
fix a very important typo
isaanca d3625dd
update standard to fix CAN
ajnadel b0fbe05
Merge branch 'master' into new-indexer
114d349
rararasputin
dd7fe70
made runnable commands a command group for two motors
ff94695
added operation for rollyBOI cubeIO
c002833
sketchy idle command for 2 motors
oshlern ab91839
Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/201…
oshlern 7aa7063
added default idle
902c1a6
jankolidar
8747ceb
more billy commits
8a69d2b
improved IdleMotors with unlimited number of motors and comments
oshlern 9bb29c6
Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/201…
oshlern 51e50ca
command names
oshlern 1b65def
made commands and states for indexer grabber and better code with req…
oshlern 7ac38ba
remapped buttons for operator
oshlern 3bbbc2d
working on indexer/intake
billwpierce cd31a4e
Merge remote-tracking branch 'origin/fix-can-via-standard' into new-i…
oshlern 3a294f4
Updated standard.
9179d0a
Merge remote-tracking branch 'origin/fix-can-via-standard' into arm-m…
48a98d1
fix deprecated in standard? and add hi prots
3aa8140
Merge branch 'arm-movement-prototype' of https://github.com/RoboticsT…
7376003
Merged basic driving into arm prototype.
9944e29
Fixed merge conflicts in robot.
6d27c91
Fixed bad reference of encoder port.
23ac442
fix minimum arm position
f0dbc4c
Added documentation to CrateIO, IntakeRollersIntake and IntakeRollers…
Krakavius e230c9f
Changed right to left, in a documentation comment.
Krakavius 816b6e9
add arbitrary arm values and do encoder stuff
6a277b7
Added upper cap on set speed
07a1804
I was going to add more stuff, but Osher made me commit
NikhilSuresh24 678bdbf
Removed RollersIntake and RollersOuttake.
Krakavius 49fe18c
fixed them merge conflicts
NikhilSuresh24 f517a72
Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/201…
NikhilSuresh24 642860e
Added lines to log arm encoder value in robot.
8720820
made intakeSquared and OuttakeSquared routines
NikhilSuresh24 2a7ae66
merged in master
NikhilSuresh24 d8455b7
added enum for grabber and made PR changes
NikhilSuresh24 757d16b
made grabber enum and PR changes
NikhilSuresh24 0d62db1
Update .classpath
NikhilSuresh24 ae9572a
simplified idlemotors
NikhilSuresh24 1c4794d
simplifying idlemotors
NikhilSuresh24 f4aa3c9
put operator chooser after driver chooser
NikhilSuresh24 04f5a3b
renamed idlemotors to MotorIdleGroup
NikhilSuresh24 4f0a5a8
added whenPressed to Default Operator
NikhilSuresh24 9f7a914
added another constructor to motorIdlegroup
NikhilSuresh24 980f91f
another added constructor
NikhilSuresh24 712b289
added javadoc
NikhilSuresh24 aa4865b
changed mig constructor
NikhilSuresh24 d67e40c
reordered mig constructors
NikhilSuresh24 6549829
add getAngle method
isaanca f35e41f
for ns
billwpierce 95410ed
Fixoed
billwpierce 3322249
neato fixes
NikhilSuresh24 48c565f
tested stuff
NikhilSuresh24 3f9806b
Slightly changed arm range.
5ff3392
updated motor idle group
NikhilSuresh24 ac98fc1
Added default operator.
12da3a8
deleted comments
NikhilSuresh24 fca443a
set disc brake ports
ajnadel 9ce8cd1
Added joystick and ports
billwpierce 6e92875
removed autogenerated stubs
NikhilSuresh24 1b7e795
changes
billwpierce 93114e1
Removed safetly set state
billwpierce eab1183
give rollyBOI grabber its own class
ajnadel 4c4ffce
Merge branch 'arm-movement-prototype' into new-indexer
billwpierce 66d5434
added command names
oshlern 2696746
some small changes to default command
NikhilSuresh24 41081ff
required grabber in command
NikhilSuresh24 34cb988
Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/201…
billwpierce da391b9
changes to controls and intake speed
billwpierce 11035e1
added buttons to open and close grabber
NikhilSuresh24 46a109a
got rid of someone's merge of arm-movement-prototype
NikhilSuresh24 3475117
default rollyBOI command: Idle()
ajnadel a6c7ef1
made PR changes
NikhilSuresh24 81147ab
updated constants
billwpierce 85ccebb
dont use button 10
NikhilSuresh24 2045b86
Added general intake with adjustments and limit switch
billwpierce 05082e0
Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/201…
billwpierce 826481d
log sensor values
ajnadel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
src/org/usfirst/frc4904/robot/commands/IndexerGrabberClasp.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
public class IndexerGrabberClasp extends IndexerGrabberSet { | ||
public IndexerGrabberClasp() { | ||
super(true); | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
src/org/usfirst/frc4904/robot/commands/IndexerGrabberRelease.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
public class IndexerGrabberRelease extends IndexerGrabberSet { | ||
public IndexerGrabberRelease() { | ||
super(false); | ||
} | ||
} |
25 changes: 25 additions & 0 deletions
25
src/org/usfirst/frc4904/robot/commands/IndexerGrabberSet.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
import org.usfirst.frc4904.robot.RobotMap; | ||
import edu.wpi.first.wpilibj.command.Command; | ||
|
||
public class IndexerGrabberSet extends Command { | ||
protected final boolean clasped; | ||
|
||
public IndexerGrabberSet(boolean clasped) { | ||
super(clasped ? "IndexerGrabberClasp" : "IndexerGrabberRelease"); | ||
requires(RobotMap.Component.rollyBOI.grabber); | ||
this.clasped = clasped; | ||
} | ||
|
||
@Override | ||
protected void initialize() { | ||
RobotMap.Component.rollyBOI.grabber.set(clasped); | ||
} | ||
|
||
@Override | ||
protected boolean isFinished() { | ||
return false; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
import org.usfirst.frc4904.robot.RobotMap; | ||
import org.usfirst.frc4904.robot.subsystems.RollyBOI; | ||
import org.usfirst.frc4904.standard.commands.motor.MotorConstant; | ||
import edu.wpi.first.wpilibj.command.CommandGroup; | ||
|
||
public class IndexerIntake extends CommandGroup { | ||
public IndexerIntake() { | ||
super("IndexerIntake"); | ||
requires(RobotMap.Component.rollyBOI); | ||
addParallel(new IndexerGrabberRelease()); | ||
addParallel(new MotorConstant(RobotMap.Component.rollyBOIRollerLeft, RollyBOI.INTAKE_SPEED)); | ||
addParallel(new MotorConstant(RobotMap.Component.rollyBOIRollerRight, RollyBOI.INTAKE_SPEED)); | ||
} | ||
} |
17 changes: 17 additions & 0 deletions
17
src/org/usfirst/frc4904/robot/commands/IndexerOuttake.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
import org.usfirst.frc4904.robot.RobotMap; | ||
import org.usfirst.frc4904.robot.subsystems.RollyBOI; | ||
import org.usfirst.frc4904.standard.commands.motor.MotorConstant; | ||
import edu.wpi.first.wpilibj.command.CommandGroup; | ||
|
||
public class IndexerOuttake extends CommandGroup { | ||
public IndexerOuttake() { | ||
super("IndexerOuttake"); | ||
requires(RobotMap.Component.rollyBOI); | ||
addParallel(new IndexerGrabberRelease()); | ||
addParallel(new MotorConstant(RobotMap.Component.rollyBOI.rollerLeft, RollyBOI.OUTTAKE_SPEED)); | ||
addParallel(new MotorConstant(RobotMap.Component.rollyBOI.rollerRight, RollyBOI.OUTTAKE_SPEED)); | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
src/org/usfirst/frc4904/robot/commands/IntakeRollersIntake.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
import org.usfirst.frc4904.robot.RobotMap; | ||
import org.usfirst.frc4904.robot.subsystems.CrateIO; | ||
import org.usfirst.frc4904.standard.commands.motor.MotorConstant; | ||
import edu.wpi.first.wpilibj.command.CommandGroup; | ||
|
||
public class IntakeRollersIntake extends CommandGroup { | ||
public IntakeRollersIntake() { | ||
super("IntakeRollersIntake"); | ||
requires(RobotMap.Component.crateIO); | ||
addParallel(new MotorConstant(RobotMap.Component.crateIO.rollerLeft, CrateIO.INTAKE_SPEED)); | ||
addParallel(new MotorConstant(RobotMap.Component.crateIO.rollerRight, CrateIO.INTAKE_SPEED)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Stop using both of these seperately, instead use the |
||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
src/org/usfirst/frc4904/robot/commands/IntakeRollersOuttake.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
import org.usfirst.frc4904.robot.RobotMap; | ||
import org.usfirst.frc4904.robot.subsystems.CrateIO; | ||
import org.usfirst.frc4904.standard.commands.motor.MotorConstant; | ||
import edu.wpi.first.wpilibj.command.CommandGroup; | ||
|
||
public class IntakeRollersOuttake extends CommandGroup { | ||
public IntakeRollersOuttake() { | ||
super("IntakeRollersOuttake"); | ||
requires(RobotMap.Component.crateIO); | ||
addParallel(new MotorConstant(RobotMap.Component.crateIO.rollerLeft, CrateIO.OUTTAKE_SPEED)); | ||
addParallel(new MotorConstant(RobotMap.Component.crateIO.rollerRight, CrateIO.OUTTAKE_SPEED)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use the |
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
import org.usfirst.frc4904.robot.RobotMap; | ||
import edu.wpi.first.wpilibj.command.CommandGroup; | ||
|
||
public class IntakeSquared extends CommandGroup { | ||
public IntakeSquared() { | ||
super("IntakeSquared"); | ||
requires(RobotMap.Component.crateIO); | ||
requires(RobotMap.Component.rollyBOI); | ||
addParallel(new IndexerIntake()); | ||
addParallel(new IntakeRollersIntake()); | ||
} | ||
} |
60 changes: 60 additions & 0 deletions
60
src/org/usfirst/frc4904/robot/commands/MotorIdleGroup.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
import org.usfirst.frc4904.standard.commands.motor.MotorIdle; | ||
import org.usfirst.frc4904.standard.subsystems.motor.Motor; | ||
import edu.wpi.first.wpilibj.command.CommandGroup; | ||
import edu.wpi.first.wpilibj.command.Subsystem; | ||
|
||
/** | ||
* Idles motors of a subsystem. | ||
* Used as a default command | ||
* | ||
*/ | ||
public class MotorIdleGroup extends CommandGroup{ | ||
|
||
/** | ||
* Run MotorIdle (from WPILib) in parallel on every motor | ||
* from a list of motors with unrestricted size. | ||
* | ||
* @param name | ||
* @param subsystem | ||
* @param motors | ||
*/ | ||
public MotorIdleGroup(String name, Subsystem subsystem, Motor... motors) { | ||
super(name); | ||
requires(subsystem); | ||
for (Motor motor : motors) { | ||
requires(motor); | ||
addParallel(new MotorIdle(motor)); | ||
} | ||
} | ||
|
||
/** | ||
* Run MotorIdle (from WPILib) in parallel on every motor | ||
* from a list of motors with unrestricted size. | ||
* Logs the names of all motors that are being idled | ||
* | ||
* @param subsystem | ||
* @param motors | ||
*/ | ||
public MotorIdleGroup(Subsystem subsystem, Motor... motors) { | ||
this(MotorIdleGroup.makeName(motors), subsystem, motors); | ||
} | ||
|
||
public static String makeName(Motor... motors) { | ||
String name = ""; | ||
for (Motor motor : motors) { | ||
if (motor.getName() != null) { | ||
name += motor.getName() + " "; | ||
} else { | ||
name += "motor "; | ||
} | ||
} | ||
name += "idling"; | ||
return name; | ||
} | ||
} | ||
|
||
|
||
|
16 changes: 16 additions & 0 deletions
16
src/org/usfirst/frc4904/robot/commands/OuttakeSquared.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package org.usfirst.frc4904.robot.commands; | ||
|
||
|
||
import org.usfirst.frc4904.robot.RobotMap; | ||
import edu.wpi.first.wpilibj.command.CommandGroup; | ||
|
||
public class OuttakeSquared extends CommandGroup { | ||
|
||
public OuttakeSquared() { | ||
super("OuttakeSquared"); | ||
requires(RobotMap.Component.crateIO); | ||
requires(RobotMap.Component.rollyBOI); | ||
addParallel(new IndexerOuttake()); | ||
addParallel(new IntakeRollersOuttake()); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ajnadel said false