Skip to content
This repository was archived by the owner on Mar 27, 2023. It is now read-only.

python3 #3

Open
jpgimenez wants to merge 1 commit into
base: master
Choose a base branch
from
Open

python3 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions __init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def stop(self):
super(KettleController, self).stop()

def run(self):
if not isinstance(self.a_inner_sensor, unicode):
if not isinstance(self.a_inner_sensor, str):
self.notify("PID Error", "An inner sensor must be selected", timeout=None, type="danger")
raise UserWarning("PID - An inner sensor must be selected")

Expand Down Expand Up @@ -101,8 +101,8 @@ def run(self):
# Print loop details
cbpi.app.logger.info("[%s] Outer loop PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, outer_target_value, outer_current_value, inner_target_value, round(outer_pid.integrator, 2)))
cbpi.app.logger.info("[%s] Inner loop PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, inner_target_value, inner_current_value, inner_output, round(inner_pid.integrator, 2)))
print("[%s] Outer loop PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, outer_target_value, outer_current_value, inner_target_value, round(outer_pid.integrator, 2)))
print("[%s] Inner loop PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, inner_target_value, inner_current_value, inner_output, round(inner_pid.integrator, 2)))
print(("[%s] Outer loop PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, outer_target_value, outer_current_value, inner_target_value, round(outer_pid.integrator, 2))))
print(("[%s] Inner loop PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, inner_target_value, inner_current_value, inner_output, round(inner_pid.integrator, 2))))

# Sleep until update required again
if waketime <= time.time() + 0.25:
Expand Down Expand Up @@ -168,7 +168,7 @@ def run(self):

# Log details
cbpi.app.logger.info("[%s] PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, target_value, current_value, output, round(SinglePID.integrator, 2)))
print("[%s] PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, target_value, current_value, output, round(SinglePID.integrator, 2)))
print(("[%s] PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, target_value, current_value, output, round(SinglePID.integrator, 2))))

# Sleep until update required again
if waketime <= time.time() + 0.25:
Expand Down Expand Up @@ -266,15 +266,15 @@ def run(self):
if inner_hysteresis.update(inner_current_value, inner_target_value):
self.heater_on(100)
cbpi.app.logger.info("[%s] Inner hysteresis actor stays ON" % (waketime))
print("[%s] Innner hysteresis actor stays ON" % (waketime))
print(("[%s] Innner hysteresis actor stays ON" % (waketime)))
else:
self.heater_off()
cbpi.app.logger.info("[%s] Inner hysteresis actor stays OFF" % (waketime))
print("[%s] Innner hysteresis actor stays OFF" % (waketime))
print(("[%s] Innner hysteresis actor stays OFF" % (waketime)))

# Print loop details
cbpi.app.logger.info("[%s] Outer loop PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, outer_target_value, outer_current_value, inner_target_value, round(outer_pid.integrator, 2)))
print("[%s] Outer loop PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, outer_target_value, outer_current_value, inner_target_value, round(outer_pid.integrator, 2)))
print(("[%s] Outer loop PID target/actual/output/integrator: %s/%s/%s/%s" % (waketime, outer_target_value, outer_current_value, inner_target_value, round(outer_pid.integrator, 2))))

# Sleep until update required again
if waketime <= time.time() + 0.25:
Expand Down Expand Up @@ -338,11 +338,11 @@ def run(self):
if hysteresis_on.update(current_value, target_value):
self.heater_on(100)
cbpi.app.logger.info("[%s] Hysteresis actor stays ON" % (waketime))
print("[%s] Hysteresis actor stays ON" % (waketime))
print(("[%s] Hysteresis actor stays ON" % (waketime)))
else:
self.heater_off()
cbpi.app.logger.info("[%s] Hysteresis actor stays OFF" % (waketime))
print("[%s] Hysteresis actor stays OFF" % (waketime))
print(("[%s] Hysteresis actor stays OFF" % (waketime)))

# Sleep until update required again
if waketime <= time.time() + 0.25:
Expand Down