Merge pull request cleanflight#2182 from gaelj/Doc_and_travis_targets

Doc: disabled-arming conditions
zhaojiahai · Jun 1, 2016 · 1e36693 · 1e36693
2 parents e209124 + 1ff8af2
commit 1e36693
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/docs/Controls.md b/docs/Controls.md
@@ -9,6 +9,13 @@ that is not recommended).
 By default, arming and disarming is done using stick positions.  (NOTE: this feature is disabled when using a
 switch to arm.)
 
+Arming is disabled if:
+- CLI is active in the configurator
+- The aircraft has landed in failsafe mode
+- Maximum arming angle is exceeded
+- Calibration is active
+- The system is overloaded
+
 ## Stick Positions
 
 The three stick positions are: