Browse Source

Show LCD bed options even without thermal protection

Scott Lahteine 8 years ago
parent
commit
7c95f762f2
1 changed files with 12 additions and 10 deletions
  1. 12
    10
      Marlin/ultralcd.cpp

+ 12
- 10
Marlin/ultralcd.cpp View File

@@ -1098,9 +1098,11 @@ void kill_screen(const char* lcd_msg) {
1098 1098
     #endif // HOTENDS > 1
1099 1099
   #endif // HAS_TEMP_HOTEND
1100 1100
 
1101
-  #if WATCH_THE_BED
1102
-    void watch_temp_callback_bed() { thermalManager.start_watching_bed(); }
1103
-  #endif
1101
+  void watch_temp_callback_bed() {
1102
+    #if WATCH_THE_BED
1103
+      thermalManager.start_watching_bed();
1104
+    #endif
1105
+  }
1104 1106
 
1105 1107
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
1106 1108
 
@@ -1162,7 +1164,7 @@ void kill_screen(const char* lcd_msg) {
1162 1164
     //
1163 1165
     // Bed:
1164 1166
     //
1165
-    #if WATCH_THE_BED
1167
+    #if HAS_TEMP_BED
1166 1168
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_BED, &thermalManager.target_temperature_bed, 0, BED_MAXTEMP - 15, watch_temp_callback_bed);
1167 1169
     #endif
1168 1170
 
@@ -1810,7 +1812,7 @@ void kill_screen(const char* lcd_msg) {
1810 1812
     void _lcd_ubl_build_custom_mesh() {
1811 1813
       char UBL_LCD_GCODE[20];
1812 1814
       enqueue_and_echo_commands_P(PSTR("G28"));
1813
-      #if WATCH_THE_BED
1815
+      #if HAS_TEMP_BED
1814 1816
         sprintf_P(UBL_LCD_GCODE, PSTR("M190 S%i"), custom_bed_temp);
1815 1817
         enqueue_and_echo_command(UBL_LCD_GCODE);
1816 1818
       #endif
@@ -1826,7 +1828,7 @@ void kill_screen(const char* lcd_msg) {
1826 1828
       START_MENU();
1827 1829
       MENU_BACK(MSG_UBL_BUILD_MESH_MENU);
1828 1830
       MENU_ITEM_EDIT(int3, MSG_UBL_CUSTOM_HOTEND_TEMP, &custom_hotend_temp, EXTRUDE_MINTEMP, (HEATER_0_MAXTEMP - 10));
1829
-      #if WATCH_THE_BED
1831
+      #if HAS_TEMP_BED
1830 1832
         MENU_ITEM_EDIT(int3, MSG_UBL_CUSTOM_BED_TEMP, &custom_bed_temp, BED_MINTEMP, (BED_MAXTEMP - 5));
1831 1833
       #endif
1832 1834
       MENU_ITEM(function, MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_build_custom_mesh);
@@ -1875,7 +1877,7 @@ void kill_screen(const char* lcd_msg) {
1875 1877
     void _lcd_ubl_validate_custom_mesh() {
1876 1878
       char UBL_LCD_GCODE[24];
1877 1879
       const int temp =
1878
-        #if WATCH_THE_BED
1880
+        #if HAS_TEMP_BED
1879 1881
           custom_bed_temp
1880 1882
         #else
1881 1883
           0
@@ -1891,7 +1893,7 @@ void kill_screen(const char* lcd_msg) {
1891 1893
     void _lcd_ubl_validate_mesh() {
1892 1894
       START_MENU();
1893 1895
       MENU_BACK(MSG_UBL_TOOLS);
1894
-      #if WATCH_THE_BED
1896
+      #if HAS_TEMP_BED
1895 1897
         MENU_ITEM(gcode, MSG_UBL_VALIDATE_PLA_MESH, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_1_TEMP_BED) " H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P"));
1896 1898
         MENU_ITEM(gcode, MSG_UBL_VALIDATE_ABS_MESH, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_2_TEMP_BED) " H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
1897 1899
       #else
@@ -1978,7 +1980,7 @@ void kill_screen(const char* lcd_msg) {
1978 1980
     void _lcd_ubl_build_mesh() {
1979 1981
       START_MENU();
1980 1982
       MENU_BACK(MSG_UBL_TOOLS);
1981
-      #if WATCH_THE_BED
1983
+      #if HAS_TEMP_BED
1982 1984
         MENU_ITEM(gcode, MSG_UBL_BUILD_PLA_MESH, PSTR(
1983 1985
           "G28\n"
1984 1986
           "M190 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\n"
@@ -2968,7 +2970,7 @@ void kill_screen(const char* lcd_msg) {
2968 2970
     //
2969 2971
     // Bed:
2970 2972
     //
2971
-    #if WATCH_THE_BED
2973
+    #if HAS_TEMP_BED
2972 2974
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_BED, &thermalManager.target_temperature_bed, 0, BED_MAXTEMP - 15, watch_temp_callback_bed);
2973 2975
     #endif
2974 2976
 

Loading…
Cancel
Save