Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 17:25:18 +03:00
Code Issues Wiki Activity

rename USE_24CHANELS to USE_34CHANNELS

Browse source
This commit is contained in:
Marcelo Bezerra 2024-08-02 12:55:03 +02:00
parent caa2798eb4
commit d61d3524d0
No known key found for this signature in database
GPG key ID: 718A5AC065848530
4 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/fc/rc_controls.h
View file

@ -40,13 +40,23 @@ typedef enum rc_alias {
AUX12, // 16 AUX12, // 16
AUX13, // 17 AUX13, // 17
AUX14, // 18 AUX14, // 18
#ifdef USE_24CHANNELS #ifdef USE_34CHANNELS
AUX15, // 19 AUX15, // 19
AUX16, // 20 AUX16, // 20
AUX17, // 21 AUX17, // 21
AUX18, // 22 AUX18, // 22
AUX19, // 23 AUX19, // 23
AUX20, // 24 AUX20, // 24
AUX21, // 25
AUX22, // 26
AUX23, // 27
AUX24, // 28
AUX25, // 29
AUX26, // 30
AUX27, // 31
AUX28, // 32
AUX29, // 33
AUX30, // 34
#endif #endif
} rc_alias_e; } rc_alias_e;

12
src/main/flight/servos.c
View file

@ -349,13 +349,23 @@ void servoMixer(float dT)
input[INPUT_RC_CH16] = GET_RX_CHANNEL_INPUT(AUX12); input[INPUT_RC_CH16] = GET_RX_CHANNEL_INPUT(AUX12);
input[INPUT_RC_CH17] = GET_RX_CHANNEL_INPUT(AUX13); input[INPUT_RC_CH17] = GET_RX_CHANNEL_INPUT(AUX13);
input[INPUT_RC_CH18] = GET_RX_CHANNEL_INPUT(AUX14); 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_CH19] = GET_RX_CHANNEL_INPUT(AUX15);
input[INPUT_RC_CH20] = GET_RX_CHANNEL_INPUT(AUX16); input[INPUT_RC_CH20] = GET_RX_CHANNEL_INPUT(AUX16);
input[INPUT_RC_CH21] = GET_RX_CHANNEL_INPUT(AUX17); input[INPUT_RC_CH21] = GET_RX_CHANNEL_INPUT(AUX17);
input[INPUT_RC_CH22] = GET_RX_CHANNEL_INPUT(AUX18); input[INPUT_RC_CH22] = GET_RX_CHANNEL_INPUT(AUX18);
input[INPUT_RC_CH23] = GET_RX_CHANNEL_INPUT(AUX19); input[INPUT_RC_CH23] = GET_RX_CHANNEL_INPUT(AUX19);
input[INPUT_RC_CH24] = GET_RX_CHANNEL_INPUT(AUX20); 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 #endif
#undef GET_RX_CHANNEL_INPUT #undef GET_RX_CHANNEL_INPUT

2
src/main/rx/jetiexbus.c
View file

@ -64,7 +64,7 @@
#define JETIEXBUS_OPTIONS (SERIAL_STOPBITS_1 | SERIAL_PARITY_NO) #define JETIEXBUS_OPTIONS (SERIAL_STOPBITS_1 | SERIAL_PARITY_NO)
#define JETIEXBUS_MIN_FRAME_GAP 1000 #define JETIEXBUS_MIN_FRAME_GAP 1000
#ifdef USE_24CHANNELS #ifdef USE_34CHANNELS
#define JETIEXBUS_CHANNEL_COUNT 24 #define JETIEXBUS_CHANNEL_COUNT 24
#else #else
#define JETIEXBUS_CHANNEL_COUNT 16 #define JETIEXBUS_CHANNEL_COUNT 16

2
src/main/target/common.h
View file

@ -206,7 +206,7 @@
#define USE_SERIALRX_SUMD #define USE_SERIALRX_SUMD
#define USE_TELEMETRY_HOTT #define USE_TELEMETRY_HOTT
#define USE_HOTT_TEXTMODE #define USE_HOTT_TEXTMODE
#define USE_24CHANNELS #define USE_34CHANNELS
#define MAX_MIXER_PROFILE_COUNT 2 #define MAX_MIXER_PROFILE_COUNT 2
#define USE_SMARTPORT_MASTER #define USE_SMARTPORT_MASTER
#elif !defined(STM32F7) #elif !defined(STM32F7)