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

22
Marlin/src/gcode/bedlevel/G26.cpp
View File

@ -156,7 +156,7 @@ constexpr float g26_e_axis_feedrate = 0.025;
static MeshFlags circle_flags;
float g26_random_deviation = 0.0;
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
/**
* If the LCD is clicked, cancel, wait for release, return true
@ -164,7 +164,7 @@ float g26_random_deviation = 0.0;
bool user_canceled() {
if (!ui.button_pressed()) return false; // Return if the button isn't pressed
ui.set_status(GET_TEXT_F(MSG_G26_CANCELED), 99);
TERN_(HAS_LCD_MENU, ui.quick_feedback());
TERN_(HAS_MARLINUI_MENU, ui.quick_feedback());
ui.wait_for_release();
return true;
}
@ -325,7 +325,7 @@ typedef struct {
#if HAS_WIRED_LCD
ui.set_status(GET_TEXT_F(MSG_G26_HEATING_BED), 99);
ui.quick_feedback();
TERN_(HAS_LCD_MENU, ui.capture());
TERN_(HAS_MARLINUI_MENU, ui.capture());
#endif
thermalManager.setTargetBed(bed_temp);
@ -365,7 +365,7 @@ typedef struct {
bool prime_nozzle() {
const feedRate_t fr_slow_e = planner.settings.max_feedrate_mm_s[E_AXIS] / 15.0f;
#if HAS_LCD_MENU && !HAS_TOUCH_BUTTONS // ui.button_pressed issue with touchscreen
#if HAS_MARLINUI_MENU && !HAS_TOUCH_BUTTONS // ui.button_pressed issue with touchscreen
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
float Total_Prime = 0.0;
#endif
@ -579,7 +579,7 @@ void GcodeSuite::G26() {
if (parser.seen('P')) {
if (!parser.has_value()) {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
g26.prime_flag = -1;
#else
SERIAL_ECHOLNPGM("?Prime length must be specified when not using an LCD.");
@ -638,7 +638,7 @@ void GcodeSuite::G26() {
// Get repeat from 'R', otherwise do one full circuit
int16_t g26_repeats;
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1);
#else
if (parser.seen('R'))
@ -699,7 +699,7 @@ void GcodeSuite::G26() {
move_to(destination, 0.0);
move_to(destination, g26.ooze_amount);
TERN_(HAS_LCD_MENU, ui.capture());
TERN_(HAS_MARLINUI_MENU, ui.capture());
#if DISABLED(ARC_SUPPORT)
@ -795,7 +795,7 @@ void GcodeSuite::G26() {
destination = current_position;
}
if (TERN0(HAS_LCD_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
if (TERN0(HAS_MARLINUI_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
#else // !ARC_SUPPORT
@ -819,7 +819,7 @@ void GcodeSuite::G26() {
for (int8_t ind = start_ind; ind <= end_ind; ind++) {
if (TERN0(HAS_LCD_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
if (TERN0(HAS_MARLINUI_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
xyz_float_t p = { circle.x + _COS(ind ), circle.y + _SIN(ind ), g26.layer_height },
q = { circle.x + _COS(ind + 1), circle.y + _SIN(ind + 1), g26.layer_height };
@ -846,7 +846,7 @@ void GcodeSuite::G26() {
g26.connect_neighbor_with_line(location.pos, 0, 1);
planner.synchronize();
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(location.pos, ExtUI::G26_POINT_FINISH));
if (TERN0(HAS_LCD_MENU, user_canceled())) goto LEAVE;
if (TERN0(HAS_MARLINUI_MENU, user_canceled())) goto LEAVE;
}
SERIAL_FLUSH(); // Prevent host M105 buffer overrun.
@ -866,7 +866,7 @@ void GcodeSuite::G26() {
planner.calculate_volumetric_multipliers();
#endif
TERN_(HAS_LCD_MENU, ui.release()); // Give back control of the LCD
TERN_(HAS_MARLINUI_MENU, ui.release()); // Give back control of the LCD
if (!g26.keep_heaters_on) {
TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(0));