|
@ -99,7 +99,7 @@ |
|
|
#define HAS_ONESTEP_LEVELING 1 |
|
|
#define HAS_ONESTEP_LEVELING 1 |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if HAS_MESH || HAS_ONESTEP_LEVELING |
|
|
#if HAS_MESH || (HAS_LEVELING && HAS_ZOFFSET_ITEM) |
|
|
#include "../../../feature/bedlevel/bedlevel.h" |
|
|
#include "../../../feature/bedlevel/bedlevel.h" |
|
|
#include "bedlevel_tools.h" |
|
|
#include "bedlevel_tools.h" |
|
|
#endif |
|
|
#endif |
|
@ -1825,7 +1825,7 @@ void DWIN_SetDataDefaults() { |
|
|
#endif |
|
|
#endif |
|
|
TERN_(BAUD_RATE_GCODE, SetBaud250K()); |
|
|
TERN_(BAUD_RATE_GCODE, SetBaud250K()); |
|
|
#if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS) |
|
|
#if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS) |
|
|
leds.set_default(); |
|
|
TERN_(LED_COLOR_PRESETS, leds.set_default()); |
|
|
ApplyLEDColor(); |
|
|
ApplyLEDColor(); |
|
|
#endif |
|
|
#endif |
|
|
} |
|
|
} |
|
@ -2138,7 +2138,7 @@ void HomeZ() { queue.inject(F("G28Z")); } |
|
|
); |
|
|
); |
|
|
gcode.process_subcommands_now(cmd); |
|
|
gcode.process_subcommands_now(cmd); |
|
|
#else |
|
|
#else |
|
|
set_bed_leveling_enabled(false); |
|
|
TERN_(HAS_LEVELING, set_bed_leveling_enabled(false)); |
|
|
gcode.process_subcommands_now(F("G28O\nG0Z0F300\nM400")); |
|
|
gcode.process_subcommands_now(F("G28O\nG0Z0F300\nM400")); |
|
|
#endif |
|
|
#endif |
|
|
ui.reset_status(); |
|
|
ui.reset_status(); |
|
@ -2226,10 +2226,9 @@ void SetPID(celsius_t t, heater_id_t h) { |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if ENABLED(BAUD_RATE_GCODE) |
|
|
#if ENABLED(BAUD_RATE_GCODE) |
|
|
void HMI_SetBaudRate() { |
|
|
void HMI_SetBaudRate() { HMI_data.Baud115K ? SetBaud115K() : SetBaud250K(); } |
|
|
if (HMI_data.Baud115K) SetBaud115K(); else SetBaud250K(); |
|
|
|
|
|
} |
|
|
|
|
|
void SetBaudRate() { |
|
|
void SetBaudRate() { |
|
|
|
|
|
HMI_data.Baud115K ^= true; |
|
|
HMI_SetBaudRate(); |
|
|
HMI_SetBaudRate(); |
|
|
Draw_Chkb_Line(CurrentMenu->line(), HMI_data.Baud115K); |
|
|
Draw_Chkb_Line(CurrentMenu->line(), HMI_data.Baud115K); |
|
|
DWIN_UpdateLCD(); |
|
|
DWIN_UpdateLCD(); |
|
@ -2268,9 +2267,7 @@ void SetPID(celsius_t t, heater_id_t h) { |
|
|
#endif |
|
|
#endif |
|
|
#if HAS_COLOR_LEDS |
|
|
#if HAS_COLOR_LEDS |
|
|
void ApplyLEDColor() { |
|
|
void ApplyLEDColor() { |
|
|
HMI_data.Led_Color = LEDColor( |
|
|
HMI_data.Led_Color = LEDColor( {leds.color.r, leds.color.g, leds.color.b OPTARG(HAS_WHITE_LED, HMI_data.Led_Color.w) } ); |
|
|
TERN(HAS_WHITE_LED, { 0, 0, 0, leds.color.w }, { leds.color.r, leds.color.g, leds.color.b }) |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
} |
|
|
void LiveLEDColor(uint8_t *color) { *color = MenuData.Value; leds.update(); } |
|
|
void LiveLEDColor(uint8_t *color) { *color = MenuData.Value; leds.update(); } |
|
|
void LiveLEDColorR() { LiveLEDColor(&leds.color.r); } |
|
|
void LiveLEDColorR() { LiveLEDColor(&leds.color.r); } |
|
@ -3415,7 +3412,7 @@ void Draw_GetColor_Menu() { |
|
|
EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_GREEN, onDrawPInt8Menu, SetLEDColorG, &leds.color.g); |
|
|
EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_GREEN, onDrawPInt8Menu, SetLEDColorG, &leds.color.g); |
|
|
EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_BLUE, onDrawPInt8Menu, SetLEDColorB, &leds.color.b); |
|
|
EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_BLUE, onDrawPInt8Menu, SetLEDColorB, &leds.color.b); |
|
|
#if ENABLED(HAS_WHITE_LED) |
|
|
#if ENABLED(HAS_WHITE_LED) |
|
|
EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_WHITE, onDrawPInt8Menu, SetLedColorW, &leds.color.w); |
|
|
EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_WHITE, onDrawPInt8Menu, SetLEDColorW, &leds.color.w); |
|
|
#endif |
|
|
#endif |
|
|
#endif |
|
|
#endif |
|
|
#endif |
|
|
#endif |
|
@ -3828,6 +3825,7 @@ void Draw_Steps_Menu() { |
|
|
#endif // AUTO_BED_LEVELING_UBL
|
|
|
#endif // AUTO_BED_LEVELING_UBL
|
|
|
|
|
|
|
|
|
#if HAS_MESH |
|
|
#if HAS_MESH |
|
|
|
|
|
|
|
|
void Draw_MeshSet_Menu() { |
|
|
void Draw_MeshSet_Menu() { |
|
|
checkkey = Menu; |
|
|
checkkey = Menu; |
|
|
if (SetMenu(MeshMenu, GET_TEXT_F(MSG_MESH_LEVELING), 15)) { |
|
|
if (SetMenu(MeshMenu, GET_TEXT_F(MSG_MESH_LEVELING), 15)) { |
|
|