3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-01-07 23:27:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'bugfix-2.1.x' into bugfix-2.1.x-February2

Browse source
This commit is contained in:
Andrew 2025-03-02 21:42:55 -05:00 • committed by GitHub
commit bc3a50e8dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

@ -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

1
Marlin/Configuration_adv.h
View file

@ -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
/**

2
Marlin/Version.h
View file

@ -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

2
Marlin/src/gcode/config/M218.cpp
View file

@ -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(

2
Marlin/src/inc/Version.h
View file

@ -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
/**

2
Marlin/src/lcd/language/language_en.h
View file

@ -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");

16
Marlin/src/lcd/menu/menu_info.cpp
View file

@ -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();
}

2
buildroot/tests/teensy41
View file

@ -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 \