rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-09 01:53:48 +02:00
Code Issues Releases Activity

OP-289/Flight: do not use RC input if disconnected. Quick fix until better arming system is designed.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2479 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
osnwt 2011-01-19 00:01:33 +00:00 committed by osnwt
parent 76420d7972
commit 780f441ae9
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
flight/Modules/ManualControl/manualcontrol.c
View File

@ -316,7 +316,7 @@ static void manualControlTask(void *parameters)
// Look for state changes and write in newArmState // Look for state changes and write in newArmState
if (settings.Arming == MANUALCONTROLSETTINGS_ARMING_NONE) { if (settings.Arming == MANUALCONTROLSETTINGS_ARMING_NONE) {
// No cahnnel assigned to arming -> arm imeediately when throttle is low // No channel assigned to arming -> arm immediately when throttle is low
newCmdArmed = MANUALCONTROLCOMMAND_ARMED_TRUE; newCmdArmed = MANUALCONTROLCOMMAND_ARMED_TRUE;
} else { } else {
float armStickLevel; float armStickLevel;
@ -325,15 +325,18 @@ static void manualControlTask(void *parameters)
bool manualArm = false; bool manualArm = false;
bool manualDisarm = false; bool manualDisarm = false;
armStickLevel = scaleChannel(cmd.Channel[channel], settings.ChannelMax[channel], if (connection_state == CONNECTED) {
settings.ChannelMin[channel], settings.ChannelNeutral[channel]); // Should use RC input only if RX is connected
if (reverse) armStickLevel = scaleChannel(cmd.Channel[channel], settings.ChannelMax[channel],
armStickLevel =-armStickLevel; settings.ChannelMin[channel], settings.ChannelNeutral[channel]);
if (reverse)
armStickLevel =-armStickLevel;
if (armStickLevel <= -0.90) if (armStickLevel <= -0.90)
manualArm = true; manualArm = true;
else if (armStickLevel >= +0.90) else if (armStickLevel >= +0.90)
manualDisarm = true; manualDisarm = true;
}
switch(armState) { switch(armState) {
case ARM_STATE_DISARMED: case ARM_STATE_DISARMED: