From 147dcaf600c57abdbf6ca52178ebed6bfc15e39b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 1 Mar 2025 00:28:04 -0600 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=93=9D=20Update=20MAX31865=20comment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 14d1cfb168..77a9176115 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -586,7 +586,7 @@ #define DUMMY_THERMISTOR_998_VALUE 25 #define DUMMY_THERMISTOR_999_VALUE 100 -// Resistor values when using MAX31865 sensors (-5) on TEMP_SENSOR_0 / 1 +// Resistor values when using MAX31865 sensors (-5) on TEMP_SENSOR_0 / 1 / 2 / BED #if TEMP_SENSOR_IS_MAX_TC(0) #define MAX31865_SENSOR_OHMS_0 100 // (Ω) Typically 100 or 1000 (PT100 or PT1000) #define MAX31865_CALIBRATION_OHMS_0 430 // (Ω) Typically 430 for Adafruit PT100; 4300 for Adafruit PT1000 From e787c8f26b8110486e9f1cba6d61957dde7cbbfd Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Sun, 2 Mar 2025 10:00:28 +1300 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=9A=B8=20Fix=20extra=20echo:=20in=20M?= =?UTF-8?q?218=20report=20(#27674)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/gcode/config/M218.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/gcode/config/M218.cpp b/Marlin/src/gcode/config/M218.cpp index 006f9a1d2c..7d167e502d 100644 --- a/Marlin/src/gcode/config/M218.cpp +++ b/Marlin/src/gcode/config/M218.cpp @@ -65,7 +65,7 @@ void GcodeSuite::M218() { void GcodeSuite::M218_report(const bool forReplay/*=true*/) { TERN_(MARLIN_SMALL_BUILD, return); - report_heading_etc(forReplay, F(STR_HOTEND_OFFSETS)); + report_heading(forReplay, F(STR_HOTEND_OFFSETS)); for (uint8_t e = 1; e < HOTENDS; ++e) { report_echo_start(forReplay); SERIAL_ECHOLNPGM_P( From 73a0f3376750c30488cdb63fb97e276f4988dc0f Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Sun, 2 Mar 2025 12:45:31 +1300 Subject: [PATCH 3/4] =?UTF-8?q?=E2=9C=A8=20BUILD=5FINFO=5FMENU=5FITEM=20(#?= =?UTF-8?q?27590)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration_adv.h | 1 + Marlin/src/lcd/language/language_en.h | 2 +- Marlin/src/lcd/menu/menu_info.cpp | 16 ++++++++++++++++ buildroot/tests/teensy41 | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index a1e5443129..6e64112786 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1551,6 +1551,7 @@ //#define LCD_INFO_MENU #if ENABLED(LCD_INFO_MENU) //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages + //#define BUILD_INFO_MENU_ITEM // Add a menu item to display the build date and time #endif /** diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index bab95d2b86..3575e40bea 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -511,7 +511,7 @@ namespace LanguageNarrow_en { LSTR MSG_INFO_MACHINENAME = _UxGT("Machine Name"); LSTR MSG_INFO_SIZE = _UxGT("Size"); LSTR MSG_INFO_FWVERSION = _UxGT("Firmware Version"); - LSTR MSG_INFO_BUILD = _UxGT("Build Datetime"); + LSTR MSG_INFO_BUILD = _UxGT("Build Info"); LSTR MSG_PREPARE = _UxGT("Prepare"); LSTR MSG_TUNE = _UxGT("Tune"); LSTR MSG_POWER_MONITOR = _UxGT("Power monitor"); diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp index 2db0caa805..1df70ba802 100644 --- a/Marlin/src/lcd/menu/menu_info.cpp +++ b/Marlin/src/lcd/menu/menu_info.cpp @@ -263,6 +263,18 @@ void menu_info_board() { #endif +// +// "Build Info" submenu +// +#if ENABLED(BUILD_INFO_MENU_ITEM) + void menu_info_build() { + if (ui.use_click()) return ui.go_back(); + START_SCREEN(); + STATIC_ITEM_F(F(__DATE__ " " __TIME__)); // YYYY-MM-DD HH:MM + END_SCREEN(); + } +#endif + // // "About Printer" submenu // @@ -306,6 +318,10 @@ void menu_info() { } #endif + #if ENABLED(BUILD_INFO_MENU_ITEM) + SUBMENU(MSG_INFO_BUILD, menu_info_build); // Build Info > + #endif + END_MENU(); } diff --git a/buildroot/tests/teensy41 b/buildroot/tests/teensy41 index 6cf3f4aba3..f66a9272ea 100755 --- a/buildroot/tests/teensy41 +++ b/buildroot/tests/teensy41 @@ -21,7 +21,7 @@ opt_set MOTHERBOARD BOARD_TEENSY41 \ NOZZLE_CLEAN_START_POINT "{ { 10, 10, 3 }, { 10, 10, 3 } }" \ NOZZLE_CLEAN_END_POINT "{ { 10, 20, 3 }, { 10, 20, 3 } }" opt_enable MAX31865_SENSOR_OHMS_0 MAX31865_CALIBRATION_OHMS_0 \ - EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \ + EXTENSIBLE_UI LCD_INFO_MENU BUILD_INFO_MENU_ITEM SDSUPPORT SDCARD_SORT_ALPHA \ FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \ FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \ BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET \ From e676d833a3668cdc6548315ae21bed167f79e4b8 Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Sun, 2 Mar 2025 00:30:52 +0000 Subject: [PATCH 4/4] [cron] Bump distribution date (2025-03-02) --- Marlin/Version.h | 2 +- Marlin/src/inc/Version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index fb330132f6..1efacafd64 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 "2025-03-01" +//#define STRING_DISTRIBUTION_DATE "2025-03-02" /** * The protocol for communication to the host. Protocol indicates communication diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index bc1615febe..53d34487fa 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 "2025-03-01" + #define STRING_DISTRIBUTION_DATE "2025-03-02" #endif /**