Skip to content

Commit 087e19a

Browse files
thinkyheadthinkyhead
authored
🔧 Fix build with no Y axis (MarlinFirmware#25311)
1 parent d0a965a commit 087e19a

File tree

10 files changed

+184
-149
lines changed

10 files changed

+184
-149
lines changed

‎Marlin/src/HAL/AVR/fastio.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ enum ClockSource2 : uint8_t {
293293

294294
#if HAS_MOTOR_CURRENT_PWM
295295
#if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
296-
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0 || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z || P == MOTOR_CURRENT_PWM_XY)
296+
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN || P == MOTOR_CURRENT_PWM_E1_PIN || P == MOTOR_CURRENT_PWM_Z_PIN || P == MOTOR_CURRENT_PWM_XY_PIN)
297297
#elif PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
298-
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0 || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z)
298+
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN || P == MOTOR_CURRENT_PWM_E1_PIN || P == MOTOR_CURRENT_PWM_Z_PIN)
299299
#else
300-
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0 || P == MOTOR_CURRENT_PWM_E1)
300+
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN || P == MOTOR_CURRENT_PWM_E1_PIN)
301301
#endif
302302
#else
303303
#define PWM_CHK_MOTOR_CURRENT(P) false

‎Marlin/src/core/serial.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ void serial_offset(const_float_t v, const uint8_t sp=0); // For v==0 draw space
337337
void print_bin(const uint16_t val);
338338
void print_pos(NUM_AXIS_ARGS(const_float_t), FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
339339

340-
inline void print_pos(const xyz_pos_t &xyz, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
341-
print_pos(NUM_AXIS_ELEM(xyz), prefix, suffix);
340+
inline void print_pos(const xyze_pos_t &xyze, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
341+
print_pos(NUM_AXIS_ELEM(xyze), prefix, suffix);
342342
}
343343

344344
#define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, F(" " STRINGIFY(VAR) "="), F(" : " SUFFIX "\n")); }while(0)

‎Marlin/src/core/types.h

+67-50
Large diffs are not rendered by default.

‎Marlin/src/gcode/calibrate/G28.cpp

+13-6
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,9 @@ void GcodeSuite::G28() {
403403
UNUSED(needZ); UNUSED(homeZZ);
404404
#else
405405
constexpr bool doZ = false;
406+
#if !HAS_Y_AXIS
407+
constexpr bool doY = false;
408+
#endif
406409
#endif
407410

408411
TERN_(HOME_Z_FIRST, if (doZ) homeaxis(Z_AXIS));
@@ -420,9 +423,11 @@ void GcodeSuite::G28() {
420423
// Diagonal move first if both are homing
421424
TERN_(QUICK_HOME, if (doX && doY) quick_home_xy());
422425

423-
// Home Y (before X)
424-
if (ENABLED(HOME_Y_BEFORE_X) && (doY || TERN0(CODEPENDENT_XY_HOMING, doX)))
425-
homeaxis(Y_AXIS);
426+
#if HAS_Y_AXIS
427+
// Home Y (before X)
428+
if (ENABLED(HOME_Y_BEFORE_X) && (doY || TERN0(CODEPENDENT_XY_HOMING, doX)))
429+
homeaxis(Y_AXIS);
430+
#endif
426431

427432
// Home X
428433
if (doX || (doY && ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X))) {
@@ -455,9 +460,11 @@ void GcodeSuite::G28() {
455460
if (doI) homeaxis(I_AXIS);
456461
#endif
457462

458-
// Home Y (after X)
459-
if (DISABLED(HOME_Y_BEFORE_X) && doY)
460-
homeaxis(Y_AXIS);
463+
#if HAS_Y_AXIS
464+
// Home Y (after X)
465+
if (DISABLED(HOME_Y_BEFORE_X) && doY)
466+
homeaxis(Y_AXIS);
467+
#endif
461468

462469
#if BOTH(FOAMCUTTER_XYUV, HAS_J_AXIS)
463470
// Home J (after Y)

‎Marlin/src/inc/Conditionals_LCD.h

+26-34
Original file line numberDiff line numberDiff line change
@@ -603,12 +603,26 @@
603603
#else
604604
#undef EXTRUDERS
605605
#define EXTRUDERS 0
606+
#undef TEMP_SENSOR_0
607+
#undef TEMP_SENSOR_1
608+
#undef TEMP_SENSOR_2
609+
#undef TEMP_SENSOR_3
610+
#undef TEMP_SENSOR_4
611+
#undef TEMP_SENSOR_5
612+
#undef TEMP_SENSOR_6
613+
#undef TEMP_SENSOR_7
606614
#undef SINGLENOZZLE
607615
#undef SWITCHING_EXTRUDER
608616
#undef SWITCHING_NOZZLE
609617
#undef MIXING_EXTRUDER
610618
#undef HOTEND_IDLE_TIMEOUT
611619
#undef DISABLE_E
620+
#undef THERMAL_PROTECTION_HOTENDS
621+
#undef PREVENT_COLD_EXTRUSION
622+
#undef PREVENT_LENGTHY_EXTRUDE
623+
#undef FILAMENT_RUNOUT_SENSOR
624+
#undef FILAMENT_RUNOUT_DISTANCE_MM
625+
#undef DISABLE_INACTIVE_EXTRUDER
612626
#endif
613627

614628
#define E_OPTARG(N) OPTARG(HAS_MULTI_EXTRUDER, N)
@@ -682,20 +696,28 @@
682696

683697
#if E_STEPPERS <= 7
684698
#undef INVERT_E7_DIR
699+
#undef E7_DRIVER_TYPE
685700
#if E_STEPPERS <= 6
686701
#undef INVERT_E6_DIR
702+
#undef E6_DRIVER_TYPE
687703
#if E_STEPPERS <= 5
688704
#undef INVERT_E5_DIR
705+
#undef E5_DRIVER_TYPE
689706
#if E_STEPPERS <= 4
690707
#undef INVERT_E4_DIR
708+
#undef E4_DRIVER_TYPE
691709
#if E_STEPPERS <= 3
692710
#undef INVERT_E3_DIR
711+
#undef E3_DRIVER_TYPE
693712
#if E_STEPPERS <= 2
694713
#undef INVERT_E2_DIR
714+
#undef E2_DRIVER_TYPE
695715
#if E_STEPPERS <= 1
696716
#undef INVERT_E1_DIR
717+
#undef E1_DRIVER_TYPE
697718
#if E_STEPPERS == 0
698719
#undef INVERT_E0_DIR
720+
#undef E0_DRIVER_TYPE
699721
#endif
700722
#endif
701723
#endif
@@ -733,6 +755,7 @@
733755
#else
734756
#define NUM_AXES 1
735757
#endif
758+
#define HAS_X_AXIS 1
736759
#if NUM_AXES >= XY
737760
#define HAS_Y_AXIS 1
738761
#if NUM_AXES >= XYZ
@@ -767,31 +790,6 @@
767790
#endif
768791
#endif
769792

770-
#if E_STEPPERS <= 0
771-
#undef E0_DRIVER_TYPE
772-
#endif
773-
#if E_STEPPERS <= 1
774-
#undef E1_DRIVER_TYPE
775-
#endif
776-
#if E_STEPPERS <= 2
777-
#undef E2_DRIVER_TYPE
778-
#endif
779-
#if E_STEPPERS <= 3
780-
#undef E3_DRIVER_TYPE
781-
#endif
782-
#if E_STEPPERS <= 4
783-
#undef E4_DRIVER_TYPE
784-
#endif
785-
#if E_STEPPERS <= 5
786-
#undef E5_DRIVER_TYPE
787-
#endif
788-
#if E_STEPPERS <= 6
789-
#undef E6_DRIVER_TYPE
790-
#endif
791-
#if E_STEPPERS <= 7
792-
#undef E7_DRIVER_TYPE
793-
#endif
794-
795793
#if !HAS_Y_AXIS
796794
#undef ENDSTOPPULLUP_YMIN
797795
#undef ENDSTOPPULLUP_YMAX
@@ -807,7 +805,6 @@
807805
#undef MANUAL_Y_HOME_POS
808806
#undef MIN_SOFTWARE_ENDSTOP_Y
809807
#undef MAX_SOFTWARE_ENDSTOP_Y
810-
#undef SAFE_BED_LEVELING_START_Y
811808
#endif
812809

813810
#if !HAS_Z_AXIS
@@ -827,7 +824,6 @@
827824
#undef MANUAL_Z_HOME_POS
828825
#undef MIN_SOFTWARE_ENDSTOP_Z
829826
#undef MAX_SOFTWARE_ENDSTOP_Z
830-
#undef SAFE_BED_LEVELING_START_Z
831827
#endif
832828

833829
#if !HAS_I_AXIS
@@ -844,7 +840,6 @@
844840
#undef MANUAL_I_HOME_POS
845841
#undef MIN_SOFTWARE_ENDSTOP_I
846842
#undef MAX_SOFTWARE_ENDSTOP_I
847-
#undef SAFE_BED_LEVELING_START_I
848843
#endif
849844

850845
#if !HAS_J_AXIS
@@ -861,7 +856,6 @@
861856
#undef MANUAL_J_HOME_POS
862857
#undef MIN_SOFTWARE_ENDSTOP_J
863858
#undef MAX_SOFTWARE_ENDSTOP_J
864-
#undef SAFE_BED_LEVELING_START_J
865859
#endif
866860

867861
#if !HAS_K_AXIS
@@ -878,7 +872,6 @@
878872
#undef MANUAL_K_HOME_POS
879873
#undef MIN_SOFTWARE_ENDSTOP_K
880874
#undef MAX_SOFTWARE_ENDSTOP_K
881-
#undef SAFE_BED_LEVELING_START_K
882875
#endif
883876

884877
#if !HAS_U_AXIS
@@ -895,7 +888,6 @@
895888
#undef MANUAL_U_HOME_POS
896889
#undef MIN_SOFTWARE_ENDSTOP_U
897890
#undef MAX_SOFTWARE_ENDSTOP_U
898-
#undef SAFE_BED_LEVELING_START_U
899891
#endif
900892

901893
#if !HAS_V_AXIS
@@ -912,7 +904,6 @@
912904
#undef MANUAL_V_HOME_POS
913905
#undef MIN_SOFTWARE_ENDSTOP_V
914906
#undef MAX_SOFTWARE_ENDSTOP_V
915-
#undef SAFE_BED_LEVELING_START_V
916907
#endif
917908

918909
#if !HAS_W_AXIS
@@ -929,7 +920,6 @@
929920
#undef MANUAL_W_HOME_POS
930921
#undef MIN_SOFTWARE_ENDSTOP_W
931922
#undef MAX_SOFTWARE_ENDSTOP_W
932-
#undef SAFE_BED_LEVELING_START_W
933923
#endif
934924

935925
#ifdef X2_DRIVER_TYPE
@@ -1665,7 +1655,9 @@
16651655
#endif
16661656
#endif
16671657

1668-
#if X_HOME_DIR || (HAS_Y_AXIS && Y_HOME_DIR) || (HAS_Z_AXIS && Z_HOME_DIR) || (HAS_I_AXIS && I_HOME_DIR) || (HAS_J_AXIS && J_HOME_DIR) || (HAS_K_AXIS && K_HOME_DIR)
1658+
#if X_HOME_DIR || (HAS_Y_AXIS && Y_HOME_DIR) || (HAS_Z_AXIS && Z_HOME_DIR) \
1659+
|| (HAS_I_AXIS && I_HOME_DIR) || (HAS_J_AXIS && J_HOME_DIR) || (HAS_K_AXIS && K_HOME_DIR) \
1660+
|| (HAS_U_AXIS && U_HOME_DIR) || (HAS_V_AXIS && V_HOME_DIR) || (HAS_W_AXIS && W_HOME_DIR)
16691661
#define HAS_ENDSTOPS 1
16701662
#define COORDINATE_OKAY(N,L,H) WITHIN(N,L,H)
16711663
#else

‎Marlin/src/inc/Conditionals_adv.h

+31-20
Original file line numberDiff line numberDiff line change
@@ -86,31 +86,47 @@
8686
#undef PROBE_DEPLOY_STOW_MENU
8787
#endif
8888

89+
// Some options are disallowed without required axes
90+
#if !HAS_Y_AXIS
91+
#undef SAFE_BED_LEVELING_START_Y
92+
#undef ARC_SUPPORT
93+
#undef INPUT_SHAPING_Y
94+
#undef SHAPING_FREQ_Y
95+
#undef SHAPING_BUFFER_Y
96+
#endif
97+
#if !HAS_Z_AXIS
98+
#undef SAFE_BED_LEVELING_START_Z
99+
#endif
100+
#if !HAS_I_AXIS
101+
#undef SAFE_BED_LEVELING_START_I
102+
#endif
103+
#if !HAS_J_AXIS
104+
#undef SAFE_BED_LEVELING_START_J
105+
#endif
106+
#if !HAS_K_AXIS
107+
#undef SAFE_BED_LEVELING_START_K
108+
#endif
109+
#if !HAS_U_AXIS
110+
#undef SAFE_BED_LEVELING_START_U
111+
#endif
112+
#if !HAS_V_AXIS
113+
#undef SAFE_BED_LEVELING_START_V
114+
#endif
115+
#if !HAS_W_AXIS
116+
#undef SAFE_BED_LEVELING_START_W
117+
#endif
118+
119+
// Disallowed with no extruders
89120
#if !HAS_EXTRUDERS
90121
#define NO_VOLUMETRICS
91-
#undef TEMP_SENSOR_0
92-
#undef TEMP_SENSOR_1
93-
#undef TEMP_SENSOR_2
94-
#undef TEMP_SENSOR_3
95-
#undef TEMP_SENSOR_4
96-
#undef TEMP_SENSOR_5
97-
#undef TEMP_SENSOR_6
98-
#undef TEMP_SENSOR_7
99122
#undef FWRETRACT
100123
#undef PIDTEMP
101124
#undef AUTOTEMP
102125
#undef PID_EXTRUSION_SCALING
103126
#undef LIN_ADVANCE
104-
#undef FILAMENT_RUNOUT_SENSOR
105127
#undef ADVANCED_PAUSE_FEATURE
106-
#undef FILAMENT_RUNOUT_DISTANCE_MM
107-
#undef FILAMENT_LOAD_UNLOAD_GCODES
108-
#undef DISABLE_INACTIVE_EXTRUDER
109128
#undef FILAMENT_LOAD_UNLOAD_GCODES
110129
#undef EXTRUDER_RUNOUT_PREVENT
111-
#undef PREVENT_COLD_EXTRUSION
112-
#undef PREVENT_LENGTHY_EXTRUDE
113-
#undef THERMAL_PROTECTION_HOTENDS
114130
#undef THERMAL_PROTECTION_PERIOD
115131
#undef WATCH_TEMP_PERIOD
116132
#undef SHOW_TEMP_ADC_VALUES
@@ -1127,11 +1143,6 @@
11271143
#endif
11281144

11291145
// Input shaping
1130-
#if !HAS_Y_AXIS
1131-
#undef INPUT_SHAPING_Y
1132-
#undef SHAPING_FREQ_Y
1133-
#undef SHAPING_BUFFER_Y
1134-
#endif
11351146
#if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y)
11361147
#define HAS_SHAPING 1
11371148
#endif

‎Marlin/src/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2250,7 +2250,7 @@
22502250
#define IS_Z3_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 3 && Z3_USE_ENDSTOP == _##A##M##_)
22512251
#define IS_Z4_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 4 && Z4_USE_ENDSTOP == _##A##M##_)
22522252

2253-
#define _HAS_STOP(A,M) (PIN_EXISTS(A##_##M) && !IS_PROBE_PIN(A,M) && !IS_X2_ENDSTOP(A,M) && !IS_Y2_ENDSTOP(A,M) && !IS_Z2_ENDSTOP(A,M) && !IS_Z3_ENDSTOP(A,M) && !IS_Z4_ENDSTOP(A,M))
2253+
#define _HAS_STOP(A,M) (HAS_##A##_AXIS && PIN_EXISTS(A##_##M) && !IS_PROBE_PIN(A,M) && !IS_X2_ENDSTOP(A,M) && !IS_Y2_ENDSTOP(A,M) && !IS_Z2_ENDSTOP(A,M) && !IS_Z3_ENDSTOP(A,M) && !IS_Z4_ENDSTOP(A,M))
22542254
#if _HAS_STOP(X,MIN)
22552255
#define HAS_X_MIN 1
22562256
#endif

‎Marlin/src/inc/SanityCheck.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,9 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
849849
* Validate that the bed size fits
850850
*/
851851
static_assert(X_MAX_LENGTH >= X_BED_SIZE, "Movement bounds (X_MIN_POS, X_MAX_POS) are too narrow to contain X_BED_SIZE.");
852-
static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS) are too narrow to contain Y_BED_SIZE.");
852+
#if HAS_Y_AXIS
853+
static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS) are too narrow to contain Y_BED_SIZE.");
854+
#endif
853855

854856
/**
855857
* Granular software endstops (Marlin >= 1.1.7)

0 commit comments

Comments
 (0)