dorian/speedclock
dorian/speedclock
Archived
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Removed delays from startsquence

Browse source
This commit is contained in:
Fenoglio 2018-07-07 23:51:35 +02:00
parent ad17222ced
commit dbae211294
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
speedclock.h
View file

@ -93,6 +93,7 @@ void set_state_LEDs(timer_state_e state, boolean warn);
void startSequence(void); void startSequence(void);
void update_statemessage(timer_state_e timer_state); void update_statemessage(timer_state_e timer_state);
void failSequence(void); void failSequence(void);
void wait(unsigned long ms);
#endif #endif

18
speedclock.ino
View file

@ -467,25 +467,25 @@ void startSequence(void)
// this is sequence of usually three tones after a wait time 1sec , in between the tones there is also a delay of 1 sec. Each tone is 200ms seconds long, except the last // this is sequence of usually three tones after a wait time 1sec , in between the tones there is also a delay of 1 sec. Each tone is 200ms seconds long, except the last
update_statemessage(timer_new_state); update_statemessage(timer_new_state);
if(timer_new_state == TIMER_RUNNING){ if(timer_new_state == TIMER_RUNNING){
delay(STARTSEQ_STARTPAUSE_MS); wait(STARTSEQ_STARTPAUSE_MS);
} }
// first tone // first tone
update_statemessage(timer_new_state); update_statemessage(timer_new_state);
if(timer_new_state == TIMER_RUNNING){ if(timer_new_state == TIMER_RUNNING){
tone(PIEZO_PIN, STARTSEQ_TON_1_2_FREQUENCY,STARTSEQ_TON_1_2_LENGTH_MS ); tone(PIEZO_PIN, STARTSEQ_TON_1_2_FREQUENCY,STARTSEQ_TON_1_2_LENGTH_MS );
delay(STARTSEQ_TONEPAUSE_MS); wait(STARTSEQ_TONEPAUSE_MS);
} }
//second tone //second tone
update_statemessage(timer_new_state); update_statemessage(timer_new_state);
if(timer_new_state == TIMER_RUNNING){ if(timer_new_state == TIMER_RUNNING){
tone(PIEZO_PIN, STARTSEQ_TON_1_2_FREQUENCY,STARTSEQ_TON_1_2_LENGTH_MS ); tone(PIEZO_PIN, STARTSEQ_TON_1_2_FREQUENCY,STARTSEQ_TON_1_2_LENGTH_MS );
delay(STARTSEQ_TONEPAUSE_MS); wait(STARTSEQ_TONEPAUSE_MS);
} }
//third tone //third tone
update_statemessage(timer_new_state); update_statemessage(timer_new_state);
if(timer_new_state == TIMER_RUNNING){ if(timer_new_state == TIMER_RUNNING){
tone(PIEZO_PIN, STARTSEQ_TON_3_FREQUENCY,STARTSEQ_TON_3_LENGTH_MS ); tone(PIEZO_PIN, STARTSEQ_TON_3_FREQUENCY,STARTSEQ_TON_3_LENGTH_MS );
delay(STARTSEQ_TON_3_LENGTH_MS); wait(STARTSEQ_TON_3_LENGTH_MS);
} }
} }
@ -519,3 +519,13 @@ void false_start_isr(void)
} }
} }
} }
void wait(unsigned long ms){
unsigned long current = 0;
unsigned long started = millis();
do{
current = millis()-started;
}while(current < ms);
}