projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7638f54
)
Troubleshooting
author
Andres Esteban Echeverria G
<estebanech@Andress-MacBook-Air.local>
Tue, 7 Feb 2017 05:26:15 +0000
(21:26 -0800)
committer
Andres Esteban Echeverria G
<estebanech@Andress-MacBook-Air.local>
Tue, 7 Feb 2017 05:26:15 +0000
(21:26 -0800)
src/org/usfirst/frc/team3501/robot/CameraFeeds.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/Constants.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/OI.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/Robot.java
patch
|
blob
|
blame
|
history
diff --git
a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 15ea3695efe43ba65a1743d32568fb9898c5ebda..4e1d919dac54204bfa4f3adfc10de0c7697b22fa 100755
(executable)
--- a/
src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/
src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@
-58,6
+58,7
@@
public class CameraFeeds {
}
public void toggleCamera() {
}
public void toggleCamera() {
+ System.out.println("enter toggleCamer");
if (curCam.equals(intakeCam)) {
changeCam(climberCam);
curCam = climberCam;
if (curCam.equals(intakeCam)) {
changeCam(climberCam);
curCam = climberCam;
@@
-80,6
+81,7
@@
public class CameraFeeds {
* newId for camera
*/
public void changeCam(VideoSource cam) {
* newId for camera
*/
public void changeCam(VideoSource cam) {
+ System.out.println("change camera");
server.removeCamera(axisCamName);
server.removeCamera(usbCamName);
server.addCamera(cam);
server.removeCamera(axisCamName);
server.removeCamera(usbCamName);
server.addCamera(cam);
diff --git
a/src/org/usfirst/frc/team3501/robot/Constants.java
b/src/org/usfirst/frc/team3501/robot/Constants.java
index a40334d01c5bdfc3cbd6eda96790d9e001ab6cce..6c3a6adabe85c45964c0fceb3a202557af99cd55 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/
src/org/usfirst/frc/team3501/robot/Constants.java
@@
-20,7
+20,7
@@
public class Constants {
public final static int TOGGLE_GEAR_PORT = 0;
public final static int TOGGLE_GEAR_PORT = 0;
- public static final int TOGGLE_CAMERA_FEEDS =
4
;
+ public static final int TOGGLE_CAMERA_FEEDS =
1
;
}
}
diff --git
a/src/org/usfirst/frc/team3501/robot/OI.java
b/src/org/usfirst/frc/team3501/robot/OI.java
index 6a99c9756c08e66da78a81fc1d96eea9b04da88f..5082911be4703b6a55a674aad623f05b9507ab05 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/OI.java
+++ b/
src/org/usfirst/frc/team3501/robot/OI.java
@@
-23,7
+23,7
@@
public class OI {
public OI() {
leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
public OI() {
leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
- toggleWinch = new JoystickButton(leftJoystick,
+
/*
toggleWinch = new JoystickButton(leftJoystick,
Constants.OI.TOGGLE_WINCH_PORT);
toggleIndexWheel = new JoystickButton(leftJoystick,
Constants.OI.TOGGLE_INDEXWHEEL_PORT);
Constants.OI.TOGGLE_WINCH_PORT);
toggleIndexWheel = new JoystickButton(leftJoystick,
Constants.OI.TOGGLE_INDEXWHEEL_PORT);
@@
-33,17
+33,13
@@
public class OI {
toggleGear = new JoystickButton(leftJoystick,
Constants.OI.TOGGLE_GEAR_PORT);
toggleGear.whenPressed(new ToggleGear());
toggleGear = new JoystickButton(leftJoystick,
Constants.OI.TOGGLE_GEAR_PORT);
toggleGear.whenPressed(new ToggleGear());
+ */
toggleCameraFeeds = new JoystickButton(leftJoystick,
Constants.OI.TOGGLE_CAMERA_FEEDS);
toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
toggleCameraFeeds = new JoystickButton(leftJoystick,
Constants.OI.TOGGLE_CAMERA_FEEDS);
toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
-
- toggleCameraFeeds = new JoystickButton(leftJoystick,
- Constants.OI.TOGGLE_CAMERA_FEEDS);
-
- toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
-
+ System.out.println("toggle ready");
}
public static OI getOI() {
}
public static OI getOI() {
diff --git
a/src/org/usfirst/frc/team3501/robot/Robot.java
b/src/org/usfirst/frc/team3501/robot/Robot.java
index d4f5d946eb9e987828350b694c6b0f550f3d4174..b0e32a72bff3b55fa6b898bcd2400821e2c6dd06 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-43,8
+43,6
@@
public class Robot extends IterativeRobot {
// cameraFeeds = new CameraFeeds();
// cameraFeeds = new CameraFeeds();
- cameraFeeds = new CameraFeeds();
-
}
public static DriveTrain getDriveTrain() {
}
public static DriveTrain getDriveTrain() {
@@
-81,8
+79,6
@@
public class Robot extends IterativeRobot {
cameraFeeds.init();
cameraFeeds.init();
- cameraFeeds.init();
-
}
@Override
}
@Override