From cd89c13c5a12fb88dd68fbf5f09034752dd9d77e Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Fri, 31 May 2019 12:45:59 +0200 Subject: [PATCH] LP-615 IBus: support up to 14ch --- flight/targets/boards/ccf3d/pios_board.h | 2 +- flight/targets/boards/coptercontrol/pios_board.h | 2 +- flight/targets/boards/nucleof303re/pios_board.h | 2 +- flight/targets/boards/pikoblx/pios_board.h | 2 +- flight/targets/boards/revolution/pios_board.h | 2 +- flight/targets/boards/revonano/pios_board.h | 2 +- flight/targets/boards/sparky2/pios_board.h | 2 +- flight/targets/boards/spracingf3/pios_board.h | 2 +- flight/targets/boards/spracingf3evo/pios_board.h | 2 +- flight/targets/boards/tinyfish/pios_board.h | 2 +- ground/gcs/src/plugins/config/inputchannelform.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flight/targets/boards/ccf3d/pios_board.h b/flight/targets/boards/ccf3d/pios_board.h index 6d0f67d46..012c9ed33 100644 --- a/flight/targets/boards/ccf3d/pios_board.h +++ b/flight/targets/boards/ccf3d/pios_board.h @@ -251,7 +251,7 @@ extern uint32_t pios_ws2811_id; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/flight/targets/boards/coptercontrol/pios_board.h b/flight/targets/boards/coptercontrol/pios_board.h index 370955e2a..154695fd5 100644 --- a/flight/targets/boards/coptercontrol/pios_board.h +++ b/flight/targets/boards/coptercontrol/pios_board.h @@ -275,7 +275,7 @@ extern uint32_t pios_spi_flash_accel_adapter_id; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/flight/targets/boards/nucleof303re/pios_board.h b/flight/targets/boards/nucleof303re/pios_board.h index 65d4272bb..fb1f1fd59 100644 --- a/flight/targets/boards/nucleof303re/pios_board.h +++ b/flight/targets/boards/nucleof303re/pios_board.h @@ -210,7 +210,7 @@ extern uint32_t pios_i2c_id; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/flight/targets/boards/pikoblx/pios_board.h b/flight/targets/boards/pikoblx/pios_board.h index f3654b0b0..d60fd1f0c 100644 --- a/flight/targets/boards/pikoblx/pios_board.h +++ b/flight/targets/boards/pikoblx/pios_board.h @@ -208,7 +208,7 @@ extern uint32_t pios_ws2811_id; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/flight/targets/boards/revolution/pios_board.h b/flight/targets/boards/revolution/pios_board.h index 811b8aad9..95fb59896 100644 --- a/flight/targets/boards/revolution/pios_board.h +++ b/flight/targets/boards/revolution/pios_board.h @@ -276,7 +276,7 @@ extern uint32_t pios_packet_handler; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/flight/targets/boards/revonano/pios_board.h b/flight/targets/boards/revonano/pios_board.h index 73c3e10bd..34fdb0b7d 100644 --- a/flight/targets/boards/revonano/pios_board.h +++ b/flight/targets/boards/revonano/pios_board.h @@ -271,7 +271,7 @@ extern uint32_t pios_packet_handler; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/flight/targets/boards/sparky2/pios_board.h b/flight/targets/boards/sparky2/pios_board.h index 825cf18d7..134bf6d5c 100644 --- a/flight/targets/boards/sparky2/pios_board.h +++ b/flight/targets/boards/sparky2/pios_board.h @@ -278,7 +278,7 @@ extern uint32_t pios_packet_handler; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/flight/targets/boards/spracingf3/pios_board.h b/flight/targets/boards/spracingf3/pios_board.h index 988cdb661..953aa8cba 100644 --- a/flight/targets/boards/spracingf3/pios_board.h +++ b/flight/targets/boards/spracingf3/pios_board.h @@ -214,7 +214,7 @@ extern uint32_t pios_ws2811_id; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/flight/targets/boards/spracingf3evo/pios_board.h b/flight/targets/boards/spracingf3evo/pios_board.h index 629b33783..0f631f190 100644 --- a/flight/targets/boards/spracingf3evo/pios_board.h +++ b/flight/targets/boards/spracingf3evo/pios_board.h @@ -219,7 +219,7 @@ extern uint32_t pios_ws2811_id; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/flight/targets/boards/tinyfish/pios_board.h b/flight/targets/boards/tinyfish/pios_board.h index 45e4f69e4..33ed376ef 100644 --- a/flight/targets/boards/tinyfish/pios_board.h +++ b/flight/targets/boards/tinyfish/pios_board.h @@ -182,7 +182,7 @@ extern uint32_t pios_ws2811_id; // Receiver FlySky IBus input // ------------------------- #define PIOS_IBUS_MAX_DEVS 1 -#define PIOS_IBUS_NUM_INPUTS 10 +#define PIOS_IBUS_NUM_INPUTS 14 // ------------------------- // Servo outputs diff --git a/ground/gcs/src/plugins/config/inputchannelform.cpp b/ground/gcs/src/plugins/config/inputchannelform.cpp index 75265878f..85ccf8004 100644 --- a/ground/gcs/src/plugins/config/inputchannelform.cpp +++ b/ground/gcs/src/plugins/config/inputchannelform.cpp @@ -147,7 +147,7 @@ void InputChannelForm::groupUpdated() count = 8; // Need to make this 6 for CC break; case ManualControlSettings::CHANNELGROUPS_IBUS: - count = 10; + count = 14; break; case ManualControlSettings::CHANNELGROUPS_DSMMAINPORT: case ManualControlSettings::CHANNELGROUPS_DSMFLEXIPORT: