diff --git a/docs/Controls.md b/docs/Controls.md index bad602e47..6a3600f0c 100644 --- a/docs/Controls.md +++ b/docs/Controls.md @@ -6,6 +6,9 @@ When armed, the aircraft is ready to fly and the motors will spin when throttle Arming and disarming is done using a switch, set up on the modes page. (NOTE: Stick arming was removed in iNav 2.2) +**YAW STICK ARMING OVERRIDE:** +Arming is disabled when Nav modes are configured and no GPS lock is available or if a WP mission is loaded but the first WP is farther than the `nav_wp_safe_distance` setting. This Arming block can be bypassed if need be by setting `nav_extra_arming_safety` to `ALLOW_BYPASS` and moving the Yaw stick to the high position when the Arm switch is used. This bypasses GPS Arm blocking pre INAV 4.0.0 and both GPS and "First WP too far" Arm blocking from INAV 4.0.0. + ## Stick Positions The three stick positions are: @@ -36,6 +39,9 @@ The stick positions are combined to activate different functions: | Save current waypoint mission | LOW | CENTER | HIGH | LOW | | Load current waypoint mission | LOW | CENTER | HIGH | HIGH | | Unload waypoint mission | LOW | CENTER | LOW | HIGH | +| Increase WP mission index | LOW | CENTER | CENTER | HIGH | +| Decrease WP mission index | LOW | CENTER | CENTER | LOW | +| Bypass Nav Arm disable | LOW | HIGH | CENTER | CENTER | | Save setting | LOW | LOW | LOW | HIGH | | Enter OSD Menu (CMS) | CENTER | LOW | HIGH | CENTER | diff --git a/docs/assets/images/StickPositions.png b/docs/assets/images/StickPositions.png index 4f7365952..8ecf4ca4a 100644 Binary files a/docs/assets/images/StickPositions.png and b/docs/assets/images/StickPositions.png differ diff --git a/docs/assets/images/StickPositions.svg b/docs/assets/images/StickPositions.svg index 3f32b5252..218c5e109 100644 --- a/docs/assets/images/StickPositions.svg +++ b/docs/assets/images/StickPositions.svg @@ -7,11 +7,11 @@ viewBox="0 0 8782.4284 4964.1146" id="svg2" version="1.1" - inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" sodipodi:docname="StickPositions.svg" inkscape:export-filename="StickPositions.png" - inkscape:export-xdpi="74.996788" - inkscape:export-ydpi="74.996788" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -28,16 +28,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.13995495" - inkscape:cx="6594.9793" - inkscape:cy="3265.3365" + inkscape:zoom="0.099730699" + inkscape:cx="7836.1027" + inkscape:cy="3133.4384" inkscape:document-units="px" inkscape:current-layer="g4157" showgrid="false" - inkscape:window-width="1920" - inkscape:window-height="1010" - inkscape:window-x="0" - inkscape:window-y="0" + inkscape:window-width="1366" + inkscape:window-height="715" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" fit-margin-top="1" fit-margin-left="1" @@ -125,795 +125,918 @@ transform="translate(2203.3186,3074.6376)"> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + inkscape:transform-center-x="82.780707" + inkscape:transform-center-y="0.440326" /> Profile 1 + d="m 1626.1528,-1679.206 c -6.5177,6.5176 -20.8487,2.7539 -32.0091,-8.4066 -11.1605,-11.1605 -14.9243,-25.4915 -8.4066,-32.0091 6.5176,-6.5177 109.8962,-91.8016 121.0567,-80.641 11.1605,11.1604 -74.1234,114.5391 -80.641,121.0567 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:transform-center-y="64.456724" + inkscape:transform-center-x="64.456724" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Profile 2 + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Profile 2 + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 2209.0683,-1464.719 c 9.2174,0 16.6896,12.795 16.6896,28.5782 0,15.7833 -7.4722,28.5782 -16.6896,28.5782 -9.2173,10e-5 -142.6219,-12.7949 -142.6219,-28.5782 0,-15.7833 133.4046,-28.5782 142.6219,-28.5782 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Profile 3 + d="m 1626.1528,127.38364 c -6.5177,6.51771 -20.8487,2.75391 -32.0091,-8.40655 -11.1605,-11.16054 -14.9243,-25.491449 -8.4066,-32.009159 6.5176,-6.51763 109.8962,-91.8014902 121.0567,-80.6410302 11.1605,11.1604602 -74.1234,114.5391092 -80.641,121.0567392 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:transform-center-y="64.456724" + inkscape:transform-center-x="64.456724" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 2092.3444,148.36077 c 0,9.21731 -12.7949,16.68946 -28.5782,16.68946 -15.7833,0 -28.5783,-7.47215 -28.5783,-16.68946 0,-9.2174 12.7949,-142.6218992 28.5783,-142.6218992 15.7833,0 28.5783,133.4044992 28.5782,142.6218992 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Calibrate Gyro + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Calibrate Gyro + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 2092.3444,514.87045 c 0,9.21732 -12.7949,16.68947 -28.5782,16.68947 -15.7833,0 -28.5783,-7.47215 -28.5783,-16.68947 0,-9.2174 12.7949,-142.62186 28.5783,-142.62186 15.7833,0 28.5783,133.40446 28.5782,142.62186 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Calibrate Acc + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Calibrate Acc + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Calibrate Compass + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 2153.8559,1339.3964 c 6.5177,-6.5177 20.8487,-2.7539 32.0091,8.4065 11.1605,11.1606 14.9243,25.4915 8.4066,32.0092 -6.5177,6.5176 -109.8962,91.8015 -121.0567,80.641 -11.1605,-11.1605 74.1233,-114.5391 80.641,-121.0567 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:transform-center-y="-64.456736" + inkscape:transform-center-x="-64.456757" /> In-flight Calibration Controls + d="m 5982.8787,-2323.603 c 0,-9.2173 -12.7949,-16.6894 -28.5782,-16.6894 -15.7833,0 -28.5782,7.4721 -28.5782,16.6894 0,9.2173 12.7949,142.6218 28.5782,142.6218 15.7833,0 28.5782,-133.4045 28.5782,-142.6218 z" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 6161.8085,-2151.7473 c -9.2174,0 -16.6894,-12.7949 -16.6894,-28.5782 0,-15.7833 7.472,-28.5782 16.6894,-28.5782 9.2173,0 142.6219,12.7949 142.6219,28.5782 0,15.7833 -133.4046,28.5782 -142.6219,28.5782 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Trim Acc Left + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Trim Acc Left + d="m 5982.8787,-1957.0932 c 0,-9.2174 -12.7949,-16.6896 -28.5782,-16.6896 -15.7833,0 -28.5782,7.4722 -28.5782,16.6896 0,9.2173 12.7949,142.6218 28.5782,142.6218 15.7833,0 28.5782,-133.4045 28.5782,-142.6218 z" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Trim Acc Right + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Trim Acc Right + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 6336.5784,-1590.5835 c 0,-9.2174 -12.7949,-16.6895 -28.5782,-16.6895 -15.7834,0 -28.5783,7.4721 -28.5783,16.6895 0,9.2173 12.7949,142.6218 28.5783,142.6218 15.7833,0 28.5782,-133.4045 28.5782,-142.6218 z" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Trim Acc Forwards + d="m 5982.8787,-1224.0738 c 0,-9.2174 -12.7949,-16.6895 -28.5782,-16.6895 -15.7833,0 -28.5782,7.4721 -28.5782,16.6895 0,9.2173 12.7949,142.6218 28.5782,142.6218 15.7833,0 28.5782,-133.4045 28.5782,-142.6218 z" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 6336.5784,-935.93448 c 0,9.21735 -12.7949,16.6895 -28.5782,16.6895 -15.7834,0 -28.5783,-7.47215 -28.5783,-16.6895 0,-9.21736 12.7949,-142.62192 28.5783,-142.62192 15.7833,0 28.5782,133.40456 28.5782,142.62192 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Trim Acc Backwards + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Trim Acc Backwards + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 5982.8787,-569.42473 c 0,9.21732 -12.7949,16.68947 -28.5782,16.68947 -15.7833,0 -28.5782,-7.47215 -28.5782,-16.68947 0,-9.2174 12.7949,-142.62189 28.5782,-142.62189 15.7833,0 28.5782,133.40449 28.5782,142.62189 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Save waypoint mission + y="-645.78082" + x="5710.9761" + sodipodi:role="line">Save Waypoint Mission + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 5982.8787,-202.91498 c 0,9.21731 -12.7949,16.68947 -28.5782,16.68947 -15.7833,0 -28.5782,-7.47216 -28.5782,-16.68947 0,-9.2174 12.7949,-142.62193 28.5782,-142.62193 15.7833,0 28.5782,133.40453 28.5782,142.62193 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 5982.8784,153.98439 c 0,9.2173 -12.7949,16.6895 -28.5782,16.6895 -15.7833,0 -28.5782,-7.4722 -28.5782,-16.6895 0,-9.2174 12.7949,-142.621885 28.5782,-142.621885 15.7833,0 28.5782,133.404485 28.5782,142.621885 z" + style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 6391.1433,-471.78039 c 6.5177,-6.51771 20.8487,-2.75391 32.0091,8.40655 11.1605,11.16054 14.9243,25.49145 8.4066,32.00916 -6.5177,6.51763 -109.8962,91.80149 -121.0567,80.64103 -11.1605,-11.16054 74.1233,-114.53911 80.641,-121.05674 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:transform-center-y="-64.456724" + inkscape:transform-center-x="-64.456757" /> Load waypoint mission + y="-279.27106" + x="5710.9761" + sodipodi:role="line">Load Waypoint Mission Unload waypoint mission + y="78.96183" + x="5714.9453" + sodipodi:role="line">Unload Waypoint Mission + d="m 5870.3864,1588.965 c -6.5177,6.5177 -20.8487,2.7539 -32.0092,-8.4066 -11.1605,-11.1605 -14.9243,-25.4914 -8.4065,-32.0091 6.5176,-6.5177 109.8962,-91.8015 121.0567,-80.6411 11.1605,11.1606 -74.1234,114.5392 -80.641,121.0568 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:transform-center-y="64.456705" + inkscape:transform-center-x="64.456726" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 6391.1429,1588.965 c 6.5177,6.5177 20.8487,2.7539 32.0091,-8.4066 11.1605,-11.1605 14.9243,-25.4914 8.4066,-32.0091 -6.5177,-6.5177 -109.8962,-91.8015 -121.0567,-80.6411 -11.1605,11.1606 74.1233,114.5392 80.641,121.0568 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:transform-center-y="64.456705" + inkscape:transform-center-x="-64.45675" /> + style="display:inline;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 6401.2239,128.4327 c 6.5176,6.51769 20.8486,2.75389 32.0091,-8.40655 11.1605,-11.16054 14.9243,-25.491453 8.4065,-32.009163 C 6435.1219,81.499365 6331.7433,-3.7845 6320.5829,7.3759649 6309.4223,18.536505 6394.7062,121.91507 6401.2239,128.4327 Z" + style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:transform-center-y="64.456724" + inkscape:transform-center-x="-64.456735" /> Save Setting + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Save Setting Enter OSD Menu (CMS) + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Enter OSD Menu (CMS) Mode 2 Stick Functions + style="font-size:307.62px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:0.871795px">Mode 2 Stick Functions + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 1917.5745,-1063.4556 c -9.2173,0 -16.6894,-12.7949 -16.6894,-28.5782 0,-15.7834 7.4721,-28.5783 16.6894,-28.5783 9.2174,0 142.6219,12.7949 142.6219,28.5783 0,15.7833 -133.4045,28.5782 -142.6219,28.5782 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Battery profile 1 + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Battery profile 1 + d="m 2092.3444,-868.80162 c 0,-9.21731 -12.7949,-16.68946 -28.5782,-16.68946 -15.7833,0 -28.5783,7.47215 -28.5783,16.68946 0,9.2174 12.7949,142.62188 28.5783,142.62188 15.7833,0 28.5783,-133.40448 28.5782,-142.62188 z" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Battery profile 2 + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Battery profile 3 + style="font-size:249.856px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:0.871795px">Battery profile 3 + d="m 1628.432,-1214.9324 c -6.5176,-6.5177 -20.8486,-2.7539 -32.0091,8.4065 -11.1605,11.1606 -14.9242,25.4915 -8.4066,32.0092 6.5177,6.5176 109.8963,91.8015 121.0567,80.641 11.1605,-11.1605 -74.1233,-114.5391 -80.641,-121.0567 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:transform-center-y="-64.456718" + inkscape:transform-center-x="64.456741" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:9.63909;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 1623.6772,-484.46368 c -6.5177,-6.51772 -20.8486,-2.75392 -32.0091,8.40654 -11.1605,11.16054 -14.9243,25.49146 -8.4066,32.00917 6.5176,6.51762 109.8962,91.80148 121.0567,80.64102 11.1605,-11.16054 -74.1234,-114.53911 -80.641,-121.05673 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:transform-center-y="-64.456724" + inkscape:transform-center-x="64.456737" /> + d="m 2036.1448,954.08719 c 0,-9.2173 12.7949,-16.6895 28.5782,-16.6895 15.7833,0 28.5782,7.4722 28.5782,16.6895 0,9.2174 -12.7949,142.62191 -28.5782,142.62191 -15.7833,0 -28.5782,-133.40451 -28.5782,-142.62191 z" + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.04219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + Inc WP Mission Index + + + + + Dec WP Mission Index + Bypass NAV Arm Disable + + + + + diff --git a/docs/assets/images/StickPositions_trans.png b/docs/assets/images/StickPositions_trans.png index 2d45981c2..4f7365952 100644 Binary files a/docs/assets/images/StickPositions_trans.png and b/docs/assets/images/StickPositions_trans.png differ