update tests to CS v1.0

JuliaControl · Aug 25, 2022 · 465fd46 · 465fd46
1 parent 5fb157e
commit 465fd46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "DiscretePIDs"
 uuid = "c1363496-6848-4723-8758-079b737f6baf"
 authors = ["Fredrik Bagge Carlson"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -20,7 +20,7 @@ end
 P = c2d(ss(tf(1, [1, 1])), Ts)
 
 ## P control
-C = c2d(ControlSystems.pid(kp = K), Ts)
+C = c2d(ControlSystems.pid(K, 0), Ts)
 res = step(feedback(P*C), 3)
 res2 = lsim(P, ctrl, 3)
 
@@ -31,7 +31,7 @@ res2 = lsim(P, ctrl, 3)
 ## PI control
 Ti = 1
 pid = DiscretePID(; K, Ts, Ti)
-C = c2d(ControlSystems.pid(kp = K, ki = Ti, series=true, time=true), Ts)
+C = c2d(ControlSystems.pid(K, Ti), Ts)
 res = step(feedback(P*C), 3)
 res2 = lsim(P, ctrl, 3)
 
@@ -79,7 +79,7 @@ ctrl = function(x,t)
     u = pid(r, y)
 end
 
-C = c2d(ControlSystems.pid(kp = K, ki = Ti, series=true, time=true), Ts)
+C = c2d(ControlSystems.pid(K, Ti), Ts)
 res = step(feedback(P*C), Tf)
 res2 = lsim(P, ctrl, Tf)
 
@@ -128,7 +128,7 @@ ctrl = function(x,t)
     r = 1
     u = pid(r, y)
 end
-C = c2d(ControlSystems.pid(kp = K), Ts)
+C = c2d(ControlSystems.pid(K, 0), Ts)
 res = step(feedback(P*C), 3)
 res2 = lsim(P, ctrl, 3)