Giuliano Zaro
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
1 deletions
-
Marlin/src/feature/spindle_laser_types.h
-
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
|
|
@ -38,10 +38,12 @@ |
|
|
#define cutter_power_t uint16_t |
|
|
#define cutter_power_t uint16_t |
|
|
#define cutter_setPower_t uint16_t |
|
|
#define cutter_setPower_t uint16_t |
|
|
#define CUTTER_MENU_POWER_TYPE uint16_5 |
|
|
#define CUTTER_MENU_POWER_TYPE uint16_5 |
|
|
|
|
|
#define cutter_power2str ui16tostr5rj |
|
|
#else |
|
|
#else |
|
|
#define cutter_power_t uint8_t |
|
|
#define cutter_power_t uint8_t |
|
|
#define cutter_setPower_t uint8_t |
|
|
#define cutter_setPower_t uint8_t |
|
|
#define CUTTER_MENU_POWER_TYPE uint8 |
|
|
#define CUTTER_MENU_POWER_TYPE uint8 |
|
|
|
|
|
#define cutter_power2str ui8tostr3rj |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if ENABLED(MARLIN_DEV_MODE) |
|
|
#if ENABLED(MARLIN_DEV_MODE) |
|
|
|
|
|
@ -542,7 +542,7 @@ void MarlinUI::draw_status_screen() { |
|
|
// Laser / Spindle
|
|
|
// Laser / Spindle
|
|
|
#if DO_DRAW_CUTTER |
|
|
#if DO_DRAW_CUTTER |
|
|
if (cutter.power && PAGE_CONTAINS(STATUS_CUTTER_TEXT_Y - INFO_FONT_ASCENT, STATUS_CUTTER_TEXT_Y - 1)) { |
|
|
if (cutter.power && PAGE_CONTAINS(STATUS_CUTTER_TEXT_Y - INFO_FONT_ASCENT, STATUS_CUTTER_TEXT_Y - 1)) { |
|
|
lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, i16tostr3rj(cutter.power)); |
|
|
lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, cutter_power2str(cutter.power)); |
|
|
#if CUTTER_DISPLAY_IS(PERCENT) |
|
|
#if CUTTER_DISPLAY_IS(PERCENT) |
|
|
lcd_put_wchar('%'); |
|
|
lcd_put_wchar('%'); |
|
|
#elif CUTTER_DISPLAY_IS(RPM) |
|
|
#elif CUTTER_DISPLAY_IS(RPM) |
|
|
|
