Use lambdas in menus, where possible (#15452)
This commit is contained in:
Scott Lahteine
GitHub
@@ -32,47 +32,7 @@
|
||||
#include "../../module/stepper/indirection.h"
|
||||
#include "../../feature/tmc_util.h"
|
||||
|
||||
#define TMC_EDIT_STORED_I_RMS(ST,MSG) EDIT_ITEM(uint16_4, MSG, &stepper##ST.val_mA, 100, 3000, refresh_stepper_current_##ST)
|
||||
|
||||
#if AXIS_IS_TMC(X)
|
||||
void refresh_stepper_current_X() { stepperX.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(Y)
|
||||
void refresh_stepper_current_Y() { stepperY.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(Z)
|
||||
void refresh_stepper_current_Z() { stepperZ.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(X2)
|
||||
void refresh_stepper_current_X2() { stepperX2.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(Y2)
|
||||
void refresh_stepper_current_Y2() { stepperY2.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(Z2)
|
||||
void refresh_stepper_current_Z2() { stepperZ2.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(Z3)
|
||||
void refresh_stepper_current_Z3() { stepperZ3.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E0)
|
||||
void refresh_stepper_current_E0() { stepperE0.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E1)
|
||||
void refresh_stepper_current_E1() { stepperE1.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E2)
|
||||
void refresh_stepper_current_E2() { stepperE2.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E3)
|
||||
void refresh_stepper_current_E3() { stepperE3.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E4)
|
||||
void refresh_stepper_current_E4() { stepperE4.refresh_stepper_current(); }
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E5)
|
||||
void refresh_stepper_current_E5() { stepperE5.refresh_stepper_current(); }
|
||||
#endif
|
||||
#define TMC_EDIT_STORED_I_RMS(ST,MSG) EDIT_ITEM(uint16_4, MSG, &stepper##ST.val_mA, 100, 3000, [](){ stepper##ST.refresh_stepper_current(); })
|
||||
|
||||
void menu_tmc_current() {
|
||||
START_MENU();
|
||||
@@ -99,69 +59,29 @@ void menu_tmc_current() {
|
||||
TMC_EDIT_STORED_I_RMS(Z3, MSG_Z3);
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E0)
|
||||
TMC_EDIT_STORED_I_RMS(E0, MSG_E1);
|
||||
TMC_EDIT_STORED_I_RMS(E0, LCD_STR_E0);
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E1)
|
||||
TMC_EDIT_STORED_I_RMS(E1, MSG_E2);
|
||||
TMC_EDIT_STORED_I_RMS(E1, LCD_STR_E1);
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E2)
|
||||
TMC_EDIT_STORED_I_RMS(E2, MSG_E3);
|
||||
TMC_EDIT_STORED_I_RMS(E2, LCD_STR_E2);
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E3)
|
||||
TMC_EDIT_STORED_I_RMS(E3, MSG_E4);
|
||||
TMC_EDIT_STORED_I_RMS(E3, LCD_STR_E3);
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E4)
|
||||
TMC_EDIT_STORED_I_RMS(E4, MSG_E5);
|
||||
TMC_EDIT_STORED_I_RMS(E4, LCD_STR_E4);
|
||||
#endif
|
||||
#if AXIS_IS_TMC(E5)
|
||||
TMC_EDIT_STORED_I_RMS(E5, MSG_E6);
|
||||
TMC_EDIT_STORED_I_RMS(E5, LCD_STR_E5);
|
||||
#endif
|
||||
END_MENU();
|
||||
}
|
||||
|
||||
#if ENABLED(HYBRID_THRESHOLD)
|
||||
|
||||
#define TMC_EDIT_STORED_HYBRID_THRS(ST, MSG) EDIT_ITEM(uint8, MSG, &stepper##ST.stored.hybrid_thrs, 0, 255, refresh_hybrid_thrs_##ST);
|
||||
|
||||
#if AXIS_HAS_STEALTHCHOP(X)
|
||||
void refresh_hybrid_thrs_X() { stepperX.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Y)
|
||||
void refresh_hybrid_thrs_Y() { stepperY.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Z)
|
||||
void refresh_hybrid_thrs_Z() { stepperZ.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(X2)
|
||||
void refresh_hybrid_thrs_X2() { stepperX2.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Y2)
|
||||
void refresh_hybrid_thrs_Y2() { stepperY2.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Z2)
|
||||
void refresh_hybrid_thrs_Z2() { stepperZ2.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Z3)
|
||||
void refresh_hybrid_thrs_Z3() { stepperZ3.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E0)
|
||||
void refresh_hybrid_thrs_E0() { stepperE0.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E1)
|
||||
void refresh_hybrid_thrs_E1() { stepperE1.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E2)
|
||||
void refresh_hybrid_thrs_E2() { stepperE2.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E3)
|
||||
void refresh_hybrid_thrs_E3() { stepperE3.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E4)
|
||||
void refresh_hybrid_thrs_E4() { stepperE4.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E5)
|
||||
void refresh_hybrid_thrs_E5() { stepperE5.refresh_hybrid_thrs(); }
|
||||
#endif
|
||||
#define TMC_EDIT_STORED_HYBRID_THRS(ST, MSG) EDIT_ITEM(uint8, MSG, &stepper##ST.stored.hybrid_thrs, 0, 255, [](){ stepper##ST.refresh_hybrid_thrs(); });
|
||||
|
||||
void menu_tmc_hybrid_thrs() {
|
||||
START_MENU();
|
||||
@@ -188,22 +108,22 @@ void menu_tmc_current() {
|
||||
TMC_EDIT_STORED_HYBRID_THRS(Z3, MSG_Z3);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E0)
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E0, MSG_E1);
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E0, LCD_STR_E0);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E1)
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E1, MSG_E2);
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E1, LCD_STR_E1);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E2)
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E2, MSG_E3);
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E2, LCD_STR_E2);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E3)
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E3, MSG_E4);
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E3, LCD_STR_E3);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E4)
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E4, MSG_E5);
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E4, LCD_STR_E4);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E5)
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E5, MSG_E6);
|
||||
TMC_EDIT_STORED_HYBRID_THRS(E5, LCD_STR_E5);
|
||||
#endif
|
||||
END_MENU();
|
||||
}
|
||||
@@ -212,20 +132,7 @@ void menu_tmc_current() {
|
||||
|
||||
#if ENABLED(SENSORLESS_HOMING)
|
||||
|
||||
#define TMC_EDIT_STORED_SGT(ST) EDIT_ITEM(int4, MSG_##ST, &stepper##ST.stored.homing_thrs, stepper##ST.sgt_min, stepper##ST.sgt_max, refresh_homing_thrs_##ST);
|
||||
|
||||
#if X_SENSORLESS
|
||||
void refresh_homing_thrs_X() { stepperX.refresh_homing_thrs(); }
|
||||
#endif
|
||||
#if X2_SENSORLESS
|
||||
void refresh_homing_thrs_X2() { stepperX2.refresh_homing_thrs(); }
|
||||
#endif
|
||||
#if Y_SENSORLESS
|
||||
void refresh_homing_thrs_Y() { stepperY.refresh_homing_thrs(); }
|
||||
#endif
|
||||
#if Z_SENSORLESS
|
||||
void refresh_homing_thrs_Z() { stepperZ.refresh_homing_thrs(); }
|
||||
#endif
|
||||
#define TMC_EDIT_STORED_SGT(ST) EDIT_ITEM(int4, MSG_##ST, &stepper##ST.stored.homing_thrs, stepper##ST.sgt_min, stepper##ST.sgt_max, [](){ stepper##ST.refresh_homing_thrs(); });
|
||||
|
||||
void menu_tmc_homing_thrs() {
|
||||
START_MENU();
|
||||
@@ -249,47 +156,7 @@ void menu_tmc_current() {
|
||||
|
||||
#if HAS_STEALTHCHOP
|
||||
|
||||
#define TMC_EDIT_STEP_MODE(ST, MSG) EDIT_ITEM(bool, MSG, &stepper##ST.stored.stealthChop_enabled, refresh_stepping_mode_##ST)
|
||||
|
||||
#if AXIS_HAS_STEALTHCHOP(X)
|
||||
void refresh_stepping_mode_X() { stepperX.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Y)
|
||||
void refresh_stepping_mode_Y() { stepperY.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Z)
|
||||
void refresh_stepping_mode_Z() { stepperZ.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(X2)
|
||||
void refresh_stepping_mode_X2() { stepperX2.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Y2)
|
||||
void refresh_stepping_mode_Y2() { stepperY2.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Z2)
|
||||
void refresh_stepping_mode_Z2() { stepperZ2.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(Z3)
|
||||
void refresh_stepping_mode_Z3() { stepperZ3.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E0)
|
||||
void refresh_stepping_mode_E0() { stepperE0.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E1)
|
||||
void refresh_stepping_mode_E1() { stepperE1.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E2)
|
||||
void refresh_stepping_mode_E2() { stepperE2.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E3)
|
||||
void refresh_stepping_mode_E3() { stepperE3.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E4)
|
||||
void refresh_stepping_mode_E4() { stepperE4.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E5)
|
||||
void refresh_stepping_mode_E5() { stepperE5.refresh_stepping_mode(); }
|
||||
#endif
|
||||
#define TMC_EDIT_STEP_MODE(ST, MSG) EDIT_ITEM(bool, MSG, &stepper##ST.stored.stealthChop_enabled, [](){ stepper##ST.refresh_stepping_mode(); })
|
||||
|
||||
void menu_tmc_step_mode() {
|
||||
START_MENU();
|
||||
@@ -317,22 +184,22 @@ void menu_tmc_current() {
|
||||
TMC_EDIT_STEP_MODE(Z3, MSG_Z3);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E0)
|
||||
TMC_EDIT_STEP_MODE(E0, MSG_E1);
|
||||
TMC_EDIT_STEP_MODE(E0, LCD_STR_E0);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E1)
|
||||
TMC_EDIT_STEP_MODE(E1, MSG_E2);
|
||||
TMC_EDIT_STEP_MODE(E1, LCD_STR_E1);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E2)
|
||||
TMC_EDIT_STEP_MODE(E2, MSG_E3);
|
||||
TMC_EDIT_STEP_MODE(E2, LCD_STR_E2);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E3)
|
||||
TMC_EDIT_STEP_MODE(E3, MSG_E4);
|
||||
TMC_EDIT_STEP_MODE(E3, LCD_STR_E3);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E4)
|
||||
TMC_EDIT_STEP_MODE(E4, MSG_E5);
|
||||
TMC_EDIT_STEP_MODE(E4, LCD_STR_E4);
|
||||
#endif
|
||||
#if AXIS_HAS_STEALTHCHOP(E5)
|
||||
TMC_EDIT_STEP_MODE(E5, MSG_E6);
|
||||
TMC_EDIT_STEP_MODE(E5, LCD_STR_E5);
|
||||
#endif
|
||||
END_MENU();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user