jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚸🌡️ Refactor AUTOTEMP (2) (#28175)

Browse Source 
Followup to #28155
This commit is contained in:
ellensp
2025-11-17 07:54:52 +13:00
committed by GitHub
parent c6f4bc1aa1
commit c7e6b7924a
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/gcode/temp/M104_M109.cpp
+3 -6
View File
@@ -140,12 +140,9 @@ void GcodeSuite::M104_M109(const bool isM109) {
//
void GcodeSuite::M104_report(const bool forReplay/*=true*/) {
TERN_(MARLIN_SMALL_BUILD, return);
report_heading_etc(forReplay, F(STR_AUTOTEMP));
SERIAL_ECHOLNPGM(" M104"
" S", thermalManager.autotemp.cfg.min,
" B", thermalManager.autotemp.cfg.max,
" F", thermalManager.autotemp.cfg.factor
);
report_heading_etc(forReplay, F(STR_AUTOTEMP));
const autotemp_cfg_t &c = thermalManager.autotemp.cfg;
SERIAL_ECHOLNPGM(" M104 S", c.min, " B", c.max, " F", c.factor);
}
#endif
Marlin/src/lcd/menu/menu_advanced.cpp
+15 -8
View File
@@ -325,9 +325,14 @@ void menu_backlash();
// Autotemp, Min, Max, Fact
//
#if ALL(AUTOTEMP, HAS_TEMP_HOTEND)
EDIT_ITEM(int3, MSG_MIN, &thermalManager.autotemp.cfg.min, 0, thermalManager.hotend_max_target(0));
EDIT_ITEM(int3, MSG_MAX, &thermalManager.autotemp.cfg.max, 0, thermalManager.hotend_max_target(0));
EDIT_ITEM(float42_52, MSG_FACTOR, &thermalManager.autotemp.cfg.factor, 0, 10);
autotemp_cfg_t &c = thermalManager.autotemp.cfg;
EDIT_ITEM(int3, MSG_MIN, &c.min, 0, thermalManager.hotend_max_target(0), []{
NOLESS(thermalManager.autotemp.cfg.max, thermalManager.autotemp.cfg.min);
});
EDIT_ITEM(int3, MSG_MAX, &c.max, 0, thermalManager.hotend_max_target(0), []{
NOMORE(thermalManager.autotemp.cfg.min, thermalManager.autotemp.cfg.max);
});
EDIT_ITEM(float42_52, MSG_FACTOR, &c.factor, 0, 10);
#endif
//
@@ -340,13 +345,15 @@ void menu_backlash();
//
#if ALL(PIDTEMP, PID_EDIT_MENU)
#define __PID_HOTEND_MENU_ITEMS(N) \
#define __PID_HOTEND_MENU_ITEMS(N) do{ \
raw_Kp = thermalManager.temp_hotend[N].pid.p(); \
raw_Ki = thermalManager.temp_hotend[N].pid.i(); \
raw_Kd = thermalManager.temp_hotend[N].pid.d(); \
EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &raw_Kp, 1, 9990, []{ apply_PID_p(N); }); \
EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &raw_Kp, 1.00f, 9990, []{ apply_PID_p(N); }); \
EDIT_ITEM_FAST_N(float52sign, N, MSG_PID_I_E, &raw_Ki, 0.01f, 9990, []{ apply_PID_i(N); }); \
EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1, 9990, []{ apply_PID_d(N); })
EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1.00f, 9990, []{ apply_PID_d(N); }); \
}while(0)
#if ENABLED(PID_EXTRUSION_SCALING)
#define _PID_HOTEND_MENU_ITEMS(N) \
@@ -377,9 +384,9 @@ void menu_backlash();
raw_Kp = T.pid.p(); \
raw_Ki = T.pid.i(); \
raw_Kd = T.pid.d(); \
EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &raw_Kp, 1, 9990, []{ apply_PID_p(N); }); \
EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &raw_Kp, 1.00f, 9990, []{ apply_PID_p(N); }); \
EDIT_ITEM_FAST_N(float52sign, N, MSG_PID_I_E, &raw_Ki, 0.01f, 9990, []{ apply_PID_i(N); }); \
EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1, 9990, []{ apply_PID_d(N); })
EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1.00f, 9990, []{ apply_PID_d(N); })
#endif
#if ENABLED(PIDTEMP)
Marlin/src/module/settings.cpp
+1 -1
View File
@@ -3875,7 +3875,7 @@ void MarlinSettings::reset() {
//
// M104 settings for AUTOTEMP
//
TERN_(AUTOTEMP, gcode.M104_report());
TERN_(AUTOTEMP, gcode.M104_report(forReplay));
//
// M149 Temperature units