josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2014 from NotaRobotexe/sound_fix 

crash and filament unload sound change
This commit is contained in:
DRracer 2019-07-18 09:41:05 +02:00 committed by GitHub
parent 090ea3145d 1c44eddf81
commit 1ae072c332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Firmware/sound.cpp
View File

@ -61,17 +61,18 @@ switch(eSoundMode)
Sound_SaveMode(); Sound_SaveMode();
} }
//if critical is true then silend and once mode is ignored
void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){ void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){
if (!critical){ if (!critical){
if (eSoundMode != e_SOUND_MODE_SILENT){ if (eSoundMode != e_SOUND_MODE_SILENT){
if(!tone_){ if(!tone_){
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
delayMicroseconds(ms); _delay(ms);
WRITE(BEEPER, LOW); WRITE(BEEPER, LOW);
} }
else{ else{
_tone(BEEPER, tone_); _tone(BEEPER, tone_);
delayMicroseconds(ms); _delay(ms);
_noTone(BEEPER); _noTone(BEEPER);
} }
} }
@ -79,13 +80,13 @@ void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){
else{ else{
if(!tone_){ if(!tone_){
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
delayMicroseconds(ms); _delay(ms);
WRITE(BEEPER, LOW); WRITE(BEEPER, LOW);
delayMicroseconds(100); _delay(ms);
} }
else{ else{
_tone(BEEPER, tone_); _tone(BEEPER, tone_);
delayMicroseconds(ms); _delay(ms);
_noTone(BEEPER); _noTone(BEEPER);
} }
} }
@ -134,10 +135,10 @@ switch(eSoundMode)
static void Sound_DoSound_Blind_Alert(void) static void Sound_DoSound_Blind_Alert(void)
{ {
_tone(BEEPER,100); _tone(BEEPER,300);
delayMicroseconds(50); _delay_ms(75);
_noTone(BEEPER); _noTone(BEEPER);
delayMicroseconds(200); _delay_ms(75);
} }
static void Sound_DoSound_Encoder_Move(void) static void Sound_DoSound_Encoder_Move(void)
@ -169,7 +170,7 @@ for(nI=0;nI<10;nI++)
static void Sound_DoSound_Prompt(void) static void Sound_DoSound_Prompt(void)
{ {
WRITE(BEEPER,HIGH); WRITE(BEEPER,HIGH);
delayMicroseconds(500); _delay_ms(500);
WRITE(BEEPER,LOW); WRITE(BEEPER,LOW);
} }