|
| 1 | +#pragma systemFile |
1 | 2 | /*---------------------------------------------------------------------------*/
|
2 | 3 | /* */
|
3 | 4 | /* Description: VEX Competition Control Include File */
|
@@ -56,7 +57,7 @@ bool bStopTasksBetweenModes = true;
|
56 | 57 | // This global is used to disable the status display on the LCD by the code
|
57 | 58 | // in this file. The user may want to use the LCD during the pre_auton
|
58 | 59 | // function and not have it overwritten by calls to displayStatusAndTime
|
59 |
| -bool bDisplayCompetitionStatusOnLcd = true; |
| 60 | +bool bDisplayCompetitionStatusOnLcd = false; |
60 | 61 |
|
61 | 62 | // There will also be many other errors but perhaps this will be noticed as it
|
62 | 63 | // will be at the top of the list. VEX platform is left for legacy reasons.
|
@@ -230,25 +231,25 @@ static void displayStatusAndTime( bool reset )
|
230 | 231 | return;
|
231 | 232 | }
|
232 | 233 |
|
233 |
| - // displayLCDPos(0, 0); |
234 |
| - //if (bIfiRobotDisabled) |
235 |
| - // displayNextLCDString("Disabled"); |
| 234 | + displayLCDPos(0, 0); |
| 235 | + if (bIfiRobotDisabled) |
| 236 | + displayNextLCDString("Disabled"); |
236 | 237 |
|
237 |
| - // displayLCDPos(1, 0); |
238 |
| - //if (bIfiRobotDisabled) |
239 |
| - // displayNextLCDString("Disable "); |
240 |
| - //else |
241 |
| - //{ |
242 |
| - // if (bIfiAutonomousMode) |
243 |
| - // displayNextLCDString("Auton "); |
244 |
| - // else |
245 |
| - // displayNextLCDString("Driver "); |
246 |
| - //} |
247 |
| - //displayNextLCDNumber(nDisplayAndStatusTimer / 600, 2); |
248 |
| - //displayNextLCDChar(':'); |
249 |
| - //displayNextLCDNumber((nDisplayAndStatusTimer / 10) % 60, -2); |
250 |
| - //displayNextLCDChar('.'); |
251 |
| - //displayNextLCDNumber(nDisplayAndStatusTimer % 10, 1); |
| 238 | + displayLCDPos(1, 0); |
| 239 | + if (bIfiRobotDisabled) |
| 240 | + displayNextLCDString("Disable "); |
| 241 | + else |
| 242 | + { |
| 243 | + if (bIfiAutonomousMode) |
| 244 | + displayNextLCDString("Auton "); |
| 245 | + else |
| 246 | + displayNextLCDString("Driver "); |
| 247 | + } |
| 248 | + displayNextLCDNumber(nDisplayAndStatusTimer / 600, 2); |
| 249 | + displayNextLCDChar(':'); |
| 250 | + displayNextLCDNumber((nDisplayAndStatusTimer / 10) % 60, -2); |
| 251 | + displayNextLCDChar('.'); |
| 252 | + displayNextLCDNumber(nDisplayAndStatusTimer % 10, 1); |
252 | 253 | ++nDisplayAndStatusTimer;
|
253 | 254 | }
|
254 | 255 |
|
|
0 commit comments