aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Scripting: rename TRIK to TRIKR for sport_aerobatics

Browse Source
This commit is contained in:
Henry Wurzburg 2022-12-28 17:55:28 -06:00 committed by Andrew Tridgell
parent d6c258e9d0
commit 65547f41c7
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/AP_Scripting/applets/Aerobatics/FixedWing/RateBased/README.md
View File

@ -91,17 +91,17 @@ modes:
- LOITER
Set TRIK_COUNT to the number of tricks you want to make available and reboot,
with a maximum of 11. (Why 11 when fewer than that are available? To allow variants, such as different knife-edges, ie 90 deg and 180 deg inveterd flight)
Set TRIKR_COUNT to the number of tricks you want to make available and reboot,
with a maximum of 11. (Why 11 when fewer than that are available? To allow variants, such as different knife-edges, ie 90 deg and 180 deg inverted flight)
After setting TRIK_COUNT, reboot and refresh parameters. You will find
you will now have 5 parameters per trick.
After setting TRIKR_COUNT, reboot and refresh parameters. You will find
you will now have 5 parameters per trick,but only three are used at this time.
- TRIKn_ID
- TRIKn_ARG1
- TRIKn_ARG2
- TRIKn_ARG3 (unused, future use)
- TRIKn_ARG4 (unused, future use)
- TRIKRn_ID
- TRIKRn_ARG1
- TRIKRn_ARG2
- TRIKRn_ARG3 (unused, future use)
- TRIKRn_ARG4 (unused, future use)
The ID parameter is the manoeuvre from the above table, and the arguments are the arguments to each manoeuvre.
@ -139,7 +139,7 @@ Changing flight modes will also cancel any active trick.
There are a number of parameters added by this script to control its control loops. The defaults should be satisfactory, but some of the key parameters are:
- AEROM_HGT_KE_BIAS: knife-edge boost. Adds immediate rudder as the plane rolls into 90 degree positions rather than waiting of an altitude change
- AEROM_THR_FF : modulates throttle as pitch increases or decreases
- AEROR_HGT_KE_BIAS: knife-edge boost. Adds immediate rudder as the plane rolls into 90 degree positions rather than waiting of an altitude change
- AEROR_THR_FF : modulates throttle as pitch increases or decreases
the other parameters control the height and speed PID controllers used in the script

2
libraries/AP_Scripting/applets/Aerobatics/FixedWing/RateBased/sport_aerobatics.lua
View File

@ -53,7 +53,7 @@ end
--]]
-- 2nd param table for tricks on a switch
local PARAM_TABLE_KEY2 = 73
local PARAM_TABLE_PREFIX2 = "TRIK"
local PARAM_TABLE_PREFIX2 = "TRIKR"
assert(param:add_table(PARAM_TABLE_KEY2, PARAM_TABLE_PREFIX2, 63), 'could not add param table2')
-- add a parameter and bind it to a variable in table2