Browse Source

MarlinUI followup

Scott Lahteine 4 years ago
parent
commit
263f29a96a

+ 1
- 1
Marlin/src/gcode/calibrate/G34_M422.cpp View File

31
 #include "../../module/stepper.h"
31
 #include "../../module/stepper.h"
32
 #include "../../module/planner.h"
32
 #include "../../module/planner.h"
33
 #include "../../module/probe.h"
33
 #include "../../module/probe.h"
34
-#include "../../lcd/ultralcd.h" // for LCD_MESSAGEPGM
34
+#include "../../lcd/marlinui.h" // for LCD_MESSAGEPGM
35
 
35
 
36
 #if HAS_LEVELING
36
 #if HAS_LEVELING
37
   #include "../../feature/bedlevel/bedlevel.h"
37
   #include "../../feature/bedlevel/bedlevel.h"

+ 1
- 1
Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp View File

201
 
201
 
202
 #if NONE(__AVR__, ARDUINO_ARCH_STM32, ARDUINO_ARCH_ESP32) || defined(U8G_HAL_LINKS)
202
 #if NONE(__AVR__, ARDUINO_ARCH_STM32, ARDUINO_ARCH_ESP32) || defined(U8G_HAL_LINKS)
203
   // Also use this device for HAL version of rrd class. This results in the same device being used
203
   // Also use this device for HAL version of rrd class. This results in the same device being used
204
-  // for the ST7920 for HAL systems no matter what is selected in ultralcd_impl_DOGM.h.
204
+  // for the ST7920 for HAL systems no matter what is selected in marlinui_DOGM.h.
205
   u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = { u8g_dev_st7920_128x64_HAL_4x_fn, &u8g_dev_st7920_128x64_HAL_4x_pb, U8G_COM_ST7920_HAL_SW_SPI };
205
   u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = { u8g_dev_st7920_128x64_HAL_4x_fn, &u8g_dev_st7920_128x64_HAL_4x_pb, U8G_COM_ST7920_HAL_SW_SPI };
206
 #endif
206
 #endif
207
 
207
 

+ 1
- 1
Marlin/src/lcd/language/language_de.h View File

70
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Ausblendhöhe");
70
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Ausblendhöhe");
71
   PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Setze Homeversatz");
71
   PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Setze Homeversatz");
72
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Homeversatz aktiv");
72
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Homeversatz aktiv");
73
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
73
+  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in marlinui.cpp
74
   #if PREHEAT_COUNT
74
   #if PREHEAT_COUNT
75
     PROGMEM Language_Str MSG_PREHEAT_1                     = PREHEAT_1_LABEL _UxGT(" Vorwärmen");
75
     PROGMEM Language_Str MSG_PREHEAT_1                     = PREHEAT_1_LABEL _UxGT(" Vorwärmen");
76
     PROGMEM Language_Str MSG_PREHEAT_1_H                   = PREHEAT_1_LABEL _UxGT(" Vorwärmen ~");
76
     PROGMEM Language_Str MSG_PREHEAT_1_H                   = PREHEAT_1_LABEL _UxGT(" Vorwärmen ~");

Loading…
Cancel
Save