Merge pull request #41 from DigitalConfections/Dev1

Ver 0.17
pull/21/head
DigitalConfections 2020-07-28 19:24:53 -04:00 zatwierdzone przez GitHub
commit bbb8ec02e4
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -178,7 +178,7 @@ void doSynchronization(void);
{
while(initializeEEPROMVars())
{
; /* Initialize variables stored in EEPROM */
; /* Initialize variables stored in EEPROM */
}
setUpTemp();
@ -329,7 +329,7 @@ void doSynchronization(void);
g_number_of_foxes = 1;
g_pattern_codespeed = 8;
g_id_interval = 600;
g_startclock_interval = 300;
g_startclock_interval = (g_fox == SPECTATOR) ? 120 : 300;
}
else if(((g_fox >= FOX_1) && (g_fox <= FOX_5)) || (g_fox == FOX_DEMO))
{
@ -907,7 +907,7 @@ ISR(TIMER1_COMPA_vect) /*timer1 interrupt 1Hz */
}
}
if((g_seconds_since_sync + 11) % g_startclock_interval <= 10)
if(g_enable_start_timer && ((g_seconds_since_sync + 11) % g_startclock_interval <= 10))
{
g_lastSeconds = (uint8_t)((g_seconds_since_sync + 11) % g_startclock_interval);
}

Wyświetl plik

@ -70,7 +70,7 @@
/******************************************************
* Set the text that gets displayed to the user */
#define SW_REVISION "0.16"
#define SW_REVISION "0.17"
//#define TRANQUILIZE_WATCHDOG