1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-28 17:54:15 +01:00

Merged in f5soh/librepilot/LP-191_Txwizard_more_robust (pull request #133)

LP-191 Receiver activity : Increase min range value and allow all Sbus channels scanning.
This commit is contained in:
Lalanne Laurent 2015-12-17 16:54:06 +01:00
commit 3faa8d621a
2 changed files with 3 additions and 3 deletions

View File

@ -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); static void applyLPF(float *value, ManualControlSettingsResponseTimeElem channel, ManualControlSettingsResponseTimeData *responseTime, uint8_t deadband, float dT);
#endif #endif
#define RCVR_ACTIVITY_MONITOR_CHANNELS_PER_GROUP 12 #define RCVR_ACTIVITY_MONITOR_CHANNELS_PER_GROUP 18 // Sbus max channel
#define RCVR_ACTIVITY_MONITOR_MIN_RANGE 10 #define RCVR_ACTIVITY_MONITOR_MIN_RANGE 15
struct rcvr_activity_fsm { struct rcvr_activity_fsm {
ManualControlSettingsChannelGroupsOptions group; ManualControlSettingsChannelGroupsOptions group;
uint16_t prev[RCVR_ACTIVITY_MONITOR_CHANNELS_PER_GROUP]; uint16_t prev[RCVR_ACTIVITY_MONITOR_CHANNELS_PER_GROUP];

View File

@ -143,10 +143,10 @@ void InputChannelForm::groupUpdated()
count = 0; count = 0;
break; break;
case ManualControlSettings::CHANNELGROUPS_PWM: case ManualControlSettings::CHANNELGROUPS_PWM:
case ManualControlSettings::CHANNELGROUPS_OPLINK:
count = 8; // Need to make this 6 for CC count = 8; // Need to make this 6 for CC
break; break;
case ManualControlSettings::CHANNELGROUPS_PPM: case ManualControlSettings::CHANNELGROUPS_PPM:
case ManualControlSettings::CHANNELGROUPS_OPLINK:
case ManualControlSettings::CHANNELGROUPS_DSMMAINPORT: case ManualControlSettings::CHANNELGROUPS_DSMMAINPORT:
case ManualControlSettings::CHANNELGROUPS_DSMFLEXIPORT: case ManualControlSettings::CHANNELGROUPS_DSMFLEXIPORT:
count = 12; count = 12;