Code

New indexer#17

Code

Open

NikhilSuresh24 wants to merge 124 commits intomasterRoboticsTeam4904/2018-Code:masterfrom new-indexerRoboticsTeam4904/2018-Code:new-indexerCopy head branch name to clipboard

+462-27

Commits

Commits on Jan 7, 2018

• I made the basis for a system that allows wheels to spin.

  Krakavius

  committed
  be2fc4a

Commits on Jan 9, 2018

• Completely rewrote the previous base for the intake rollers, added MilkIO.java and Intake.java

  Krakavius

  committed
  7904908

• make some packages

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  8f96d64

• Slightly changed Intake.java and added Outtake.java

  Krakavius

  committed
  234b2ce

• get and initialize motors

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  53260b2

• Fixed Intake.java and Outtake.java to actually do something.

  Krakavius

  committed
  951b761

• Merge branch 'master' into arm-movement-prototype

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  f90fbaf

• Merge branch 'master' into intakeroller

  Krakavius

  authored
  ff0bdf9

• make ArmMove command

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  ca3c3f2

• Added CANTalonEncoders for Arm (prototype)

  lauwong

  committed
  e75fc1e

• Merge branch 'master' into intakeroller

  oldgalileo

  authored
  834e0b6

• add xbox control

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  76bbb2e

• Added CANTalonEncoders for Arm prototype

  lauwong

  committed
  a018a78

• Changed the requests that I was able to.

  Krakavius

  committed
  4884a62

• update for talonSRX

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  19ddf97

• Changed MilkIO to CubeIO.

  Krakavius

  committed
  b9f3ab3

Commits on Jan 10, 2018

• Changed IntakeRollers/OuttakeRollers to RollersIntake/RollersOuttake, addressed all issues that I could fix myself.

  Krakavius

  committed
  f74400e

Commits on Jan 11, 2018

• Moved the roller variable to RobotMap.java, renamed some things to better fit everyone's wishes.

  Krakavius

  committed
  eb7ca4e

• Replaced xbox arm control with joystick (joystick currently does not exist but will work once Daniel commits.

  lauwong

  committed
  9a26e3d

• add some joystick stuff

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  889452c

• Added a different default command to CrateIO.java, added a RollersRest.java class that extends Command.

  Krakavius

  committed
  fe5384b

• add more joystick stuff

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  3d6656a

Commits on Jan 12, 2018

• Didn't do anything but git is making me commit before I can pull from master

  lauwong

  committed
  1aacecc

• Completely redid RollersIntake and RollersOuttake, changed the way that CrateIO interacts with RobotMap.

  Krakavius

  committed
  af8a3c6

Commits on Jan 13, 2018

• Added idle to initDefaultCommand() for Arm and hopefully fixed merge conflicts

  lauwong

  committed
  ad0f3a7

• Merge conflicts fixed plz?

  lauwong

  committed
  8bdf2af

• AJ's requested changes for merge

  lauwong

  committed
  303e849

Commits on Jan 14, 2018

• Git still isn't letting me checkout to master ... :(

  lauwong

  committed
  93b5a5a

Commits on Jan 15, 2018

• Changed the speed of the rollers from 1.0/-1.0 to 0.5/-0.5

  Krakavius

  committed
  5a8860c

Commits on Jan 18, 2018

• remove wrist motors

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  597f6fb

Commits on Jan 19, 2018

• Added the class RollyBOI.java into subsystems

  Krakavius

  committed
  1102a4a

• Added RollyBOI-related stuff to RobotMap, and created the classes IndexerRollersIntake and IndexerRollersOuttake into robot.commands

  Krakavius

  committed
  1093f11

Commits on Jan 20, 2018

• Added a new motor called 'ElbowMotorC'

  Krakavius

  committed
  d671283

Commits on Jan 21, 2018

• add PositionSensorMotor to arm

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  105722d

• remove commented out code

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  1444934

Commits on Jan 22, 2018

• Added arm in in robotmap and subsystems.

  

  Codadillo

  committed
  9d5c93f

• Added arm set command.

  

  Codadillo

  committed
  a9c1d92

Commits on Jan 25, 2018

• Merge branch 'master' into arm-movement-prototype

  ajnadel

  committed
  7b2a734

• Fixed review comments.

  

  Codadillo

  committed
  506aba5

• Fixed classpath.:

  

  Codadillo

  committed
  ec06273

Commits on Jan 26, 2018

• Added documentation to RollersIntake, RollersOuttake, and CrateIO.

  Krakavius

  committed
  82f7984

• Added javadocs for ArmSet

  lauwong

  committed
  337d40b

Commits on Jan 27, 2018

• Merge branch 'master' into intakeroller

  Krakavius

  committed
  e9dd7f0

• Changed ArmSet to ArmMove, added the command ArmBrakeSet and commandgroup ArmSet, with documentation.

  Krakavius

  committed
  abeb017

Commits on Feb 8, 2018

• fix a very important typo

  isaanca

  committed
  391c92b

• update standard to fix CAN

  ajnadel

  committed
  d3625dd

Commits on Feb 9, 2018

• Merge branch 'master' into new-indexer

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  b0fbe05

• rararasputin

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  114d349

• made runnable commands a command group for two motors

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  dd7fe70

• added operation for rollyBOI cubeIO

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  ff94695

• sketchy idle command for 2 motors

  oshlern

  committed
  c002833

• Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/2018-Code into new-indexer

  oshlern

  committed
  ab91839

• added default idle

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  7aa7063

• jankolidar

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  902c1a6

• more billy commits

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  8747ceb

• improved IdleMotors with unlimited number of motors and comments

  oshlern

  committed
  8a69d2b

• Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/2018-Code into new-indexer

  oshlern

  committed
  9bb29c6

• command names

  oshlern

  committed
  51e50ca

• made commands and states for indexer grabber and better code with requires

  oshlern

  committed
  1b65def

• remapped buttons for operator

  oshlern

  committed
  7ac38ba

• working on indexer/intake

  billwpierce

  committed
  3bbbc2d

• Merge remote-tracking branch 'origin/fix-can-via-standard' into new-indexer

  oshlern

  committed
  cd31a4e

• Updated standard.

  

  Codadillo

  committed
  3a294f4

• Merge remote-tracking branch 'origin/fix-can-via-standard' into arm-movement-prototype

  Show description for 9179d0a
  

  Codadillo

  committed
  9179d0a

Commits on Feb 10, 2018

• fix deprecated in standard? and add hi prots

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  48a98d1

• Merge branch 'arm-movement-prototype' of https://github.com/RoboticsTeam4904/2018-Code into arm-movement-prototype

  

  Codadillo

  committed
  3aa8140

• Merged basic driving into arm prototype.

  

  Codadillo

  committed
  7376003

• Fixed merge conflicts in robot.

  

  Codadillo

  committed
  9944e29

• Fixed bad reference of encoder port.

  

  Codadillo

  committed
  6d27c91

• fix minimum arm position

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  23ac442

• Added documentation to CrateIO, IntakeRollersIntake and IntakeRollersOuttake, effectively merging intakerollers into new-indexer.

  Krakavius

  committed
  f0dbc4c

• Changed right to left, in a documentation comment.

  Krakavius

  committed
  e230c9f

• add arbitrary arm values and do encoder stuff

  

  GOAF-Pilot

  authored and

  GOAF-Pilot

  committed
  816b6e9

• Added upper cap on set speed

  

  Codadillo

  committed
  6a277b7

• I was going to add more stuff, but Osher made me commit

  NikhilSuresh24

  committed
  07a1804

• Removed RollersIntake and RollersOuttake.

  Krakavius

  committed
  678bdbf

• fixed them merge conflicts

  NikhilSuresh24

  committed
  49fe18c

• Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/2018-Code into new-indexer

  NikhilSuresh24

  committed
  f517a72

• Added lines to log arm encoder value in robot.

  

  Codadillo

  committed
  642860e

• made intakeSquared and OuttakeSquared routines

  NikhilSuresh24

  committed
  8720820

• merged in master

  NikhilSuresh24

  committed
  2a7ae66

Commits on Feb 11, 2018

• added enum for grabber and made PR changes

  NikhilSuresh24

  committed
  d8455b7

• made grabber enum and PR changes

  NikhilSuresh24

  committed
  757d16b

• Update .classpath

  Show description for 0d62db1
  NikhilSuresh24

  authored
  0d62db1

• simplified idlemotors

  NikhilSuresh24

  committed
  ae9572a

• simplifying idlemotors

  NikhilSuresh24

  committed
  1c4794d

• put operator chooser after driver chooser

  NikhilSuresh24

  committed
  f4aa3c9

• renamed idlemotors to MotorIdleGroup

  NikhilSuresh24

  committed
  04f5a3b

• added whenPressed to Default Operator

  NikhilSuresh24

  committed
  4f0a5a8

• added another constructor to motorIdlegroup

  NikhilSuresh24

  committed
  9f7a914

• another added constructor

  NikhilSuresh24

  committed
  980f91f

• added javadoc

  NikhilSuresh24

  committed
  712b289

• changed mig constructor

  NikhilSuresh24

  committed
  aa4865b

• reordered mig constructors

  NikhilSuresh24

  committed
  d67e40c

• add getAngle method

  isaanca

  committed
  6549829

• for ns

  billwpierce

  committed
  f35e41f

• Fixoed

  billwpierce

  committed
  95410ed

• neato fixes

  NikhilSuresh24

  committed
  3322249

• tested stuff

  NikhilSuresh24

  committed
  48c565f

• Slightly changed arm range.

  

  Codadillo

  committed
  3f9806b

• updated motor idle group

  NikhilSuresh24

  committed
  5ff3392

• Added default operator.

  

  Codadillo

  committed
  ac98fc1

• deleted comments

  NikhilSuresh24

  committed
  12da3a8

• set disc brake ports

  ajnadel

  committed
  fca443a

• Added joystick and ports

  billwpierce

  committed
  9ce8cd1

• removed autogenerated stubs

  NikhilSuresh24

  committed
  6e92875

• changes

  billwpierce

  committed
  1b7e795

• Removed safetly set state

  billwpierce

  committed
  93114e1

• give rollyBOI grabber its own class

  ajnadel

  committed
  eab1183

• Merge branch 'arm-movement-prototype' into new-indexer

  billwpierce

  committed
  4c4ffce

Commits on Feb 12, 2018

• added command names

  oshlern

  committed
  66d5434

• some small changes to default command

  NikhilSuresh24

  committed
  2696746

• required grabber in command

  NikhilSuresh24

  committed
  41081ff

Commits on Feb 13, 2018

• Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/2018-Code into new-indexer

  billwpierce

  committed
  34cb988

• changes to controls and intake speed

  billwpierce

  committed
  da391b9

• added buttons to open and close grabber

  NikhilSuresh24

  committed
  11035e1

• got rid of someone's merge of arm-movement-prototype

  NikhilSuresh24

  committed
  46a109a

• default rollyBOI command: Idle()

  ajnadel

  committed
  3475117

Commits on Feb 17, 2018

• made PR changes

  NikhilSuresh24

  committed
  a6c7ef1

• updated constants

  billwpierce

  committed
  81147ab

Commits on Feb 18, 2018

• dont use button 10

  NikhilSuresh24

  committed
  85ccebb

• Added general intake with adjustments and limit switch

  billwpierce

  committed
  2045b86

Commits on Feb 19, 2018

• Merge branch 'new-indexer' of https://github.com/RoboticsTeam4904/2018-Code into new-indexer

  billwpierce

  committed
  05082e0

• log sensor values

  ajnadel

  committed
  826481d