raphael.breiting/Marlin
1
1
Fork 0
forked from Mirrors/Marlin
Code Pull Requests Activity

🧑‍💻 Missed some

Browse Source 
Followup to ba8b685ede
This commit is contained in:
Scott Lahteine
2025-11-11 21:59:31 -06:00
parent b0f6155d99
commit 54fe84ea32
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/core/types.h
View File

@@ -543,7 +543,7 @@ struct XYval {
FI void set(const T px, const T py) { x = px; y = py; }
FI void set(const T (&arr)[2]) { x = arr[0]; y = arr[1]; }
#endif
#if NUM_AXES > XY
#if NUM_AXES > 2
FI void set(const T (&arr)[NUM_AXES]) { x = arr[0]; y = arr[1]; }
#endif
#if LOGICAL_AXES > NUM_AXES
@@ -1334,7 +1334,7 @@ public:
// Axis names for G-code parsing, reports, etc.
constexpr xyze_char_t axis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', AXIS4_NAME, AXIS5_NAME, AXIS6_NAME, AXIS7_NAME, AXIS8_NAME, AXIS9_NAME);
#if NUM_AXES <= XYZ && !HAS_EXTRUDERS
#if NUM_AXES <= 3 && !HAS_EXTRUDERS
#define AXIS_CHAR(A) ((char)('X' + A))
#define IAXIS_CHAR AXIS_CHAR
#else

2
Marlin/src/gcode/host/M115.cpp
View File

@@ -85,7 +85,7 @@ void GcodeSuite::M115() {
" MACHINE_TYPE:" MACHINE_NAME
" KINEMATICS:" MACHINE_KINEMATICS
" EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS)
#if NUM_AXES != XYZ
#if NUM_AXES != 3
" AXIS_COUNT:" STRINGIFY(NUM_AXES)
#endif
#if defined(MACHINE_UUID) || ENABLED(HAS_STM32_UID)

2
Marlin/src/inc/Conditionals-1-axes.h
View File

@@ -258,7 +258,7 @@
#if NUM_AXES >= XY
#define HAS_Y_AXIS 1
#define HAS_B_AXIS 1
#if NUM_AXES >= XYZ
#if NUM_AXES >= 3
#define HAS_Z_AXIS 1
#define HAS_C_AXIS 1
#if NUM_AXES >= 4