From 6618adb455f9122345499ac5c816a02400fcff4d Mon Sep 17 00:00:00 2001 From: Timothe Jost <timothe.jost@wanadoo.fr> Date: Thu, 4 Jul 2024 17:33:42 +0200 Subject: [PATCH] test mapping axes --- sources/inc/constants.h | 20 +++++++++++++------- sources/src/misc.c | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sources/inc/constants.h b/sources/inc/constants.h index e4b5799..69e5751 100644 --- a/sources/inc/constants.h +++ b/sources/inc/constants.h @@ -62,13 +62,19 @@ typedef enum typedef uint32_t mcu_actuator; -#define ACTUATOR_0 0 -#define ACTUATOR_1 1 -#define ACTUATOR_2 2 -#define ACTUATOR_3 3 +#define ACTUATOR_0 0 // by default : axis X +#define ACTUATOR_1 6 // by default : axis Y +#define ACTUATOR_2 2 // by default : axis Z +#define ACTUATOR_3 3 // by default : axis A -#define ACTUATOR_FIRST ACTUATOR_0 -#define ACTUATOR_LAST ACTUATOR_2 -#define MCU_SYSTEM_ACT_MAX_COUNT (ACTUATOR_2 + 1) +#define MCU_SYSTEM_ACT_MAX_COUNT 2 // total : 4 actuators + +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) + +// #define ACTUATOR_FIRST ACTUATOR_0 +// #define ACTUATOR_LAST ACTUATOR_2 #endif diff --git a/sources/src/misc.c b/sources/src/misc.c index 88a38e4..6617b77 100644 --- a/sources/src/misc.c +++ b/sources/src/misc.c @@ -110,7 +110,7 @@ mcu_error initSystem() int axisMask = 0; for (mcu_actuator act = ACTUATOR_FIRST; act <= ACTUATOR_LAST; act++) { - mcu_error initStatus = initActuator(act); + mcu_error initStatus = initActuator(actuators[act]); if (initStatus == MCU_ERROR_NONE) { axisMask |= (1 << act); -- GitLab