|
@@ -547,6 +547,15 @@ uint16_t max_display_update_time = 0;
|
547
|
547
|
|
548
|
548
|
void lcd_status_screen() {
|
549
|
549
|
|
|
550
|
+ #if DISABLED(DOGLCD) && ENABLED(AUTO_BED_LEVELING_UBL)
|
|
551
|
+ if(!ubl_lcd_map_control)
|
|
552
|
+ lcd_set_custom_characters(
|
|
553
|
+ #if ENABLED(LCD_PROGRESS_BAR)
|
|
554
|
+ const bool info_screen_charset = true
|
|
555
|
+ #endif
|
|
556
|
+ );
|
|
557
|
+ #endif
|
|
558
|
+
|
550
|
559
|
#if ENABLED(ULTIPANEL)
|
551
|
560
|
ENCODER_DIRECTION_NORMAL();
|
552
|
561
|
ENCODER_RATE_MULTIPLY(false);
|
|
@@ -2158,8 +2167,6 @@ void kill_screen(const char* lcd_msg) {
|
2158
|
2167
|
void _lcd_ubl_map_lcd_edit_cmd() {
|
2159
|
2168
|
char ubl_lcd_gcode [50], str[10], str2[10];
|
2160
|
2169
|
|
2161
|
|
- ubl_lcd_map_control = true; // Used for returning to the map screen
|
2162
|
|
-
|
2163
|
2170
|
dtostrf(pgm_read_float(&ubl._mesh_index_to_xpos[x_plot]), 0, 2, str);
|
2164
|
2171
|
dtostrf(pgm_read_float(&ubl._mesh_index_to_ypos[y_plot]), 0, 2, str2);
|
2165
|
2172
|
snprintf_P(ubl_lcd_gcode, sizeof(ubl_lcd_gcode), PSTR("G29 P4 X%s Y%s R%i"), str, str2, n_edit_pts);
|
|
@@ -2253,6 +2260,7 @@ void kill_screen(const char* lcd_msg) {
|
2253
|
2260
|
* UBL Homing before LCD map
|
2254
|
2261
|
*/
|
2255
|
2262
|
void _lcd_ubl_output_map_lcd_cmd() {
|
|
2263
|
+ ubl_lcd_map_control = true; // Used for returning to the map screen
|
2256
|
2264
|
if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]))
|
2257
|
2265
|
enqueue_and_echo_commands_P(PSTR("G28"));
|
2258
|
2266
|
lcd_goto_screen(_lcd_ubl_map_homing);
|
|
@@ -2393,6 +2401,8 @@ void kill_screen(const char* lcd_msg) {
|
2393
|
2401
|
if (!g29_in_progress)
|
2394
|
2402
|
#endif
|
2395
|
2403
|
MENU_ITEM(submenu, MSG_BED_LEVELING, lcd_bed_leveling);
|
|
2404
|
+ #elif PLANNER_LEVELING
|
|
2405
|
+ MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
|
2396
|
2406
|
#endif
|
2397
|
2407
|
|
2398
|
2408
|
#if HAS_M206_COMMAND
|