Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 15:23:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Scripting: fixed spelling of barrel roll

Browse Source
This commit is contained in:
Andrew Tridgell 2022-11-11 21:51:08 +11:00
parent 8726962036
commit af44cbfc30
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Scripting/applets/Aerobatics/FixedWing/README.md
View File

@ -46,7 +46,7 @@ the ground track.
| 23 | Half Climbing Circle | radius | height | bank angle | | Yes |
| 24 | Crossbox Humpty | radius | height | | | Yes |
| 25 | Laydown Humpty | radius | height | | | Yes |
| 25 | Barrell Roll | radius | length | num spirals | | No |
| 25 | Barrel Roll | radius | length | num spirals | | No |
| 26 | Straight Hold | length | bank angle | | | No |
Note: In the script you will find other (specialised) manouvers which do not appear in the

12
libraries/AP_Scripting/applets/Aerobatics/FixedWing/plane_aerobatics.lua
View File

@ -581,7 +581,7 @@ function path_horizontal_arc(_radius, _angle, _height_gain)
end
--[[
path component that does a cylinder for a barrell roll
path component that does a cylinder for a barrel roll
--]]
function path_cylinder(_radius, _length, _num_spirals)
local self = PathComponent()
@ -1013,12 +1013,12 @@ function cylinder(radius, length, num_spirals, arg4)
})
end
function barrell_roll(radius, length, num_spirals, arg4)
function barrel_roll(radius, length, num_spirals, arg4)
local gamma_deg = math.deg(math.atan((length/num_spirals)/(2*math.pi*radius)))
local speed = target_groundspeed()
local bank = math.deg(math.atan((speed*speed) / (radius * GRAVITY_MSS)))
return make_paths("barrell_roll", {
return make_paths("barrel_roll", {
{ path_horizontal_arc(-radius, 90-gamma_deg, 0), roll_angle_entry_exit(-bank) },
{ path_cylinder(radius, length, num_spirals), roll_angle(0) },
{ path_horizontal_arc(radius, 90-gamma_deg, 0), roll_angle_entry_exit(bank) },
@ -1591,7 +1591,7 @@ function f4c_example_l_r() -- positioned for a flight l
{ straight_roll, { 200, 0 } },
{ half_climbing_circle, { -65, 0, -60 } },
{ straight_align, { 200, 0 } },
--{ barrell_roll, { 100, 200 } , message="Barrel Roll"}, -- barrel roll - (radius, length)
--{ barrel_roll, { 100, 200 } , message="Barrel Roll"}, -- barrel roll - (radius, length)
{ straight_roll, { 20, 0 } },
})
end
@ -2247,7 +2247,7 @@ command_table[22]= PathFunction(two_point_roll, "Two Point Roll")
command_table[23]= PathFunction(half_climbing_circle, "Half Climbing Circle")
command_table[24]= PathFunction(crossbox_humpty, "Crossbox Humpty")
command_table[25]= PathFunction(laydown_humpty, "Laydown Humpty")
command_table[26] = PathFunction(barrell_roll, "Barrell Roll")
command_table[26] = PathFunction(barrel_roll, "Barrel Roll")
command_table[27]= PathFunction(straight_flight, "Straight Hold")
command_table[28] = PathFunction(partial_circle, "Partial Circle")
command_table[200] = PathFunction(test_all_paths, "Test Suite")
@ -2289,7 +2289,7 @@ load_table["crossbox_humpty"] = crossbox_humpty
load_table["laydown_humpty"] = laydown_humpty
load_table["straight_align"] = straight_align
load_table["figure_eight"] = figure_eight
load_table["barrell_roll"] = barrell_roll
load_table["barrel_roll"] = barrel_roll
load_table["straight_hold"] = straight_hold
load_table["partial_circle"] = partial_circle

4
libraries/AP_Scripting/applets/Aerobatics/FixedWing/trick72.txt
View File

@ -43,8 +43,8 @@ message: HalfCubanEight
half_cuban_eight 25
straight_align 75
message: BarrellRoll
barrell_roll 30 100 2
message: BarrelRoll
barrel_roll 30 100 2
message: ProcedureTurn
procedure_turn 30 45 30