projects/openledrace
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace open-led-race.ino

Browse source
This commit is contained in:
Singular Devices 2021-07-13 22:27:41 +00:00
parent 00c082830a
commit 10f429497b
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
open-led-race/open-led-race.ino
View file

@ -31,7 +31,7 @@
*/ */
// 2020/12/10 - Ver 0.9.6 // 2020/12/10 - Ver 0.9.7
// --see changelog.txt // --see changelog.txt
char const softwareId[] = "A4P0"; // A4P -> A = Open LED Race, 4P0 = Game ID (4P = 4 Players, 0=Type 0) char const softwareId[] = "A4P0"; // A4P -> A = Open LED Race, 4P0 = Game ID (4P = 4 Players, 0=Type 0)
@ -58,7 +58,7 @@ char const version[] = "0.9.7";
#define COLOR4 track.Color(255,255,255) #define COLOR4 track.Color(255,255,255)
#define COLOR_RAMP track.Color(64,0,64) #define COLOR_RAMP track.Color(64,0,64)
#define COLOR_COIN track.Color(0,255,255) #define COLOR_COIN track.Color(40,40,0)
#define COLOR_BOXMARKS track.Color(64,64,0) #define COLOR_BOXMARKS track.Color(64,64,0)
#define LED_SEMAPHORE 12 #define LED_SEMAPHORE 12
@ -125,6 +125,7 @@ byte SMOTOR=0;
int TBEEP=0; int TBEEP=0;
int FBEEP=0; int FBEEP=0;
/*------------------------------------------------------*/ /*------------------------------------------------------*/
enum loglevel verbose = DISABLE; enum loglevel verbose = DISABLE;
@ -304,8 +305,8 @@ void loop() {
case RACING: case RACING:
{ {
strip_clear( &tck ); strip_clear( &tck );
if( box_isactive( &tck ) ) { if( box_isactive( &tck ) ) {
if( tck.ledcoin == COIN_RESET ) { if( tck.ledcoin == COIN_RESET ) {
tck.ledcoin = COIN_WAIT; tck.ledcoin = COIN_WAIT;
@ -316,7 +317,17 @@ void loop() {
else if( millis() > tck.ledtime ) else if( millis() > tck.ledtime )
tck.ledcoin = random( 20, tck.cfg.track.nled_aux - 20 ); tck.ledcoin = random( 20, tck.cfg.track.nled_aux - 20 );
} }
else if (BATTERY_MODE==1){
if( tck.ledcoin == COIN_RESET ) {
tck.ledcoin = COIN_WAIT;
tck.ledtime = millis() + random(3000,8000);
}
if( tck.ledcoin > 0 )
draw_coin( &tck );
else if( millis() > tck.ledtime )
tck.ledcoin = random( LED_SEMAPHORE+4, tck.cfg.track.nled_main - 60); //valid zone from random charge (semaphore to 1 meter before to start-finish position
}
if( ramp_isactive( &tck ) ) if( ramp_isactive( &tck ) )
draw_ramp( &tck ); draw_ramp( &tck );
if( box_isactive( &tck ) ) if( box_isactive( &tck ) )
@ -345,7 +356,7 @@ void loop() {
// ---------------- // ----------------
} }
break; break;
case COMPLETE : case COMPLETE :
{ {
strip_clear( &tck ); strip_clear( &tck );
@ -456,7 +467,8 @@ void print_cars_positions( car_t* cars ) {
for( int i = 0; i < race.numcars; ++i ) { for( int i = 0; i < race.numcars; ++i ) {
int const rpos = get_relative_position( &cars[i] ); int const rpos = get_relative_position( &cars[i] );
sprintf( txbuff, "p%d%s%d,%d,%d%c", i + 1, tracksID[cars[i].trackID], cars[i].nlap, rpos,(int)cars[i].battery, EOL ); if (BATTERY_MODE==1) {sprintf( txbuff, "p%d%s%d,%d,%d%c", i + 1, tracksID[cars[i].trackID], cars[i].nlap, rpos,(int)cars[i].battery, EOL );}
else {sprintf( txbuff, "p%d%s%d,%d%c", i + 1, tracksID[cars[i].trackID], cars[i].nlap, rpos, EOL );};
serialCommand.sendCommand(txbuff); serialCommand.sendCommand(txbuff);
//sendCommand(txbuff); //sendCommand(txbuff);
} }
@ -578,12 +590,12 @@ void draw_car( track_t* tck, car_t* car ) {
case TRACK_MAIN: case TRACK_MAIN:
for(int i=0; i<=1; ++i ) for(int i=0; i<=1; ++i )
track.setPixelColor( ((word)car->dist % cfg->nled_main) - i, car->color ); track.setPixelColor( ((word)car->dist % cfg->nled_main) - i, car->color );
if ( (car->battery<=BATTERY_MIN) && ((millis()%100)>50)) track.setPixelColor( ((word)car->dist % cfg->nled_main) - 2, 0x493905 ); if (BATTERY_MODE==1) if ( (car->battery<=BATTERY_MIN) && ((millis()%100)>50)) track.setPixelColor( ((word)car->dist % cfg->nled_main) - 2, 0x493905 );
break; break;
case TRACK_AUX: case TRACK_AUX:
for(int i=0; i<=1; ++i ) for(int i=0; i<=1; ++i )
track.setPixelColor( (word)(cfg->nled_main + cfg->nled_aux - car->dist_aux) + i, car->color); track.setPixelColor( (word)(cfg->nled_main + cfg->nled_aux - car->dist_aux) + i, car->color);
if ( (car->battery<=BATTERY_MIN) && ((millis()%100)>50) ) track.setPixelColor( (word)(cfg->nled_main + cfg->nled_aux - car->dist_aux) + 2, 0x493905); if (BATTERY_MODE==1) if ( (car->battery<=BATTERY_MIN) && ((millis()%100)>50) ) track.setPixelColor( (word)(cfg->nled_main + cfg->nled_aux - car->dist_aux) + 2, 0x493905);
break; break;
} }
} }