relay managment added

Author: alg1973

boiler

@@ -14,15 +14,15 @@ def db2local(b, db):
     	if b.state['target']!=float(i.get('target',-1)) or  b.state['heating']!=int(i.get('heating',-1)):
             print (b.write_state(float(i.get('target',-1)),int(i.get('heating',-1))))
     else:
-        print ("No boiler '{0}' targets in cloud".format(b.boiler_name),file=sys.stderr)
+        print ("No boiler '{0}' state change in cloud".format(b.boiler_name),file=sys.stderr)
 	sys.exit(1)
     return b.state
 
 
 thermo_name=tconf.thermo_name
 if len(sys.argv)<2:
 	print ("usage: boiler <cmd> [<target_temperature> <heating> [<thermo_name>]]",file=sys.stderr)
-	print ("              <cmd> - sync,loop,local,db,read",file=sys.stderr)
+	print ("              <cmd> - sync, loop, local, dbw, read",file=sys.stderr)
 	sys.exit(1)
 else:
 	cmd=sys.argv[1]
@@ -49,11 +49,12 @@ elif cmd=='loop': #sync local state from db in loop
 	sys.sleep(tconf.therm_rate*1.5)
 elif cmd=='local': #write values to local state file only
     print (b.write_state(target,heating))
-elif cmd=='db': #write values to db and locally
+elif cmd=='dbw': #write values to db and locally
     response=db.thermo_cmd(target,heating,b.boiler_name,b.boiler_name)
     print (b.write_state(target,heating))
 elif cmd=='read':
     print ('Local file: ', b.read_state())
+    print ('Boiler: ', b.boiler_name )
     response=db.get_cmd(b.boiler_name,b.boiler_name)
     if response.has_key('Item'):
     	i=response['Item']	

dyndb.py

@@ -12,14 +12,14 @@ def __init__(self,url="http://localhost:8000",region="eu-central-1"):
     	self.table_log = self.dynamodb.Table('Temperature')
         self.table_cmd = self.dynamodb.Table('Commands')
 
-    def put_values(self,temperature,humidity,thermo_name="InsideHall",target_t=100,is_heating=0):
+    def put_values(self,temperature1,temperature2,thermo_name="InsideHall",target_t=100,is_heating=0):
          try:
    		response=self.table_log.put_item(
         		Item={
             			'Thermometer': thermo_name,
             			'GetDate': get_now(),
-            			'val': get_val(temperature),
-            			'hum': get_val(humidity),
+            			'val1': get_val(temperature1),
+            			'val2': get_val(temperature2),
             			'target': get_val(target_t),
             			'heating': get_val(is_heating),
         		}
@@ -29,8 +29,8 @@ def put_values(self,temperature,humidity,thermo_name="InsideHall",target_t=100,i
                         Item={
                                 'Thermometer': thermo_name,
                                 'GetDate': get_now(),
-                                'val': float_to_decimal(temperature),
-                                'hum': float_to_decimal(humidity),
+                                'val1': float_to_decimal(temperature1),
+                                'val2': float_to_decimal(temperature2),
             			'target': float_to_decimal(target_t),
             			'heating': get_val(int(is_heating)),
                         }

get_thermo.py

@@ -34,7 +34,7 @@ def default(self, o):
 
 
 for i in response['Items']:
-    print(time.ctime(float(i['GetDate'])),'temp',float(i['val']), 'hum', float(i['hum']),
+    print(time.ctime(float(i['GetDate'])),'temp1',float(i.get('val1', -1)), 'temp2', float(i.get('val2', -1)),
 			int(i.get('target',-1)),int(i.get('heating',-1)))
 
 

tconf.py

@@ -7,3 +7,8 @@
 therm_rate=120
 thermo_name="InsideHall"
 state_prefix="."
+def_temp = 5 
+relay="959BI_1"
+relay_on = "1"
+relay_off = "0"
+relay_cmd = "/usr/local/bin/usbrelay"

thermd

@@ -1,14 +1,75 @@
 #!/usr/bin/python 
 
+from __future__ import print_function
 import sys
 import time
+import datetime
 import dyndb
 import tconf
 import bstate
 from w1thermsensor import W1ThermSensor
+import subprocess
+
 
 sensor = W1ThermSensor()
 
+def db2local(b, db):
+        response=db.get_cmd(b.boiler_name,b.boiler_name)
+        if response.has_key('Item'):
+                i=response['Item']
+                if b.state['target']!=float(i.get('target',-1)) or  b.state['heating']!=int(i.get('heating',-1)):
+                        print ("Remote state change for {0}".format(b.boiler_name))
+                        print (b.write_state(float(i.get('target',-1)),int(i.get('heating',-1))))
+                        
+        return b.state
+
+
+def boiler_state():
+        out = subprocess.check_output([tconf.relay_cmd])
+        if out:
+                for l in out.splitlines():
+                        state = l.split('=')
+                        if len(state) == 1 and state[0] == tconf.relay:
+                                return state[1]
+        return None
+
+def boiler_on():
+        cur_s = boiler_state()
+        if cur_s == tconf.relay_on:
+                return
+        
+        subprocess.check_output([tconf.relay_cmd, "{0}={1}".format(tconf.relay,tconf.relay_on)])
+
+def boiler_off():
+        cur_s = boiler_state()
+        if cur_s == tconf.relay_off:
+                return
+        
+        subprocess.check_output([tconf.relay_cmd, "{0}={1}".format(tconf.relay,tconf.relay_off)])
+
+def now_day():
+        now = datetime.datetime.now()
+        if now.hour >= 23 or now.hour<7:
+                return 0
+        else:
+                return 1
+
+
+def run_cmd(cur_t, cmd):
+        target_t = cmd.get('target', tconf.def_temp)
+        # command mode: 0 - always off; 1 - maintain target; 2 - target at night, 5 at day  
+        mode = cmd.get('heating', 1)
+        if mode == 0:
+                boiler_off();
+        else:
+                if mode == 2 and now_day():
+                        target_t = tconf.def_temp
+                if cur_t < target_t:
+                        boiler_on()
+                else:
+                        boiler_off()
+
+                                
 
 if len(sys.argv)==3:
         tty_name=sys.argv[1]
@@ -27,13 +88,18 @@ db=dyndb.Tempdb(tconf.url,tconf.region)
 
 while True:
         boiler.read_state()
-	temp_in_c = sensor.get_temperature()
-        if temp_in_c:
-                print time.time(),temp_in_c, 0.0, boiler.state['target'],boiler.state['heating']
-                db.put_values(temp_in_c, 0.0, thermo_name,boiler.state['target'],
+	temp_in_c1 = sensor.get_temperature()
+	temp_in_c2 = sensor.get_temperature()
+        if temp_in_c1:
+                print (time.time(),temp_in_c1, temp_in_c2, boiler.state['target'],boiler.state['heating'])
+                db.put_values(temp_in_c1, temp_in_c2, thermo_name,boiler.state['target'],
                         boiler.state['heating'])
         else:
-                print ("ERR read invalid data from serial: '")
+                print ("ERR read invalid data from wired thermometr: '")
+        
+        boiler_cmd = db2local(boiler, db)
+        run_cmd(temp_in_c1, boiler_cmd)
+
         time.sleep(tconf.therm_rate)