From 54d6b1703b27aee1fbc3355e3d15fb81704705cc Mon Sep 17 00:00:00 2001 From: Timothe Jost <timothe.jost@wanadoo.fr> Date: Thu, 4 Jul 2024 18:43:00 +0200 Subject: [PATCH] test motors mapping --- sources/inc/constants.h | 6 +++--- sources/src/misc.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/inc/constants.h b/sources/inc/constants.h index 69e5751..5b3f0a9 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 6617b77..a072edf 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 { -- GitLab