melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some cleanup, fixes for ultralcd.cpp UBL code

Browse Source 
- Free up 30 bytes of SRAM in UBL LCD code
- Fix BUILD_ABS_MESH temperature
- Fix UBL indentation in ultralcd.cpp
- UBL vars lowercase, "convert to positive" sensibly
This commit is contained in:
Scott Lahteine 2017-05-23 15:09:26 -05:00
parent 2dfb7c212c
commit 1d167a6874
2 changed files with 341 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/language_en.h
View File

@ -170,18 +170,18 @@
#ifndef MSG_UBL_DEACTIVATE_MESH #ifndef MSG_UBL_DEACTIVATE_MESH
#define MSG_UBL_DEACTIVATE_MESH _UxGT("Deactivate UBL") #define MSG_UBL_DEACTIVATE_MESH _UxGT("Deactivate UBL")
#endif #endif
#ifndef MSG_UBL_CUSTOM_BED_TEMP
#define MSG_UBL_CUSTOM_BED_TEMP _UxGT("Bed Temp")
#endif
#ifndef MSG_UBL_SET_BED_TEMP #ifndef MSG_UBL_SET_BED_TEMP
#define MSG_UBL_SET_BED_TEMP _UxGT("Bed Temp") #define MSG_UBL_SET_BED_TEMP _UxGT("Bed Temp")
#endif #endif
#ifndef MSG_UBL_CUSTOM_HOTEND_TEMP #ifndef MSG_UBL_CUSTOM_BED_TEMP
#define MSG_UBL_CUSTOM_HOTEND_TEMP _UxGT("Hotend Temp") #define MSG_UBL_CUSTOM_BED_TEMP MSG_UBL_SET_BED_TEMP
#endif #endif
#ifndef MSG_UBL_SET_HOTEND_TEMP #ifndef MSG_UBL_SET_HOTEND_TEMP
#define MSG_UBL_SET_HOTEND_TEMP _UxGT("Hotend Temp") #define MSG_UBL_SET_HOTEND_TEMP _UxGT("Hotend Temp")
#endif #endif
#ifndef MSG_UBL_CUSTOM_HOTEND_TEMP
#define MSG_UBL_CUSTOM_HOTEND_TEMP MSG_UBL_SET_HOTEND_TEMP
#endif
#ifndef MSG_UBL_EDIT_CUSTOM_MESH #ifndef MSG_UBL_EDIT_CUSTOM_MESH
#define MSG_UBL_EDIT_CUSTOM_MESH _UxGT("Edit Custom Mesh") #define MSG_UBL_EDIT_CUSTOM_MESH _UxGT("Edit Custom Mesh")
#endif #endif

652
Marlin/ultralcd.cpp
View File

@ -1663,346 +1663,366 @@ void kill_screen(const char* lcd_msg) {
END_MENU(); END_MENU();
} }
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
void _lcd_ubl_level_bed(); void _lcd_ubl_level_bed();
int UBL_STORAGE_SLOT = 0, static int ubl_storage_slot = 0,
CUSTOM_BED_TEMP = 50, custom_bed_temp = 50,
CUSTOM_HOTEND_TEMP = 190, custom_hotend_temp = 190,
SIDE_POINTS = 3, side_points = 3,
UBL_FILLIN_AMOUNT = 5, ubl_fillin_amount = 5,
UBL_HEIGHT_AMOUNT, ubl_height_amount,
map_type; map_type;
char UBL_LCD_GCODE [30]; /**
* UBL Build Custom Mesh Command
/** */
* UBL Build Custom Mesh Command void _lcd_ubl_build_custom_mesh() {
*/ char UBL_LCD_GCODE[20];
void _lcd_ubl_build_custom_mesh() { enqueue_and_echo_commands_P(PSTR("G28"));
enqueue_and_echo_command("G28"); #if WATCH_THE_BED
#if (WATCH_THE_BED) sprintf_P(UBL_LCD_GCODE, PSTR("M190 S%i"), custom_bed_temp);
sprintf_P(UBL_LCD_GCODE, PSTR("M190 S%i"), CUSTOM_BED_TEMP); enqueue_and_echo_command(UBL_LCD_GCODE);
enqueue_and_echo_command(UBL_LCD_GCODE); #endif
#endif sprintf_P(UBL_LCD_GCODE, PSTR("M109 S%i"), custom_hotend_temp);
sprintf_P(UBL_LCD_GCODE, PSTR("M109 S%i"), CUSTOM_HOTEND_TEMP); enqueue_and_echo_command(UBL_LCD_GCODE);
enqueue_and_echo_command(UBL_LCD_GCODE); enqueue_and_echo_commands_P(PSTR("G29 P1"));
enqueue_and_echo_command("G29 P1");
}
/**
* UBL Custom Mesh submenu
*/
void _lcd_ubl_custom_mesh() {
START_MENU();
MENU_BACK(MSG_UBL_BUILD_MESH_MENU);
MENU_ITEM_EDIT(int3, MSG_UBL_CUSTOM_HOTEND_TEMP, &CUSTOM_HOTEND_TEMP, EXTRUDE_MINTEMP, (HEATER_0_MAXTEMP - 10));
#if (WATCH_THE_BED)
MENU_ITEM_EDIT(int3, MSG_UBL_CUSTOM_BED_TEMP, &CUSTOM_BED_TEMP, BED_MINTEMP, (BED_MAXTEMP - 5));
#endif
MENU_ITEM(function, MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_build_custom_mesh);
END_MENU();
}
/**
* UBL Adjust Mesh Height Command
*/
void _lcd_ubl_adjust_height_cmd() {
if (UBL_HEIGHT_AMOUNT < 0) {
// Convert to positive for the `sprintf_P` string.
UBL_HEIGHT_AMOUNT = (UBL_HEIGHT_AMOUNT - (UBL_HEIGHT_AMOUNT * 2)); // Convert to positive
sprintf_P(UBL_LCD_GCODE, PSTR("G29 P6-.%i"), UBL_HEIGHT_AMOUNT);
// Convert back to negative to preserve the user setting.
UBL_HEIGHT_AMOUNT = (UBL_HEIGHT_AMOUNT - (UBL_HEIGHT_AMOUNT * 2)); // Convert back to negative
} }
else {
sprintf_P(UBL_LCD_GCODE, PSTR("G29 P6.%i"), UBL_HEIGHT_AMOUNT); /**
* UBL Custom Mesh submenu
*/
void _lcd_ubl_custom_mesh() {
START_MENU();
MENU_BACK(MSG_UBL_BUILD_MESH_MENU);
MENU_ITEM_EDIT(int3, MSG_UBL_CUSTOM_HOTEND_TEMP, &custom_hotend_temp, EXTRUDE_MINTEMP, (HEATER_0_MAXTEMP - 10));
#if WATCH_THE_BED
MENU_ITEM_EDIT(int3, MSG_UBL_CUSTOM_BED_TEMP, &custom_bed_temp, BED_MINTEMP, (BED_MAXTEMP - 5));
#endif
MENU_ITEM(function, MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_build_custom_mesh);
END_MENU();
} }
enqueue_and_echo_command(UBL_LCD_GCODE);
}
/** /**
* UBL Adjust Mesh Height submenu * UBL Adjust Mesh Height Command
*/ */
void _lcd_ubl_height_adjust_menu() { void _lcd_ubl_adjust_height_cmd() {
START_MENU(); char UBL_LCD_GCODE[16];
MENU_BACK(MSG_UBL_EDIT_MESH_MENU); const int ind = ubl_height_amount < 0 ? 6 : 7;
MENU_ITEM_EDIT(int3, MSG_UBL_MESH_HEIGHT_AMOUNT, &UBL_HEIGHT_AMOUNT, -9, 9); strcpy_P(UBL_LCD_GCODE, PSTR("G29 P6-"));
MENU_ITEM(function, MSG_UBL_MESH_HEIGHT_ADJUST, _lcd_ubl_adjust_height_cmd); sprintf_P(&UBL_LCD_GCODE[ind], PSTR(".%i"), abs(ubl_height_amount));
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen); enqueue_and_echo_command(UBL_LCD_GCODE);
END_MENU(); }
}
/** /**
* UBL Edit Mesh submenu * UBL Adjust Mesh Height submenu
*/ */
void _lcd_ubl_edit_mesh() { void _lcd_ubl_height_adjust_menu() {
START_MENU(); START_MENU();
MENU_BACK(MSG_UBL_TOOLS); MENU_BACK(MSG_UBL_EDIT_MESH_MENU);
MENU_BACK(MSG_UBL_LEVEL_BED); MENU_ITEM_EDIT(int3, MSG_UBL_MESH_HEIGHT_AMOUNT, &ubl_height_amount, -9, 9);
MENU_ITEM(gcode, MSG_UBL_FINE_TUNE_ALL, PSTR("G29 P4 R T")); MENU_ITEM(function, MSG_UBL_MESH_HEIGHT_ADJUST, _lcd_ubl_adjust_height_cmd);
MENU_ITEM(gcode, MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29 P4 T")); MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
MENU_ITEM(submenu, MSG_UBL_MESH_HEIGHT_ADJUST, _lcd_ubl_height_adjust_menu); END_MENU();
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen); }
END_MENU();
}
/** /**
* UBL Validate Custom Mesh Command * UBL Edit Mesh submenu
*/ */
void _lcd_ubl_validate_custom_mesh() { void _lcd_ubl_edit_mesh() {
enqueue_and_echo_command("G28"); START_MENU();
#if (WATCH_THE_BED) MENU_BACK(MSG_UBL_TOOLS);
sprintf_P(UBL_LCD_GCODE, PSTR("G26 C B%i H%i P"), CUSTOM_BED_TEMP, CUSTOM_HOTEND_TEMP); MENU_BACK(MSG_UBL_LEVEL_BED);
#else MENU_ITEM(gcode, MSG_UBL_FINE_TUNE_ALL, PSTR("G29 P4 R T"));
sprintf_P(UBL_LCD_GCODE, PSTR("G26 C B0 H%i P"), CUSTOM_HOTEND_TEMP); MENU_ITEM(gcode, MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29 P4 T"));
#endif MENU_ITEM(submenu, MSG_UBL_MESH_HEIGHT_ADJUST, _lcd_ubl_height_adjust_menu);
enqueue_and_echo_command(UBL_LCD_GCODE); MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
} END_MENU();
}
/** /**
* UBL Validate Mesh submenu * UBL Validate Custom Mesh Command
*/ */
void _lcd_ubl_validate_mesh() { void _lcd_ubl_validate_custom_mesh() {
START_MENU(); char UBL_LCD_GCODE[24];
MENU_BACK(MSG_UBL_TOOLS); const int temp =
#if (WATCH_THE_BED) #if WATCH_THE_BED
MENU_ITEM(gcode, MSG_UBL_VALIDATE_PLA_MESH, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_1_TEMP_BED) custom_bed_temp
" H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P")); #else
MENU_ITEM(gcode, MSG_UBL_VALIDATE_ABS_MESH, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_2_TEMP_BED) 0
" H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P")); #endif
#else ;
MENU_ITEM(gcode, MSG_UBL_VALIDATE_PLA_MESH, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P")); sprintf_P(UBL_LCD_GCODE, PSTR("G28\nG26 C B%i H%i P"), temp, custom_hotend_temp);
MENU_ITEM(gcode, MSG_UBL_VALIDATE_ABS_MESH, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P")); enqueue_and_echo_command(UBL_LCD_GCODE);
#endif }
MENU_ITEM(function, MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
END_MENU();
}
/** /**
* UBL Grid Leveling Command * UBL Validate Mesh submenu
*/ */
void _lcd_ubl_grid_level_cmd() { void _lcd_ubl_validate_mesh() {
sprintf_P(UBL_LCD_GCODE, PSTR("G29 J%i"), SIDE_POINTS); START_MENU();
enqueue_and_echo_command(UBL_LCD_GCODE); MENU_BACK(MSG_UBL_TOOLS);
} #if WATCH_THE_BED
MENU_ITEM(gcode, MSG_UBL_VALIDATE_PLA_MESH, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_1_TEMP_BED) " H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P"));
MENU_ITEM(gcode, MSG_UBL_VALIDATE_ABS_MESH, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_2_TEMP_BED) " H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
#else
MENU_ITEM(gcode, MSG_UBL_VALIDATE_PLA_MESH, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P"));
MENU_ITEM(gcode, MSG_UBL_VALIDATE_ABS_MESH, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
#endif
MENU_ITEM(function, MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
END_MENU();
}
/** /**
* UBL Grid Leveling submenu * UBL Grid Leveling Command
*/ */
void _lcd_ubl_grid_level() { void _lcd_ubl_grid_level_cmd() {
START_MENU(); char UBL_LCD_GCODE[10];
MENU_BACK(MSG_UBL_TOOLS); sprintf_P(UBL_LCD_GCODE, PSTR("G29 J%i"), side_points);
MENU_ITEM_EDIT(int3, MSG_UBL_SIDE_POINTS, &SIDE_POINTS, 2, 6); enqueue_and_echo_command(UBL_LCD_GCODE);
MENU_ITEM(function, MSG_UBL_MESH_LEVEL, _lcd_ubl_grid_level_cmd); }
END_MENU();
}
/** /**
* UBL Mesh Leveling submenu * UBL Grid Leveling submenu
*/ */
void _lcd_ubl_mesh_leveling() { void _lcd_ubl_grid_level() {
START_MENU(); START_MENU();
MENU_BACK(MSG_UBL_TOOLS); MENU_BACK(MSG_UBL_TOOLS);
MENU_ITEM(gcode, MSG_UBL_3POINT_MESH_LEVELING, PSTR("G29 J0")); MENU_ITEM_EDIT(int3, MSG_UBL_SIDE_POINTS, &side_points, 2, 6);
MENU_ITEM(submenu, MSG_UBL_GRID_MESH_LEVELING, _lcd_ubl_grid_level); MENU_ITEM(function, MSG_UBL_MESH_LEVEL, _lcd_ubl_grid_level_cmd);
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen); END_MENU();
END_MENU(); }
}
/** /**
* UBL Fill-in Amount Mesh Command * UBL Mesh Leveling submenu
*/ */
void _lcd_ubl_fillin_amount_cmd() { void _lcd_ubl_mesh_leveling() {
sprintf_P(UBL_LCD_GCODE, PSTR("G29 P3 R C.%i"), UBL_FILLIN_AMOUNT); START_MENU();
enqueue_and_echo_command(UBL_LCD_GCODE); MENU_BACK(MSG_UBL_TOOLS);
} MENU_ITEM(gcode, MSG_UBL_3POINT_MESH_LEVELING, PSTR("G29 J0"));
MENU_ITEM(submenu, MSG_UBL_GRID_MESH_LEVELING, _lcd_ubl_grid_level);
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
END_MENU();
}
/** /**
* UBL Smart Fill-in Command * UBL Fill-in Amount Mesh Command
*/ */
void _lcd_ubl_smart_fillin_cmd() { void _lcd_ubl_fillin_amount_cmd() {
sprintf_P(UBL_LCD_GCODE, PSTR("G29 P3 T%i"), map_type); char UBL_LCD_GCODE[16];
enqueue_and_echo_command(UBL_LCD_GCODE); sprintf_P(UBL_LCD_GCODE, PSTR("G29 P3 R C.%i"), ubl_fillin_amount);
} enqueue_and_echo_command(UBL_LCD_GCODE);
}
/** /**
* UBL Fill-in Mesh submenu * UBL Smart Fill-in Command
*/ */
void _lcd_ubl_fillin_menu() { void _lcd_ubl_smart_fillin_cmd() {
START_MENU(); char UBL_LCD_GCODE[12];
MENU_BACK(MSG_UBL_BUILD_MESH_MENU); sprintf_P(UBL_LCD_GCODE, PSTR("G29 P3 T%i"), map_type);
MENU_ITEM_EDIT(int3, MSG_UBL_FILLIN_AMOUNT, &UBL_FILLIN_AMOUNT, 0, 9); enqueue_and_echo_command(UBL_LCD_GCODE);
MENU_ITEM(function, MSG_UBL_FILLIN_MESH, _lcd_ubl_fillin_amount_cmd); }
MENU_ITEM(function, MSG_UBL_SMART_FILLIN, _lcd_ubl_smart_fillin_cmd);
MENU_ITEM(gcode, MSG_UBL_MANUAL_FILLIN, PSTR("G29 P2 B T0"));
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
END_MENU();
}
void _lcd_ubl_invalidate() { /**
ubl.invalidate(); * UBL Fill-in Mesh submenu
SERIAL_PROTOCOLLNPGM("Mesh invalidated."); */
} void _lcd_ubl_fillin_menu() {
START_MENU();
MENU_BACK(MSG_UBL_BUILD_MESH_MENU);
MENU_ITEM_EDIT(int3, MSG_UBL_FILLIN_AMOUNT, &ubl_fillin_amount, 0, 9);
MENU_ITEM(function, MSG_UBL_FILLIN_MESH, _lcd_ubl_fillin_amount_cmd);
MENU_ITEM(function, MSG_UBL_SMART_FILLIN, _lcd_ubl_smart_fillin_cmd);
MENU_ITEM(gcode, MSG_UBL_MANUAL_FILLIN, PSTR("G29 P2 B T0"));
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
END_MENU();
}
/** void _lcd_ubl_invalidate() {
* UBL Build Mesh submenu ubl.invalidate();
*/ SERIAL_PROTOCOLLNPGM("Mesh invalidated.");
void _lcd_ubl_build_mesh() { }
START_MENU();
MENU_BACK(MSG_UBL_TOOLS);
#if (WATCH_THE_BED)
MENU_ITEM(gcode, MSG_UBL_BUILD_PLA_MESH, PSTR("G28\nM190 S" STRINGIFY(PREHEAT_1_TEMP_BED)
"\nM109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\nG29 P1\nM104 S0\nM140 S0"));
MENU_ITEM(gcode, MSG_UBL_BUILD_ABS_MESH, PSTR("G28\nM190 S" STRINGIFY(PREHEAT_1_TEMP_BED)
"\nM109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\nG29 P1\nM104 S0\nM140 S0"));
#else
MENU_ITEM(gcode, MSG_UBL_BUILD_PLA_MESH, PSTR("G28\nM109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
"\nG29 P1\nM104 S0"));
MENU_ITEM(gcode, MSG_UBL_BUILD_ABS_MESH, PSTR("G28\nM109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
"\nG29 P1\nM104 S0"));
#endif
MENU_ITEM(submenu, MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh);
MENU_ITEM(gcode, MSG_UBL_BUILD_COLD_MESH, PSTR("G28\nG29 P1"));
MENU_ITEM(submenu, MSG_UBL_FILLIN_MESH, _lcd_ubl_fillin_menu);
MENU_ITEM(gcode, MSG_UBL_CONTINUE_MESH, PSTR("G29 P1 C"));
MENU_ITEM(function, MSG_UBL_INVALIDATE_ALL, _lcd_ubl_invalidate);
MENU_ITEM(gcode, MSG_UBL_INVALIDATE_CLOSEST, PSTR("G29 I"));
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
END_MENU();
}
/** /**
* UBL Load Mesh Command * UBL Build Mesh submenu
*/ */
void _lcd_ubl_load_mesh_cmd() { void _lcd_ubl_build_mesh() {
sprintf_P(UBL_LCD_GCODE, PSTR("G29 L%i"), UBL_STORAGE_SLOT); START_MENU();
enqueue_and_echo_command(UBL_LCD_GCODE); MENU_BACK(MSG_UBL_TOOLS);
} #if WATCH_THE_BED
MENU_ITEM(gcode, MSG_UBL_BUILD_PLA_MESH, PSTR(
"G28\n"
"M190 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\n"
"M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n"
"G29 P1\n"
"M104 S0\n"
"M140 S0"
));
MENU_ITEM(gcode, MSG_UBL_BUILD_ABS_MESH, PSTR(
"G28\n"
"M190 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\n"
"M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n"
"G29 P1\n"
"M104 S0\n"
"M140 S0"
));
#else
MENU_ITEM(gcode, MSG_UBL_BUILD_PLA_MESH, PSTR(
"G28\n"
"M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n"
"G29 P1\n"
"M104 S0"
));
MENU_ITEM(gcode, MSG_UBL_BUILD_ABS_MESH, PSTR(
"G28\n"
"M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n"
"G29 P1\n"
"M104 S0"
));
#endif
MENU_ITEM(submenu, MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh);
MENU_ITEM(gcode, MSG_UBL_BUILD_COLD_MESH, PSTR("G28\nG29 P1"));
MENU_ITEM(submenu, MSG_UBL_FILLIN_MESH, _lcd_ubl_fillin_menu);
MENU_ITEM(gcode, MSG_UBL_CONTINUE_MESH, PSTR("G29 P1 C"));
MENU_ITEM(function, MSG_UBL_INVALIDATE_ALL, _lcd_ubl_invalidate);
MENU_ITEM(gcode, MSG_UBL_INVALIDATE_CLOSEST, PSTR("G29 I"));
MENU_ITEM(submenu, MSG_WATCH, lcd_status_screen);
END_MENU();
}
/** /**
* UBL Save Mesh Command * UBL Load Mesh Command
*/ */
void _lcd_ubl_save_mesh_cmd() { void _lcd_ubl_load_mesh_cmd() {
sprintf_P(UBL_LCD_GCODE, PSTR("G29 S%i"), UBL_STORAGE_SLOT); char UBL_LCD_GCODE[8];
enqueue_and_echo_command(UBL_LCD_GCODE); sprintf_P(UBL_LCD_GCODE, PSTR("G29 L%i"), ubl_storage_slot);
} enqueue_and_echo_command(UBL_LCD_GCODE);
}
/** /**
* UBL Mesh Storage submenu * UBL Save Mesh Command
*/ */
void _lcd_ubl_storage_mesh() { void _lcd_ubl_save_mesh_cmd() {
START_MENU(); char UBL_LCD_GCODE[8];
MENU_BACK(MSG_UBL_LEVEL_BED); sprintf_P(UBL_LCD_GCODE, PSTR("G29 S%i"), ubl_storage_slot);
MENU_ITEM_EDIT(int3, MSG_UBL_STORAGE_SLOT, &UBL_STORAGE_SLOT, 0, 9); enqueue_and_echo_command(UBL_LCD_GCODE);
MENU_ITEM(function, MSG_UBL_LOAD_MESH, _lcd_ubl_load_mesh_cmd); }
MENU_ITEM(function, MSG_UBL_SAVE_MESH, _lcd_ubl_save_mesh_cmd);
END_MENU();
}
/** /**
* UBL Output map Command * UBL Mesh Storage submenu
*/ */
void _lcd_ubl_output_map_cmd() { void _lcd_ubl_storage_mesh() {
sprintf_P(UBL_LCD_GCODE, PSTR("G29 T%i"), map_type); START_MENU();
enqueue_and_echo_command(UBL_LCD_GCODE); MENU_BACK(MSG_UBL_LEVEL_BED);
} MENU_ITEM_EDIT(int3, MSG_UBL_STORAGE_SLOT, &ubl_storage_slot, 0, 9);
MENU_ITEM(function, MSG_UBL_LOAD_MESH, _lcd_ubl_load_mesh_cmd);
MENU_ITEM(function, MSG_UBL_SAVE_MESH, _lcd_ubl_save_mesh_cmd);
END_MENU();
}
/** /**
* UBL Output map submenu * UBL Output map Command
*/ */
void _lcd_ubl_output_map() { void _lcd_ubl_output_map_cmd() {
START_MENU(); char UBL_LCD_GCODE[10];
MENU_BACK(MSG_UBL_LEVEL_BED); sprintf_P(UBL_LCD_GCODE, PSTR("G29 T%i"), map_type);
MENU_ITEM_EDIT(int3, MSG_UBL_MAP_TYPE, &map_type, 0, 1); enqueue_and_echo_command(UBL_LCD_GCODE);
if (map_type == 0) MENU_ITEM(function, MSG_UBL_OUTPUT_MAP_HOST, _lcd_ubl_output_map_cmd); }
if (map_type == 1) MENU_ITEM(function, MSG_UBL_OUTPUT_MAP_CSV, _lcd_ubl_output_map_cmd);
END_MENU();
}
/** /**
* UBL Tools submenu * UBL Output map submenu
*/ */
void _lcd_ubl_tools_menu() { void _lcd_ubl_output_map() {
START_MENU(); START_MENU();
MENU_BACK(MSG_UBL_LEVEL_BED); MENU_BACK(MSG_UBL_LEVEL_BED);
MENU_ITEM(submenu, MSG_UBL_BUILD_MESH_MENU, _lcd_ubl_build_mesh); MENU_ITEM_EDIT(int3, MSG_UBL_MAP_TYPE, &map_type, 0, 1);
MENU_ITEM(submenu, MSG_UBL_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh); if (map_type == 0) MENU_ITEM(function, MSG_UBL_OUTPUT_MAP_HOST, _lcd_ubl_output_map_cmd);
MENU_ITEM(submenu, MSG_UBL_EDIT_MESH_MENU, _lcd_ubl_edit_mesh); if (map_type == 1) MENU_ITEM(function, MSG_UBL_OUTPUT_MAP_CSV, _lcd_ubl_output_map_cmd);
MENU_ITEM(submenu, MSG_UBL_MESH_LEVELING, _lcd_ubl_mesh_leveling); END_MENU();
END_MENU(); }
}
/** /**
* UBL System submenu * UBL Tools submenu
* */
* Prepare void _lcd_ubl_tools_menu() {
* - Unified Bed Leveling START_MENU();
* - Activate UBL MENU_BACK(MSG_UBL_LEVEL_BED);
* - Deactivate UBL MENU_ITEM(submenu, MSG_UBL_BUILD_MESH_MENU, _lcd_ubl_build_mesh);
* - Mesh Storage MENU_ITEM(submenu, MSG_UBL_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
* Memory Slot: MENU_ITEM(submenu, MSG_UBL_EDIT_MESH_MENU, _lcd_ubl_edit_mesh);
* Load Bed Mesh MENU_ITEM(submenu, MSG_UBL_MESH_LEVELING, _lcd_ubl_mesh_leveling);
* Save Bed Mesh END_MENU();
* - Output Map }
* Map Type:
* Output Bed Mesh Host / Output Bed Mesh CSV
* - UBL Tools
* - Build Mesh
* Build PLA Mesh
* Build ABS Mesh
* - Build Custom Mesh
* Hotend Temp:
* Bed Temp:
* Build Custom Mesh
* Info Screen
* - Build Cold Mesh
* - Fill-in Mesh
* Fill-in Mesh
* Smart Fill-in
* Manual Fill-in
* Info Screen
* Continue Bed Mesh
* Invalidate All
* Invalidate Closest
* - Validate Mesh
* PLA Mesh Validation
* ABS Mesh Validation
* - Custom Mesh Validation
* Hotend Temp:
* Bed Temp:
* Validate Mesh
* Info Screen
* - Edit Mesh
* Fine Tune All
* Fine Tune Closest
* - Adjust Mesh Height
* Height Amount:
* Adjust Mesh Height
* Info Screen
* - Mesh Leveling
* 3-Point Mesh Leveling
* - Grid Mesh Leveling
* Side points:
* Level Mesh
* Info Screen
* - Output UBL Info
*/
void _lcd_ubl_level_bed() { /**
START_MENU(); * UBL System submenu
MENU_BACK(MSG_PREPARE); *
MENU_ITEM(gcode, MSG_UBL_ACTIVATE_MESH, PSTR("G29 A")); * Prepare
MENU_ITEM(gcode, MSG_UBL_DEACTIVATE_MESH, PSTR("G29 D")); * - Unified Bed Leveling
MENU_ITEM(submenu, MSG_UBL_STORAGE_MESH_MENU, _lcd_ubl_storage_mesh); * - Activate UBL
MENU_ITEM(submenu, MSG_UBL_OUTPUT_MAP, _lcd_ubl_output_map); * - Deactivate UBL
MENU_ITEM(submenu, MSG_UBL_TOOLS, _lcd_ubl_tools_menu); * - Mesh Storage
MENU_ITEM(gcode, MSG_UBL_INFO_UBL, PSTR("G29 W")); * Memory Slot:
END_MENU(); * Load Bed Mesh
} * Save Bed Mesh
#endif * - Output Map
* Map Type:
* Output Bed Mesh Host / Output Bed Mesh CSV
* - UBL Tools
* - Build Mesh
* Build PLA Mesh
* Build ABS Mesh
* - Build Custom Mesh
* Hotend Temp:
* Bed Temp:
* Build Custom Mesh
* Info Screen
* - Build Cold Mesh
* - Fill-in Mesh
* Fill-in Mesh
* Smart Fill-in
* Manual Fill-in
* Info Screen
* Continue Bed Mesh
* Invalidate All
* Invalidate Closest
* - Validate Mesh
* PLA Mesh Validation
* ABS Mesh Validation
* - Custom Mesh Validation
* Hotend Temp:
* Bed Temp:
* Validate Mesh
* Info Screen
* - Edit Mesh
* Fine Tune All
* Fine Tune Closest
* - Adjust Mesh Height
* Height Amount:
* Adjust Mesh Height
* Info Screen
* - Mesh Leveling
* 3-Point Mesh Leveling
* - Grid Mesh Leveling
* Side points:
* Level Mesh
* Info Screen
* - Output UBL Info
*/
void _lcd_ubl_level_bed() {
START_MENU();
MENU_BACK(MSG_PREPARE);
MENU_ITEM(gcode, MSG_UBL_ACTIVATE_MESH, PSTR("G29 A"));
MENU_ITEM(gcode, MSG_UBL_DEACTIVATE_MESH, PSTR("G29 D"));
MENU_ITEM(submenu, MSG_UBL_STORAGE_MESH_MENU, _lcd_ubl_storage_mesh);
MENU_ITEM(submenu, MSG_UBL_OUTPUT_MAP, _lcd_ubl_output_map);
MENU_ITEM(submenu, MSG_UBL_TOOLS, _lcd_ubl_tools_menu);
MENU_ITEM(gcode, MSG_UBL_INFO_UBL, PSTR("G29 W"));
END_MENU();
}
#endif
#endif // LCD_BED_LEVELING || HAS_ABL #endif // LCD_BED_LEVELING || HAS_ABL
@ -2052,7 +2072,7 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed); MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed);
#endif #endif
#endif #endif // LCD_BED_LEVELING || HAS_ABL
#if HAS_M206_COMMAND #if HAS_M206_COMMAND
// //