diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 59cf7b9129..f6963bcccc 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2582,7 +2582,7 @@
/**
* Minimum stepper driver pulse width (in ns)
- * If undefined, these defaults (from Conditionals_adv.h) apply:
+ * If undefined, these defaults (from Conditionals-4-adv.h) apply:
* 100 : Minimum for TMC2xxx stepper drivers
* 500 : Minimum for LV8729
* 1000 : Minimum for A4988 and A5984 stepper drivers
@@ -2596,7 +2596,7 @@
/**
* Maximum stepping rate (in Hz) the stepper driver allows
- * If undefined, these defaults (from Conditionals_adv.h) apply:
+ * If undefined, these defaults (from Conditionals-4-adv.h) apply:
* 5000000 : Maximum for TMC2xxx stepper drivers
* 1000000 : Maximum for LV8729 stepper driver
* 500000 : Maximum for A4988 stepper driver
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 9b0fdd6ec2..3cc1beba2d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,10 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
-//#define STRING_DISTRIBUTION_DATE "2024-08-31"
-
-#define STRING_DISTRIBUTION_DATE __DATE__
-#define STRING_DISTRIBUTION_TIME __TIME__
+//#define STRING_DISTRIBUTION_DATE "2024-09-03"
/**
* 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 e08e89e699..d20c5b253b 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -274,7 +274,7 @@ bool wait_for_heatup = false;
// For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
#if HAS_RESUME_CONTINUE
- bool wait_for_user; // = false;
+ bool wait_for_user; // = false
void wait_for_user_response(millis_t ms/*=0*/, const bool no_sleep/*=false*/) {
IF_DISABLED(ADVANCED_PAUSE_FEATURE, UNUSED(no_sleep);)
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index d2821ac519..cffe90040a 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -72,13 +72,9 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
constexpr bool should_set = true;
#else
#ifdef DEBUG_OUT
- if (DEBUGGING(LEVELING)) {
- PGMSTR(mode0, "OD");
- PGMSTR(mode1, "5V");
- DEBUG_ECHOPGM("BLTouch Mode: ");
- DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
- DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
- }
+ if (DEBUGGING(LEVELING))
+ DEBUG_ECHOLN( F("BLTouch Mode: "), bltouch.od_5v_mode ? F("5V") : F("OD"),
+ F(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")"));
#endif
const bool should_set = od_5v_mode != ENABLED(BLTOUCH_SET_5V_MODE);
#endif
diff --git a/Marlin/src/feature/filwidth.cpp b/Marlin/src/feature/filwidth.cpp
index 3befd7752a..1142423cf7 100644
--- a/Marlin/src/feature/filwidth.cpp
+++ b/Marlin/src/feature/filwidth.cpp
@@ -28,7 +28,7 @@
FilamentWidthSensor filwidth;
-bool FilamentWidthSensor::enabled; // = false; // (M405-M406) Filament Width Sensor ON/OFF.
+bool FilamentWidthSensor::enabled; // = false // (M405-M406) Filament Width Sensor ON/OFF.
uint32_t FilamentWidthSensor::accum; // = 0 // ADC accumulator
uint16_t FilamentWidthSensor::raw; // = 0 // Measured filament diameter - one extruder only
float FilamentWidthSensor::nominal_mm = DEFAULT_NOMINAL_FILAMENT_DIA, // (M104) Nominal filament width
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index acab5d7437..29addfcf1e 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -123,7 +123,7 @@ Joystick joystick;
void Joystick::inject_jog_moves() {
// Recursion barrier
- static bool injecting_now; // = false;
+ static bool injecting_now; // = false
if (injecting_now) return;
#if ENABLED(NO_MOTION_BEFORE_HOMING)
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index b8d9d4811b..71fa7c7b4d 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -88,7 +88,7 @@ void GcodeSuite::M125() {
park_point += hotend_offset[active_extruder];
#endif
- const bool sd_printing = TERN0(HAS_MEDIA, IS_SD_PRINTING());
+ const bool sd_printing = IS_SD_PRINTING();
ui.pause_show_message(PAUSE_MESSAGE_PARKING, PAUSE_MODE_PAUSE_PRINT);
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index e445ef8311..bbbf384d0b 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -368,7 +368,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 0: case 1: // G0: Fast Move, G1: Linear Move
G0_G1(TERN_(HAS_FAST_MOVES, parser.codenum == 0)); break;
- #if ENABLED(ARC_SUPPORT) && DISABLED(SCARA)
+ #if ENABLED(ARC_SUPPORT)
case 2: case 3: G2_G3(parser.codenum == 2); break; // G2: CW ARC, G3: CCW ARC
#endif
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index c87d64d19b..c3c2758af4 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -29,12 +29,6 @@
#include "../../module/planner.h"
#include "../../module/temperature.h"
-#if ENABLED(DELTA)
- #include "../../module/delta.h"
-#elif ENABLED(SCARA)
- #include "../../module/scara.h"
-#endif
-
#if N_ARC_CORRECTION < 1
#undef N_ARC_CORRECTION
#define N_ARC_CORRECTION 1
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index 247f9d955f..21fd58b7c9 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -50,8 +50,7 @@
*/
void GcodeSuite::G30() {
- xy_pos_t old_pos = current_position,
- probepos = current_position;
+ xy_pos_t probepos = current_position;
const bool seenX = parser.seenval('X');
if (seenX) probepos.x = RAW_X_POSITION(parser.value_linear_units());
@@ -62,21 +61,28 @@ void GcodeSuite::G30() {
if (probe.can_reach(probepos)) {
- if (seenX) old_pos.x = probepos.x;
- if (seenY) old_pos.y = probepos.y;
-
// Disable leveling so the planner won't mess with us
TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
+ // Disable feedrate scaling so movement speeds are correct
remember_feedrate_scaling_off();
+ // With VERBOSE_SINGLE_PROBE home only if needed
TERN_(VERBOSE_SINGLE_PROBE, process_subcommands_now(F("G28O")));
+ // Raise after based on the 'E' parameter
const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
+ // Use 'C' to set Probe Temperature Compensation ON/OFF (on by default)
TERN_(HAS_PTC, ptc.set_enabled(parser.boolval('C', true)));
+
+ // Probe the bed, optionally raise, and return the measured height
const float measured_z = probe.probe_at_point(probepos, raise_after);
+
+ // After probing always re-enable Probe Temperature Compensation
TERN_(HAS_PTC, ptc.set_enabled(true));
+
+ // Report a good probe result to the host and LCD
if (!isnan(measured_z)) {
const xy_pos_t lpos = probepos.asLogical();
SString<30> msg(
@@ -88,9 +94,11 @@ void GcodeSuite::G30() {
TERN_(VERBOSE_SINGLE_PROBE, ui.set_status(msg));
}
+ // Restore feedrate scaling
restore_feedrate_and_scaling();
- do_blocking_move_to(old_pos);
+ // Move the nozzle to the position of the probe
+ do_blocking_move_to(probepos);
if (raise_after == PROBE_PT_STOW)
probe.move_z_after_probing();
diff --git a/Marlin/src/inc/Conditionals_axes.h b/Marlin/src/inc/Conditionals-1-axes.h
similarity index 98%
rename from Marlin/src/inc/Conditionals_axes.h
rename to Marlin/src/inc/Conditionals-1-axes.h
index c46499b9d8..1ea88cec86 100644
--- a/Marlin/src/inc/Conditionals_axes.h
+++ b/Marlin/src/inc/Conditionals-1-axes.h
@@ -22,10 +22,16 @@
#pragma once
/**
- * Conditionals_axes.h
+ * Conditionals-1-axes.h
* Conditionals that need to be set before Configuration_adv.h or pins.h
*/
+//========================================================
+// Get requirements for the benefit of IntelliSense, etc.
+//
+#include "MarlinConfigPre-1-axes.h"
+//========================================================
+
/**
* Extruders have some combination of stepper motors and hotends
* so we separate these concepts into the defines:
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals-2-LCD.h
similarity index 99%
rename from Marlin/src/inc/Conditionals_LCD.h
rename to Marlin/src/inc/Conditionals-2-LCD.h
index a299add110..0c48e78986 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals-2-LCD.h
@@ -22,10 +22,16 @@
#pragma once
/**
- * Conditionals_LCD.h
+ * Conditionals-2-LCD.h
* Conditionals that need to be set before Configuration_adv.h or pins.h
*/
+//========================================================
+// Get requirements for the benefit of IntelliSense, etc.
+//
+#include "Conditionals-1-axes.h"
+//========================================================
+
// Support for SD Card and other file storage
#if ENABLED(SDSUPPORT)
#define HAS_MEDIA 1
diff --git a/Marlin/src/inc/Conditionals_etc.h b/Marlin/src/inc/Conditionals-3-etc.h
similarity index 98%
rename from Marlin/src/inc/Conditionals_etc.h
rename to Marlin/src/inc/Conditionals-3-etc.h
index 9eda2b72c1..7fb73d9bae 100644
--- a/Marlin/src/inc/Conditionals_etc.h
+++ b/Marlin/src/inc/Conditionals-3-etc.h
@@ -22,10 +22,16 @@
#pragma once
/**
- * Conditionals_etc.h
+ * Conditionals-3-etc.h
* Conditionals that need to be set before Configuration_adv.h or pins.h
*/
+//========================================================
+// Get requirements for the benefit of IntelliSense, etc.
+//
+#include "Conditionals-2-LCD.h"
+//========================================================
+
#ifndef STRING_CONFIG_H_AUTHOR
#define STRING_CONFIG_H_AUTHOR "(anonymous)"
#endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals-4-adv.h
similarity index 98%
rename from Marlin/src/inc/Conditionals_adv.h
rename to Marlin/src/inc/Conditionals-4-adv.h
index 8c9f6b12f2..fc6d74d2f7 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals-4-adv.h
@@ -22,10 +22,16 @@
#pragma once
/**
- * Conditionals_adv.h
+ * Conditionals-4-adv.h
* Conditionals set before pins.h and which depend on Configuration_adv.h.
*/
+//========================================================
+// Get requirements for the benefit of IntelliSense, etc.
+//
+#include "MarlinConfigPre-4-adv.h"
+//========================================================
+
#if ENABLED(MARLIN_SMALL_BUILD)
#undef EEPROM_CHITCHAT
#undef CAPABILITIES_REPORT
@@ -1458,3 +1464,13 @@
#if !HAS_ROTATIONAL_AXES
#undef MANUAL_MOVE_DISTANCE_DEG
#endif
+
+// Only report "Not SD printing" when the state changes
+// To get legacy behavior define AUTO_REPORT_SD_STATUS 2
+#ifdef AUTO_REPORT_SD_STATUS
+ #if ENABLED(AUTO_REPORT_SD_STATUS) // Not blank, 1, or true
+ #define QUIETER_AUTO_REPORT_SD_STATUS
+ #endif
+ #undef AUTO_REPORT_SD_STATUS
+ #define AUTO_REPORT_SD_STATUS
+#endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals-5-post.h
similarity index 99%
rename from Marlin/src/inc/Conditionals_post.h
rename to Marlin/src/inc/Conditionals-5-post.h
index 199d395d45..72abb74de4 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals-5-post.h
@@ -22,10 +22,16 @@
#pragma once
/**
- * Conditionals_post.h
+ * Conditionals-5-post.h
* Internal defines that depend on Configurations and Pins but are not user-editable.
*/
+//========================================================
+// Get requirements for the benefit of IntelliSense, etc.
+//
+#include "MarlinConfigPre-5-post.h"
+//========================================================
+
#ifdef GITHUB_ACTIONS
// Extras for CI testing
#endif
@@ -50,7 +56,7 @@
// Determine which type of 'EEPROM' is in use
#if ENABLED(EEPROM_SETTINGS)
// EEPROM type may be defined by compile flags, configs, HALs, or pins
- // Set additional flags to let HALs choose in their Conditionals_post.h
+ // Set additional flags to let HALs choose in their Conditionals-5-post.h
#if ANY(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION, QSPI_EEPROM)
#define USE_EMULATED_EEPROM 1
#elif ANY(I2C_EEPROM, SPI_EEPROM)
@@ -3522,6 +3528,8 @@
#define LCD_WIDTH 21
#elif IS_DWIN_MARLINUI
// Defined by header
+ #elif HAS_GRAPHICAL_TFT
+ #define LCD_WIDTH ((TFT_WIDTH) / 16)
#else
#define LCD_WIDTH TERN(IS_ULTIPANEL, 20, 16)
#endif
diff --git a/Marlin/src/inc/Conditionals_type.h b/Marlin/src/inc/Conditionals-6-type.h
similarity index 86%
rename from Marlin/src/inc/Conditionals_type.h
rename to Marlin/src/inc/Conditionals-6-type.h
index e798a2d934..e14c6d7ce5 100644
--- a/Marlin/src/inc/Conditionals_type.h
+++ b/Marlin/src/inc/Conditionals-6-type.h
@@ -22,11 +22,17 @@
#pragma once
/**
- * Conditionals_type.h
+ * Conditionals-6-type.h
* Internal defines that depend on Configurations and Pins but are not user-editable.
* Define conditionals in this file if they depend on core/types.h.
*/
+//========================================================
+// Get requirements for the benefit of IntelliSense, etc.
+//
+#include "MarlinConfigPre-6-type.h"
+//========================================================
+
#ifdef GITHUB_ACTIONS
// Extras for CI testing
#endif
diff --git a/Marlin/src/inc/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h
index 807082d839..b0a0434cdd 100644
--- a/Marlin/src/inc/MarlinConfig.h
+++ b/Marlin/src/inc/MarlinConfig.h
@@ -25,30 +25,11 @@
// Prefix header for all Marlin sources
//
-#include "MarlinConfigPre.h"
-
-#ifdef __MARLIN_DEPS__
- #include "../HAL/shared/fauxpins.h"
-#else
- #include "../HAL/HAL.h"
-#endif
-
-#include "../pins/pins.h"
+#include "MarlinConfigPre-6-type.h" // Include even with __MARLIN_DEPS__
#ifndef __MARLIN_DEPS__
- #include HAL_PATH(.., timers.h)
- #include HAL_PATH(.., spi_pins.h)
-#endif
-
-#include "Conditionals_post.h"
-
-#ifndef __MARLIN_DEPS__
-
- #include HAL_PATH(.., inc/Conditionals_post.h)
-
- #include "../core/types.h" // Ahead of sanity-checks
- #include "Conditionals_type.h"
+ #include "Conditionals-6-type.h"
#include HAL_PATH(.., inc/Conditionals_type.h)
#include "Changes.h"
diff --git a/Marlin/src/inc/MarlinConfigPre-1-axes.h b/Marlin/src/inc/MarlinConfigPre-1-axes.h
new file mode 100644
index 0000000000..1131376213
--- /dev/null
+++ b/Marlin/src/inc/MarlinConfigPre-1-axes.h
@@ -0,0 +1,54 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#pragma once
+
+#ifndef __MARLIN_FIRMWARE__
+#define __MARLIN_FIRMWARE__
+#endif
+
+#if __has_include("../../Config.h")
+ #include "../../Config.h"
+#else
+ #define USE_STD_CONFIGS 1
+#endif
+
+#include
+
+#ifndef __MARLIN_DEPS__
+ #include "../HAL/platforms.h"
+#endif
+
+#include "../core/boards.h"
+
+#if USE_STD_CONFIGS
+ #include "../../Configuration.h"
+#endif
+//#include "../../../configurations/_Undef_Configuration.h" // **EXPERIMENTAL** Uncomment to use
+//#include "../../../configurations/_Define_Configuration.h" // **EXPERIMENTAL** Uncomment to use
+
+#ifdef CUSTOM_VERSION_FILE
+ #if __has_include(STRINGIFY(../../CUSTOM_VERSION_FILE))
+ #include STRINGIFY(../../CUSTOM_VERSION_FILE)
+ #endif
+#endif
+
+#include "Version.h"
diff --git a/Marlin/src/inc/MarlinConfigPre-4-adv.h b/Marlin/src/inc/MarlinConfigPre-4-adv.h
new file mode 100644
index 0000000000..eb387dcd8b
--- /dev/null
+++ b/Marlin/src/inc/MarlinConfigPre-4-adv.h
@@ -0,0 +1,36 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#pragma once
+
+#include "Conditionals-3-etc.h"
+
+#ifndef __MARLIN_DEPS__
+ #include HAL_PATH(.., inc/Conditionals_LCD.h)
+#endif
+
+#include "../core/drivers.h"
+
+#if USE_STD_CONFIGS
+ #include "../../Configuration_adv.h"
+#endif
+//#include "../../../configurations/_Undef_Configuration_adv.h" // **EXPERIMENTAL** Uncomment to use
+//#include "../../../configurations/_Define_Configuration_adv.h" // **EXPERIMENTAL** Uncomment to use
diff --git a/Marlin/src/inc/MarlinConfigPre-5-post.h b/Marlin/src/inc/MarlinConfigPre-5-post.h
new file mode 100644
index 0000000000..77307d177b
--- /dev/null
+++ b/Marlin/src/inc/MarlinConfigPre-5-post.h
@@ -0,0 +1,37 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#pragma once
+
+#include "MarlinConfigPre.h"
+
+#ifdef __MARLIN_DEPS__
+ #include "../HAL/shared/fauxpins.h"
+#else
+ #include "../HAL/HAL.h"
+#endif
+
+#include "../pins/pins.h"
+
+#ifndef __MARLIN_DEPS__
+ #include HAL_PATH(.., timers.h)
+ #include HAL_PATH(.., spi_pins.h)
+#endif
diff --git a/Marlin/src/inc/MarlinConfigPre-6-type.h b/Marlin/src/inc/MarlinConfigPre-6-type.h
new file mode 100644
index 0000000000..358e34a7d6
--- /dev/null
+++ b/Marlin/src/inc/MarlinConfigPre-6-type.h
@@ -0,0 +1,30 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#pragma once
+
+#include "MarlinConfigPre-5-post.h"
+#include "Conditionals-5-post.h"
+
+#ifndef __MARLIN_DEPS__
+ #include HAL_PATH(.., inc/Conditionals_post.h)
+ #include "../core/types.h" // Ahead of sanity-checks
+#endif
diff --git a/Marlin/src/inc/MarlinConfigPre.h b/Marlin/src/inc/MarlinConfigPre.h
index 367637e5ab..6db6bca964 100644
--- a/Marlin/src/inc/MarlinConfigPre.h
+++ b/Marlin/src/inc/MarlinConfigPre.h
@@ -21,58 +21,13 @@
*/
#pragma once
-#ifndef __MARLIN_FIRMWARE__
-#define __MARLIN_FIRMWARE__
-#endif
-
-#if __has_include("../../Config.h")
- #include "../../Config.h"
-#else
- #define USE_STD_CONFIGS 1
-#endif
-
//
// Prefix header to acquire configurations
//
-#include
-
-#ifndef __MARLIN_DEPS__
- #include "../HAL/platforms.h"
-#endif
-
-#include "../core/boards.h"
-
-#if USE_STD_CONFIGS
- #include "../../Configuration.h"
-#endif
-//#include "../../../configurations/_Undef_Configuration.h" //**EXPERIMENTAL** Uncomment to use
-//#include "../../../configurations/_Define_Configuration.h" //**EXPERIMENTAL** Uncomment to use
-
-#ifdef CUSTOM_VERSION_FILE
- #if __has_include(STRINGIFY(../../CUSTOM_VERSION_FILE))
- #include STRINGIFY(../../CUSTOM_VERSION_FILE)
- #endif
-#endif
-
-#include "Version.h"
-
-#include "Conditionals_axes.h"
-#include "Conditionals_LCD.h"
-#include "Conditionals_etc.h"
-
-#ifndef __MARLIN_DEPS__
- #include HAL_PATH(.., inc/Conditionals_LCD.h)
-#endif
-
-#include "../core/drivers.h"
-
-#if USE_STD_CONFIGS
- #include "../../Configuration_adv.h"
-#endif
-//#include "../../../configurations/_Undef_Configuration_adv.h" //**EXPERIMENTAL** Uncomment to use
-//#include "../../../configurations/_Define_Configuration_adv.h" //**EXPERIMENTAL** Uncomment to use
-
-#include "Conditionals_adv.h"
+#include "Conditionals-1-axes.h"
+#include "Conditionals-2-LCD.h"
+#include "Conditionals-3-etc.h"
+#include "Conditionals-4-adv.h"
#ifndef __MARLIN_DEPS__
#include HAL_PATH(.., inc/Conditionals_adv.h)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 0b151d5a61..12e7dd7ed2 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -27,6 +27,12 @@
* Test configuration values for errors at compile-time.
*/
+//========================================================
+// Get requirements for the benefit of IntelliSense, etc.
+//
+#include "MarlinConfig.h"
+//========================================================
+
/**
* Require gcc 4.7 or newer (first included with Arduino 1.6.8) for C++11 features.
*/
@@ -473,7 +479,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
* Babystepping
*/
#if ENABLED(BABYSTEPPING)
- #if ENABLED(SCARA)
+ #if IS_SCARA
#error "BABYSTEPPING is not implemented for SCARA yet."
#elif ENABLED(BABYSTEP_XY) && ANY(MARKFORGED_XY, MARKFORGED_YX)
#error "BABYSTEPPING only implemented for Z axis on MarkForged."
@@ -1786,7 +1792,7 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
* Make sure Z_CLEARANCE_FOR_HOMING is below Z_MAX_POS and above or equal to 2
*/
#if HAS_Z_AXIS && !PROUI_EX
- static_assert(Z_CLEARANCE_FOR_HOMING <= Z_MAX_POS, "Z_CLEARANCE_FOR_HOMING must be smaller than or equal to Z_MAX_POS.");
+ static_assert(Z_CLEARANCE_FOR_HOMING <= Z_MAX_POS, "Z_CLEARANCE_FOR_HOMING must be less than or equal to Z_MAX_POS.");
#endif
#ifdef Z_CLEARANCE_FOR_HOMING
static_assert(Z_CLEARANCE_FOR_HOMING >= 2, "Z_CLEARANCE_FOR_HOMING must be >= 2.");
@@ -4343,9 +4349,9 @@ static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive."
static_assert(SHAPING_FREQ_X == SHAPING_FREQ_Y && SHAPING_FREQ_Y == SHAPING_FREQ_Z, "SHAPING_FREQ_X, SHAPING_FREQ_Y and SHAPING_FREQ_Z must be the same for DELTA.");
static_assert(SHAPING_ZETA_X == SHAPING_ZETA_Y && SHAPING_ZETA_Y == SHAPING_ZETA_Z, "SHAPING_ZETA_X, SHAPING_ZETA_Y and SHAPING_ZETA_Z must be the same for DELTA.");
#endif
- #elif ENABLED(SCARA)
+ #elif IS_SCARA
#error "Input Shaping is not compatible with SCARA kinematics."
- #elif ENABLED(TPARA)
+ #elif ENABLED(AXEL_TPARA)
#error "Input Shaping is not compatible with TPARA kinematics."
#elif ENABLED(POLAR)
#error "Input Shaping is not compatible with POLAR kinematics."
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index bd8862c41f..20232104db 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-31"
+ #define STRING_DISTRIBUTION_DATE "2024-09-03"
#endif
/**
diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
index 8e54b20d99..074dad96c2 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
@@ -60,7 +60,7 @@ constexpr uint8_t DGUS_CMD_WRITEVAR = 0x82;
constexpr uint8_t DGUS_CMD_READVAR = 0x83;
#if ENABLED(DEBUG_DGUSLCD)
- bool dguslcd_local_debug; // = false;
+ bool dguslcd_local_debug; // = false
#endif
void DGUSDisplay::initDisplay() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
index 2c9928f387..1ceacdc063 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
@@ -34,7 +34,7 @@
static lv_obj_t *scr;
void lv_draw_error_message(FSTR_P const fmsg) {
- FSTR_P fhalted = F("PRINTER HALTED"), fplease = F("Please Reset");
+ FSTR_P const fhalted = F("PRINTER HALTED"), fplease = F("Please Reset");
SPI_TFT.lcdClear(0x0000);
if (fmsg) disp_string((TFT_WIDTH - strlen_P(FTOP(fmsg)) * 16) / 2, 100, fmsg, 0xFFFF, 0x0000);
disp_string((TFT_WIDTH - strlen_P(FTOP(fhalted)) * 16) / 2, 140, fhalted, 0xFFFF, 0x0000);
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 3b30332488..a38d45f073 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1178,10 +1178,10 @@ namespace ExtUI {
}
bool isPrintingFromMediaPaused() {
- return TERN0(HAS_MEDIA, IS_SD_PAUSED());
+ return IS_SD_PAUSED();
}
- bool isPrintingFromMedia() { return TERN0(HAS_MEDIA, IS_SD_PRINTING() || IS_SD_PAUSED()); }
+ bool isPrintingFromMedia() { return IS_SD_PRINTING() || IS_SD_PAUSED(); }
bool isPrinting() {
return commandsInQueue() || isPrintingFromMedia() || printJobOngoing() || printingIsPaused();
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 6b68f1af24..0937817b9b 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -393,9 +393,9 @@ void MarlinUI::init() {
}
}
#else
- theCard.longFilename[
- TERN(UTF_FILENAME_SUPPORT, utf8_byte_pos_by_char_num(theCard.longFilename, maxlen), maxlen)
- ] = '\0'; // cutoff at screen edge
+ // Simply cut off at maxlen
+ const uint8_t chop = TERN(UTF_FILENAME_SUPPORT, utf8_byte_pos_by_char_num(theCard.longFilename, maxlen), maxlen);
+ theCard.longFilename[_MAX(chop, LONG_FILENAME_LENGTH - 1)] = '\0';
#endif
}
return outstr;
@@ -1493,16 +1493,6 @@ void MarlinUI::host_notify(const char * const cstr) {
* Reset the status message
*/
void MarlinUI::reset_status(const bool no_welcome) {
- #if SERVICE_INTERVAL_1 > 0
- static PGMSTR(service1, "> " SERVICE_NAME_1 "!");
- #endif
- #if SERVICE_INTERVAL_2 > 0
- static PGMSTR(service2, "> " SERVICE_NAME_2 "!");
- #endif
- #if SERVICE_INTERVAL_3 > 0
- static PGMSTR(service3, "> " SERVICE_NAME_3 "!");
- #endif
-
FSTR_P msg;
if (printingIsPaused())
msg = GET_TEXT_F(MSG_PRINT_PAUSED);
@@ -1518,13 +1508,13 @@ void MarlinUI::host_notify(const char * const cstr) {
#endif
}
#if SERVICE_INTERVAL_1 > 0
- else if (print_job_timer.needsService(1)) msg = FPSTR(service1);
+ else if (print_job_timer.needsService(1)) msg = F("> " SERVICE_NAME_1 "!");
#endif
#if SERVICE_INTERVAL_2 > 0
- else if (print_job_timer.needsService(2)) msg = FPSTR(service2);
+ else if (print_job_timer.needsService(2)) msg = F("> " SERVICE_NAME_2 "!");
#endif
#if SERVICE_INTERVAL_3 > 0
- else if (print_job_timer.needsService(3)) msg = FPSTR(service3);
+ else if (print_job_timer.needsService(3)) msg = F("> " SERVICE_NAME_3 "!");
#endif
else if (!no_welcome) msg = GET_TEXT_F(WELCOME_MSG);
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index f939452143..a85feb5683 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -237,11 +237,14 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
// all moves are finished. Go back to calling screen when done.
//
void MarlinUI::synchronize(FSTR_P const fmsg/*=nullptr*/) {
- static FSTR_P sync_message = fmsg ?: GET_TEXT_F(MSG_MOVING);
push_current_screen();
+
+ // Hijack 'editable' for the string pointer
+ editable.fstr = fmsg ?: GET_TEXT_F(MSG_MOVING);
goto_screen([]{
- if (should_draw()) MenuItem_static::draw(LCD_HEIGHT >= 4, sync_message);
+ if (should_draw()) MenuItem_static::draw(LCD_HEIGHT >= 4, editable.fstr);
});
+
defer_status_screen();
planner.synchronize(); // idle() is called until moves complete
goto_previous_screen_no_defer();
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 47ddc00bf4..4e33054b43 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -145,6 +145,8 @@ typedef union {
uint16_t uint16;
uint32_t uint32;
celsius_t celsius;
+ void *ptr;
+ FSTR_P fstr;
} chimera_t;
extern chimera_t editable;
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index 4aa45e43f7..2db0caa805 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -213,7 +213,7 @@ void menu_info_board() {
START_SCREEN();
STATIC_ITEM_F(F(BOARD_INFO_NAME), SS_DEFAULT|SS_INVERT); // MyPrinterController
#ifdef BOARD_WEBSITE_URL
- STATIC_ITEM_F(F(BOARD_WEBSITE_URL), SS_LEFT); // www.my3dprinter.com
+ STATIC_ITEM_F(F(BOARD_WEBSITE_URL), SS_CENTER); // www.my3dprinter.com
#endif
PSTRING_ITEM(MSG_INFO_BAUDRATE, STRINGIFY(BAUDRATE), SS_CENTER); // Baud: 250000
PSTRING_ITEM(MSG_INFO_PROTOCOL, PROTOCOL_VERSION, SS_CENTER); // Protocol: 1.0
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index bf7e203695..0a5a5fb443 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -265,7 +265,7 @@ class MenuItem_bool : public MenuEditItemBase {
* MenuItem_