Merge remote-tracking branch 'origin/danielv5' into danielv5
This commit is contained in:
@@ -124,7 +124,8 @@ public class Hardware_Tester extends LinearOpMode {
|
||||
|
||||
// Sensor Data
|
||||
|
||||
// TELE.addData("Beam Break 1?", robot.beam1.isPressed());
|
||||
TELE.addData("Beam Break insideBeam?", robot.insideBeam.isPressed());
|
||||
TELE.addData("Beam Break outsideBeam?", robot.outsideBeam.isPressed());
|
||||
// TELE.addData("Beam Break 2?", robot.beam2.isPressed());
|
||||
// TELE.addData("Beam Break 3?", robot.beam3.isPressed());
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package org.firstinspires.ftc.teamcode.utilsv2;
|
||||
|
||||
import android.view.View;
|
||||
|
||||
import com.qualcomm.hardware.limelightvision.Limelight3A;
|
||||
import com.qualcomm.hardware.rev.RevColorSensorV3;
|
||||
import com.qualcomm.robotcore.hardware.AnalogInput;
|
||||
@@ -19,6 +21,7 @@ public class Robot {
|
||||
// Singleton instance
|
||||
private static Robot instance;
|
||||
|
||||
|
||||
/**
|
||||
* Returns the existing Robot instance or creates one if it doesn't exist.
|
||||
*/
|
||||
@@ -65,7 +68,6 @@ public class Robot {
|
||||
public Servo spin2;
|
||||
public TouchSensor insideBeam;
|
||||
public TouchSensor outsideBeam;
|
||||
|
||||
public RevColorSensorV3 revSensor;
|
||||
|
||||
public VoltageSensor voltage;
|
||||
|
||||
Reference in New Issue
Block a user