Browse Source

Fix spindle power LCD display (#18189)

Giuliano Zaro 4 years ago
parent
commit
076b2112a3
No account linked to committer's email address

+ 2
- 0
Marlin/src/feature/spindle_laser_types.h View File

38
   #define cutter_power_t              uint16_t
38
   #define cutter_power_t              uint16_t
39
   #define cutter_setPower_t           uint16_t
39
   #define cutter_setPower_t           uint16_t
40
   #define CUTTER_MENU_POWER_TYPE      uint16_5
40
   #define CUTTER_MENU_POWER_TYPE      uint16_5
41
+  #define cutter_power2str            ui16tostr5rj
41
 #else
42
 #else
42
   #define cutter_power_t              uint8_t
43
   #define cutter_power_t              uint8_t
43
   #define cutter_setPower_t           uint8_t
44
   #define cutter_setPower_t           uint8_t
44
   #define CUTTER_MENU_POWER_TYPE      uint8
45
   #define CUTTER_MENU_POWER_TYPE      uint8
46
+  #define cutter_power2str            ui8tostr3rj
45
 #endif
47
 #endif
46
 
48
 
47
 #if ENABLED(MARLIN_DEV_MODE)
49
 #if ENABLED(MARLIN_DEV_MODE)

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

542
     // Laser / Spindle
542
     // Laser / Spindle
543
     #if DO_DRAW_CUTTER
543
     #if DO_DRAW_CUTTER
544
       if (cutter.power && PAGE_CONTAINS(STATUS_CUTTER_TEXT_Y - INFO_FONT_ASCENT, STATUS_CUTTER_TEXT_Y - 1)) {
544
       if (cutter.power && PAGE_CONTAINS(STATUS_CUTTER_TEXT_Y - INFO_FONT_ASCENT, STATUS_CUTTER_TEXT_Y - 1)) {
545
-        lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, i16tostr3rj(cutter.power));
545
+        lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, cutter_power2str(cutter.power));
546
         #if CUTTER_DISPLAY_IS(PERCENT)
546
         #if CUTTER_DISPLAY_IS(PERCENT)
547
           lcd_put_wchar('%');
547
           lcd_put_wchar('%');
548
         #elif CUTTER_DISPLAY_IS(RPM)
548
         #elif CUTTER_DISPLAY_IS(RPM)

Loading…
Cancel
Save