Skip to content

Commit 1d1ac79

Browse files
committed
move competition includes, edit them so they dont display time/status by default, include
1 parent 8c3f081 commit 1d1ac79

File tree

2 files changed

+25
-19
lines changed

2 files changed

+25
-19
lines changed

Vex_Competition_Includes_JON.c Includes/Vex_Competition_Includes_JON.c

+20-19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma systemFile
12
/*---------------------------------------------------------------------------*/
23
/* */
34
/* Description: VEX Competition Control Include File */
@@ -56,7 +57,7 @@ bool bStopTasksBetweenModes = true;
5657
// This global is used to disable the status display on the LCD by the code
5758
// in this file. The user may want to use the LCD during the pre_auton
5859
// function and not have it overwritten by calls to displayStatusAndTime
59-
bool bDisplayCompetitionStatusOnLcd = true;
60+
bool bDisplayCompetitionStatusOnLcd = false;
6061

6162
// There will also be many other errors but perhaps this will be noticed as it
6263
// will be at the top of the list. VEX platform is left for legacy reasons.
@@ -230,25 +231,25 @@ static void displayStatusAndTime( bool reset )
230231
return;
231232
}
232233

233-
// displayLCDPos(0, 0);
234-
//if (bIfiRobotDisabled)
235-
// displayNextLCDString("Disabled");
234+
displayLCDPos(0, 0);
235+
if (bIfiRobotDisabled)
236+
displayNextLCDString("Disabled");
236237

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);
252253
++nDisplayAndStatusTimer;
253254
}
254255

JonLib2.h

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#pragma systemFile
22

3+
#pragma platform(VEX2)
4+
#pragma competitionControl(competition)
5+
6+
#include "Includes/VEX_Competition_Includes_JON.c"
7+
38
#define MOVE_TIMEOUT 1000 //timeout for "auto" moves
49
#define THRESHOLD_COEFF 2 //expanded size of threshold for timeout
510

0 commit comments

Comments
 (0)