gistfile1.txt

ESC[33mcommit 7cfd5401d0edcaece9459195eab4252ca76e7f0eESC[m
Author:     Joseph Warner <hardolaf@hardolaf.com>
AuthorDate: Sat Apr 13 10:37:30 2013 -0400
Commit:     Joseph Warner <hardolaf@hardolaf.com>
CommitDate: Sat Apr 13 10:37:30 2013 -0400

    [Robot] Code right before competition start

ESC[1mdiff --git a/Proteus/Proteus.creator.user b/Proteus/Proteus.creator.userESC[m
ESC[1mindex 6066117..ad38000 100755ESC[m
ESC[1m--- a/Proteus/Proteus.creator.userESC[m
ESC[1m+++ b/Proteus/Proteus.creator.userESC[m
ESC[36m@@ -1,6 +1,6 @@ESC[m
 <?xml version="1.0" encoding="UTF-8"?>ESC[m
 <!DOCTYPE QtCreatorProject>ESC[m
ESC[31m-<!-- Written by QtCreator 2.7.81, 2013-04-12T12:21:27. -->ESC[m
ESC[32m+ESC[mESC[32m<!-- Written by QtCreator 2.7.81, 2013-04-13T10:28:13. -->ESC[mESC[41m^MESC[m
 <qtcreator>ESC[m
  <data>ESC[m
   <variable>ProjectExplorer.Project.ActiveTarget</variable>ESC[m
ESC[1mdiff --git a/Proteus/main.cpp b/Proteus/main.cppESC[m
ESC[1mindex d042fbb..aa25aa4 100755ESC[m
ESC[1m--- a/Proteus/main.cppESC[m
ESC[1m+++ b/Proteus/main.cppESC[m
ESC[36m@@ -58,10 +58,10 @@ESC[m ESC[mint main(void)ESC[m
                 robot.calibrateOptosensors();ESC[m
                 debug_menu();ESC[m
             } else if (buttons.MiddlePressed()) {ESC[m
ESC[31m-                robot.testServoElevatorSetAngle();ESC[m
ESC[32m+ESC[mESC[32m                robot.calibrateLightSensor();ESC[mESC[41m^MESC[m
                 debug_menu();ESC[m
             } else if (buttons.RightPressed()) {ESC[m
ESC[31m-                robot.testServoElevator();ESC[m
ESC[32m+ESC[mESC[32m                robot.calibrateEncoders();ESC[mESC[41m^MESC[m
                 debug_menu();ESC[m
             }ESC[m
 ESC[m
ESC[36m@@ -79,8 +79,8 @@ESC[m ESC[mvoid debug_menu() {ESC[m
     LCD.Clear( FEHLCD::Black );ESC[m
     LCD.WriteLine("DEBUG MODE");ESC[m
     LCD.WriteLine("Left: Calibrate optosensors");ESC[m
ESC[31m-    LCD.WriteLine("Middle: Test Elevator Extreme");ESC[m
ESC[31m-    LCD.WriteLine("Right: Test Elevator Servo");ESC[m
ESC[32m+ESC[mESC[32m    LCD.WriteLine("Middle: Calibrate light sensor");ESC[mESC[41m^MESC[m
ESC[32m+ESC[mESC[32m    LCD.WriteLine("Right: Calibrate shaft encoders");ESC[mESC[41m^MESC[m
     Sleep( 300 );ESC[m
 }ESC[m
 ESC[m