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

Merge pull request #1720 from PavelSindler/remove_sound_mute 

sound [mute] mode removed (MK2)
This commit is contained in:
MRprusa3d 2019-04-12 22:10:44 +02:00 committed by GitHub
parent 6797725c02 be5a91d998
commit 3ca3de0297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/sound.cpp
View File

@ -48,9 +48,6 @@ switch(eSoundMode)
eSoundMode=e_SOUND_MODE_SILENT; eSoundMode=e_SOUND_MODE_SILENT;
break; break;
case e_SOUND_MODE_SILENT: case e_SOUND_MODE_SILENT:
eSoundMode=e_SOUND_MODE_MUTE;
break;
case e_SOUND_MODE_MUTE:
eSoundMode=e_SOUND_MODE_LOUD; eSoundMode=e_SOUND_MODE_LOUD;
break; break;
default: default:
@ -77,8 +74,6 @@ switch(eSoundMode)
break; break;
case e_SOUND_MODE_SILENT: case e_SOUND_MODE_SILENT:
break; break;
case e_SOUND_MODE_MUTE:
break;
default: default:
; ;
} }

2
Firmware/temperature.cpp
View File

@ -1273,7 +1273,6 @@ void temp_runaway_stop(bool isPreheat, bool isBed)
disable_e2(); disable_e2();
manage_heater(); manage_heater();
lcd_update(); lcd_update();
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT))
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
delayMicroseconds(500); delayMicroseconds(500);
WRITE(BEEPER, LOW); WRITE(BEEPER, LOW);
@ -1359,7 +1358,6 @@ void max_temp_error(uint8_t e) {
SET_OUTPUT(BEEPER); SET_OUTPUT(BEEPER);
WRITE(FAN_PIN, 1); WRITE(FAN_PIN, 1);
WRITE(EXTRUDER_0_AUTO_FAN_PIN, 1); WRITE(EXTRUDER_0_AUTO_FAN_PIN, 1);
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT))
WRITE(BEEPER, 1); WRITE(BEEPER, 1);
// fanSpeed will consumed by the check_axes_activity() routine. // fanSpeed will consumed by the check_axes_activity() routine.
fanSpeed=255; fanSpeed=255;

7
Firmware/ultralcd.cpp
View File

@ -3533,9 +3533,6 @@ switch(eSoundMode)
case e_SOUND_MODE_SILENT: case e_SOUND_MODE_SILENT:
MENU_ITEM(function,MSG_SOUND_MODE_SILENT,lcd_sound_state_set); MENU_ITEM(function,MSG_SOUND_MODE_SILENT,lcd_sound_state_set);
break; break;
case e_SOUND_MODE_MUTE:
MENU_ITEM(function,MSG_SOUND_MODE_MUTE,lcd_sound_state_set);
break;
default: default:
MENU_ITEM(function,MSG_SOUND_MODE_LOUD,lcd_sound_state_set); MENU_ITEM(function,MSG_SOUND_MODE_LOUD,lcd_sound_state_set);
} }
@ -4779,7 +4776,6 @@ static void lcd_main_menu()
void stack_error() { void stack_error() {
SET_OUTPUT(BEEPER); SET_OUTPUT(BEEPER);
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT))
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
delay(1000); delay(1000);
WRITE(BEEPER, LOW); WRITE(BEEPER, LOW);
@ -4850,9 +4846,6 @@ static void lcd_tune_menu()
case e_SOUND_MODE_SILENT: case e_SOUND_MODE_SILENT:
MENU_ITEM(function,MSG_SOUND_MODE_SILENT,lcd_sound_state_set); MENU_ITEM(function,MSG_SOUND_MODE_SILENT,lcd_sound_state_set);
break; break;
case e_SOUND_MODE_MUTE:
MENU_ITEM(function,MSG_SOUND_MODE_MUTE,lcd_sound_state_set);
break;
default: default:
MENU_ITEM(function,MSG_SOUND_MODE_LOUD,lcd_sound_state_set); MENU_ITEM(function,MSG_SOUND_MODE_LOUD,lcd_sound_state_set);
} }