From d61d3524d0c949c69a6469ad8aa97d90ae7aa150 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:55:03 +0200 Subject: [PATCH] rename USE_24CHANELS to USE_34CHANNELS --- src/main/fc/rc_controls.h | 12 +++++++++++- src/main/flight/servos.c | 12 +++++++++++- src/main/rx/jetiexbus.c | 2 +- src/main/target/common.h | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/fc/rc_controls.h b/src/main/fc/rc_controls.h index 3705a29c3a..f5b96f2d23 100644 --- a/src/main/fc/rc_controls.h +++ b/src/main/fc/rc_controls.h @@ -40,13 +40,23 @@ typedef enum rc_alias { AUX12, // 16 AUX13, // 17 AUX14, // 18 -#ifdef USE_24CHANNELS +#ifdef USE_34CHANNELS AUX15, // 19 AUX16, // 20 AUX17, // 21 AUX18, // 22 AUX19, // 23 AUX20, // 24 + AUX21, // 25 + AUX22, // 26 + AUX23, // 27 + AUX24, // 28 + AUX25, // 29 + AUX26, // 30 + AUX27, // 31 + AUX28, // 32 + AUX29, // 33 + AUX30, // 34 #endif } rc_alias_e; diff --git a/src/main/flight/servos.c b/src/main/flight/servos.c index 5ac98f7821..40711706e7 100755 --- a/src/main/flight/servos.c +++ b/src/main/flight/servos.c @@ -349,13 +349,23 @@ void servoMixer(float dT) input[INPUT_RC_CH16] = GET_RX_CHANNEL_INPUT(AUX12); input[INPUT_RC_CH17] = GET_RX_CHANNEL_INPUT(AUX13); input[INPUT_RC_CH18] = GET_RX_CHANNEL_INPUT(AUX14); -#ifdef USE_24CHANNELS +#ifdef USE_34CHANNELS input[INPUT_RC_CH19] = GET_RX_CHANNEL_INPUT(AUX15); input[INPUT_RC_CH20] = GET_RX_CHANNEL_INPUT(AUX16); input[INPUT_RC_CH21] = GET_RX_CHANNEL_INPUT(AUX17); input[INPUT_RC_CH22] = GET_RX_CHANNEL_INPUT(AUX18); input[INPUT_RC_CH23] = GET_RX_CHANNEL_INPUT(AUX19); input[INPUT_RC_CH24] = GET_RX_CHANNEL_INPUT(AUX20); + input[INPUT_RC_CH25] = GET_RX_CHANNEL_INPUT(AUX21); + input[INPUT_RC_CH26] = GET_RX_CHANNEL_INPUT(AUX22); + input[INPUT_RC_CH27] = GET_RX_CHANNEL_INPUT(AUX23); + input[INPUT_RC_CH28] = GET_RX_CHANNEL_INPUT(AUX24); + input[INPUT_RC_CH29] = GET_RX_CHANNEL_INPUT(AUX25); + input[INPUT_RC_CH30] = GET_RX_CHANNEL_INPUT(AUX26); + input[INPUT_RC_CH31] = GET_RX_CHANNEL_INPUT(AUX27); + input[INPUT_RC_CH32] = GET_RX_CHANNEL_INPUT(AUX28); + input[INPUT_RC_CH33] = GET_RX_CHANNEL_INPUT(AUX29); + input[INPUT_RC_CH34] = GET_RX_CHANNEL_INPUT(AUX30); #endif #undef GET_RX_CHANNEL_INPUT diff --git a/src/main/rx/jetiexbus.c b/src/main/rx/jetiexbus.c index 3556483399..9e3c04d2c1 100644 --- a/src/main/rx/jetiexbus.c +++ b/src/main/rx/jetiexbus.c @@ -64,7 +64,7 @@ #define JETIEXBUS_OPTIONS (SERIAL_STOPBITS_1 | SERIAL_PARITY_NO) #define JETIEXBUS_MIN_FRAME_GAP 1000 -#ifdef USE_24CHANNELS +#ifdef USE_34CHANNELS #define JETIEXBUS_CHANNEL_COUNT 24 #else #define JETIEXBUS_CHANNEL_COUNT 16 diff --git a/src/main/target/common.h b/src/main/target/common.h index 51f1fbf6ea..f7cc3f747c 100644 --- a/src/main/target/common.h +++ b/src/main/target/common.h @@ -206,7 +206,7 @@ #define USE_SERIALRX_SUMD #define USE_TELEMETRY_HOTT #define USE_HOTT_TEXTMODE -#define USE_24CHANNELS +#define USE_34CHANNELS #define MAX_MIXER_PROFILE_COUNT 2 #define USE_SMARTPORT_MASTER #elif !defined(STM32F7)