Autowatering change and HomeAssistant integration fixing

Hydrosys4 · Nov 5, 2022 · e3530b4 · e3530b4
1 parent 6b46fa5
commit e3530b4
Show file tree

Hide file tree

Showing 75 changed files with 989 additions and 1,053 deletions.
diff --git a/HASScompMatrix.py b/HASScompMatrix.py
@@ -404,7 +404,7 @@ def create_config_entity(self, elem_name):  # used for the MQTT Discovery
                 config_payload["device"]= {"model": "Hydrosys4","identifiers": NodeID,"via_device": "H4", "name": NodeID, "manufacturer": "AngeloVa"}
                 # here the MQTT part
                 #print("Topic ", topics["config"], " send payload: " , config_payload)
-                self.MQTT_client.publish(topics["config"],json.dumps(config_payload))
+                self.MQTT_client.publish(topics["config"],json.dumps(config_payload), True)
 
                 data_to_store={"topics" : topics, "config_payload": config_payload}
                 statusdataDBmod.write_status_data(HASS_entity_config.config_reg,"device", elem_name,data_to_store,permanent=True, storeid="HASSIO_device_config")

diff --git a/HASSintegrMQTT.py b/HASSintegrMQTT.py
@@ -67,10 +67,10 @@ def subscribe(self, topic):
         isok=HASS_Client.ClientObj.connect() 
         HASS_Client.ClientObj.subscribe(topic, qos=2)
 
-    def publish(self, topic, payload):
+    def publish(self, topic, payload , retained=False):
       if self.is_send_state():
         isok=HASS_Client.ClientObj.connect() 
-        HASS_Client.ClientObj.publish(topic, payload) 
+        HASS_Client.ClientObj.publish(topic, payload , retained=retained) 
 
     def check_loop_and_connect(self):
       if self.is_enabled():

diff --git a/__pycache__/ActuatorControllermod.cpython-37.pyc b/__pycache__/ActuatorControllermod.cpython-37.pyc
diff --git a/__pycache__/GPIOEXPI2Ccontrol.cpython-37.pyc b/__pycache__/GPIOEXPI2Ccontrol.cpython-37.pyc
diff --git a/__pycache__/HASScompMatrix.cpython-37.pyc b/__pycache__/HASScompMatrix.cpython-37.pyc
diff --git a/__pycache__/HASSintegrMQTT.cpython-37.pyc b/__pycache__/HASSintegrMQTT.cpython-37.pyc
diff --git a/__pycache__/HC12control.cpython-37.pyc b/__pycache__/HC12control.cpython-37.pyc
diff --git a/__pycache__/HC12mod.cpython-37.pyc b/__pycache__/HC12mod.cpython-37.pyc
diff --git a/__pycache__/HWcontrol.cpython-37.pyc b/__pycache__/HWcontrol.cpython-37.pyc
diff --git a/__pycache__/Hygro24_I2C.cpython-37.pyc b/__pycache__/Hygro24_I2C.cpython-37.pyc
diff --git a/__pycache__/MQTTcontrol.cpython-37.pyc b/__pycache__/MQTTcontrol.cpython-37.pyc
diff --git a/__pycache__/REGandDBmod.cpython-37.pyc b/__pycache__/REGandDBmod.cpython-37.pyc
diff --git a/__pycache__/SchedulerMod.cpython-37.pyc b/__pycache__/SchedulerMod.cpython-37.pyc
diff --git a/__pycache__/SlowWire.cpython-37.pyc b/__pycache__/SlowWire.cpython-37.pyc
diff --git a/__pycache__/actuatordbmod.cpython-37.pyc b/__pycache__/actuatordbmod.cpython-37.pyc
diff --git a/__pycache__/advancedmod.cpython-37.pyc b/__pycache__/advancedmod.cpython-37.pyc
diff --git a/__pycache__/autofertilizerdbmod.cpython-37.pyc b/__pycache__/autofertilizerdbmod.cpython-37.pyc
diff --git a/__pycache__/autofertilizermod.cpython-37.pyc b/__pycache__/autofertilizermod.cpython-37.pyc
diff --git a/__pycache__/automationdbmod.cpython-37.pyc b/__pycache__/automationdbmod.cpython-37.pyc
diff --git a/__pycache__/automationmod.cpython-37.pyc b/__pycache__/automationmod.cpython-37.pyc
diff --git a/__pycache__/autowateringdbmod.cpython-37.pyc b/__pycache__/autowateringdbmod.cpython-37.pyc
diff --git a/__pycache__/autowateringmod.cpython-37.pyc b/__pycache__/autowateringmod.cpython-37.pyc
diff --git a/__pycache__/basicSetting.cpython-37.pyc b/__pycache__/basicSetting.cpython-37.pyc
diff --git a/__pycache__/camera_pi.cpython-37.pyc b/__pycache__/camera_pi.cpython-37.pyc
diff --git a/__pycache__/cameradbmod.cpython-37.pyc b/__pycache__/cameradbmod.cpython-37.pyc
diff --git a/__pycache__/clockdbmod.cpython-37.pyc b/__pycache__/clockdbmod.cpython-37.pyc
diff --git a/__pycache__/clockmod.cpython-37.pyc b/__pycache__/clockmod.cpython-37.pyc
diff --git a/__pycache__/countryinfo.cpython-37.pyc b/__pycache__/countryinfo.cpython-37.pyc
diff --git a/__pycache__/databasemod.cpython-37.pyc b/__pycache__/databasemod.cpython-37.pyc
diff --git a/__pycache__/debuggingmod.cpython-37.pyc b/__pycache__/debuggingmod.cpython-37.pyc
diff --git a/__pycache__/emaildbmod.cpython-37.pyc b/__pycache__/emaildbmod.cpython-37.pyc
diff --git a/__pycache__/emailmod.cpython-37.pyc b/__pycache__/emailmod.cpython-37.pyc
diff --git a/__pycache__/fertilizerdbmod.cpython-37.pyc b/__pycache__/fertilizerdbmod.cpython-37.pyc
diff --git a/__pycache__/filemanagementmod.cpython-37.pyc b/__pycache__/filemanagementmod.cpython-37.pyc
diff --git a/__pycache__/filestoragemod.cpython-37.pyc b/__pycache__/filestoragemod.cpython-37.pyc
diff --git a/__pycache__/flasksettings.cpython-37.pyc b/__pycache__/flasksettings.cpython-37.pyc
diff --git a/__pycache__/hardwaremod.cpython-37.pyc b/__pycache__/hardwaremod.cpython-37.pyc
diff --git a/__pycache__/hx711_AV.cpython-37.pyc b/__pycache__/hx711_AV.cpython-37.pyc
diff --git a/__pycache__/interruptdbmod.cpython-37.pyc b/__pycache__/interruptdbmod.cpython-37.pyc
diff --git a/__pycache__/interruptmod.cpython-37.pyc b/__pycache__/interruptmod.cpython-37.pyc
diff --git a/__pycache__/jsonFormUtils.cpython-37.pyc b/__pycache__/jsonFormUtils.cpython-37.pyc
diff --git a/__pycache__/loggerconfig.cpython-37.pyc b/__pycache__/loggerconfig.cpython-37.pyc
diff --git a/__pycache__/logindbmod.cpython-37.pyc b/__pycache__/logindbmod.cpython-37.pyc
diff --git a/__pycache__/messageboxmod.cpython-37.pyc b/__pycache__/messageboxmod.cpython-37.pyc
diff --git a/__pycache__/networkdbmod.cpython-37.pyc b/__pycache__/networkdbmod.cpython-37.pyc
diff --git a/__pycache__/networkmod.cpython-37.pyc b/__pycache__/networkmod.cpython-37.pyc
diff --git a/__pycache__/photomod.cpython-37.pyc b/__pycache__/photomod.cpython-37.pyc
diff --git a/__pycache__/selectedplanmod.cpython-37.pyc b/__pycache__/selectedplanmod.cpython-37.pyc
diff --git a/__pycache__/sensordbmod.cpython-37.pyc b/__pycache__/sensordbmod.cpython-37.pyc
diff --git a/__pycache__/start.cpython-37.pyc b/__pycache__/start.cpython-37.pyc
diff --git a/__pycache__/statusdataDBmod.cpython-37.pyc b/__pycache__/statusdataDBmod.cpython-37.pyc
diff --git a/__pycache__/sysconfigfilemod.cpython-37.pyc b/__pycache__/sysconfigfilemod.cpython-37.pyc
diff --git a/__pycache__/systemtimeMod.cpython-37.pyc b/__pycache__/systemtimeMod.cpython-37.pyc
diff --git a/__pycache__/videocontrolmod.cpython-37.pyc b/__pycache__/videocontrolmod.cpython-37.pyc
diff --git a/__pycache__/videomod.cpython-37.pyc b/__pycache__/videomod.cpython-37.pyc
diff --git a/__pycache__/wateringdbmod.cpython-37.pyc b/__pycache__/wateringdbmod.cpython-37.pyc
diff --git a/__pycache__/wateringplansensordbmod.cpython-37.pyc b/__pycache__/wateringplansensordbmod.cpython-37.pyc
diff --git a/__pycache__/weatherAPIdbmod.cpython-37.pyc b/__pycache__/weatherAPIdbmod.cpython-37.pyc
diff --git a/__pycache__/weatherAPImod.cpython-37.pyc b/__pycache__/weatherAPImod.cpython-37.pyc
diff --git a/__pycache__/wpa_cli_mod.cpython-37.pyc b/__pycache__/wpa_cli_mod.cpython-37.pyc
diff --git a/automationdbmod.py b/automationdbmod.py
@@ -31,7 +31,7 @@
 if not filestoragemod.readfiledata(WTDATAFILENAME,WTdata): #read watering setting file
 	#read from default file
 	filestoragemod.readfiledata(DEFWTDATAFILENAME,WTdata)
-	print("Watering writing default calibration data")
+
 	filestoragemod.savefiledata(WTDATAFILENAME,WTdata)
 
 # end read IOdata -----
@@ -129,7 +129,7 @@ def restoredefault():
 	filestoragemod.deletefile(WTDATAFILENAME)
 	filestoragemod.readfiledata(DEFWTDATAFILENAME,WTdata)
 	#print "WT data -----------------------------------> ",  WTdata
-	consitencycheck()
+	consistencycheck()
 
 
 def saveWTsetting():

diff --git a/autowatering/__init__.py b/autowatering/__init__.py
@@ -0,0 +1 @@
+
diff --git a/autowatering/__pycache__/__init__.cpython-37.pyc b/autowatering/__pycache__/__init__.cpython-37.pyc
diff --git a/autowatering/__pycache__/autowateringdbmod.cpython-37.pyc b/autowatering/__pycache__/autowateringdbmod.cpython-37.pyc
diff --git a/autowatering/__pycache__/autowateringmod.cpython-37.pyc b/autowatering/__pycache__/autowateringmod.cpython-37.pyc
diff --git a/autowateringdbmod.py → autowatering/autowateringdbmod.py b/autowateringdbmod.py → autowatering/autowateringdbmod.py
@@ -2,7 +2,6 @@
 """
 Auto watering UI setting storage utilities
 """
-from __future__ import print_function
 
 import logging
 import os
@@ -54,6 +53,15 @@ def readfromfile():
 	global WTdata
 	filestoragemod.readfiledata(WTDATAFILENAME,WTdata)
 
+# Callback are used to propagate the changes in the configuration to the variables inside the class in the autowateringmod
+# make use of the global variable to store the link to the function in the other module.
+callbacklist={}
+def register_callback(name, callback_func):
+    print("append the callback ----------------------------")
+    global callbacklist
+    callbacklist[name]=callback_func
+
+
 def consistencycheck():
 
 	# this routine align the watering table elements with the Hardware available elements "name" labelled with usedfor "watering"
@@ -112,9 +120,17 @@ def consistencycheck():
 
 	saveWTsetting()
 
-	# extra code for the sensor field which should be consistent with sensor names in HW
+	# make call to update the class instances variables using a callback function
+	if "UpdateBots" in callbacklist:
+		callbacklist["UpdateBots"](elementlist,tabletoadd,tabletoremove)
+	else:
+		print( " no callback found: UpdateBots " )
+
 
+
+
 
+
 
 def replacewordandsave(oldword,newword):
 	global WTdata
@@ -128,7 +144,7 @@ def restoredefault():
 	filestoragemod.deletefile(WTDATAFILENAME)
 	filestoragemod.readfiledata(DEFWTDATAFILENAME,WTdata)
 	#print "WT data -----------------------------------> ",  WTdata
-	consitencycheck()
+	consistencycheck()
 
 
 def saveWTsetting():
@@ -196,17 +212,6 @@ def getrowdata(recordvalue,paramlist,index): #for parameters with array of integ
 
 	return datalist
 
-def gettable(index):
-	paramlist=getparamlist()
-	#print "paramlist" , paramlist
-	elementlist=getelementlist()
-	datalist=[]
-	for row in elementlist:
-		rowdatalist=getrowdata(row,paramlist,index)
-		datalist.append(rowdatalist)
-	#print datalist
-	return datalist
-
 
 def replacerow(element,dicttemp):
 	searchfield="element"
@@ -236,9 +241,17 @@ def searchdata(recordkey,recordvalue,keytosearch):
 		if recordkey in ln:
 			if ln[recordkey]==recordvalue:
 				if keytosearch in ln:
-					return ln[keytosearch]	
+					return ln[keytosearch]
+
 	return ""
 
+def recordmatch(recordkey, recordvalue):
+	for ln in WTdata:
+		value = ln.get(recordkey, None)
+		if value == recordvalue:
+			return True
+	return False
+
 def isdatapresent(recordkey,recordvalue,keytosearch,recordtofind):
 	for ln in WTdata:
 		if recordkey in ln: