Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 00:35:34 +03:00
Code Issues Wiki Activity

reimplement stick mission load as toggle; update RC control images and documentation (#7204)

Browse source
This commit is contained in:
Jonathan Hudson 2021-06-28 15:48:26 +01:00 • committed by GitHub
parent 6901c87d7c
commit 562fc0017a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/Controls.md
View file

@ -40,6 +40,8 @@ The stick positions are combined to activate different functions:
![Stick Positions](assets/images/StickPositions.png) ![Stick Positions](assets/images/StickPositions.png)
"Load/unload Mission" is a toogle. If no mission is loaded to RAM, the EEPROM mission is loaded; if a mission is in RAM, it is cleared. Successful loading is indicated by the `ACTION_SUCCESS` beep, otherwise the `ACTION_FAIL` beep is played.
## Yaw control ## Yaw control
While arming/disarming with sticks, your yaw stick will be moving to extreme values. In order to prevent your craft from trying to yaw during arming/disarming while on the ground, your yaw input will not cause the craft to yaw when the throttle is LOW (i.e. below the `min_check` setting). While arming/disarming with sticks, your yaw stick will be moving to extreme values. In order to prevent your craft from trying to yaw during arming/disarming while on the ground, your yaw input will not cause the craft to yaw when the throttle is LOW (i.e. below the `min_check` setting).

BIN
docs/assets/images/StickPositions.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1,012 KiB

After

Width:  |  Height:  |  Size: 478 KiB

Before After
Before After

77
docs/assets/images/StickPositions.svg
View file

@ -2,23 +2,23 @@
<!-- Created with Inkscape (http://www.inkscape.org/) --> <!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="2478.5964mm" width="2478.5964mm"
height="1400.9835mm" height="1400.9835mm"
viewBox="0 0 8782.4284 4964.1146" viewBox="0 0 8782.4284 4964.1146"
id="svg2" id="svg2"
version="1.1" version="1.1"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)" inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
sodipodi:docname="StickPositions.svg" sodipodi:docname="StickPositions.svg"
inkscape:export-filename="C:\Users\teckel.SSCORP\Downloads\StickPositions.png" inkscape:export-filename="StickPositions.png"
inkscape:export-xdpi="74.996788" inkscape:export-xdpi="74.996788"
inkscape:export-ydpi="74.996788"> inkscape:export-ydpi="74.996788"
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"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs <defs
id="defs4" /> id="defs4" />
<sodipodi:namedview <sodipodi:namedview
@ -29,15 +29,15 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="0.13995495" inkscape:zoom="0.13995495"
inkscape:cx="3633.6202" inkscape:cx="2157.8372"
inkscape:cy="2120.4595" inkscape:cy="3265.3365"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="g4157" inkscape:current-layer="g4157"
showgrid="false" showgrid="false"
inkscape:window-width="2560" inkscape:window-width="1920"
inkscape:window-height="1377" inkscape:window-height="1010"
inkscape:window-x="-8" inkscape:window-x="0"
inkscape:window-y="-8" inkscape:window-y="0"
inkscape:window-maximized="1" inkscape:window-maximized="1"
fit-margin-top="1" fit-margin-top="1"
fit-margin-left="1" fit-margin-left="1"
@ -49,7 +49,8 @@
inkscape:guide-bbox="true" inkscape:guide-bbox="true"
inkscape:snap-object-midpoints="true" inkscape:snap-object-midpoints="true"
inkscape:snap-others="false" inkscape:snap-others="false"
inkscape:object-nodes="true" /> inkscape:object-nodes="true"
inkscape:pagecheckerboard="0" />
<metadata <metadata
id="metadata7"> id="metadata7">
<rdf:RDF> <rdf:RDF>
@ -58,7 +59,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -160,7 +161,7 @@
x="533.55804" x="533.55804"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan xml:space="preserve"><tspan
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end" style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end"
id="tspan4711" id="tspan4711"
y="-1909.1018" y="-1909.1018"
x="533.55804" x="533.55804"
@ -205,7 +206,7 @@
x="533.55804" x="533.55804"
y="-1488.6938" y="-1488.6938"
id="tspan4763" id="tspan4763"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Profile 2</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Profile 2</tspan></text>
<rect <rect
ry="0" ry="0"
y="-1317.7664" y="-1317.7664"
@ -242,7 +243,7 @@
x="533.55804" x="533.55804"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan xml:space="preserve"><tspan
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end" style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end"
id="tspan4815" id="tspan4815"
y="-1068.2856" y="-1068.2856"
x="533.55804" x="533.55804"
@ -287,7 +288,7 @@
x="533.55811" x="533.55811"
y="583.57056" y="583.57056"
id="tspan4867" id="tspan4867"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Calibrate Gyro</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Calibrate Gyro</tspan></text>
<rect <rect
style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4875" id="rect4875"
@ -328,7 +329,7 @@
x="533.55811" x="533.55811"
y="1003.9787" y="1003.9787"
id="tspan4919" id="tspan4919"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Calibrate Acc</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Calibrate Acc</tspan></text>
<rect <rect
ry="0" ry="0"
y="1171.4286" y="1171.4286"
@ -365,7 +366,7 @@
x="536.28436" x="536.28436"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan xml:space="preserve"><tspan
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end" style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end"
id="tspan4971" id="tspan4971"
y="1420.9093" y="1420.9093"
x="536.2843" x="536.2843"
@ -408,7 +409,7 @@
x="5680.7969" x="5680.7969"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan xml:space="preserve"><tspan
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end" style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end"
id="tspan5651" id="tspan5651"
y="-1527.5551" y="-1527.5551"
x="5680.7969" x="5680.7969"
@ -453,7 +454,7 @@
x="5680.7969" x="5680.7969"
y="-1107.1469" y="-1107.1469"
id="tspan5703" id="tspan5703"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Trim Acc Left</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Trim Acc Left</tspan></text>
<rect <rect
style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5711" id="rect5711"
@ -492,7 +493,7 @@
x="5680.7969" x="5680.7969"
y="-686.73877" y="-686.73877"
id="tspan5755" id="tspan5755"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Trim Acc Right</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Trim Acc Right</tspan></text>
<rect <rect
ry="0" ry="0"
y="-489.01691" y="-489.01691"
@ -527,7 +528,7 @@
x="5680.7969" x="5680.7969"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan xml:space="preserve"><tspan
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end" style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end"
id="tspan5807" id="tspan5807"
y="-266.3306" y="-266.3306"
x="5680.7969" x="5680.7969"
@ -570,7 +571,7 @@
x="5680.7969" x="5680.7969"
y="154.07762" y="154.07762"
id="tspan5859" id="tspan5859"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Trim Acc Backwards</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Trim Acc Backwards</tspan></text>
<rect <rect
ry="0" ry="0"
y="351.79944" y="351.79944"
@ -607,7 +608,7 @@
x="5680.7969" x="5680.7969"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan xml:space="preserve"><tspan
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end" style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end"
id="tspan5911" id="tspan5911"
y="574.48572" y="574.48572"
x="5680.7969" x="5680.7969"
@ -648,11 +649,11 @@
x="5680.7969" x="5680.7969"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan xml:space="preserve"><tspan
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end" style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end"
id="tspan5963" id="tspan5963"
y="994.89398" y="994.89398"
x="5680.7969" x="5680.7969"
sodipodi:role="line">Load waypoint mission</tspan></text> sodipodi:role="line">(Un)/load waypoint mission</tspan></text>
<rect <rect
style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5971" id="rect5971"
@ -695,7 +696,7 @@
x="5680.7969" x="5680.7969"
y="1415.3022" y="1415.3022"
id="tspan6015" id="tspan6015"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Save Setting</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Save Setting</tspan></text>
<text <text
xml:space="preserve" xml:space="preserve"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@ -706,7 +707,7 @@
x="5690.6709" x="5690.6709"
y="-1955.0773" y="-1955.0773"
id="tspan4219" id="tspan4219"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Enter OSD Menu (CMS)</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Enter OSD Menu (CMS)</tspan></text>
<text <text
xml:space="preserve" xml:space="preserve"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@ -717,7 +718,7 @@
x="2179.2812" x="2179.2812"
y="-2663.0625" y="-2663.0625"
id="tspan7909" id="tspan7909"
style="font-size:352.85842896px;line-height:1.25;text-align:center;text-anchor:middle">Mode 2 Stick Functions</tspan></text> style="font-size:352.858px;line-height:1.25;text-align:center;text-anchor:middle">Mode 2 Stick Functions</tspan></text>
<rect <rect
style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect927" id="rect927"
@ -752,7 +753,7 @@
x="533.55811" x="533.55811"
y="-673.06989" y="-673.06989"
id="tspan935" id="tspan935"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Battery profile 1</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Battery profile 1</tspan></text>
<rect <rect
style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#808080;stroke-width:11.05660725;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect943" id="rect943"
@ -773,7 +774,7 @@
x="533.55804" x="533.55804"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan xml:space="preserve"><tspan
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end" style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end"
id="tspan947" id="tspan947"
y="-252.66168" y="-252.66168"
x="533.55811" x="533.55811"
@ -802,7 +803,7 @@
x="533.55811" x="533.55811"
y="167.74652" y="167.74652"
id="tspan959" id="tspan959"
style="font-size:286.5987854px;line-height:1.25;text-align:end;text-anchor:end">Battery profile 3</tspan></text> style="font-size:286.599px;line-height:1.25;text-align:end;text-anchor:end">Battery profile 3</tspan></text>
<path <path
sodipodi:nodetypes="sssss" sodipodi:nodetypes="sssss"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Before After
Before After

2
src/main/fc/rc_controls.c
View file

@ -260,7 +260,7 @@ void processRcStickPositions(throttleStatus_e throttleStatus)
// Load waypoint list // Load waypoint list
if (rcSticks == THR_LO + YAW_CE + PIT_HI + ROL_HI) { if (rcSticks == THR_LO + YAW_CE + PIT_HI + ROL_HI) {
const bool success = loadNonVolatileWaypointList(false); const bool success = loadNonVolatileWaypointList(true);
beeper(success ? BEEPER_ACTION_SUCCESS : BEEPER_ACTION_FAIL); beeper(success ? BEEPER_ACTION_SUCCESS : BEEPER_ACTION_FAIL);
} }
#endif #endif