3501/stronghold-2016
8 years agofix compile errors that somehow got into master
Kevin Zhang [Sat, 13 Feb 2016 05:08:36 +0000 (21:08 -0800)]
fix compile errors that somehow got into master

8 years agofix merge conflicts
David [Fri, 12 Feb 2016 04:50:49 +0000 (20:50 -0800)]
fix merge conflicts

8 years agoFix bug so that the sensitivity threshold worked correctly
Shivani Oghanta [Fri, 12 Feb 2016 04:27:38 +0000 (20:27 -0800)]
Fix bug so that the sensitivity threshold worked correctly

8 years agoAdd command MoveIntakeArmToAngle
Shivani Oghanta [Fri, 12 Feb 2016 03:53:54 +0000 (19:53 -0800)]
Add command MoveIntakeArmToAngle

8 years agodelete MoveIntakeArmToHeight
Shivani Oghanta [Thu, 11 Feb 2016 05:12:09 +0000 (21:12 -0800)]
delete MoveIntakeArmToHeight

8 years agoAdd MoveIntakeArmUp
Shivani Oghanta [Thu, 11 Feb 2016 05:03:16 +0000 (21:03 -0800)]
Add MoveIntakeArmUp

8 years agoDelete MoveIntakeArmToHeight and created MoveIntakeArmToLevel
Shivani Oghanta [Thu, 11 Feb 2016 04:09:02 +0000 (20:09 -0800)]
Delete MoveIntakeArmToHeight and created MoveIntakeArmToLevel

8 years agoAdd MoveIntakeArmToBallIntakeHeight
Shivani Oghanta [Sun, 7 Feb 2016 04:14:43 +0000 (20:14 -0800)]
Add MoveIntakeArmToBallIntakeHeight

8 years agoAdd getArmHeight to MoveIntakeArmToBallIntakeHeight
Shivani Oghanta [Sun, 7 Feb 2016 02:32:29 +0000 (18:32 -0800)]
Add getArmHeight to MoveIntakeArmToBallIntakeHeight

8 years agoAdd constant arm length and command getArmHeight
Shivani Oghanta [Sun, 7 Feb 2016 02:25:59 +0000 (18:25 -0800)]
Add constant arm length and command getArmHeight

8 years agoFill out MoveIntakeArmToBallIntakeHeight command
Shivani Oghanta [Sun, 7 Feb 2016 01:44:23 +0000 (17:44 -0800)]
Fill out MoveIntakeArmToBallIntakeHeight command

8 years agoCreate a zeroangle constant for intake arm
Shivani Oghanta [Sun, 7 Feb 2016 01:27:01 +0000 (17:27 -0800)]
Create a zeroangle constant for intake arm

8 years agoRename MoveIntakeArm to MoveIntakeArmToAngle
Shivani Oghanta [Sun, 7 Feb 2016 00:25:07 +0000 (16:25 -0800)]
Rename MoveIntakeArm to MoveIntakeArmToAngle

8 years agofill MoveIntakeArm command
Shivani Oghanta [Sun, 7 Feb 2016 00:20:20 +0000 (16:20 -0800)]
fill MoveIntakeArm command

8 years agofix Robot.java bug: intantiate IntakeArm subsystem, not constants
Shivani Ghanta [Sat, 6 Feb 2016 22:54:57 +0000 (14:54 -0800)]
fix Robot.java bug:  intantiate IntakeArm subsystem, not constants

8 years agofix port names in Constant
Shivani Ghanta [Sat, 6 Feb 2016 22:00:31 +0000 (14:00 -0800)]
fix port names in Constant

8 years agochange arm and hand angle input variables to constants
Shaina Chen [Fri, 12 Feb 2016 03:59:48 +0000 (19:59 -0800)]
change arm and hand angle input variables to constants

8 years agoadd javadoc style comment for class
Shaina Chen [Fri, 12 Feb 2016 03:51:10 +0000 (19:51 -0800)]
add javadoc style comment for class

8 years agoadd javadoc style comment for class
Shaina Chen [Fri, 12 Feb 2016 03:47:28 +0000 (19:47 -0800)]
add javadoc style comment for class

8 years agoadd javadoc style comment for class
Shaina Chen [Fri, 12 Feb 2016 03:46:42 +0000 (19:46 -0800)]
add javadoc style comment for class

8 years agoupdate todo tasks that are done
Cindy Zhang [Fri, 12 Feb 2016 03:35:10 +0000 (19:35 -0800)]
update todo tasks that are done

8 years agoadd javadoc style for class and change isFinished to return true
Shaina Chen [Fri, 12 Feb 2016 03:34:55 +0000 (19:34 -0800)]
add javadoc style for class and change isFinished to return true

8 years agochange method getArmHeight to getArmVerticalDisplacement
Cindy Zhang [Fri, 12 Feb 2016 03:34:36 +0000 (19:34 -0800)]
change method getArmHeight to getArmVerticalDisplacement

8 years agoadd javadoc style for class and change isFinished to return true
Shaina Chen [Fri, 12 Feb 2016 03:34:06 +0000 (19:34 -0800)]
add javadoc style for class and change isFinished to return true

8 years agochange method getArmHorizontalDist to getArmHorizontalDisplacement
Cindy Zhang [Fri, 12 Feb 2016 03:33:22 +0000 (19:33 -0800)]
change method getArmHorizontalDist to getArmHorizontalDisplacement

8 years agochange variables arm and hand to armHorizontalDisplacement and armVerticalDisplacemen...
Cindy Zhang [Fri, 12 Feb 2016 03:31:59 +0000 (19:31 -0800)]
change variables arm and hand to armHorizontalDisplacement and armVerticalDisplacement and handHorizontalDisplacement and handVerticalDisplacement

8 years agoadd javadoc style comment for class
Shaina Chen [Fri, 12 Feb 2016 03:31:43 +0000 (19:31 -0800)]
add javadoc style comment for class

8 years agoadd javadoc style comment for class
Shaina Chen [Fri, 12 Feb 2016 03:29:57 +0000 (19:29 -0800)]
add javadoc style comment for class

8 years agochange isFinished to return true instead of false
Shaina Chen [Fri, 12 Feb 2016 03:27:47 +0000 (19:27 -0800)]
change isFinished to return true instead of false

8 years agochange isFinished to return true instead of false
Shaina Chen [Fri, 12 Feb 2016 03:27:29 +0000 (19:27 -0800)]
change isFinished to return true instead of false

8 years agoadd todo's after reviewing code with danny
Cindy Zhang [Fri, 12 Feb 2016 03:22:43 +0000 (19:22 -0800)]
add todo's after reviewing code with danny

8 years agodelete setHandToLevel command
Shaina Chen [Fri, 12 Feb 2016 03:19:41 +0000 (19:19 -0800)]
delete setHandToLevel command

8 years agocreate and fill in setHandToAngle command and change variable name for setHandToAngle...
Shaina Chen [Fri, 12 Feb 2016 03:08:29 +0000 (19:08 -0800)]
create and fill in setHandToAngle command and change variable name for setHandToAngle in retractDefenseArm

8 years agochange name of command to SetArmToAngle
Shaina Chen [Fri, 12 Feb 2016 02:53:19 +0000 (18:53 -0800)]
change name of command to SetArmToAngle

8 years agoadd methods that return how far arm is sticking out and how high arm is at, and const...
Cindy Zhang [Fri, 12 Feb 2016 02:31:57 +0000 (18:31 -0800)]
add methods that return how far arm is sticking out and how high arm is at, and constants that need filling in

8 years agochange variable name to match new variable names in defenseArm
Shaina Chen [Thu, 11 Feb 2016 05:03:25 +0000 (21:03 -0800)]
change variable name to match new variable names in defenseArm

8 years agocreate separate arrays to hold potentiometer angles for hand and arm and add separate...
Shaina Chen [Thu, 11 Feb 2016 04:53:53 +0000 (20:53 -0800)]
create separate arrays to hold potentiometer angles for hand and arm and add separate methods for both angle arrays

8 years agochange command to moving to level instead of target angle and simplify isFinished
Shaina Chen [Thu, 11 Feb 2016 04:34:01 +0000 (20:34 -0800)]
change command to moving to level instead of target angle and simplify isFinished

8 years agochange input variable from targetPosition to level
Shaina Chen [Thu, 11 Feb 2016 04:14:48 +0000 (20:14 -0800)]
change input variable from targetPosition to level

8 years agoFix some errors
Kevin Zhang [Thu, 11 Feb 2016 04:02:41 +0000 (20:02 -0800)]
Fix some errors

8 years agorename commands to set to level instead of angle
Shaina Chen [Thu, 11 Feb 2016 03:58:45 +0000 (19:58 -0800)]
rename commands to set to level instead of angle

8 years agodelete moveDefenseArmUp command
Shaina Chen [Thu, 11 Feb 2016 03:56:10 +0000 (19:56 -0800)]
delete moveDefenseArmUp command

8 years agoRename commands to clarify defense arm
Shaina Chen [Thu, 11 Feb 2016 03:53:03 +0000 (19:53 -0800)]
Rename commands to clarify defense arm

8 years agoAdd lidar to drivetrain
Kevin Zhang [Thu, 11 Feb 2016 03:10:11 +0000 (19:10 -0800)]
Add lidar to drivetrain

8 years agoFix some style errors
Kevin Zhang [Thu, 11 Feb 2016 02:24:52 +0000 (18:24 -0800)]
Fix some style errors

8 years agoCreate methods for lidar to work
EvanYap [Sat, 6 Feb 2016 23:40:21 +0000 (15:40 -0800)]
Create methods for lidar to work

8 years agoImport a lidar class
EvanYap [Sat, 6 Feb 2016 23:40:02 +0000 (15:40 -0800)]
Import a lidar class

8 years agoDelete PID stuff that somehow got into master
Kevin Zhang [Thu, 11 Feb 2016 03:02:15 +0000 (19:02 -0800)]
Delete PID stuff that somehow got into master

8 years agofill in retractDefense commandgroup
Shaina Chen [Thu, 11 Feb 2016 02:02:33 +0000 (18:02 -0800)]
fill in retractDefense commandgroup

8 years agocreate and fill in retractDefenseArm command group
Shaina Chen [Wed, 10 Feb 2016 04:46:07 +0000 (20:46 -0800)]
create and fill in retractDefenseArm command group

8 years agofill in skeleton for setHandToAngle command
Shaina Chen [Wed, 10 Feb 2016 04:32:07 +0000 (20:32 -0800)]
fill in skeleton for setHandToAngle command

8 years agocreate setHandToAngle command and add basic command skeleton
Shaina Chen [Wed, 10 Feb 2016 04:28:55 +0000 (20:28 -0800)]
create setHandToAngle command and add basic command skeleton

8 years agocreate and fill setArmToAngle command
Shaina Chen [Wed, 10 Feb 2016 04:25:36 +0000 (20:25 -0800)]
create and fill setArmToAngle command

8 years agocreate and fill lowerWristContinuous command
Shaina Chen [Wed, 10 Feb 2016 03:38:48 +0000 (19:38 -0800)]
create and fill lowerWristContinuous command

8 years agocreate and fill raiseWristContinuous command
Shaina Chen [Wed, 10 Feb 2016 03:36:26 +0000 (19:36 -0800)]
create and fill raiseWristContinuous command

8 years agodelete comment in isFinished()
Shaina Chen [Wed, 10 Feb 2016 03:25:16 +0000 (19:25 -0800)]
delete comment in isFinished()

8 years agocreate and fill lowerArmContinuous command
Shaina Chen [Wed, 10 Feb 2016 03:24:30 +0000 (19:24 -0800)]
create and fill lowerArmContinuous command

8 years agoadd commments of confusion to isFinished()
Shaina Chen [Wed, 10 Feb 2016 03:14:40 +0000 (19:14 -0800)]
add commments of confusion to isFinished()

8 years agocreate and fill in raiseArmContinuous command
Shaina Chen [Wed, 10 Feb 2016 03:11:24 +0000 (19:11 -0800)]
create and fill in raiseArmContinuous command

8 years agocreate defenseArm variable in robot.java
Shaina Chen [Wed, 10 Feb 2016 03:01:04 +0000 (19:01 -0800)]
create defenseArm variable in robot.java

8 years agoCreated defenseArm variable in robot.java
Shaina Chen [Wed, 10 Feb 2016 03:00:25 +0000 (19:00 -0800)]
Created defenseArm variable in robot.java

8 years agochange getCurrentSetPoint in changeSpeed method to getSpeed
Shaina Chen [Fri, 5 Feb 2016 04:46:05 +0000 (20:46 -0800)]
change getCurrentSetPoint in changeSpeed method to getSpeed

8 years agodelete getCurrentSetPoint method
Shaina Chen [Fri, 5 Feb 2016 04:44:47 +0000 (20:44 -0800)]
delete getCurrentSetPoint method

8 years agochange motor controlling platform to piston controlling platform,the motor controllin...
Shaina Chen [Fri, 5 Feb 2016 04:43:59 +0000 (20:43 -0800)]
change motor controlling platform to piston controlling platform,the motor controlling the wheel is running before the ball is pushed on

8 years agomake separate javadoc comments for intakeBall method and outputBall method
Shaina Chen [Fri, 5 Feb 2016 04:41:31 +0000 (20:41 -0800)]
make separate javadoc comments for intakeBall method and outputBall method

8 years agochange getIntakePot method name to getArmAngle
Shaina Chen [Fri, 5 Feb 2016 04:39:58 +0000 (20:39 -0800)]
change getIntakePot method name to getArmAngle

8 years agodelete comment
Shaina Chen [Fri, 5 Feb 2016 04:38:35 +0000 (20:38 -0800)]
delete comment

8 years agoconstruct intakePot and add intake potentiometer constants to Constants
Shaina Chen [Fri, 5 Feb 2016 04:37:42 +0000 (20:37 -0800)]
construct intakePot and add intake potentiometer constants to Constants

8 years agochange intake arm constant names
Shaina Chen [Fri, 5 Feb 2016 04:19:54 +0000 (20:19 -0800)]
change intake arm constant names

8 years agoadd setArmVoltage and getArmVoltage methods
Shaina Chen [Fri, 5 Feb 2016 04:12:48 +0000 (20:12 -0800)]
add setArmVoltage and getArmVoltage methods

8 years agodelete setRollerVoltage method, add javadoc style comment for intakeBall and outputBa...
Shaina Chen [Fri, 5 Feb 2016 04:06:34 +0000 (20:06 -0800)]
delete setRollerVoltage method, add javadoc style comment for intakeBall and outputBall methods, fill in getRollerVoltage method

8 years agochange intake and output method names to intakeBall and outputBall
Shaina Chen [Fri, 5 Feb 2016 03:56:40 +0000 (19:56 -0800)]
change intake and output method names to intakeBall and outputBall

8 years agocreate intake potentiometer and create method getIntakePot
Shaina Chen [Fri, 5 Feb 2016 03:53:26 +0000 (19:53 -0800)]
create intake potentiometer and create method getIntakePot

8 years agochange intake and chevalDeFriseHand CANTalon variable names to intakeRoller and intakeArm
Shaina Chen [Fri, 5 Feb 2016 03:40:35 +0000 (19:40 -0800)]
change intake and chevalDeFriseHand CANTalon variable names to intakeRoller and intakeArm

8 years agochange class comment
Shaina Chen [Fri, 5 Feb 2016 03:36:56 +0000 (19:36 -0800)]
change class comment

8 years agochange javadoc comment for areRollersRolling method
Shaina Chen [Fri, 5 Feb 2016 03:34:37 +0000 (19:34 -0800)]
change javadoc comment for areRollersRolling method

8 years agochange javadoc comment for isBallInside method
Shaina Chen [Fri, 5 Feb 2016 03:32:53 +0000 (19:32 -0800)]
change javadoc comment for isBallInside method

8 years agofix javadoc comment for getRollerVoltage method
Shaina Chen [Fri, 5 Feb 2016 03:28:40 +0000 (19:28 -0800)]
fix javadoc comment for getRollerVoltage method

8 years agofixed merge conflict for setRollerVoltage method
Shaina Chen [Fri, 5 Feb 2016 03:23:29 +0000 (19:23 -0800)]
fixed merge conflict for setRollerVoltage method

8 years agorename methods punch and resetPunch to extendPunch and retractPunch
Shaina Chen [Fri, 5 Feb 2016 03:12:52 +0000 (19:12 -0800)]
rename methods punch and resetPunch to extendPunch and retractPunch

8 years agoremove content of changeSpeed and call setSpeed(newSpeed)
Shaina Chen [Fri, 5 Feb 2016 03:09:22 +0000 (19:09 -0800)]
remove content of changeSpeed and call setSpeed(newSpeed)

8 years agochange method name from getDistance to getAngleForLevel and add javadoc style comment...
Shaina Chen [Fri, 5 Feb 2016 02:49:10 +0000 (18:49 -0800)]
change method name from getDistance to getAngleForLevel and add javadoc style comment for getAngleForLevel method

8 years agoadd HAND_CHANNEL to Constants
Shaina Chen [Fri, 5 Feb 2016 02:37:49 +0000 (18:37 -0800)]
add HAND_CHANNEL to Constants

8 years agoconstruct defenseHandPotentiometer
Shaina Chen [Fri, 5 Feb 2016 02:37:27 +0000 (18:37 -0800)]
construct defenseHandPotentiometer

8 years agoRemove comment on line 10
Shaina Chen [Fri, 5 Feb 2016 02:26:46 +0000 (18:26 -0800)]
Remove comment on line 10

8 years agoadd class level comment and change speed to voltage
Yamini Adusumelli [Sat, 30 Jan 2016 21:04:10 +0000 (13:04 -0800)]
add class level comment and change speed to voltage

8 years agoadd class level comment for Shooter class- describe mechanism
Yamini Adusumelli [Sat, 30 Jan 2016 21:03:18 +0000 (13:03 -0800)]
add class level comment for Shooter class- describe mechanism

8 years agoadd 3 method stubs- setRollerSpeeds, getRollerSpeeds, and areRollersRolling
Yamini Adusumelli [Sat, 30 Jan 2016 18:46:38 +0000 (10:46 -0800)]
add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and areRollersRolling

8 years agoreset to unix format
Kevin Zhang [Sat, 30 Jan 2016 05:51:01 +0000 (21:51 -0800)]
reset to unix format

8 years agoAdd set motor speed methods in defense arm and add potentiometer getter methods
Shaina Chen [Sat, 30 Jan 2016 05:38:35 +0000 (21:38 -0800)]
Add set motor speed methods in defense arm and add potentiometer getter methods

8 years agoadd four method stubs
Yamini Adusumelli [Fri, 29 Jan 2016 03:46:56 +0000 (19:46 -0800)]
add four method stubs

8 years agowrite methods getArmAngle and getHandAngle
roeibustein [Fri, 29 Jan 2016 03:36:42 +0000 (19:36 -0800)]
write methods getArmAngle and getHandAngle

8 years agoDetelete tower tracker class
Yamini Adusumelli [Fri, 29 Jan 2016 03:21:41 +0000 (19:21 -0800)]
Detelete tower tracker class

8 years agodelete defense hand potentiometer
Yamini Adusumelli [Fri, 29 Jan 2016 03:16:11 +0000 (19:16 -0800)]
delete defense hand potentiometer

8 years agodelete defense hand potentiometer related constants
Yamini Adusumelli [Fri, 29 Jan 2016 03:15:40 +0000 (19:15 -0800)]
delete defense hand potentiometer related constants

8 years agodelete second potentiometer for defense hand
Yamini Adusumelli [Fri, 29 Jan 2016 03:13:58 +0000 (19:13 -0800)]
delete second potentiometer for defense hand

8 years agoadd second defenseArmMotor related constants
Yamini Adusumelli [Fri, 29 Jan 2016 03:12:55 +0000 (19:12 -0800)]
add second defenseArmMotor related constants

8 years agoadd command to move defense arm up
Yamini Adusumelli [Wed, 27 Jan 2016 04:41:24 +0000 (20:41 -0800)]
add command to move defense arm up

8 years agochange array name from levelsToDegrees to armPotValues
Yamini Adusumelli [Wed, 27 Jan 2016 03:08:53 +0000 (19:08 -0800)]
change array name from levelsToDegrees to armPotValues

8 years agoadd defense arm motor port
Yamini Adusumelli [Tue, 26 Jan 2016 03:47:13 +0000 (19:47 -0800)]
add defense arm motor port