bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🧑‍💻 HAS_MARLINUI_MENU, HAS_MANUAL_MOVE_MENU

Browse Source
This commit is contained in:
Scott Lahteine
2022-01-25 15:33:03 -06:00
parent 33c89547f0
commit 2dcc3ddeed
63 changed files with 201 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/ubl/ubl.h
View File

@ -120,7 +120,7 @@ public:
static const float _mesh_index_to_xpos[GRID_MAX_POINTS_X],
_mesh_index_to_ypos[GRID_MAX_POINTS_Y];
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
static bool lcd_map_control;
static void steppers_were_disabled();
#else

24
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -57,7 +57,7 @@
#define UBL_G29_P31
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
bool unified_bed_leveling::lcd_map_control = false;
@ -443,7 +443,7 @@ void unified_bed_leveling::G29() {
#endif // HAS_BED_PROBE
case 2: {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
//
// Manually Probe Mesh in areas that can't be reached by the probe
//
@ -555,7 +555,7 @@ void unified_bed_leveling::G29() {
}
case 4: // Fine Tune (i.e., Edit) the Mesh
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
fine_tune_mesh(param.XY_pos, parser.seen_test('T'));
#else
SERIAL_ECHOLNPGM("?P4 is only available when an LCD is present.");
@ -646,7 +646,7 @@ void unified_bed_leveling::G29() {
LEAVE:
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
ui.reset_alert_level();
ui.quick_feedback();
ui.reset_status();
@ -725,7 +725,7 @@ void unified_bed_leveling::shift_mesh_height() {
void unified_bed_leveling::probe_entire_mesh(const xy_pos_t &nearby, const bool do_ubl_mesh_map, const bool stow_probe, const bool do_furthest) {
probe.deploy(); // Deploy before ui.capture() to allow for PAUSE_BEFORE_DEPLOY_STOW
TERN_(HAS_LCD_MENU, ui.capture());
TERN_(HAS_MARLINUI_MENU, ui.capture());
save_ubl_active_state_and_disable(); // No bed level correction so only raw data is obtained
uint8_t count = GRID_MAX_POINTS;
@ -739,7 +739,7 @@ void unified_bed_leveling::shift_mesh_height() {
SERIAL_ECHOLNPGM("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
if (ui.button_pressed()) {
ui.quick_feedback(false); // Preserve button state for click-and-hold
SERIAL_ECHOLNPGM("\nMesh only partially populated.\n");
@ -774,9 +774,9 @@ void unified_bed_leveling::shift_mesh_height() {
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(best.pos, ExtUI::G29_FINISH));
// Release UI during stow to allow for PAUSE_BEFORE_DEPLOY_STOW
TERN_(HAS_LCD_MENU, ui.release());
TERN_(HAS_MARLINUI_MENU, ui.release());
probe.stow();
TERN_(HAS_LCD_MENU, ui.capture());
TERN_(HAS_MARLINUI_MENU, ui.capture());
probe.move_z_after_probing();
@ -791,7 +791,7 @@ void unified_bed_leveling::shift_mesh_height() {
#endif // HAS_BED_PROBE
void set_message_with_feedback(FSTR_P const fstr) {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
ui.set_status(fstr);
ui.quick_feedback();
#else
@ -799,7 +799,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
#endif
}
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
typedef void (*clickFunc_t)();
@ -1070,7 +1070,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
ui.return_to_status();
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
/**
* Parse and validate most G29 parameters, store for use by G29 functions.
@ -1210,7 +1210,7 @@ void unified_bed_leveling::save_ubl_active_state_and_disable() {
}
void unified_bed_leveling::restore_ubl_active_state_and_leave() {
TERN_(HAS_LCD_MENU, ui.release());
TERN_(HAS_MARLINUI_MENU, ui.release());
#if ENABLED(UBL_DEVEL_DEBUGGING)
if (--ubl_state_recursion_chk) {
SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");