From 2c392d18136bbdc658c53f52f4e5ecf8ba8e2d9f Mon Sep 17 00:00:00 2001 From: Joseph Date: Fri, 26 Jun 2015 09:39:36 -0400 Subject: [PATCH] Fixed comment problem in GyroMecanum cpp and made other small fixes to sample programs. Change-Id: Id6ee60085fa369ce3eb2e8261c0352b24886e2ae --- .../resources/templates/examples/Gyro/src/Robot.cpp | 2 +- .../resources/templates/examples/GyroMecanum/src/Robot.cpp | 1 - .../examples/Gyro/src/org/usfirst/frc/team190/robot/Robot.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/Gyro/src/Robot.cpp b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/Gyro/src/Robot.cpp index 3667c4e691..3c5a6d733a 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/Gyro/src/Robot.cpp +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/Gyro/src/Robot.cpp @@ -20,7 +20,7 @@ class Robot: public SampleRobot { const int rightRearMotorChannel = 2; double angleSetpoint = 0.0; - const double pGain = .005; //propotional turning constant + const double pGain = .006; //propotional turning constant //gyro calibration constant, may need to be adjusted //gyro value of 360 is set to correspond to one full revolution diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GyroMecanum/src/Robot.cpp b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GyroMecanum/src/Robot.cpp index 23259d591a..f2c4e255fe 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GyroMecanum/src/Robot.cpp +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GyroMecanum/src/Robot.cpp @@ -8,7 +8,6 @@ * don't. Unless you know what you are doing, complex code will be much more difficult under * this system. Use IterativeRobot or Command-Based instead if you're new. */ - */ class Robot: public SampleRobot { Joystick *joystick; RobotDrive *myRobot; diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/Gyro/src/org/usfirst/frc/team190/robot/Robot.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/Gyro/src/org/usfirst/frc/team190/robot/Robot.java index eab760a45e..1762067ebb 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/Gyro/src/org/usfirst/frc/team190/robot/Robot.java +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/Gyro/src/org/usfirst/frc/team190/robot/Robot.java @@ -28,7 +28,7 @@ public class Robot extends SampleRobot { final int rightRearMotorChannel = 2; double angleSetpoint = 0.0; - final double pGain = .005; //propotional turning constant + final double pGain = .006; //propotional turning constant //gyro calibration constant, may need to be adjusted; //gyro value of 360 is set to correspond to one full revolution