Browse Source

Merge pull request #3186 from AnHardt/Fix-KEEPALIVE_STATE

Fix KEEPALIVE_STATE
Scott Lahteine 9 years ago
parent
commit
ac4e461901
2 changed files with 7 additions and 1 deletions
  1. 5
    0
      .travis.yml
  2. 2
    1
      Marlin/Marlin_main.cpp

+ 5
- 0
.travis.yml View File

155
   - sed -i 's/\/\/#define LCM1602/#define LCM1602/g' Marlin/Configuration.h
155
   - sed -i 's/\/\/#define LCM1602/#define LCM1602/g' Marlin/Configuration.h
156
   - rm -rf .build/
156
   - rm -rf .build/
157
   - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
157
   - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
158
+  # Enable FILAMENTCHANGEENABLE
159
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
160
+  - sed -i 's/\/\/#define FILAMENTCHANGEENABLE/#define FILAMENTCHANGEENABLE/g' Marlin/Configuration.h
161
+  - rm -rf .build/
162
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
158
   # Enable filament sensor
163
   # Enable filament sensor
159
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
164
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
160
   - sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h
165
   - sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h

+ 2
- 1
Marlin/Marlin_main.cpp View File

5508
     delay(100);
5508
     delay(100);
5509
     LCD_ALERTMESSAGEPGM(MSG_FILAMENTCHANGE);
5509
     LCD_ALERTMESSAGEPGM(MSG_FILAMENTCHANGE);
5510
     millis_t next_tick = 0;
5510
     millis_t next_tick = 0;
5511
-    KEEPALIVE_STATE(WAIT_FOR_USER);
5511
+    KEEPALIVE_STATE(PAUSED_FOR_USER);
5512
     while (!lcd_clicked()) {
5512
     while (!lcd_clicked()) {
5513
       #if DISABLED(AUTO_FILAMENT_CHANGE)
5513
       #if DISABLED(AUTO_FILAMENT_CHANGE)
5514
         millis_t ms = millis();
5514
         millis_t ms = millis();
6028
 
6028
 
6029
       case 105: // M105: Read current temperature
6029
       case 105: // M105: Read current temperature
6030
         gcode_M105();
6030
         gcode_M105();
6031
+        KEEPALIVE_STATE(NOT_BUSY);
6031
         return; // "ok" already printed
6032
         return; // "ok" already printed
6032
 
6033
 
6033
       case 109: // M109: Wait for temperature
6034
       case 109: // M109: Wait for temperature

Loading…
Cancel
Save