3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-12-29 02:40:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'bugfix-2.1.x' (early part) into pr/27376

Browse source
This commit is contained in:
Scott Lahteine 2024-10-04 20:43:41 -05:00
commit a9fbc8f095
5 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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 "2024-10-04"
//#define STRING_DISTRIBUTION_DATE "2024-10-05"
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.

2
Marlin/src/gcode/calibrate/G28.cpp
View file

@ -388,7 +388,7 @@ void GcodeSuite::G28() {
#if HAS_Z_AXIS
UNUSED(needZ); UNUSED(homeZ);
UNUSED(needZ);
// Z may home first, e.g., when homing away from the bed.
// This is also permitted when homing with a Z endstop.

6
Marlin/src/gcode/gcode.h
View file

@ -903,8 +903,10 @@ private:
static void M210_report(const bool forReplay=true);
#endif
static void M211();
static void M211_report(const bool forReplay=true);
#if HAS_SOFTWARE_ENDSTOPS
static void M211();
static void M211_report(const bool forReplay=true);
#endif
#if HAS_MULTI_EXTRUDER
static void M217();

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

@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2024-10-04"
#define STRING_DISTRIBUTION_DATE "2024-10-05"
#endif
/**

37
Marlin/src/lcd/menu/menu_configuration.cpp
View file

@ -395,7 +395,40 @@ void menu_advanced_settings();
END_MENU();
}
#endif
#endif // FWRETRACT
#if ENABLED(EDITABLE_HOMING_FEEDRATE)
#include "../../module/motion.h"
#include "../../module/planner.h"
#include "../../gcode/parser.h"
// Edit homing feedrates in inches- or degrees- or mm-per-minute
void menu_homing_feedrate() {
START_MENU();
BACK_ITEM(MSG_HOMING_FEEDRATE);
#if ENABLED(MENUS_ALLOW_INCH_UNITS)
#define _EDIT_HOMING_FR(A) do{ \
const float maxfr = MMS_TO_MMM(planner.settings.max_feedrate_mm_s[_AXIS(A)]); \
editable.decimal = A##_AXIS_UNIT(homing_feedrate_mm_m.A); \
EDIT_ITEM(float5, MSG_HOMING_FEEDRATE_N, &editable.decimal, \
A##_AXIS_UNIT(10), A##_AXIS_UNIT(maxfr), []{ \
homing_feedrate_mm_m.A = parser.axis_value_to_mm(_AXIS(A), editable.decimal); \
}); \
}while(0);
#else
#define _EDIT_HOMING_FR(A) do{ \
EDIT_ITEM(float5, MSG_HOMING_FEEDRATE_N, &homing_feedrate_mm_m.A, 10, MMS_TO_MMM(planner.settings.max_feedrate_mm_s[_AXIS(A)])); \
}while(0);
#endif
MAIN_AXIS_MAP(_EDIT_HOMING_FR);
END_MENU();
}
#endif // EDITABLE_HOMING_FEEDRATE
#if ENABLED(EDITABLE_HOMING_FEEDRATE)
@ -451,7 +484,7 @@ void menu_advanced_settings();
END_MENU();
}
#endif
#endif // HAS_PREHEAT && !SLIM_LCD_MENUS
#if ENABLED(CUSTOM_MENU_CONFIG)