CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use millis for M600 audio feedback interval

Browse Source
This commit is contained in:
Scott Lahteine 2015-06-15 17:55:39 -07:00 committed by Richard Wackerbarth
parent fb16a83b8a
commit 5ccb1c9e7d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/Marlin_main.cpp
View File

@ -4963,10 +4963,14 @@ inline void gcode_M503() {
disable_e3(); disable_e3();
delay(100); delay(100);
LCD_ALERTMESSAGEPGM(MSG_FILAMENTCHANGE); LCD_ALERTMESSAGEPGM(MSG_FILAMENTCHANGE);
uint8_t cnt = 0; millis_t next_tick = 0;
while (!lcd_clicked()) { while (!lcd_clicked()) {
#ifndef AUTO_FILAMENT_CHANGE #ifndef AUTO_FILAMENT_CHANGE
if (++cnt == 0) lcd_quick_feedback(); // every 256th frame till the lcd is clicked millis_t ms = millis();
if (ms >= next_tick) {
lcd_quick_feedback();
next_tick = ms + 2500; // feedback every 2.5s while waiting
}
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
lcd_update(); lcd_update();
@ -4976,6 +4980,7 @@ inline void gcode_M503() {
st_synchronize(); st_synchronize();
#endif #endif
} // while(!lcd_clicked) } // while(!lcd_clicked)
lcd_quick_feedback(); // click sound feedback
#ifdef AUTO_FILAMENT_CHANGE #ifdef AUTO_FILAMENT_CHANGE
current_position[E_AXIS]= 0; current_position[E_AXIS]= 0;