Cindy Zhang [Sat, 13 Feb 2016 23:49:56 +0000 (15:49 -0800)]
get rid of merge error markers
Kevin Zhang [Sat, 13 Feb 2016 05:38:09 +0000 (21:38 -0800)]
Fix deleted stuff that shouldn't have been deleted
EvanYap [Sat, 13 Feb 2016 05:10:20 +0000 (21:10 -0800)]
Remove useless variables and commented stuff in Robot.java
EvanYap [Fri, 12 Feb 2016 05:00:56 +0000 (21:00 -0800)]
Use GyroClass and currently using method getDegrees in teleopPeriodic
EvanYap [Tue, 9 Feb 2016 05:02:26 +0000 (21:02 -0800)]
Switch all methods of gyro to Robot class so DriveTrain does not have to be depended on, errors in driverstation
EvanYap [Thu, 28 Jan 2016 03:13:37 +0000 (19:13 -0800)]
Make 2 methods for gyro to getAngle and setSensitivity in DriveTrain class
EvanYap [Thu, 28 Jan 2016 02:30:18 +0000 (18:30 -0800)]
Initialize AnalogGyro in Robot class
EvanYap [Thu, 28 Jan 2016 03:13:37 +0000 (19:13 -0800)]
Make 2 methods for gyro to getAngle and setSensitivity in DriveTrain class
Kevin Zhang [Sat, 13 Feb 2016 05:08:36 +0000 (21:08 -0800)]
fix compile errors that somehow got into master
Shivani Ghanta [Sat, 6 Feb 2016 22:54:57 +0000 (14:54 -0800)]
fix Robot.java bug: intantiate IntakeArm subsystem, not constants
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
Kevin Zhang [Thu, 11 Feb 2016 04:02:41 +0000 (20:02 -0800)]
Fix some errors
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
Meryem Esa [Thu, 11 Feb 2016 03:37:37 +0000 (19:37 -0800)]
instead of just one lidar, add one left and one right
Kevin Zhang [Sat, 13 Feb 2016 05:38:09 +0000 (21:38 -0800)]
Fix deleted stuff that shouldn't have been deleted
EvanYap [Sat, 13 Feb 2016 05:10:20 +0000 (21:10 -0800)]
Remove useless variables and commented stuff in Robot.java
EvanYap [Sat, 13 Feb 2016 04:50:56 +0000 (20:50 -0800)]
Use AnotherGyroClass's method of getAngle for getRotationZ, MAGICALLY WORKS
EvanYap [Fri, 12 Feb 2016 05:00:56 +0000 (21:00 -0800)]
Use GyroClass and currently using method getDegrees in teleopPeriodic
EvanYap [Tue, 9 Feb 2016 05:02:26 +0000 (21:02 -0800)]
Switch all methods of gyro to Robot class so DriveTrain does not have to be depended on, errors in driverstation
EvanYap [Thu, 28 Jan 2016 03:13:37 +0000 (19:13 -0800)]
Make 2 methods for gyro to getAngle and setSensitivity in DriveTrain class
EvanYap [Thu, 28 Jan 2016 02:30:18 +0000 (18:30 -0800)]
Initialize AnalogGyro in Robot class
EvanYap [Thu, 28 Jan 2016 03:13:37 +0000 (19:13 -0800)]
Make 2 methods for gyro to getAngle and setSensitivity in DriveTrain class
EvanYap [Thu, 28 Jan 2016 02:30:18 +0000 (18:30 -0800)]
Initialize AnalogGyro in Robot class
Kevin Zhang [Sat, 13 Feb 2016 05:08:36 +0000 (21:08 -0800)]
fix compile errors that somehow got into master
Shivani Ghanta [Sat, 6 Feb 2016 22:54:57 +0000 (14:54 -0800)]
fix Robot.java bug: intantiate IntakeArm subsystem, not constants
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
Cindy Zhang [Sat, 13 Feb 2016 21:59:16 +0000 (13:59 -0800)]
change input variables horizontalLimit and height to x and y, respectively
Cindy Zhang [Sat, 13 Feb 2016 21:56:09 +0000 (13:56 -0800)]
add comments that explain what this commandgroups do
Cindy Zhang [Sat, 13 Feb 2016 21:51:07 +0000 (13:51 -0800)]
add comments that explain what these commandgroups do
Cindy Zhang [Sat, 13 Feb 2016 21:41:36 +0000 (13:41 -0800)]
change current x and y position to values gotten by MoveDefenseArmHorizontal instead of input values
Cindy Zhang [Sat, 13 Feb 2016 21:11:06 +0000 (13:11 -0800)]
change current x and y position to values gotten by MoveDefenseArmVertical instead of input values
Cindy Zhang [Sat, 13 Feb 2016 21:05:44 +0000 (13:05 -0800)]
add command MoveDefenseArm to specified target position based on input verticalDisplacement
Cindy Zhang [Sat, 13 Feb 2016 21:04:29 +0000 (13:04 -0800)]
add command MoveDefenseArm to specified target position based on input horizontalDisplacement
Cindy Zhang [Sat, 13 Feb 2016 21:01:49 +0000 (13:01 -0800)]
create new MoveDefenseArmVertical commandGroup
Cindy Zhang [Sat, 13 Feb 2016 21:00:59 +0000 (13:00 -0800)]
rename MoveDefenseArmVertical to MoveDefenseArm because previously MoveDefenseArmVertical is general enough to rename MoveDefenseArm
Cindy Zhang [Sat, 13 Feb 2016 21:00:02 +0000 (13:00 -0800)]
create new commandGroup MoveDefenseArmHorizontal
Cindy Zhang [Sat, 13 Feb 2016 20:53:42 +0000 (12:53 -0800)]
add parallel commands setArmToAngle and setHandToAngle
Cindy Zhang [Sat, 13 Feb 2016 20:39:20 +0000 (12:39 -0800)]
untracked .gitignore
Cindy Zhang [Sat, 13 Feb 2016 20:34:25 +0000 (12:34 -0800)]
add thing to git ignore
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
Meryem Esa [Thu, 11 Feb 2016 03:37:37 +0000 (19:37 -0800)]
instead of just one lidar, add one left and one right
Kevin Zhang [Sat, 13 Feb 2016 05:38:09 +0000 (21:38 -0800)]
Fix deleted stuff that shouldn't have been deleted
EvanYap [Sat, 13 Feb 2016 05:10:20 +0000 (21:10 -0800)]
Remove useless variables and commented stuff in Robot.java
EvanYap [Sat, 13 Feb 2016 04:59:25 +0000 (20:59 -0800)]
rename print line statement to say Degrees: and rename AnotherGyroClass to GyroLib from another team
EvanYap [Sat, 13 Feb 2016 04:50:56 +0000 (20:50 -0800)]
Use AnotherGyroClass's method of getAngle for getRotationZ, MAGICALLY WORKS
EvanYap [Fri, 12 Feb 2016 05:00:56 +0000 (21:00 -0800)]
Use GyroClass and currently using method getDegrees in teleopPeriodic
EvanYap [Thu, 11 Feb 2016 05:30:05 +0000 (21:30 -0800)]
add another team's gyro code in case decision to use either one would proceed for the better judgement for the robot
EvanYap [Thu, 11 Feb 2016 05:29:33 +0000 (21:29 -0800)]
Refactor name of FirebotGyro class to GyroClass since another team mentor created it
EvanYap [Thu, 11 Feb 2016 05:15:04 +0000 (21:15 -0800)]
Attempts to create methods for the gyro to work, but testing has failed
EvanYap [Tue, 9 Feb 2016 05:02:26 +0000 (21:02 -0800)]
Switch all methods of gyro to Robot class so DriveTrain does not have to be depended on, errors in driverstation
EvanYap [Tue, 9 Feb 2016 04:42:35 +0000 (20:42 -0800)]
Make methods to convert DegreesPerSecond to Degrees
EvanYap [Tue, 9 Feb 2016 04:07:23 +0000 (20:07 -0800)]
Make convert method to get Z axis in Degrees per second regarding short MAX and MIN value calculations
EvanYap [Tue, 9 Feb 2016 03:15:36 +0000 (19:15 -0800)]
Remake gyro methods to print out rawValue of the gyro Rotation of Z axis
EvanYap [Tue, 2 Feb 2016 02:46:54 +0000 (18:46 -0800)]
Change variable name from angle to rawValue
EvanYap [Sat, 30 Jan 2016 22:17:06 +0000 (14:17 -0800)]
Instantiate and run gyro method in TeleOp
EvanYap [Sat, 30 Jan 2016 22:16:31 +0000 (14:16 -0800)]
Remove useless constants for gyro
EvanYap [Sat, 30 Jan 2016 22:15:12 +0000 (14:15 -0800)]
Add library for ITG3200 gyro
EvanYap [Thu, 28 Jan 2016 03:13:37 +0000 (19:13 -0800)]
Make 2 methods for gyro to getAngle and setSensitivity in DriveTrain class
EvanYap [Thu, 28 Jan 2016 02:30:18 +0000 (18:30 -0800)]
Initialize AnalogGyro in Robot class
EvanYap [Thu, 28 Jan 2016 03:13:37 +0000 (19:13 -0800)]
Make 2 methods for gyro to getAngle and setSensitivity in DriveTrain class
EvanYap [Thu, 28 Jan 2016 02:30:18 +0000 (18:30 -0800)]
Initialize AnalogGyro in Robot class
Kevin Zhang [Sat, 13 Feb 2016 05:08:36 +0000 (21:08 -0800)]
fix compile errors that somehow got into master
Shivani Oghanta [Fri, 12 Feb 2016 04:27:38 +0000 (20:27 -0800)]
Fix bug so that the sensitivity threshold worked correctly
Shivani Oghanta [Fri, 12 Feb 2016 03:53:54 +0000 (19:53 -0800)]
Add command MoveIntakeArmToAngle
Shivani Oghanta [Thu, 11 Feb 2016 05:12:09 +0000 (21:12 -0800)]
delete MoveIntakeArmToHeight
Shivani Oghanta [Thu, 11 Feb 2016 05:03:16 +0000 (21:03 -0800)]
Add MoveIntakeArmUp
Shivani Oghanta [Thu, 11 Feb 2016 04:09:02 +0000 (20:09 -0800)]
Delete MoveIntakeArmToHeight and created MoveIntakeArmToLevel
Shivani Oghanta [Sun, 7 Feb 2016 04:14:43 +0000 (20:14 -0800)]
Add MoveIntakeArmToBallIntakeHeight
Shivani Oghanta [Sun, 7 Feb 2016 02:32:29 +0000 (18:32 -0800)]
Add getArmHeight to MoveIntakeArmToBallIntakeHeight
Shivani Oghanta [Sun, 7 Feb 2016 02:25:59 +0000 (18:25 -0800)]
Add constant arm length and command getArmHeight
Shivani Oghanta [Sun, 7 Feb 2016 01:44:23 +0000 (17:44 -0800)]
Fill out MoveIntakeArmToBallIntakeHeight command
Shivani Oghanta [Sun, 7 Feb 2016 01:27:01 +0000 (17:27 -0800)]
Create a zeroangle constant for intake arm
Shivani Oghanta [Sun, 7 Feb 2016 00:25:07 +0000 (16:25 -0800)]
Rename MoveIntakeArm to MoveIntakeArmToAngle
Shivani Oghanta [Sun, 7 Feb 2016 00:20:20 +0000 (16:20 -0800)]
fill MoveIntakeArm command
Shivani Ghanta [Sat, 6 Feb 2016 22:54:57 +0000 (14:54 -0800)]
fix Robot.java bug: intantiate IntakeArm subsystem, not constants
Shivani Ghanta [Sat, 6 Feb 2016 22:00:31 +0000 (14:00 -0800)]
fix port names in Constant
Shaina Chen [Fri, 12 Feb 2016 03:59:48 +0000 (19:59 -0800)]
change arm and hand angle input variables to constants
Shaina Chen [Fri, 12 Feb 2016 03:51:10 +0000 (19:51 -0800)]
add javadoc style comment for class
Shaina Chen [Fri, 12 Feb 2016 03:47:28 +0000 (19:47 -0800)]
add javadoc style comment for class
Shaina Chen [Fri, 12 Feb 2016 03:46:42 +0000 (19:46 -0800)]
add javadoc style comment for class
Cindy Zhang [Fri, 12 Feb 2016 03:35:10 +0000 (19:35 -0800)]
update todo tasks that are done
Shaina Chen [Fri, 12 Feb 2016 03:34:55 +0000 (19:34 -0800)]
add javadoc style for class and change isFinished to return true
Cindy Zhang [Fri, 12 Feb 2016 03:34:36 +0000 (19:34 -0800)]
change method getArmHeight to getArmVerticalDisplacement
Shaina Chen [Fri, 12 Feb 2016 03:34:06 +0000 (19:34 -0800)]
add javadoc style for class and change isFinished to return true
Cindy Zhang [Fri, 12 Feb 2016 03:33:22 +0000 (19:33 -0800)]
change method getArmHorizontalDist to getArmHorizontalDisplacement
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
Shaina Chen [Fri, 12 Feb 2016 03:31:43 +0000 (19:31 -0800)]
add javadoc style comment for class
Shaina Chen [Fri, 12 Feb 2016 03:29:57 +0000 (19:29 -0800)]
add javadoc style comment for class
Shaina Chen [Fri, 12 Feb 2016 03:27:47 +0000 (19:27 -0800)]
change 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
Cindy Zhang [Fri, 12 Feb 2016 03:22:43 +0000 (19:22 -0800)]
add todo's after reviewing code with danny
Shaina Chen [Fri, 12 Feb 2016 03:19:41 +0000 (19:19 -0800)]
delete setHandToLevel command
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
Shaina Chen [Fri, 12 Feb 2016 02:53:19 +0000 (18:53 -0800)]
change name of command to SetArmToAngle
Shaina Chen [Thu, 11 Feb 2016 05:03:25 +0000 (21:03 -0800)]
change variable name to match new variable names in defenseArm
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
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
Shaina Chen [Thu, 11 Feb 2016 04:14:48 +0000 (20:14 -0800)]
change input variable from targetPosition to level
Kevin Zhang [Thu, 11 Feb 2016 04:02:41 +0000 (20:02 -0800)]
Fix some errors
Shaina Chen [Thu, 11 Feb 2016 03:58:45 +0000 (19:58 -0800)]
rename commands to set to level instead of angle