MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3186 from AnHardt/Fix-KEEPALIVE_STATE

Browse Source 
Fix KEEPALIVE_STATE
This commit is contained in:
Scott Lahteine 2016-03-20 16:29:19 -07:00
commit ac4e461901
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -155,6 +155,11 @@ script:
- sed -i 's/\/\/#define LCM1602/#define LCM1602/g' Marlin/Configuration.h - sed -i 's/\/\/#define LCM1602/#define LCM1602/g' Marlin/Configuration.h
- rm -rf .build/ - rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable FILAMENTCHANGEENABLE
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define FILAMENTCHANGEENABLE/#define FILAMENTCHANGEENABLE/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable filament sensor # Enable filament sensor
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h - sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h

3
Marlin/Marlin_main.cpp
View File

@ -5508,7 +5508,7 @@ inline void gcode_M503() {
delay(100); delay(100);
LCD_ALERTMESSAGEPGM(MSG_FILAMENTCHANGE); LCD_ALERTMESSAGEPGM(MSG_FILAMENTCHANGE);
millis_t next_tick = 0; millis_t next_tick = 0;
KEEPALIVE_STATE(WAIT_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
while (!lcd_clicked()) { while (!lcd_clicked()) {
#if DISABLED(AUTO_FILAMENT_CHANGE) #if DISABLED(AUTO_FILAMENT_CHANGE)
millis_t ms = millis(); millis_t ms = millis();
@ -6028,6 +6028,7 @@ void process_next_command() {
case 105: // M105: Read current temperature case 105: // M105: Read current temperature
gcode_M105(); gcode_M105();
KEEPALIVE_STATE(NOT_BUSY);
return; // "ok" already printed return; // "ok" already printed
case 109: // M109: Wait for temperature case 109: // M109: Wait for temperature