Skip to content

Commit 5159519

Browse files
committed
Change version to 0.5.1
1 parent 0581b7c commit 5159519

File tree

8 files changed

+14
-10
lines changed

8 files changed

+14
-10
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### WinchControllers v0.6 2025-05-28
1+
### WinchControllers v0.5.1 2025-05-28
22
#### Added
33
- all public functions document
44
- add page `Performance Indicators` to documentation
@@ -10,5 +10,5 @@
1010
#### Changed
1111
- reduced `df_high` in `wc_settings.yaml` to reduce oscillations
1212
- all examples are making use of `wc_settings.yaml` now
13-
- the function `get_v_error` returns now `NaN` instead of zero when the speed controller is inactive
13+
- the function `get_v_err` returns now `NaN` instead of zero when the speed controller is inactive
1414
- improved the plots of the examples

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "WinchControllers"
22
uuid = "9e74470a-8ab1-4f32-b878-f32ebd236ea2"
33
authors = ["Uwe Fechner <u.fechner-1@tudelft.nl> and contributors"]
4-
version = "0.6.0"
4+
version = "0.5.1"
55

66
[deps]
77
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"

docs/src/winchcontroller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ set_v_set(sc::SpeedController, v_set)
2828
set_v_set_in(sc::SpeedController, v_set_in)
2929
set_tracking(sc::SpeedController, tracking)
3030
get_v_set_out(sc::SpeedController)
31-
get_v_error(sc::SpeedController)
31+
get_v_err(sc::SpeedController)
3232
on_timer(sc::SpeedController)
3333
```
3434

examples/test_winchcontroller.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ for i in 1:length(lg)
7575

7676
# log the values
7777
log(lg; v_ro=v_act, acc=get_acc(winch), state, reset=status[1], active=status[2],
78-
force, f_set, f_err, v_err= wc.sc.v_err, v_set, v_set_out, v_set_in)
78+
force, f_set, f_err, v_err=get_v_err(wc), v_set, v_set_out, v_set_in)
7979
end
8080

8181
# plot the results

src/WinchControllers.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Base.length
1010
export WCSettings, WinchController, Winch, update
1111
export Mixer_2CH, Mixer_3CH, Integrator, UnitDelay, RateLimiter, CalcVSetIn
1212
export set_f_set, set_v_sw, set_reset, set_inactive, set_vset_pc
13-
export set_tracking, set_f_set, get_v_error, calc_vro, get_f_err
13+
export set_tracking, set_f_set, get_v_err, calc_vro, get_f_err
1414
export get_speed, set_force, calc_v_set, set_v_set, on_timer, get_acc, get_state, get_status
1515
export select_b, select_c, reset, calc_output
1616
export merge_angles, @limit

src/wc_components.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ function get_v_set_out(sc::SpeedController)
443443
end
444444

445445
"""
446-
get_v_error(sc::SpeedController)
446+
get_v_err(sc::SpeedController)
447447
448448
Compute and return the velocity error for the given `SpeedController` instance `sc`.
449449
@@ -455,7 +455,7 @@ Compute and return the velocity error for the given `SpeedController` instance `
455455
If the controller is inactive, it returns `NaN`.
456456
457457
"""
458-
function get_v_error(sc::SpeedController)
458+
function get_v_err(sc::SpeedController)
459459
if sc.inactive
460460
return NaN
461461
else

src/winchcontroller.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,3 +215,7 @@ function get_status(wc::WinchController)
215215
result[7] = wc.ufc.v_set_out
216216
result
217217
end
218+
219+
function get_v_err(wc::WinchController)
220+
get_v_err(wc.sc)
221+
end

test/test_utilities.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function speed_controller_step3!(pid1, sc, winch, calc, i, last_force, last_v_se
7777
# calculate v_set_out_A from the speed controller
7878
set_v_act(pid1, v_ro)
7979
v_set_out_A = get_v_set_out(pid1)
80-
V_ERR[i] = get_v_error(pid1)
80+
V_ERR[i] = get_v_err(pid1)
8181
# calculate v_set_out_B from the force controller
8282
set_force(sc, last_force[])
8383
if i * wcs.dt <= wcs.t_startup
@@ -136,7 +136,7 @@ function speed_controller_step4!(pid1, sc, ufc, mix3, winch, calc, i, last_force
136136
# calculate v_set_out_A from the speed controller
137137
set_v_act(pid1, v_ro)
138138
v_set_out_A = get_v_set_out(pid1)
139-
V_ERR[i] = get_v_error(pid1)
139+
V_ERR[i] = get_v_err(pid1)
140140
# calculate v_set_out_B from the force controller
141141
set_force(sc, last_force[])
142142
if i * wcs.dt <= wcs.t_startup

0 commit comments

Comments
 (0)