@@ -488,9 +488,9 @@ def renameTempKey(key):
488
488
elif messageType == "getMode" : # echo cs['mode'] setting
489
489
conn .send (cs ['mode' ])
490
490
elif messageType == "getFridge" : # echo fridge temperature setting
491
- conn .send (str (cs ['fridgeSet' ]))
491
+ conn .send (json . dumps (cs ['fridgeSet' ]))
492
492
elif messageType == "getBeer" : # echo fridge temperature setting
493
- conn .send (str (cs ['beerSet' ]))
493
+ conn .send (json . dumps (cs ['beerSet' ]))
494
494
elif messageType == "getControlConstants" :
495
495
conn .send (json .dumps (cc ))
496
496
elif messageType == "getControlSettings" :
@@ -527,7 +527,7 @@ def renameTempKey(key):
527
527
cs ['mode' ] = 'b'
528
528
# round to 2 dec, python will otherwise produce 6.999999999
529
529
cs ['beerSet' ] = round (newTemp , 2 )
530
- ser .write ("j{mode:b, beerSet:" + str (cs ['beerSet' ]) + "}" )
530
+ ser .write ("j{mode:b, beerSet:" + json . dumps (cs ['beerSet' ]) + "}" )
531
531
logMessage ("Notification: Beer temperature set to " +
532
532
str (cs ['beerSet' ]) +
533
533
" degrees in web interface" )
@@ -547,7 +547,7 @@ def renameTempKey(key):
547
547
if cc ['tempSetMin' ] <= newTemp <= cc ['tempSetMax' ]:
548
548
cs ['mode' ] = 'f'
549
549
cs ['fridgeSet' ] = round (newTemp , 2 )
550
- ser .write ("j{mode:f, fridgeSet:" + str (cs ['fridgeSet' ]) + "}" )
550
+ ser .write ("j{mode:f, fridgeSet:" + json . dumps (cs ['fridgeSet' ]) + "}" )
551
551
logMessage ("Notification: Fridge temperature set to " +
552
552
str (cs ['fridgeSet' ]) +
553
553
" degrees in web interface" )
@@ -775,14 +775,14 @@ def renameTempKey(key):
775
775
csvFile = open (localCsvFileName , "a" )
776
776
try :
777
777
lineToWrite = (time .strftime ("%b %d %Y %H:%M:%S;" ) +
778
- str (newRow ['BeerTemp' ]) + ';' +
779
- str (newRow ['BeerSet' ]) + ';' +
780
- str (newRow ['BeerAnn' ]) + ';' +
781
- str (newRow ['FridgeTemp' ]) + ';' +
782
- str (newRow ['FridgeSet' ]) + ';' +
783
- str (newRow ['FridgeAnn' ]) + ';' +
784
- str (newRow ['State' ]) + ';' +
785
- str (newRow ['RoomTemp' ]) + '\n ' )
778
+ json . dumps (newRow ['BeerTemp' ]) + ';' +
779
+ json . dumps (newRow ['BeerSet' ]) + ';' +
780
+ json . dumps (newRow ['BeerAnn' ]) + ';' +
781
+ json . dumps (newRow ['FridgeTemp' ]) + ';' +
782
+ json . dumps (newRow ['FridgeSet' ]) + ';' +
783
+ json . dumps (newRow ['FridgeAnn' ]) + ';' +
784
+ json . dumps (newRow ['State' ]) + ';' +
785
+ json . dumps (newRow ['RoomTemp' ]) + '\n ' )
786
786
csvFile .write (lineToWrite )
787
787
except KeyError , e :
788
788
logMessage ("KeyError in line from controller: %s" % str (e ))
@@ -839,14 +839,8 @@ def renameTempKey(key):
839
839
newTemp = temperatureProfile .getNewTemp (util .scriptPath ())
840
840
if newTemp != cs ['beerSet' ]:
841
841
cs ['beerSet' ] = newTemp
842
- if cc ['tempSetMin' ] < newTemp < cc ['tempSetMax' ]:
843
- # if temperature has to be updated send settings to controller
844
- ser .write ("j{beerSet:" + str (cs ['beerSet' ]) + "}" )
845
- elif newTemp is None :
846
- # temperature control disabled by profile
847
- logMessage ("Temperature control disabled by empty cell in profile." )
848
- ser .write ("j{beerSet:-99999}" ) # send as high negative value that will result in INT_MIN on controller
849
-
842
+ # if temperature has to be updated send settings to controller
843
+ ser .write ("j{beerSet:" + json .dumps (cs ['beerSet' ]) + "}" )
850
844
851
845
except socket .error as e :
852
846
logMessage ("Socket error(%d): %s" % (e .errno , e .strerror ))
0 commit comments