From 5287cfbb5974fe324c82f135a17a79c2b5cd5da9 Mon Sep 17 00:00:00 2001 From: Jason Smith <jason.inet@gmail.com> Date: Sun, 19 Nov 2023 13:23:20 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20rotational=20AxisFlags=20(?= =?UTF-8?q?#26444)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to #26438 --- Marlin/src/core/types.h | 2 +- Marlin/src/module/motion.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h index 679cb2ce13..d92dbde8b7 100644 --- a/Marlin/src/core/types.h +++ b/Marlin/src/core/types.h @@ -159,7 +159,7 @@ template <class L, class R> struct IF<true, L, R> { typedef L type; }; // General Flags for some number of states template<size_t N> 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, 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, diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h index ae9224dea4..c7558db43f 100644 --- a/Marlin/src/module/motion.h +++ b/Marlin/src/module/motion.h @@ -144,9 +144,9 @@ XYZ_DEFS(int8_t, home_dir, HOME_DIR); // Flags for rotational axes constexpr AxisFlags rotational{0 LOGICAL_AXIS_GANG( - || 0, || 0, || 0, || 0, - || (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)) + | 0, | 0, | 0, | 0, + | (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)) }; inline float home_bump_mm(const AxisEnum axis) {