Jason Smith 4 лет назад
Родитель
Сommit
ce90447531
Аккаунт пользователя с таким Email не найден

+ 3
- 0
Marlin/src/lcd/dogm/status_screen_DOGM.cpp Просмотреть файл

@@ -104,6 +104,9 @@
104 104
 
105 105
 #if DO_DRAW_HOTENDS
106 106
   #define MAX_HOTEND_DRAW _MIN(HOTENDS, ((LCD_PIXEL_WIDTH - (STATUS_LOGO_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8) / (STATUS_HEATERS_XSPACE)))
107
+#endif
108
+
109
+#if EITHER(DO_DRAW_BED, DO_DRAW_HOTENDS)
107 110
   #define STATUS_HEATERS_BOT (STATUS_HEATERS_Y + STATUS_HEATERS_HEIGHT - 1)
108 111
 #endif
109 112
 

+ 2
- 7
Marlin/src/lcd/menu/menu_temperature.cpp Просмотреть файл

@@ -63,15 +63,14 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i
63 63
 
64 64
   #if HAS_TEMP_HOTEND
65 65
     inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); }
66
-    #if HAS_HEATED_BED
67
-      inline void _preheat_both(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, m); }
68
-    #endif
66
+    void do_preheat_end_m() { _preheat_end(editable.int8, 0); }
69 67
   #endif
70 68
   #if HAS_HEATED_BED
71 69
     inline void _preheat_bed(const uint8_t m) { thermalManager.lcd_preheat(-1, -1, m); }
72 70
   #endif
73 71
 
74 72
   #if HAS_TEMP_HOTEND && HAS_HEATED_BED
73
+    inline void _preheat_both(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, m); }
75 74
 
76 75
     // Indexed "Preheat ABC" and "Heat Bed" items
77 76
     #define PREHEAT_ITEMS(M,E) do{ \
@@ -86,10 +85,6 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i
86 85
 
87 86
   #endif
88 87
 
89
-  void do_preheat_end_m() {
90
-    _preheat_end(editable.int8, 0);
91
-  }
92
-
93 88
   #if HAS_MULTI_HOTEND || HAS_HEATED_BED
94 89
 
95 90
     // Set editable.int8 to the Material index before entering this menu

+ 10
- 0
buildroot/tests/rambo-tests Просмотреть файл

@@ -61,6 +61,16 @@ opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS
61 61
 exec_test $1 $2 "Rambo CNC Configuration"
62 62
 
63 63
 #
64
+# Rambo heated bed only
65
+#
66
+restore_configs
67
+opt_set MOTHERBOARD BOARD_RAMBO
68
+opt_set EXTRUDERS 0
69
+opt_set TEMP_SENSOR_BED 1
70
+opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
71
+exec_test $1 $2 "Rambo heated bed only"
72
+
73
+#
64 74
 # Build with the default configurations
65 75
 #
66 76
 restore_configs

Загрузка…
Отмена
Сохранить