Fixed Merging Issues

Coconuts2486-FRC · Feb 19, 2020 · e3afdc2 · e3afdc2
1 parent 790ffe7
commit e3afdc2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/FRC2020/src/main/java/frc/robot/Color_Wheel/ColorSensor.java b/FRC2020/src/main/java/frc/robot/Color_Wheel/ColorSensor.java
@@ -1,8 +1,6 @@
 package frc.robot.Color_Wheel;
 
 import com.revrobotics.ColorSensorV3;
-import com.revrobotics.ColorSensorV3.RawColor;
-
 import edu.wpi.first.wpilibj.I2C;
 import edu.wpi.first.wpilibj.I2C.Port;
 

diff --git a/FRC2020/src/main/java/frc/robot/Robot.java b/FRC2020/src/main/java/frc/robot/Robot.java
@@ -1,15 +1,10 @@
 package frc.robot;
 
 import com.ctre.phoenix.motorcontrol.NeutralMode;
-
 import edu.wpi.first.wpilibj.TimedRobot;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
-<<<<<<< HEAD
-=======
 import frc.robot.Autonomous.AutoMissions;
-import frc.robot.Cartridge.pixyControl;
 import frc.robot.Color_Wheel.ColorSensor;
->>>>>>> 41bc6a56fde2d046687205cc30fa675a6331f4c6
 import frc.robot.Turret.TurretControl;
 import frc.robot.Turret.TurretDisplay;
 import frc.robot.Turret.TurretMotion;
@@ -33,9 +28,6 @@ public void robotPeriodic(){
 
   @Override
   public void autonomousInit() {
-<<<<<<< HEAD
-    Map.Turret.motors.rotation.setSelectedSensorPosition(0);
-=======
     if(AutoMissions.SelectedAuto == 0){
       AutoMissions.NoAutoSelected();
     }
@@ -46,7 +38,6 @@ public void autonomousInit() {
     if(AutoMissions.SelectedAuto == 2){
       AutoMissions.GeneratorAuto();
     }
->>>>>>> 41bc6a56fde2d046687205cc30fa675a6331f4c6
   }
 
   @Override
@@ -55,28 +46,14 @@ public void autonomousPeriodic() {
 
   @Override
   public void teleopInit() {
-    Map.Turret.motors.rotation.setNeutralMode(NeutralMode.Coast);
+    Map.Turret.motors.rotation.setNeutralMode(NeutralMode.Brake);
   }
 
   @Override
   public void teleopPeriodic() {
     TurretControl.run(); // Runs turret
     TurretDisplay.display(); // Displays LimeLight stats
-    pixyControl.run(); // Runs pixy homing automation
-
-<<<<<<< HEAD
-    //DriveTrain.drive();
-    //pistonlift.run();
-=======
-    //DriveTrain.drive(); // Driver Controll ** BIG DEAL ** (needs to have correct CAN IDs)
-    /*
-    if(Map.Controllers.xbox.getRawButton(1)){
-      LimeLight.LED.on();
-    }else{
-      LimeLight.LED.off();
-    }
-    */
->>>>>>> 41bc6a56fde2d046687205cc30fa675a6331f4c6
+    //pixyControl.run(); // Runs pixy homing automation
   }
 
   @Override
@@ -85,14 +62,7 @@ public void testInit() {
 
   @Override
   public void testPeriodic() {
-<<<<<<< HEAD
-    if(Map.Controllers.driverLeft.getRawButtonPressed(3)){
-      Map.Turret.motors.rotation.setSelectedSensorPosition(0);
-    }
-    SmartDashboard.putNumber("Position!!! ", TurretMotion.Rotation.getDegrees());
-=======
     SmartDashboard.putNumber("Red: ", ColorSensor.GetColor());
->>>>>>> 41bc6a56fde2d046687205cc30fa675a6331f4c6
   }
 
 }
diff --git a/FRC2020/src/main/java/frc/robot/TeleOp/DriveTrain.Java b/FRC2020/src/main/java/frc/robot/TeleOp/DriveTrain.Java
@@ -1,8 +1,6 @@
 package frc.robot.TeleOp;
 
-import com.ctre.phoenix.motorcontrol.can.TalonSRX;
 import com.revrobotics.CANSparkMax;
-import com.revrobotics.SparkMax;
 
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import frc.robot.Map;