Skip to content

Commit d080704

Browse files
ufechner7ufechner7
committed
Fix examples
1 parent 48b0b85 commit d080704

14 files changed

Lines changed: 71 additions & 38 deletions

‎examples/Project.toml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[deps]
2+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
3+
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
4+
ControlPlots = "23c2ee80-7a9e-4350-b264-8e670f12517c"
5+
DiscretePIDs = "c1363496-6848-4723-8758-079b737f6baf"
6+
Joysticks = "82f05805-4863-42dc-b1a7-0852bd62c632"
7+
KiteControllers = "b19fd437-5b3a-4cca-b199-c3ded0f20ded"
8+
KiteModels = "b94af626-7959-4878-9336-2adc27959007"
9+
KitePodModels = "9de5dc81-f971-414a-927b-652b2f41c539"
10+
KiteUtils = "90980105-b163-44e5-ba9f-8b1c83bb0533"
11+
KiteViewers = "2e593061-95e7-45e4-95f4-df0491f2e601"
12+
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
13+
NativeFileDialog = "e1fe445b-aa65-4df4-81c1-2041507f0fd4"
14+
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
15+
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
16+
Rotations = "6038ab10-8711-5258-84ad-4b1120ba62dc"
17+
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
18+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
19+
Timers = "21f18d07-b854-4dab-86f0-c15a3821819a"
20+
21+
[sources]
22+
KiteControllers = {path = ".."}
23+
24+
[compat]
25+
Aqua = "0.8.11"
26+
BenchmarkTools = "1.6"
27+
ControlPlots = "0.2.13"
28+
Joysticks = "0.1.4"
29+
KitePodModels = "0.4.0"
30+
KiteViewers = "0.5.1"
31+
LaTeXStrings = "1.4"
32+
NativeFileDialog = "0.2.1"
33+
NonlinearSolve = "4.11.0"

‎examples/autopilot.jl‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# activate the test environment if needed
22
using Pkg
33
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
4-
using TestEnv; TestEnv.activate()
4+
Pkg.activate(@__DIR__)
55
end
66
using Timers; tic()
77

@@ -13,9 +13,6 @@ using Printf, LinearAlgebra
1313
import KiteViewers.GLMakie
1414
import KiteViewers.GLMakie.GLFW
1515
import KiteControllers.YAML
16-
if false; include("../src/flightpathcontroller.jl"); end
17-
if false; include("../src/flightpathcalculator2.jl"); end
18-
if false; include("../src/systemstatecontrol.jl"); end
1916

2017
function read_project()
2118
config_file = joinpath(get_data_path(), "gui.yaml")

‎examples/autopilot_1p.jl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# activate the test environment if needed
22
using Pkg
33
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
4-
using TestEnv; TestEnv.activate()
4+
Pkg.activate(@__DIR__)
55
end
66
using Timers; tic()
77

88
using KiteControllers, KiteViewers, KiteModels, Rotations
9+
using KiteUtils: Settings, load_settings
910

10-
set = deepcopy(load_settings("system.yaml"))
11+
set::Settings = deepcopy(load_settings("system.yaml"))
1112

1213
kcu::KCU = KCU(set)
1314
kps3::KPS3 = KPS3(kcu)

‎examples/joystick.jl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# activate the test environment if needed
22
using Pkg
33
if ! ("KiteViewers" ∈ keys(Pkg.project().dependencies))
4-
using TestEnv; TestEnv.activate()
4+
Pkg.activate(@__DIR__)
55
end
66
using Timers; tic()
77

88
using KiteControllers, KiteViewers, KiteModels, Joysticks
9+
using KiteUtils: Settings, load_settings
910

10-
set = deepcopy(load_settings("system.yaml"))
11+
set::Settings = deepcopy(load_settings("system.yaml"))
1112
kcu::KCU = KCU(set)
1213
kps4::KPS4 = KPS4(kcu)
1314
if ! @isdefined js;

‎examples/learning.jl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
# activate the test environment if needed
88
using Pkg
99
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
10-
using TestEnv; TestEnv.activate()
11-
# pkg"add KiteModels#main"
10+
Pkg.activate(@__DIR__)
1211
end
13-
using KiteModels, KiteControllers
12+
using KiteControllers, KiteModels
1413

1514
function read_project()
1615
config_file = joinpath(get_data_path(), "gui.yaml")

‎examples/minipilot.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using Pkg
22
if ! ("KiteViewers" ∈ keys(Pkg.project().dependencies))
3-
using TestEnv; TestEnv.activate()
3+
Pkg.activate(@__DIR__)
44
end
55
using Timers; tic()
66

7-
using KiteControllers, KiteViewers, KiteModels, StatsBase
7+
using KiteControllers, KiteViewers, KiteModels, Statistics
8+
using KiteUtils: Settings, load_settings
89

9-
10-
set = deepcopy(load_settings("system.yaml"))
10+
set::Settings = deepcopy(load_settings("system.yaml"))
1111
kcu::KCU = KCU(set)
1212
kps4::KPS4 = KPS4(kcu)
1313

‎examples/minipilot_12.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using Pkg
22
if ! ("KiteViewers" ∈ keys(Pkg.project().dependencies))
3-
using TestEnv; TestEnv.activate()
3+
Pkg.activate(@__DIR__)
44
end
55
using Timers; tic()
66

7-
using KiteControllers, KiteViewers, KiteModels, StatsBase
7+
using KiteControllers, KiteModels, KiteViewers, Statistics
8+
using KiteUtils: Settings, load_settings
89

9-
10-
set = deepcopy(load_settings("system.yaml"))
10+
set::Settings = deepcopy(load_settings("system.yaml"))
1111
set.segments = 12
1212
kcu::KCU = KCU(set)
1313
kps4::KPS4 = KPS4(kcu)

‎examples/parking_1p.jl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# activate the test environment if needed
22
using Pkg
33
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
4-
using TestEnv; TestEnv.activate()
4+
Pkg.activate(@__DIR__)
55
end
66
using Timers; tic()
77

8-
using KiteUtils
9-
set = deepcopy(load_settings("system.yaml"))
8+
using KiteUtils: Settings, load_settings
9+
10+
set::Settings = deepcopy(load_settings("system.yaml"))
1011
set.abs_tol=0.00006
1112
set.rel_tol=0.0001
1213
set.v_wind = 6.5

‎examples/parking_4p.jl‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# activate the test environment if needed
22
using Pkg
33
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
4-
using TestEnv; TestEnv.activate()
4+
Pkg.activate(@__DIR__)
55
end
66
using Timers; tic()
77

8-
using KiteViewers, KiteModels, ControlPlots, Rotations
9-
set = deepcopy(load_settings("system.yaml"))
8+
using ControlPlots, KiteModels, KiteViewers, Rotations
9+
using KiteUtils: Settings, load_settings
10+
11+
set::Settings = deepcopy(load_settings("system.yaml"))
1012
set.abs_tol=0.00006
1113
set.rel_tol=0.0001
1214
set.v_wind = 10 # v_min1 6-25; v_min2 5.3-30

‎examples/parking_controller.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module ParkingControllers
44

55
using DiscretePIDs, Parameters, Test
6-
import KiteControllers: wrap2pi
6+
import KiteUtils: wrap2pi
77

88
@with_kw mutable struct ParkingControllerSettings @deftype Float64
99
dt

0 commit comments

Comments
 (0)