3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-26 13:25:54 +00:00
Code Issues Releases Wiki Activity

🐛 Fix rotational AxisFlags (#26444)

Browse Source 
Followup to #26438
This commit is contained in:
Jason Smith 2023-11-19 13:23:20 -08:00 committed by GitHub
parent f345f60f73
commit 5287cfbb59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@ template <class L, class R> struct IF<true, L, R> { typedef L type; };
// General Flags for some number of states // General Flags for some number of states
template<size_t N> template<size_t N>
struct Flags { struct Flags {
typedef value_t(N) flagbits_t; typedef uvalue_t(N) flagbits_t;
typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1; } N8; typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1; } N8;
typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1, b8:1, b9:1, b10:1, b11:1, b12:1, b13:1, b14:1, b15:1; } N16; typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1, b8:1, b9:1, b10:1, b11:1, b12:1, b13:1, b14:1, b15:1; } N16;
typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1, b8:1, b9:1, b10:1, b11:1, b12:1, b13:1, b14:1, b15:1, typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1, b8:1, b9:1, b10:1, b11:1, b12:1, b13:1, b14:1, b15:1,

6
Marlin/src/module/motion.h
View File

@ -144,9 +144,9 @@ XYZ_DEFS(int8_t, home_dir, HOME_DIR);
// Flags for rotational axes // Flags for rotational axes
constexpr AxisFlags rotational{0 LOGICAL_AXIS_GANG( constexpr AxisFlags rotational{0 LOGICAL_AXIS_GANG(
|| 0, || 0, || 0, || 0, | 0, | 0, | 0, | 0,
|| (ENABLED(AXIS4_ROTATES)<<I_AXIS), || (ENABLED(AXIS5_ROTATES)<<J_AXIS), || (ENABLED(AXIS6_ROTATES)<<K_AXIS), | (ENABLED(AXIS4_ROTATES)<<I_AXIS), | (ENABLED(AXIS5_ROTATES)<<J_AXIS), | (ENABLED(AXIS6_ROTATES)<<K_AXIS),
|| (ENABLED(AXIS7_ROTATES)<<U_AXIS), || (ENABLED(AXIS8_ROTATES)<<V_AXIS), || (ENABLED(AXIS9_ROTATES)<<W_AXIS)) | (ENABLED(AXIS7_ROTATES)<<U_AXIS), | (ENABLED(AXIS8_ROTATES)<<V_AXIS), | (ENABLED(AXIS9_ROTATES)<<W_AXIS))
}; };
inline float home_bump_mm(const AxisEnum axis) { inline float home_bump_mm(const AxisEnum axis) {