Skip to content

Commit dfb637b

Browse files
committed
Add PID controller implementation
1 parent 64aaaa3 commit dfb637b

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

control_algorithms/pid.py

-6
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,8 @@
1111
"""
1212

1313

14-
<<<<<<< HEAD
15-
class PID:
16-
17-
def __init__(self, kp: float, ki: float, kd: float, setpoint: float = 0):
18-
=======
1914
class pid:
2015
def __init__(self, Kp: float, Ki: float, Kd: float, setpoint: float = 0):
21-
>>>>>>> 588538eaddcee6fa4733a1775487123c0ed09a43
2216
"""
2317
Initialize the PID controller.
2418

0 commit comments

Comments
 (0)