Skip to content

Commit 012182f

Browse files
committed
Merge upstream and add local modifications
Pulled upstream changes and merged my previous modifications.
1 parent 0c71394 commit 012182f

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

control_msgs/msg/PidState.msg

+9-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,17 @@ float64 p_gain
1515
float64 i_gain
1616
# derivative gain
1717
float64 d_gain
18-
# upper integral clamp.
18+
19+
# upper integral clamp
1920
float64 i_max
20-
# lower integral clamp.
21+
# lower integral clamp
2122
float64 i_min
23+
# upper output clamp
24+
float64 u_max
25+
# lower output clamp
26+
float64 u_min
27+
# tracking time constant
28+
float64 trk_tc
2229

2330
# output of the PID controller
2431
float64 output

0 commit comments

Comments
 (0)