Skip to content

python3 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

python3 #2

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
24 changes: 12 additions & 12 deletions __init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ def draw_rotated_text(image, text, position, angle, font, fill=(255, 255, 255)):

if is_fermenter_step_running() == "active":

TextDigit = (u"%6.2f%s" % (float(femTemp(kettleID)),(tftunit())))
TextDigit = ("%6.2f%s" % (float(femTemp(kettleID)),(tftunit())))

TextDigitSetTemp = (u"%6.2f%s" % (float(femTargTemp(kettleID)),(tftunit())))
TextDigitSetTemp = ("%6.2f%s" % (float(femTargTemp(kettleID)),(tftunit())))

# change colour when temp is 2 C/F away from targettemp
Diff = (float(femTargTemp(kettleID))-float(femTemp(kettleID)))
Expand All @@ -200,19 +200,19 @@ def draw_rotated_text(image, text, position, angle, font, fill=(255, 255, 255)):
else:
fill1 = (255,255,255)

draw_rotated_text(disp.buffer, u"Curr. temperature of fermeter", (0, 0), 90, fontmin, fill=(255,255,255))
draw_rotated_text(disp.buffer, "Curr. temperature of fermeter", (0, 0), 90, fontmin, fill=(255,255,255))
draw_rotated_text(disp.buffer, TextDigit, (20, 10), 90, font, fill1)
draw.line((105, 0, 105, 320), fill=(0,255,0), width=3)
draw_rotated_text(disp.buffer, (u"Temperat. of fermeter no %s " % (kettleID)), (110, 0), 90, fontmin, fill=(0,255,0))
draw_rotated_text(disp.buffer, ("Temperat. of fermeter no %s " % (kettleID)), (110, 0), 90, fontmin, fill=(0,255,0))
draw.line((135, 0, 135, 320), fill=(0,255,0), width=3)
draw_rotated_text(disp.buffer, TextDigitSetTemp, (135, 10), 90, font, fill=(255,255,0))
draw_rotated_text(disp.buffer, u"Target temperat. of fermenter", (215, 0), 90, fontmin, fill=(255,255,0))
draw_rotated_text(disp.buffer, "Target temperat. of fermenter", (215, 0), 90, fontmin, fill=(255,255,0))

else:

TextDigit = (u"%6.2f%s" % (float(Temp(kettleID)), (tftunit())))
TextDigit = ("%6.2f%s" % (float(Temp(kettleID)), (tftunit())))

TextDigitSetTemp = (u"%6.2f%s" % (float(TempTargTemp(kettleID)), (tftunit())))
TextDigitSetTemp = ("%6.2f%s" % (float(TempTargTemp(kettleID)), (tftunit())))

# change colour when temp is 2 C/F close to targettemp
Diff = (float(TempTargTemp(kettleID))-float(Temp(kettleID)))
Expand All @@ -223,13 +223,13 @@ def draw_rotated_text(image, text, position, angle, font, fill=(255, 255, 255)):
else:
fill1 = (255,255,255)

draw_rotated_text(disp.buffer, u"Current temperature of kettle", (0, 0), 90, fontmin, fill=(255,255,255))
draw_rotated_text(disp.buffer, "Current temperature of kettle", (0, 0), 90, fontmin, fill=(255,255,255))
draw_rotated_text(disp.buffer, TextDigit, (20, 10), 90, font, fill1)
draw.line((105, 0, 105, 320), fill=(0,255,0), width=3)
draw_rotated_text(disp.buffer, (u"Temperatures of kettle no %s " % (kettleID)), (110, 0), 90, fontmin, fill=(0,255,0))
draw_rotated_text(disp.buffer, ("Temperatures of kettle no %s " % (kettleID)), (110, 0), 90, fontmin, fill=(0,255,0))
draw.line((135, 0, 135, 320), fill=(0,255,0), width=3)
draw_rotated_text(disp.buffer, TextDigitSetTemp, (135, 10), 90, font, fill=(255,255,0))
draw_rotated_text(disp.buffer, u"Target temperature of kettle", (215, 0), 90, fontmin, fill=(255,255,0))
draw_rotated_text(disp.buffer, "Target temperature of kettle", (215, 0), 90, fontmin, fill=(255,255,0))

# Write buffer to display hardware, must be called to make things visible on the display!
disp.display()
Expand Down Expand Up @@ -376,12 +376,12 @@ def femTargTemp(femtargid):
return curfemtargTemp

def tftunit():
unit = u"°%s" % (cbpi.get_config_parameter("unit", None))
unit = "°%s" % (cbpi.get_config_parameter("unit", None))
# cbpi.app.logger.info("TFTDisplay - TFTunit: %s" % (unit))
return unit

def is_fermenter_step_running():
for key, value2 in cbpi.cache["fermenter_task"].items():
for key, value2 in list(cbpi.cache["fermenter_task"].items()):
if value2.state == "A":
return "active"
else:
Expand Down