diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index c2fb4fdb9579..557ba6a08971 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1469,7 +1469,8 @@ * A lightweight, solenoid-driven probe. * For information about this sensor https://github.com/bigtreetech/MicroProbe * - * Also requires: PROBE_ENABLE_DISABLE, ENDSTOP_INTERRUPTS_FEATURE if FT_MOTION is enabled. + * Also requires PROBE_ENABLE_DISABLE + * With FT_MOTION requires ENDSTOP_INTERRUPTS_FEATURE */ //#define BIQU_MICROPROBE_V1 // Triggers HIGH //#define BIQU_MICROPROBE_V2 // Triggers LOW diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 3ffd1ee92aee..08db885be374 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1554,6 +1554,9 @@ // BACK menu items keep the highlight at the top //#define TURBO_BACK_MENU_ITEM + // BACK menu items show "Back" instead of the previous menu name + //#define GENERIC_BACK_MENU_ITEM + // Insert a menu for preheating at the top level to allow for quick access //#define PREHEAT_SHORTCUT_MENU_ITEM diff --git a/Marlin/Version.h b/Marlin/Version.h index c21a93568b53..8e55db459ddd 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-08-18" +//#define STRING_DISTRIBUTION_DATE "2024-08-20" /** * Defines a generic printer name to be output to the LCD after booting Marlin. diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 9803ec875fe3..853a951c13bd 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -325,7 +325,7 @@ bool pin_is_protected(const pin_t pin) { #pragma GCC diagnostic pop bool printer_busy() { - return planner.movesplanned() || printingIsActive(); + return planner.has_blocks_queued() || printingIsActive(); } /** diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index b61fb0e44282..f04d79f1552b 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -3880,7 +3880,7 @@ static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive." #elif ENABLED(LASER_MOVE_G0_OFF) #error "LASER_MOVE_G0_OFF is no longer required, G0 and G28 cannot apply power." #elif ENABLED(LASER_MOVE_G28_OFF) - #error "LASER_MOVE_G0_OFF is no longer required, G0 and G28 cannot apply power." + #error "LASER_MOVE_G28_OFF is no longer required, G0 and G28 cannot apply power." #elif ENABLED(LASER_MOVE_POWER) #error "LASER_MOVE_POWER is no longer applicable." #endif diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index b926a56e4860..71557fa5d215 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2024-08-18" + #define STRING_DISTRIBUTION_DATE "2024-08-20" #endif /** diff --git a/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp b/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp index 815d0783bf4e..ef9452a9db85 100644 --- a/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp +++ b/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp @@ -1670,7 +1670,8 @@ namespace Anycubic { if (getAxisPosition_mm(Z) < 0) setAxisPosition_mm(0, Z, 8); } - // if (!planner.movesplanned())return; + //if (!planner.has_blocks_queued()) return; + switch (key_value) { case 0: break; diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp index ae7702e8a421..3b30332488a6 100644 --- a/Marlin/src/lcd/extui/ui_api.cpp +++ b/Marlin/src/lcd/extui/ui_api.cpp @@ -1070,7 +1070,7 @@ namespace ExtUI { void injectCommands_P(PGM_P const gcode) { queue.inject_P(gcode); } void injectCommands(char * const gcode) { queue.inject(gcode); } - bool commandsInQueue() { return (planner.movesplanned() || queue.has_commands_queued()); } + bool commandsInQueue() { return (planner.has_blocks_queued() || queue.has_commands_queued()); } bool isAxisPositionKnown(const axis_t axis) { return axis_is_trusted((AxisEnum)axis); } bool isAxisPositionKnown(const extruder_t) { return axis_is_trusted(E_AXIS); } diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h index 07aa59675a9f..bf7e20369515 100644 --- a/Marlin/src/lcd/menu/menu_item.h +++ b/Marlin/src/lcd/menu/menu_item.h @@ -426,12 +426,15 @@ class MenuItem_bool : public MenuEditItemBase { // Predefined menu item types // -#if DISABLED(NO_BACK_MENU_ITEM) - #define BACK_ITEM_F(FLABEL) MENU_ITEM_F(back, FLABEL) - #define BACK_ITEM(LABEL) MENU_ITEM(back, LABEL) -#else +#if ENABLED(NO_BACK_MENU_ITEM) #define BACK_ITEM_F(FLABEL) NOOP #define BACK_ITEM(LABEL) NOOP +#elif ENABLED(GENERIC_BACK_MENU_ITEM) + #define BACK_ITEM_F(V...) MENU_ITEM_F(back, GET_TEXT_F(MSG_BACK)) + #define BACK_ITEM(V...) MENU_ITEM(back, MSG_BACK) +#else + #define BACK_ITEM_F(FLABEL) MENU_ITEM_F(back, FLABEL) + #define BACK_ITEM(LABEL) MENU_ITEM(back, LABEL) #endif #define ACTION_ITEM_N_S_F(N, S, FLABEL, ACTION) MENU_ITEM_N_S_F(function, N, S, FLABEL, ACTION) diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index ff7225a16679..3b9f0f3983a7 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -507,7 +507,7 @@ void _ubl_map_screen_homing() { * UBL Homing before LCD map */ void _ubl_goto_map_screen() { - if (planner.movesplanned()) return; // The ACTION_ITEM will do nothing + if (planner.has_blocks_queued()) return; // The ACTION_ITEM will do nothing if (!all_axes_trusted()) { set_all_unhomed(); queue.inject_P(G28_STR); diff --git a/Marlin/src/module/ft_motion.cpp b/Marlin/src/module/ft_motion.cpp index a94516478b96..fc8b6a14e37c 100644 --- a/Marlin/src/module/ft_motion.cpp +++ b/Marlin/src/module/ft_motion.cpp @@ -166,7 +166,7 @@ void FTMotion::loop() { discard_planner_block_protected(); // Check if the block needs to be runout: - if (!batchRdy && !planner.movesplanned()) { + if (!batchRdy && !planner.has_blocks_queued()) { runoutBlock(); makeVector(); // Do an additional makeVector call to guarantee batchRdy set this loop. }