more fixes

aenarete · Oct 27, 2024 · 9afaa79 · 9afaa79
1 parent e23f00a
commit 9afaa79
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/examples/tune_1p.jl b/examples/tune_1p.jl
@@ -15,9 +15,9 @@ using KiteControllers, KiteModels, BayesOpt, ControlPlots
 
 kcu::KCU  = KCU(set)
 kps::KPS3 = KPS3(kcu)
-wcs::WCSettings   = WCSettings();  wcs.dt = 1/set.sample_freq
-fcs::FPCSettings  = FPCSettings(dt=wcs.dt)
-fpps::FPPSettings = FPPSettings()
+wcs::WCSettings   = WCSettings(true, dt = 1/set.sample_freq)
+fcs::FPCSettings  = FPCSettings(true, dt=wcs.dt)
+fpps::FPPSettings = FPPSettings(true)
 u_d0 = 0.01 * set.depower_offset
 u_d  = 0.01 * set.depower
 ssc::SystemStateControl = SystemStateControl(wcs, fcs, fpps; u_d0, u_d)

diff --git a/examples/tune_1p_glb.jl b/examples/tune_1p_glb.jl
@@ -15,9 +15,9 @@ using KiteControllers, KiteModels, ControlPlots, BlackBoxOptim
 
 kcu::KCU  = KCU(set)
 kps::KPS3 = KPS3(kcu)
-wcs::WCSettings   = WCSettings();  wcs.dt = 1/set.sample_freq
-fcs::FPCSettings  = FPCSettings(dt=wcs.dt)
-fpps::FPPSettings = FPPSettings()
+wcs::WCSettings   = WCSettings(true, dt = 1/set.sample_freq)
+fcs::FPCSettings  = FPCSettings(true, dt=wcs.dt)
+fpps::FPPSettings = FPPSettings(true)
 u_d0 = 0.01 * set.depower_offset
 u_d  = 0.01 * set.depower
 ssc::SystemStateControl = SystemStateControl(wcs, fcs, fpps; u_d0, u_d)

diff --git a/test/test_flightpathcalculator.jl b/test/test_flightpathcalculator.jl
@@ -11,7 +11,7 @@ set = deepcopy(load_settings("system.yaml"))
 kcu::KCU   = KCU(set)
 kps4::KPS4 = KPS4(kcu)
 
-wcs::WCSettings = WCSettings(); wcs.dt = 1/set.sample_freq
+wcs::WCSettings = WCSettings(dt = 1/set.sample_freq)
 fcs::FPCSettings = FPCSettings(dt=wcs.dt)
 fpps::FPPSettings = FPPSettings()
 u_d0 = 0.01 * set.depower_offset

diff --git a/test/test_flightpathcontroller3.jl b/test/test_flightpathcontroller3.jl
@@ -19,7 +19,7 @@ PROJECT="system_8000.yaml"
 set = deepcopy(se(PROJECT))
 kcu::KCU   = KCU(set)
 kps4::KPS4 = KPS4(kcu)
-wcs::WCSettings   = WCSettings();  wcs.dt = 1/set.sample_freq
+wcs::WCSettings   = WCSettings(dt=0.02);  wcs.dt = 1/set.sample_freq
 fcs::FPCSettings  = FPCSettings(dt=wcs.dt)
 fpps::FPPSettings = FPPSettings()
 dt::Float64 = wcs.dt

diff --git a/test/test_forcespeedcontroller1.jl b/test/test_forcespeedcontroller1.jl
@@ -12,7 +12,7 @@ using KiteControllers, KiteUtils, ControlPlots, BenchmarkTools
 
 set = deepcopy(load_settings("system.yaml"))
 
-wcs = WCSettings()
+wcs = WCSettings(dt=0.02)
 wcs.test = true
 wcs.f_low = 1500
 wcs.fac = 1.0

diff --git a/test/test_forcespeedcontroller2.jl b/test/test_forcespeedcontroller2.jl
@@ -12,7 +12,7 @@ using KiteControllers, ControlPlots, BenchmarkTools
 
 set = deepcopy(load_settings("system.yaml"))
 
-wcs = WCSettings()
+wcs = WCSettings(dt=0.02)
 wcs.test = true
 wcs.f_low = 350
 wcs.fac = 1.0

diff --git a/test/test_fpc_low_right.jl b/test/test_fpc_low_right.jl
@@ -21,9 +21,9 @@ PROJECT="system_8000.yaml"
 set = deepcopy(se(PROJECT))
 kcu::KCU   = KCU(set)
 kps4::KPS4 = KPS4(kcu)
-wcs::WCSettings   = WCSettings();  wcs.dt = 1/set.sample_freq
-fcs::FPCSettings  = FPCSettings(dt = wcs.dt)
-fpps::FPPSettings = FPPSettings()
+wcs::WCSettings   = WCSettings(true, dt = 1/set.sample_freq)
+fcs::FPCSettings  = FPCSettings(true, dt = wcs.dt)
+fpps::FPPSettings = FPPSettings(true)
 dt::Float64 = wcs.dt
 attractor=[55.73, 56.95]
 # attractor=[0, 90] # zenith

diff --git a/test/test_lower_force1.jl b/test/test_lower_force1.jl
@@ -31,7 +31,7 @@ ACC = zeros(SAMPLES)
 D_F_ERR = zeros(SAMPLES)
 
 # create and initialize winch controller
-wcs = WCSettings()
+wcs = WCSettings(dt=0.02)
 update(wcs)
 wcs.dt = 0.05
 lfc = LowerForceController(wcs)

diff --git a/test/test_speedcontroller1.jl b/test/test_speedcontroller1.jl
@@ -11,7 +11,7 @@ using Timers; tic()
 using KiteControllers, ControlPlots, BenchmarkTools
 
 set = deepcopy(load_settings("system.yaml"))
-wcs = WCSettings()
+wcs = WCSettings(dt=0.02)
 
 DURATION = 10.0
 SAMPLES = Int(DURATION / wcs.dt + 1)

diff --git a/test/test_speedcontroller2.jl b/test/test_speedcontroller2.jl
@@ -12,7 +12,7 @@ using Timers; tic()
 using KiteControllers, ControlPlots, BenchmarkTools
 
 set = deepcopy(load_settings("system.yaml"))
-wcs = WCSettings()
+wcs = WCSettings(dt=0.02)
 
 DURATION = 10.0
 SAMPLES = Int(DURATION / wcs.dt + 1)