Skip to content

Commit

Permalink
Merge 1a2e705 into 7fc5ba4
Browse files Browse the repository at this point in the history
  • Loading branch information
baggepinnen committed Sep 23, 2020
2 parents 7fc5ba4 + 1a2e705 commit 1c7b55f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/analysis.jl
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ Given a transfer function describing the Plant `P` and a transferfunction descri
`T = PC/(1+PC)` Complementary sensitivity function
Only supports SISO systems"""
function gangoffour(P::TransferFunction,C::TransferFunction)
function gangoffour(P::LTISystem,C::LTISystem)
if P.nu + P.ny + C.nu + C.ny > 4
error("gangoffour only supports SISO systems")
end
Expand Down
1 change: 1 addition & 0 deletions test/test_pid_design.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

P = tf(1,[1,1])^4
gangoffourplot(P,tf(1))
gangoffourplot(ss(P),ss(1))
ωp = 0.8
kp,ki,C = loopshapingPI(P,ωp,phasemargin=60, doplot=true)
@test kp 0.82274734724854
Expand Down

0 comments on commit 1c7b55f

Please sign in to comment.