Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-13 11:29:56 +03:00
Code Issues Wiki Activity

Number of mixer mappable channels increased to 16

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2018-04-25 11:56:06 +02:00
parent 2fc0717548
commit afc722be70
3 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,11 @@ typedef enum rc_alias {
AUX5,
AUX6,
AUX7,
AUX8
AUX8,
AUX9,
AUX10,
AUX11,
AUX12
} rc_alias_e;
typedef enum {

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

@ -279,10 +279,18 @@ void servoMixer(float dT)
input[INPUT_RC_PITCH] = rcData[PITCH] - rxConfig()->midrc;
input[INPUT_RC_YAW] = rcData[YAW] - rxConfig()->midrc;
input[INPUT_RC_THROTTLE] = rcData[THROTTLE] - rxConfig()->midrc;
input[INPUT_RC_AUX1] = rcData[AUX1] - rxConfig()->midrc;
input[INPUT_RC_AUX2] = rcData[AUX2] - rxConfig()->midrc;
input[INPUT_RC_AUX3] = rcData[AUX3] - rxConfig()->midrc;
input[INPUT_RC_AUX4] = rcData[AUX4] - rxConfig()->midrc;
input[INPUT_RC_CH5] = rcData[AUX1] - rxConfig()->midrc;
input[INPUT_RC_CH6] = rcData[AUX2] - rxConfig()->midrc;
input[INPUT_RC_CH7] = rcData[AUX3] - rxConfig()->midrc;
input[INPUT_RC_CH8] = rcData[AUX4] - rxConfig()->midrc;
input[INPUT_RC_CH9] = rcData[AUX5] - rxConfig()->midrc;
input[INPUT_RC_CH10] = rcData[AUX6] - rxConfig()->midrc;
input[INPUT_RC_CH11] = rcData[AUX7] - rxConfig()->midrc;
input[INPUT_RC_CH12] = rcData[AUX8] - rxConfig()->midrc;
input[INPUT_RC_CH13] = rcData[AUX9] - rxConfig()->midrc;
input[INPUT_RC_CH14] = rcData[AUX10] - rxConfig()->midrc;
input[INPUT_RC_CH15] = rcData[AUX11] - rxConfig()->midrc;
input[INPUT_RC_CH16] = rcData[AUX12] - rxConfig()->midrc;
for (int i = 0; i < MAX_SUPPORTED_SERVOS; i++) {
servo[i] = 0;

16
src/main/flight/servos.h
View file

@ -31,13 +31,21 @@ enum {
INPUT_RC_PITCH = 5,
INPUT_RC_YAW = 6,
INPUT_RC_THROTTLE = 7,
INPUT_RC_AUX1 = 8,
INPUT_RC_AUX2 = 9,
INPUT_RC_AUX3 = 10,
INPUT_RC_AUX4 = 11,
INPUT_RC_CH5 = 8,
INPUT_RC_CH6 = 9,
INPUT_RC_CH7 = 10,
INPUT_RC_CH8 = 11,
INPUT_GIMBAL_PITCH = 12,
INPUT_GIMBAL_ROLL = 13,
INPUT_FEATURE_FLAPS = 14,
INPUT_RC_CH9 = 15,
INPUT_RC_CH10 = 16,
INPUT_RC_CH11 = 17,
INPUT_RC_CH12 = 18,
INPUT_RC_CH13 = 19,
INPUT_RC_CH14 = 20,
INPUT_RC_CH15 = 21,
INPUT_RC_CH16 = 22,
INPUT_SOURCE_COUNT
} inputSource_e;