Browse Source

Patch LCD code for 5th extruder, EEPROM reset

Scott Lahteine 7 years ago
parent
commit
3843a5151a
2 changed files with 22 additions and 17 deletions
  1. 3
    3
      Marlin/language_en.h
  2. 19
    14
      Marlin/ultralcd.cpp

+ 3
- 3
Marlin/language_en.h View File

455
   #define MSG_CONTRAST                        _UxGT("LCD contrast")
455
   #define MSG_CONTRAST                        _UxGT("LCD contrast")
456
 #endif
456
 #endif
457
 #ifndef MSG_STORE_EEPROM
457
 #ifndef MSG_STORE_EEPROM
458
-  #define MSG_STORE_EEPROM                    _UxGT("Store memory")
458
+  #define MSG_STORE_EEPROM                    _UxGT("Store settings")
459
 #endif
459
 #endif
460
 #ifndef MSG_LOAD_EEPROM
460
 #ifndef MSG_LOAD_EEPROM
461
-  #define MSG_LOAD_EEPROM                     _UxGT("Load memory")
461
+  #define MSG_LOAD_EEPROM                     _UxGT("Load settings")
462
 #endif
462
 #endif
463
 #ifndef MSG_RESTORE_FAILSAFE
463
 #ifndef MSG_RESTORE_FAILSAFE
464
   #define MSG_RESTORE_FAILSAFE                _UxGT("Restore failsafe")
464
   #define MSG_RESTORE_FAILSAFE                _UxGT("Restore failsafe")
465
 #endif
465
 #endif
466
 #ifndef MSG_INIT_EEPROM
466
 #ifndef MSG_INIT_EEPROM
467
-  #define MSG_INIT_EEPROM                     _UxGT("Initalize Memory")
467
+  #define MSG_INIT_EEPROM                     _UxGT("Initialize EEPROM")
468
 #endif
468
 #endif
469
 #ifndef MSG_REFRESH
469
 #ifndef MSG_REFRESH
470
   #define MSG_REFRESH                         _UxGT("Refresh")
470
   #define MSG_REFRESH                         _UxGT("Refresh")

+ 19
- 14
Marlin/ultralcd.cpp View File

1289
     void lcd_preheat_m2_bedonly() { _lcd_preheat(0, 0, lcd_preheat_bed_temp[1], lcd_preheat_fan_speed[1]); }
1289
     void lcd_preheat_m2_bedonly() { _lcd_preheat(0, 0, lcd_preheat_bed_temp[1], lcd_preheat_fan_speed[1]); }
1290
   #endif
1290
   #endif
1291
 
1291
 
1292
-  #if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0)
1292
+  #if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_4 != 0 || TEMP_SENSOR_BED != 0)
1293
 
1293
 
1294
     void lcd_preheat_m1_menu() {
1294
     void lcd_preheat_m1_menu() {
1295
       START_MENU();
1295
       START_MENU();
1395
       END_MENU();
1395
       END_MENU();
1396
     }
1396
     }
1397
 
1397
 
1398
-  #endif // TEMP_SENSOR_0 && (TEMP_SENSOR_1 || TEMP_SENSOR_2 || TEMP_SENSOR_3 || TEMP_SENSOR_BED)
1398
+  #endif // TEMP_SENSOR_0 && (TEMP_SENSOR_1 || TEMP_SENSOR_2 || TEMP_SENSOR_3 || TEMP_SENSOR_4 || TEMP_SENSOR_BED)
1399
 
1399
 
1400
   void lcd_cooldown() {
1400
   void lcd_cooldown() {
1401
     #if FAN_COUNT > 0
1401
     #if FAN_COUNT > 0
2076
     MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84"));
2076
     MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84"));
2077
 
2077
 
2078
     //
2078
     //
2079
-    // Preheat PLA
2080
-    // Preheat ABS
2079
+    // Change filament
2081
     //
2080
     //
2082
-    #if TEMP_SENSOR_0 != 0
2081
+    #if ENABLED(FILAMENT_CHANGE_FEATURE)
2082
+      if (!thermalManager.tooColdToExtrude(active_extruder))
2083
+        MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change);
2084
+    #endif
2083
 
2085
 
2084
-      //
2085
-      // Change filament
2086
-      //
2087
-      #if ENABLED(FILAMENT_CHANGE_FEATURE)
2088
-        if (!thermalManager.tooColdToExtrude(active_extruder))
2089
-          MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change);
2090
-      #endif
2086
+    #if TEMP_SENSOR_0 != 0
2091
 
2087
 
2092
       //
2088
       //
2093
       // Cooldown
2089
       // Cooldown
2102
       //
2098
       //
2103
       // Preheat for Material 1 and 2
2099
       // Preheat for Material 1 and 2
2104
       //
2100
       //
2105
-      #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0
2101
+      #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_4 != 0 || TEMP_SENSOR_BED != 0
2106
         MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_m1_menu);
2102
         MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_m1_menu);
2107
         MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_m2_menu);
2103
         MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_m2_menu);
2108
       #else
2104
       #else
2498
       MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
2494
       MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
2499
       MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
2495
       MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
2500
       MENU_ITEM(function, MSG_RESTORE_FAILSAFE, lcd_factory_settings);
2496
       MENU_ITEM(function, MSG_RESTORE_FAILSAFE, lcd_factory_settings);
2501
-      MENU_ITEM(gcode, MSG_INIT_EEPROM, PSTR("M502\nM500\nM501"));
2497
+      MENU_ITEM(gcode, MSG_INIT_EEPROM, PSTR("M502\nM500")); // TODO: Add "Are You Sure?" step
2502
     #endif
2498
     #endif
2503
     END_MENU();
2499
     END_MENU();
2504
   }
2500
   }
3146
         STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_3_MAXTEMP), false);
3142
         STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_3_MAXTEMP), false);
3147
       #endif
3143
       #endif
3148
 
3144
 
3145
+      #if TEMP_SENSOR_4 != 0
3146
+        #undef THERMISTOR_ID
3147
+        #define THERMISTOR_ID TEMP_SENSOR_4
3148
+        #include "thermistornames.h"
3149
+        STATIC_ITEM("T4: " THERMISTOR_NAME, false, true);
3150
+        STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_4_MINTEMP), false);
3151
+        STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_4_MAXTEMP), false);
3152
+      #endif
3153
+
3149
       #if TEMP_SENSOR_BED != 0
3154
       #if TEMP_SENSOR_BED != 0
3150
         #undef THERMISTOR_ID
3155
         #undef THERMISTOR_ID
3151
         #define THERMISTOR_ID TEMP_SENSOR_BED
3156
         #define THERMISTOR_ID TEMP_SENSOR_BED

Loading…
Cancel
Save