Skip to content

Commit 64aaaa3

Browse files
committed
Add PID controller implementation
2 parents 7708d3c + 588538e commit 64aaaa3

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

control_algorithms/pid.py

+5
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,14 @@
1111
"""
1212

1313

14+
<<<<<<< HEAD
1415
class PID:
1516

1617
def __init__(self, kp: float, ki: float, kd: float, setpoint: float = 0):
18+
=======
19+
class pid:
20+
def __init__(self, Kp: float, Ki: float, Kd: float, setpoint: float = 0):
21+
>>>>>>> 588538eaddcee6fa4733a1775487123c0ed09a43
1722
"""
1823
Initialize the PID controller.
1924

0 commit comments

Comments
 (0)