mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-15 07:29:15 +01:00
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
Conflicts: ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
This commit is contained in:
commit
124a31f0b5
@ -274,6 +274,9 @@ static bool okToArm(void)
|
||||
case FLIGHTSTATUS_FLIGHTMODE_STABILIZED1:
|
||||
case FLIGHTSTATUS_FLIGHTMODE_STABILIZED2:
|
||||
case FLIGHTSTATUS_FLIGHTMODE_STABILIZED3:
|
||||
case FLIGHTSTATUS_FLIGHTMODE_STABILIZED4:
|
||||
case FLIGHTSTATUS_FLIGHTMODE_STABILIZED5:
|
||||
case FLIGHTSTATUS_FLIGHTMODE_STABILIZED6:
|
||||
return true;
|
||||
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user