Skip to content
This repository was archived by the owner on Sep 14, 2019. It is now read-only.

Commit 17c2c71

Browse files
Added cameras, comment out PID
1 parent f8b8af7 commit 17c2c71

7 files changed

Lines changed: 22 additions & 8 deletions

File tree

Robot2018/.classpath

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@
1616
<classpathentry kind="lib" path="lib/CTRE_Phoenix-sources.jar"/>
1717
<classpathentry kind="lib" path="lib/CTRE_Phoenix.jar"/>
1818
<classpathentry kind="lib" path="lib/navx_frc.jar"/>
19-
<classpathentry kind="var" path="USERLIBS_DIR/CTRE_Phoenix-sources.jar"/>
20-
<classpathentry kind="var" path="USERLIBS_DIR/CTRE_Phoenix.jar"/>
21-
<classpathentry kind="var" path="USERLIBS_DIR/navx_frc.jar"/>
2219
<classpathentry kind="output" path="bin"/>
2320
</classpath>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#Sat Feb 17 14:18:13 PST 2018
2+
C\:\\Users\\dean\\git\\RobotCode2018\\Robot2018\\lib\\libpathfinderjava.so=4087ee38c338446b8305f67716260df4

Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.usfirst.frc.team199.Robot2018.subsystems.IntakeEject;
2323
import org.usfirst.frc.team199.Robot2018.subsystems.Lift;
2424

25+
import edu.wpi.first.wpilibj.CameraServer;
2526
import edu.wpi.first.wpilibj.DriverStation;
2627
import edu.wpi.first.wpilibj.Preferences;
2728
import edu.wpi.first.wpilibj.TimedRobot;
@@ -113,6 +114,8 @@ public void robotInit() {
113114
autoScripts = AutoUtils.parseScriptFile(Preferences.getInstance().getString("autoscripts", ""));
114115

115116
listen = new Listener();
117+
CameraServer.getInstance().startAutomaticCapture(0);
118+
CameraServer.getInstance().startAutomaticCapture(1);
116119
}
117120

118121
/**

Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,10 @@ public RobotMap() {
171171
rightVelocityController.setContinuous(false);
172172
rightVelocityController.setAbsoluteTolerance(Robot.getConst("VelocityToleranceRight", 2));
173173

174-
robotDrive = new DifferentialDrive(leftVelocityController, rightVelocityController);
175-
robotDrive.setMaxOutput(Robot.getConst("Max High Speed", 204));
176-
// robotDrive = new DifferentialDrive(dtLeft, dtRight);
174+
// robotDrive = new DifferentialDrive(leftVelocityController,
175+
// rightVelocityController);
176+
// robotDrive.setMaxOutput(Robot.getConst("Max High Speed", 204));
177+
robotDrive = new DifferentialDrive(dtLeft, dtRight);
177178

178179
distEncAvg = new PIDSourceAverage(leftEncDist, rightEncDist);
179180
fancyGyro = new AHRS(SerialPort.Port.kMXP);

Robot2018/src/org/usfirst/frc/team199/Robot2018/autonomous/VelocityPIDController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public VelocityPIDController(double kp, double ki, double kd, double kf, PIDSour
4141
*/
4242
@Override
4343
public void pidWrite(double output) {
44-
setSetpoint(output);
44+
set(output);
4545
}
4646

4747
/**

Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/TeleopDrive.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public TeleopDrive() {
2323
// Called just before this Command runs the first time
2424
@Override
2525
protected void initialize() {
26-
Robot.dt.enableVelocityPIDs();
26+
// Robot.dt.enableVelocityPIDs();
2727
}
2828

2929
// Called repeatedly when this Command is scheduled to run

shuffleboard.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,17 @@
242242
"colorWhenTrue": "#7CFC00FF",
243243
"colorWhenFalse": "#8B0000FF"
244244
}
245+
},
246+
"2,1": {
247+
"size": [
248+
2,
249+
1
250+
],
251+
"content": {
252+
"_type": "Text View",
253+
"_source0": "network_table:///SmartDashboard/Const/DPP",
254+
"_title": "SmartDashboard/Const/DPP"
255+
}
245256
}
246257
}
247258
}

0 commit comments

Comments
 (0)