From 309f5db9562ac601af7ddf62c35b20a0725a0b91 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Fri, 4 Dec 2015 20:36:51 +0100 Subject: [PATCH 1/2] LP-191 Receiver activity : Increase min range value and allow all Sbus channels scanning. --- flight/modules/Receiver/receiver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flight/modules/Receiver/receiver.c b/flight/modules/Receiver/receiver.c index 4dfd26770..10f68da67 100644 --- a/flight/modules/Receiver/receiver.c +++ b/flight/modules/Receiver/receiver.c @@ -99,8 +99,8 @@ static uint8_t isAssistedFlightMode(uint8_t position); static void applyLPF(float *value, ManualControlSettingsResponseTimeElem channel, ManualControlSettingsResponseTimeData *responseTime, uint8_t deadband, float dT); #endif -#define RCVR_ACTIVITY_MONITOR_CHANNELS_PER_GROUP 12 -#define RCVR_ACTIVITY_MONITOR_MIN_RANGE 10 +#define RCVR_ACTIVITY_MONITOR_CHANNELS_PER_GROUP 18 // Sbus max channel +#define RCVR_ACTIVITY_MONITOR_MIN_RANGE 15 struct rcvr_activity_fsm { ManualControlSettingsChannelGroupsOptions group; uint16_t prev[RCVR_ACTIVITY_MONITOR_CHANNELS_PER_GROUP]; From 63534e8014c9d4861a3f4e2a9af7aa4524449fcd Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Fri, 4 Dec 2015 21:23:33 +0100 Subject: [PATCH 2/2] LP-191 Little fix : OPlink has 8 channels --- ground/gcs/src/plugins/config/inputchannelform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/gcs/src/plugins/config/inputchannelform.cpp b/ground/gcs/src/plugins/config/inputchannelform.cpp index 165241842..a96cb7365 100644 --- a/ground/gcs/src/plugins/config/inputchannelform.cpp +++ b/ground/gcs/src/plugins/config/inputchannelform.cpp @@ -143,10 +143,10 @@ void InputChannelForm::groupUpdated() count = 0; break; case ManualControlSettings::CHANNELGROUPS_PWM: + case ManualControlSettings::CHANNELGROUPS_OPLINK: count = 8; // Need to make this 6 for CC break; case ManualControlSettings::CHANNELGROUPS_PPM: - case ManualControlSettings::CHANNELGROUPS_OPLINK: case ManualControlSettings::CHANNELGROUPS_DSMMAINPORT: case ManualControlSettings::CHANNELGROUPS_DSMFLEXIPORT: count = 12;