|
@ -763,14 +763,16 @@ void kill_screen(const char* lcd_msg) { |
|
|
* |
|
|
* |
|
|
*/ |
|
|
*/ |
|
|
|
|
|
|
|
|
/**
|
|
|
#if DISABLED(NO_WORKSPACE_OFFSETS) |
|
|
* Set the home offset based on the current_position |
|
|
/**
|
|
|
*/ |
|
|
* Set the home offset based on the current_position |
|
|
void lcd_set_home_offsets() { |
|
|
*/ |
|
|
// M428 Command
|
|
|
void lcd_set_home_offsets() { |
|
|
enqueue_and_echo_commands_P(PSTR("M428")); |
|
|
// M428 Command
|
|
|
lcd_return_to_status(); |
|
|
enqueue_and_echo_commands_P(PSTR("M428")); |
|
|
} |
|
|
lcd_return_to_status(); |
|
|
|
|
|
} |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
#if ENABLED(BABYSTEPPING) |
|
|
#if ENABLED(BABYSTEPPING) |
|
|
|
|
|
|
|
@ -1106,16 +1108,16 @@ void kill_screen(const char* lcd_msg) { |
|
|
#if HOTENDS == 1 |
|
|
#if HOTENDS == 1 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_m1_e0); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_m1_e0); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1 MSG_HOTEND, lcd_preheat_m1_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_END, lcd_preheat_m1_e0_only); |
|
|
#else |
|
|
#else |
|
|
MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_m1_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_m1_e0_only); |
|
|
#endif |
|
|
#endif |
|
|
#else |
|
|
#else |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_m1_e0); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_m1_e0); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_HOTEND " " MSG_E1, lcd_preheat_m1_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_END " " MSG_E1, lcd_preheat_m1_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_m1_e1); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_m1_e1); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_HOTEND " " MSG_E2, lcd_preheat_m1_e1_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_END " " MSG_E2, lcd_preheat_m1_e1_only); |
|
|
#else |
|
|
#else |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_m1_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_m1_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_m1_e1_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_m1_e1_only); |
|
@ -1124,14 +1126,14 @@ void kill_screen(const char* lcd_msg) { |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only); |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_HOTEND " " MSG_E3, lcd_preheat_m1_e2_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_END " " MSG_E3, lcd_preheat_m1_e2_only); |
|
|
#else |
|
|
#else |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only); |
|
|
#endif |
|
|
#endif |
|
|
#if HOTENDS > 3 |
|
|
#if HOTENDS > 3 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_m1_e3); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_m1_e3); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_HOTEND " " MSG_E4, lcd_preheat_m1_e3_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_END " " MSG_E4, lcd_preheat_m1_e3_only); |
|
|
#else |
|
|
#else |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_m1_e3_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_m1_e3_only); |
|
|
#endif |
|
|
#endif |
|
@ -1151,16 +1153,16 @@ void kill_screen(const char* lcd_msg) { |
|
|
#if HOTENDS == 1 |
|
|
#if HOTENDS == 1 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2 MSG_HOTEND, lcd_preheat_m2_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_END, lcd_preheat_m2_e0_only); |
|
|
#else |
|
|
#else |
|
|
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only); |
|
|
#endif |
|
|
#endif |
|
|
#else |
|
|
#else |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_m2_e0); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_m2_e0); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_HOTEND " " MSG_E1, lcd_preheat_m2_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_END " " MSG_E1, lcd_preheat_m2_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_m2_e1); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_m2_e1); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_HOTEND " " MSG_E2, lcd_preheat_m2_e1_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_END " " MSG_E2, lcd_preheat_m2_e1_only); |
|
|
#else |
|
|
#else |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_m2_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_m2_e0_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_m2_e1_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_m2_e1_only); |
|
@ -1169,14 +1171,14 @@ void kill_screen(const char* lcd_msg) { |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only); |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_HOTEND " " MSG_E3, lcd_preheat_m2_e2_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_END " " MSG_E3, lcd_preheat_m2_e2_only); |
|
|
#else |
|
|
#else |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only); |
|
|
#endif |
|
|
#endif |
|
|
#if HOTENDS > 3 |
|
|
#if HOTENDS > 3 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
#if TEMP_SENSOR_BED != 0 |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_m2_e3); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_m2_e3); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_HOTEND " " MSG_E4, lcd_preheat_m2_e3_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_END " " MSG_E4, lcd_preheat_m2_e3_only); |
|
|
#else |
|
|
#else |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_m2_e3_only); |
|
|
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_m2_e3_only); |
|
|
#endif |
|
|
#endif |
|
@ -1427,11 +1429,13 @@ KeepDrawing: |
|
|
MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed); |
|
|
MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
//
|
|
|
#if DISABLED(NO_WORKSPACE_OFFSETS) |
|
|
// Set Home Offsets
|
|
|
//
|
|
|
//
|
|
|
// Set Home Offsets
|
|
|
MENU_ITEM(function, MSG_SET_HOME_OFFSETS, lcd_set_home_offsets); |
|
|
//
|
|
|
//MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0"));
|
|
|
MENU_ITEM(function, MSG_SET_HOME_OFFSETS, lcd_set_home_offsets); |
|
|
|
|
|
//MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0"));
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
//
|
|
|
//
|
|
|
// Disable Steppers
|
|
|
// Disable Steppers
|
|
|