team696 · shuxshu3 · Jan 31, 2018 · Feb 11, 2018 · Feb 11, 2018 · Feb 11, 2018
diff --git a/2018Robot1/build/org/usfirst/frc/team696/robot/Robot.class b/2018Robot1/build/org/usfirst/frc/team696/robot/Robot.class
diff --git a/2018Robot1/build/org/usfirst/frc/team696/robot/RobotMap.class b/2018Robot1/build/org/usfirst/frc/team696/robot/RobotMap.class
diff --git a/2018Robot1/build/org/usfirst/frc/team696/robot/RobotTesting.class b/2018Robot1/build/org/usfirst/frc/team696/robot/RobotTesting.class
diff --git a/2018Robot1/build/org/usfirst/frc/team696/robot/commands/DriveCommand.class b/2018Robot1/build/org/usfirst/frc/team696/robot/commands/DriveCommand.class
diff --git a/2018Robot1/build/org/usfirst/frc/team696/robot/subsystems/ClimberSubsystemPID.class b/2018Robot1/build/org/usfirst/frc/team696/robot/subsystems/ClimberSubsystemPID.class
diff --git a/2018Robot1/build/org/usfirst/frc/team696/robot/subsystems/GreenLEDClimber.class b/2018Robot1/build/org/usfirst/frc/team696/robot/subsystems/GreenLEDClimber.class
diff --git a/2018Robot1/build/org/usfirst/frc/team696/robot/utilities/Constants.class b/2018Robot1/build/org/usfirst/frc/team696/robot/utilities/Constants.class
diff --git a/2018Robot1/build/org/usfirst/frc/team696/robot/utilities/RGBSensor.class b/2018Robot1/build/org/usfirst/frc/team696/robot/utilities/RGBSensor.class
diff --git a/2018Robot1/dist/FRCUserProgram.jar b/2018Robot1/dist/FRCUserProgram.jar
diff --git a/2018Robot1/src/org/usfirst/frc/team696/robot/Robot.java b/2018Robot1/src/org/usfirst/frc/team696/robot/Robot.java
diff --git a/2018Robot1/src/org/usfirst/frc/team696/robot/RobotMap.java b/2018Robot1/src/org/usfirst/frc/team696/robot/RobotMap.java
@@ -36,40 +36,40 @@ public class RobotMap {
     /*
     Drive Base
      */
-    public static int leftFront;
-    public static int leftMid;
-    public static int leftRear;
-    public static int rightFront;
-    public static int rightMid;
-    public static int rightRear;
+    public static int leftFront = 14;
+    public static int leftMid = 15;
+    public static int leftRear = 16;
+    public static int rightFront = 3;
+    public static int rightMid = 2;
+    public static int rightRear = 1;
 
-    public static int leftRearCurrent;
-    public static int leftMidCurrent;
-    public static int leftFrontCurrent;
-    public static int rightRearCurrent;
-    public static int rightMidCurrent;
-    public static int rightFrontCurrent;
+    public static int leftRearCurrent = 13;
+    public static int leftMidCurrent = 14;
+    public static int leftFrontCurrent = 15;
+    public static int rightRearCurrent = 0;
+    public static int rightMidCurrent = 1;
+    public static int rightFrontCurrent = 2;
 
     /*
     Elevator
      */
 
-    public static int leftIntake = 1;
-    public static int rightIntake = 2;
-    public static int leftElevator = 3;
-    public static int rightElevator = 4;
+    public static int leftIntake = 4;
+    public static int rightIntake = 5;
+    public static int leftElevator = 6;
+    public static int rightElevator = 8;
 
-    public static int leftIntakeCurrent = 1;
-    public static int rightIntakeCurrent = 2;
+    public static int leftIntakeCurrent = 3;
+    public static int rightIntakeCurrent = 4;
 
     /*
     Climber
      */
 
-    public static int leftClimber = 1;
-    public static int rightClimber = 3;
-    public static int hookDeploy = 2;
-    public static int greenLED = 0;
+    public static int leftClimber = 9;
+    public static int rightClimber = 10;
+    public static int hookDeploy = 1;
+    public static int greenLED = 12;
 
 
 }

diff --git a/2018Robot1/src/org/usfirst/frc/team696/robot/RobotTesting.java b/2018Robot1/src/org/usfirst/frc/team696/robot/RobotTesting.java
diff --git a/2018Robot1/src/org/usfirst/frc/team696/robot/commands/DriveCommand.java b/2018Robot1/src/org/usfirst/frc/team696/robot/commands/DriveCommand.java
@@ -62,8 +62,8 @@ public DriveCommand(double distance, double direction, double maxSpeed, double r
      */
     @Override
     protected void initialize() {
-        Robot.leftDriveEncoder.reset();
-        Robot.rightDriveEncoder.reset();
+//        Robot.leftDriveEncoder.reset();
+//        Robot.rightDriveEncoder.reset();
         tempTargetDirection = Robot.targetDirection +  Robot.navX.getYaw();
 
 

diff --git a/2018Robot1/src/org/usfirst/frc/team696/robot/subsystems/GreenLEDClimber.java b/2018Robot1/src/org/usfirst/frc/team696/robot/subsystems/GreenLEDClimber.java
@@ -10,10 +10,10 @@
 
     // Put methods for controlling this subsystem
     // here. Call these from Commands.
-    DigitalOutput greenLED;
+//    DigitalOutput greenLED;
 
     public GreenLEDClimber(int greenLED) {
-        this.greenLED = new DigitalOutput(greenLED);
+//        this.greenLED = new DigitalOutput(greenLED);
     }
 
 
@@ -22,11 +22,14 @@ public void initDefaultCommand() {
         //    setDefaultCommand(new MySpecialCommand());
     }
     public void set(boolean state) {
-        greenLED.set(state);
+//        greenLED.set(state);
 
 
         }
 
-    public boolean get() { return greenLED.get(); }
+    public boolean get() {
+//        return greenLED.get();
+        return true;
+    }
 }
 
diff --git a/2018Robot1/src/org/usfirst/frc/team696/robot/utilities/Constants.java b/2018Robot1/src/org/usfirst/frc/team696/robot/utilities/Constants.java
@@ -15,7 +15,7 @@ public class Constants {
     public int buttonY = 4;
     public int leftXAxis = 0;
     public int leftYAxis = 1;
-    public int rightXAxis = 4;
+    public int rightXAxis = 2;
     public int rightYAxis = 5;
     public int leftBumper = 5;
     public int rightBumper = 6;

diff --git a/2018Robot1/src/org/usfirst/frc/team696/robot/utilities/RGBSensor.java b/2018Robot1/src/org/usfirst/frc/team696/robot/utilities/RGBSensor.java
@@ -1,3 +1,39 @@
+<<<<<<< HEAD
+//package org.usfirst.frc.team696.robot.utilities;
+//
+//import edu.wpi.first.wpilibj.I2C;
+//
+//public class RGBSensor {
+//
+//    static double seconds;
+//    public static Timer timer = new Timer(seconds);
+//
+//    I2C rgbSensor;
+//    byte sensorAddress = 0x29;
+//    byte sensorEnableAddress = 0x00;
+//    byte sensorEnable_PON = 0x01;
+//    byte sensorEnable_AEN = 0x02;
+//    byte sensorCommand_Bit = (byte) 0x80;
+//    public byte sensorClearL = 0x14;
+//    public byte sensorRedL = 0x16;
+//    public byte sensorGreenL = 0x18;
+//    public byte sensorBlueL = 0x1A;
+//    byte[] buffer1 = new byte[1];
+//    byte[] buffer2 = new byte[2];
+//    int[] RGBC = new int[4];
+//
+//    public RGBSensor(I2C rgbSensor) {
+//        this.rgbSensor = rgbSensor;
+//
+//        RGBC[0] = read16(sensorClearL);
+//        RGBC[1] = read16(sensorRedL);
+//        RGBC[2] = read16(sensorGreenL);
+//        RGBC[3] = read16(sensorBlueL);
+//    }
+//
+//    public void enable() {
+//        rgbSensor.write(sensorEnableAddress, sensorEnable_PON);
+=======
 package org.usfirst.frc.team696.robot.utilities;
 
 import edu.wpi.first.wpilibj.I2C;
@@ -51,18 +87,38 @@ public int read16(int reg){
         int x;
 
 //        rgbSensor.write(sensorCommand_Bit | reg, 2);
+>>>>>>> Testing_RGBSensor
 //        timer.runTimer(3);
-        rgbSensor.read(sensorCommand_Bit | reg, 2, buffer2);
-
-        t = buffer2[0];
-        x = buffer2[1];
-
-        x <<=8;
-        x |= t;
-
-        return x;
-
-
-    }
-
-}
+//        rgbSensor.write(sensorEnableAddress, sensorEnable_PON | sensorEnable_AEN);
+//
+//    }
+//
+//    public byte read8(byte reg) {
+////        rgbSensor.write(sensorCommand_Bit, reg);
+//        timer.runTimer(3);
+//        rgbSensor.read(sensorCommand_Bit | reg, 1, buffer1);
+//
+//        return reg;
+//    }
+//
+//    public int read16(int reg){
+//
+//        int t;
+//        int x;
+//
+////        rgbSensor.write(sensorCommand_Bit | reg, 2);
+////        timer.runTimer(3);
+//        rgbSensor.read(sensorCommand_Bit | reg, 2, buffer2);
+//
+//        t = buffer2[0];
+//        x = buffer2[1];
+//
+//        x <<=8;
+//        x |= t;
+//
+//        return x;
+//
+//
+//    }
+//
+//}
diff --git a/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$GyroUpdate.class b/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$GyroUpdate.class
diff --git a/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$QuaternionUpdate.class b/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$QuaternionUpdate.class
diff --git a/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$StreamCommand.class b/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$StreamCommand.class
diff --git a/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$StreamResponse.class b/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$StreamResponse.class
diff --git a/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$YPRUpdate.class b/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol$YPRUpdate.class
diff --git a/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol.class b/2018Robot2/bin/com/kauailabs/nav6/IMUProtocol.class
diff --git a/2018Robot2/bin/com/kauailabs/nav6/frc/IMU.class b/2018Robot2/bin/com/kauailabs/nav6/frc/IMU.class
diff --git a/2018Robot2/bin/com/kauailabs/nav6/frc/IMUAdvanced.class b/2018Robot2/bin/com/kauailabs/nav6/frc/IMUAdvanced.class
diff --git a/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$AHRSUpdate.class b/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$AHRSUpdate.class
diff --git a/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$AHRS_DATA_ACTION.class b/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$AHRS_DATA_ACTION.class
diff --git a/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$AHRS_DATA_TYPE.class b/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$AHRS_DATA_TYPE.class
diff --git a/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$AHRS_TUNING_VAR_ID.class b/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$AHRS_TUNING_VAR_ID.class
diff --git a/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$BoardID.class b/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$BoardID.class
diff --git a/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$DataSetResponse.class b/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$DataSetResponse.class
diff --git a/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$MagCalData.class b/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$MagCalData.class
diff --git a/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$TuningVar.class b/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol$TuningVar.class
diff --git a/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol.class b/2018Robot2/bin/com/kauailabs/navx_mxp/AHRSProtocol.class
diff --git a/2018Robot2/bin/org/usfirst/frc/team696/robot/OI.class b/2018Robot2/bin/org/usfirst/frc/team696/robot/OI.class
diff --git a/2018Robot2/bin/org/usfirst/frc/team696/robot/Robot.class b/2018Robot2/bin/org/usfirst/frc/team696/robot/Robot.class
diff --git a/2018Robot2/bin/org/usfirst/frc/team696/robot/RobotMap.class b/2018Robot2/bin/org/usfirst/frc/team696/robot/RobotMap.class
diff --git a/2018Robot2/bin/org/usfirst/frc/team696/robot/commands/ExampleCommand.class b/2018Robot2/bin/org/usfirst/frc/team696/robot/commands/ExampleCommand.class
diff --git a/2018Robot2/bin/org/usfirst/frc/team696/robot/subsystems/DriveTrainSubsystem.class b/2018Robot2/bin/org/usfirst/frc/team696/robot/subsystems/DriveTrainSubsystem.class
diff --git a/2018Robot2/bin/org/usfirst/frc/team696/robot/subsystems/ExampleSubsystem.class b/2018Robot2/bin/org/usfirst/frc/team696/robot/subsystems/ExampleSubsystem.class
diff --git a/ScorpiusCustom/.idea/misc.xml b/ScorpiusCustom/.idea/misc.xml