Apply REPEAT, RREPEAT, and loop macros (#16757)
This commit is contained in:
Scott Lahteine
GitHub
@ -2667,7 +2667,7 @@ void MarlinSettings::reset() {
|
||||
false
|
||||
#endif
|
||||
;
|
||||
for (uint8_t q = 0; q < COUNT(planner.filament_size); q++)
|
||||
LOOP_L_N(q, COUNT(planner.filament_size))
|
||||
planner.filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
||||
|
||||
#endif
|
||||
@ -2730,7 +2730,7 @@ void MarlinSettings::reset() {
|
||||
//
|
||||
|
||||
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
||||
for (uint8_t e = 0; e < EXTRUDERS; e++) {
|
||||
LOOP_L_N(e, EXTRUDERS) {
|
||||
fc_settings[e].unload_length = FILAMENT_CHANGE_UNLOAD_LENGTH;
|
||||
fc_settings[e].load_length = FILAMENT_CHANGE_FAST_LOAD_LENGTH;
|
||||
}
|
||||
@ -2842,36 +2842,17 @@ void MarlinSettings::reset() {
|
||||
SERIAL_ECHOLNPGM(" Disabled");
|
||||
}
|
||||
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOLNPAIR(" M200 D", LINEAR_UNIT(planner.filament_size[0]));
|
||||
#if EXTRUDERS > 1
|
||||
#if EXTRUDERS == 1
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOLNPAIR(" M200 T1 D", LINEAR_UNIT(planner.filament_size[1]));
|
||||
#if EXTRUDERS > 2
|
||||
SERIAL_ECHOLNPAIR(" M200 D", LINEAR_UNIT(planner.filament_size[0]));
|
||||
#elif EXTRUDERS
|
||||
LOOP_L_N(i, EXTRUDERS) {
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOLNPAIR(" M200 T2 D", LINEAR_UNIT(planner.filament_size[2]));
|
||||
#if EXTRUDERS > 3
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOLNPAIR(" M200 T3 D", LINEAR_UNIT(planner.filament_size[3]));
|
||||
#if EXTRUDERS > 4
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOLNPAIR(" M200 T4 D", LINEAR_UNIT(planner.filament_size[4]));
|
||||
#if EXTRUDERS > 5
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOLNPAIR(" M200 T5 D", LINEAR_UNIT(planner.filament_size[5]));
|
||||
#if EXTRUDERS > 6
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOLNPAIR(" M200 T6 D", LINEAR_UNIT(planner.filament_size[6]));
|
||||
#if EXTRUDERS > 7
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOLNPAIR(" M200 T7 D", LINEAR_UNIT(planner.filament_size[7]));
|
||||
#endif // EXTRUDERS > 7
|
||||
#endif // EXTRUDERS > 6
|
||||
#endif // EXTRUDERS > 5
|
||||
#endif // EXTRUDERS > 4
|
||||
#endif // EXTRUDERS > 3
|
||||
#endif // EXTRUDERS > 2
|
||||
#endif // EXTRUDERS > 1
|
||||
SERIAL_ECHOPGM(" M200");
|
||||
if (i) SERIAL_ECHOPAIR_P(SP_T_STR, int(i));
|
||||
SERIAL_ECHOLNPAIR(" D", LINEAR_UNIT(planner.filament_size[i]));
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!parser.volumetric_enabled)
|
||||
CONFIG_ECHO_MSG(" M200 D0");
|
||||
@ -2893,7 +2874,7 @@ void MarlinSettings::reset() {
|
||||
);
|
||||
#if ENABLED(DISTINCT_E_FACTORS)
|
||||
CONFIG_ECHO_START();
|
||||
for (uint8_t i = 0; i < E_STEPPERS; i++) {
|
||||
LOOP_L_N(i, E_STEPPERS) {
|
||||
SERIAL_ECHOLNPAIR_P(
|
||||
PSTR(" M203 T"), (int)i
|
||||
, SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
|
||||
@ -2913,7 +2894,7 @@ void MarlinSettings::reset() {
|
||||
);
|
||||
#if ENABLED(DISTINCT_E_FACTORS)
|
||||
CONFIG_ECHO_START();
|
||||
for (uint8_t i = 0; i < E_STEPPERS; i++)
|
||||
LOOP_L_N(i, E_STEPPERS)
|
||||
SERIAL_ECHOLNPAIR_P(
|
||||
PSTR(" M201 T"), (int)i
|
||||
, SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
|
||||
@ -3022,8 +3003,8 @@ void MarlinSettings::reset() {
|
||||
#if ENABLED(MESH_BED_LEVELING)
|
||||
|
||||
if (leveling_is_valid()) {
|
||||
for (uint8_t py = 0; py < GRID_MAX_POINTS_Y; py++) {
|
||||
for (uint8_t px = 0; px < GRID_MAX_POINTS_X; px++) {
|
||||
LOOP_L_N(py, GRID_MAX_POINTS_Y) {
|
||||
LOOP_L_N(px, GRID_MAX_POINTS_X) {
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOPAIR_P(PSTR(" G29 S3 I"), (int)px, PSTR(" J"), (int)py);
|
||||
SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(mbl.z_values[px][py]), 5);
|
||||
@ -3047,8 +3028,8 @@ void MarlinSettings::reset() {
|
||||
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||
|
||||
if (leveling_is_valid()) {
|
||||
for (uint8_t py = 0; py < GRID_MAX_POINTS_Y; py++) {
|
||||
for (uint8_t px = 0; px < GRID_MAX_POINTS_X; px++) {
|
||||
LOOP_L_N(py, GRID_MAX_POINTS_Y) {
|
||||
LOOP_L_N(px, GRID_MAX_POINTS_X) {
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOPAIR(" G29 W I", (int)px, " J", (int)py);
|
||||
SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(z_values[px][py]), 5);
|
||||
@ -3063,7 +3044,7 @@ void MarlinSettings::reset() {
|
||||
#if ENABLED(EDITABLE_SERVO_ANGLES)
|
||||
|
||||
CONFIG_ECHO_HEADING("Servo Angles:");
|
||||
for (uint8_t i = 0; i < NUM_SERVOS; i++) {
|
||||
LOOP_L_N(i, NUM_SERVOS) {
|
||||
switch (i) {
|
||||
#if ENABLED(SWITCHING_EXTRUDER)
|
||||
case SWITCHING_EXTRUDER_SERVO_NR:
|
||||
@ -3146,7 +3127,7 @@ void MarlinSettings::reset() {
|
||||
#if HOTENDS && HAS_LCD_MENU
|
||||
|
||||
CONFIG_ECHO_HEADING("Material heatup parameters:");
|
||||
for (uint8_t i = 0; i < COUNT(ui.preheat_hotend_temp); i++) {
|
||||
LOOP_L_N(i, COUNT(ui.preheat_hotend_temp)) {
|
||||
CONFIG_ECHO_START();
|
||||
SERIAL_ECHOLNPAIR(
|
||||
" M145 S", (int)i
|
||||
@ -3200,7 +3181,7 @@ void MarlinSettings::reset() {
|
||||
|
||||
#if HAS_USER_THERMISTORS
|
||||
CONFIG_ECHO_HEADING("User thermistors:");
|
||||
for (uint8_t i = 0; i < USER_THERMISTORS; i++)
|
||||
LOOP_L_N(i, USER_THERMISTORS)
|
||||
thermalManager.log_user_thermistor(i, true);
|
||||
#endif
|
||||
|
||||
@ -3596,29 +3577,10 @@ void MarlinSettings::reset() {
|
||||
say_M603(forReplay);
|
||||
SERIAL_ECHOLNPAIR("L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length));
|
||||
#else
|
||||
#define _ECHO_603(N) do{ say_M603(forReplay); SERIAL_ECHOLNPAIR("T" STRINGIFY(N) " L", LINEAR_UNIT(fc_settings[N].load_length), " U", LINEAR_UNIT(fc_settings[N].unload_length)); }while(0)
|
||||
_ECHO_603(0);
|
||||
_ECHO_603(1);
|
||||
#if EXTRUDERS > 2
|
||||
_ECHO_603(2);
|
||||
#if EXTRUDERS > 3
|
||||
_ECHO_603(3);
|
||||
#if EXTRUDERS > 4
|
||||
_ECHO_603(4);
|
||||
#if EXTRUDERS > 5
|
||||
_ECHO_603(5);
|
||||
#if EXTRUDERS > 6
|
||||
_ECHO_603(6);
|
||||
#if EXTRUDERS > 7
|
||||
_ECHO_603(7);
|
||||
#endif // EXTRUDERS > 7
|
||||
#endif // EXTRUDERS > 6
|
||||
#endif // EXTRUDERS > 5
|
||||
#endif // EXTRUDERS > 4
|
||||
#endif // EXTRUDERS > 3
|
||||
#endif // EXTRUDERS > 2
|
||||
#endif // EXTRUDERS == 1
|
||||
#endif // ADVANCED_PAUSE_FEATURE
|
||||
#define _ECHO_603(N) do{ say_M603(forReplay); SERIAL_ECHOLNPAIR("T" STRINGIFY(N) " L", LINEAR_UNIT(fc_settings[N].load_length), " U", LINEAR_UNIT(fc_settings[N].unload_length)); }while(0);
|
||||
REPEAT(EXTRUDERS, _ECHO_603)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if EXTRUDERS > 1
|
||||
CONFIG_ECHO_HEADING("Tool-changing:");
|
||||
|
||||
@ -480,35 +480,18 @@ void _O2 Endstops::report_states() {
|
||||
#if NUM_RUNOUT_SENSORS == 1
|
||||
print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(MSG_FILAMENT_RUNOUT_SENSOR));
|
||||
#else
|
||||
#define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; break;
|
||||
for (uint8_t i = 1; i <= NUM_RUNOUT_SENSORS; i++) {
|
||||
pin_t pin;
|
||||
switch (i) {
|
||||
default: continue;
|
||||
case 1: pin = FIL_RUNOUT_PIN; break;
|
||||
case 2: pin = FIL_RUNOUT2_PIN; break;
|
||||
#if NUM_RUNOUT_SENSORS >= 3
|
||||
case 3: pin = FIL_RUNOUT3_PIN; break;
|
||||
#if NUM_RUNOUT_SENSORS >= 4
|
||||
case 4: pin = FIL_RUNOUT4_PIN; break;
|
||||
#if NUM_RUNOUT_SENSORS >= 5
|
||||
case 5: pin = FIL_RUNOUT5_PIN; break;
|
||||
#if NUM_RUNOUT_SENSORS >= 6
|
||||
case 6: pin = FIL_RUNOUT6_PIN; break;
|
||||
#if NUM_RUNOUT_SENSORS >= 7
|
||||
case 7: pin = FIL_RUNOUT7_PIN; break;
|
||||
#if NUM_RUNOUT_SENSORS >= 8
|
||||
case 8: pin = FIL_RUNOUT8_PIN; break;
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_RUNOUT)
|
||||
}
|
||||
SERIAL_ECHOPGM(MSG_FILAMENT_RUNOUT_SENSOR);
|
||||
if (i > 1) SERIAL_CHAR(' ', '0' + i);
|
||||
print_es_state(extDigitalRead(pin) != FIL_RUNOUT_INVERTING);
|
||||
}
|
||||
#undef _CASE_RUNOUT
|
||||
#endif
|
||||
#endif
|
||||
#if ENABLED(BLTOUCH)
|
||||
|
||||
@ -855,34 +855,14 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
|
||||
//
|
||||
|
||||
#if ENABLED(MIXING_EXTRUDER)
|
||||
|
||||
/**
|
||||
* Mixing steppers keep all their enable (and direction) states synchronized
|
||||
*/
|
||||
#if MIXING_STEPPERS > 7
|
||||
#define ENABLE_AXIS_E0() { ENABLE_STEPPER_E0(); ENABLE_STEPPER_E1(); ENABLE_STEPPER_E2(); ENABLE_STEPPER_E3(); ENABLE_STEPPER_E4(); ENABLE_STEPPER_E5(); ENABLE_STEPPER_E6(); ENABLE_STEPPER_E7(); }
|
||||
#define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); DISABLE_STEPPER_E5(); DISABLE_STEPPER_E6(); DISABLE_STEPPER_E7(); }
|
||||
#elif MIXING_STEPPERS > 6
|
||||
#define ENABLE_AXIS_E0() { ENABLE_STEPPER_E0(); ENABLE_STEPPER_E1(); ENABLE_STEPPER_E2(); ENABLE_STEPPER_E3(); ENABLE_STEPPER_E4(); ENABLE_STEPPER_E5(); ENABLE_STEPPER_E6(); }
|
||||
#define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); DISABLE_STEPPER_E5(); DISABLE_STEPPER_E6(); }
|
||||
#elif MIXING_STEPPERS > 5
|
||||
#define ENABLE_AXIS_E0() { ENABLE_STEPPER_E0(); ENABLE_STEPPER_E1(); ENABLE_STEPPER_E2(); ENABLE_STEPPER_E3(); ENABLE_STEPPER_E4(); ENABLE_STEPPER_E5(); }
|
||||
#define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); DISABLE_STEPPER_E5(); }
|
||||
#elif MIXING_STEPPERS > 4
|
||||
#define ENABLE_AXIS_E0() { ENABLE_STEPPER_E0(); ENABLE_STEPPER_E1(); ENABLE_STEPPER_E2(); ENABLE_STEPPER_E3(); ENABLE_STEPPER_E4(); }
|
||||
#define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); }
|
||||
#elif MIXING_STEPPERS > 3
|
||||
#define ENABLE_AXIS_E0() { ENABLE_STEPPER_E0(); ENABLE_STEPPER_E1(); ENABLE_STEPPER_E2(); ENABLE_STEPPER_E3(); }
|
||||
#define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); }
|
||||
#elif MIXING_STEPPERS > 2
|
||||
#define ENABLE_AXIS_E0() { ENABLE_STEPPER_E0(); ENABLE_STEPPER_E1(); ENABLE_STEPPER_E2(); }
|
||||
#define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); }
|
||||
#else
|
||||
#define ENABLE_AXIS_E0() { ENABLE_STEPPER_E0(); ENABLE_STEPPER_E1(); }
|
||||
#define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); }
|
||||
#endif
|
||||
|
||||
#endif // !MIXING_EXTRUDER
|
||||
#define _CALL_ENA_E(N) ENABLE_STEPPER_E##N () ;
|
||||
#define _CALL_DIS_E(N) DISABLE_STEPPER_E##N () ;
|
||||
#define ENABLE_AXIS_E0() { RREPEAT(MIXING_STEPPERS, _CALL_ENA_E) }
|
||||
#define DISABLE_AXIS_E0() { RREPEAT(MIXING_STEPPERS, _CALL_DIS_E) }
|
||||
#endif
|
||||
|
||||
#ifndef ENABLE_AXIS_E0
|
||||
#if E_STEPPERS > 0 && HAS_E0_ENABLE
|
||||
|
||||
@ -679,25 +679,8 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
|
||||
static const uint8_t fanBit[] PROGMEM = {
|
||||
0
|
||||
#if HOTENDS > 1
|
||||
, REPEAT2(1,_EFAN,1) 1
|
||||
#if HOTENDS > 2
|
||||
, REPEAT2(2,_EFAN,2) 2
|
||||
#if HOTENDS > 3
|
||||
, REPEAT2(3,_EFAN,3) 3
|
||||
#if HOTENDS > 4
|
||||
, REPEAT2(4,_EFAN,4) 4
|
||||
#if HOTENDS > 5
|
||||
, REPEAT2(5,_EFAN,5) 5
|
||||
#if HOTENDS > 6
|
||||
, REPEAT2(6,_EFAN,6) 6
|
||||
#if HOTENDS > 7
|
||||
, REPEAT2(7,_EFAN,7) 7
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#define _NEXT_FAN(N) , REPEAT2(N,_EFAN,N) N
|
||||
RREPEAT_S(1, HOTENDS, _NEXT_FAN)
|
||||
#endif
|
||||
#if HAS_AUTO_CHAMBER_FAN
|
||||
#define _CFAN(B) _FANOVERLAP(CHAMBER,B) ? B :
|
||||
@ -2116,10 +2099,10 @@ void Temperature::disable_all_heaters() {
|
||||
pause(false);
|
||||
#endif
|
||||
|
||||
#define DISABLE_HEATER(NR) { \
|
||||
setTargetHotend(0, NR); \
|
||||
temp_hotend[NR].soft_pwm_amount = 0; \
|
||||
WRITE_HEATER_ ##NR (LOW); \
|
||||
#define DISABLE_HEATER(N) { \
|
||||
setTargetHotend(0, N); \
|
||||
temp_hotend[N].soft_pwm_amount = 0; \
|
||||
WRITE_HEATER_##N(LOW); \
|
||||
}
|
||||
|
||||
#if HAS_TEMP_HOTEND
|
||||
|
||||
Reference in New Issue
Block a user