diff --git a/sources/inc/constants.h b/sources/inc/constants.h index 69e5751deda2e088b368f3eb96ee5fe86516a5a7..5b3f0a9c13a57223e31fea90db433c1b32f9dfee 100644 --- a/sources/inc/constants.h +++ b/sources/inc/constants.h @@ -63,13 +63,13 @@ typedef enum typedef uint32_t mcu_actuator; #define ACTUATOR_0 0 // by default : axis X -#define ACTUATOR_1 6 // by default : axis Y +#define ACTUATOR_1 1 // by default : axis Y #define ACTUATOR_2 2 // by default : axis Z #define ACTUATOR_3 3 // by default : axis A -#define MCU_SYSTEM_ACT_MAX_COUNT 2 // total : 4 actuators +#define MCU_SYSTEM_ACT_MAX_COUNT 4 // total : 4 actuators -const mcu_actuator actuators[MCU_SYSTEM_ACT_MAX_COUNT] = {ACTUATOR_0, ACTUATOR_1} //, ACTUATOR_2, ACTUATOR_3}; +const mcu_actuator actuators[MCU_SYSTEM_ACT_MAX_COUNT] = {ACTUATOR_0, ACTUATOR_1, ACTUATOR_2, ACTUATOR_3}; #define ACTUATOR_FIRST 0 #define ACTUATOR_LAST (MCU_SYSTEM_ACT_MAX_COUNT - 1) diff --git a/sources/src/misc.c b/sources/src/misc.c index 6617b77ce0153045fe66b471549ab40587b93c67..a072edf70f4ecaee137edc00e7e9e303a5458067 100644 --- a/sources/src/misc.c +++ b/sources/src/misc.c @@ -113,7 +113,7 @@ mcu_error initSystem() mcu_error initStatus = initActuator(actuators[act]); if (initStatus == MCU_ERROR_NONE) { - axisMask |= (1 << act); + axisMask |= (1 << actuators[act]); } else {