updated with config code

Pub_Sub/advvfdipp/guidon/v2/pub/sendData.py

@@ -1,9 +1,119 @@
-# Enter your python code.
-import json
+import json, os, uuid
 from common.Logger import logger
 from quickfaas.remotebus import publish
-import re, uuid
 from paho.mqtt import client
+from quickfaas.global_dict import get as get_params
+from quickfaas.global_dict import _set_global_args
+
+def reboot():
+    #basic = Basic()
+    logger.info("!" * 10 + "REBOOTING DEVICE" + "!"*10)
+    r = os.popen("kill -s SIGHUP `cat /var/run/python/supervisord.pid`").read()
+    logger.info(f"REBOOT : {r}")
+
+def checkFileExist(filename):
+    path = "/var/user/files"
+    if not os.path.exists(path):
+        logger.info("no folder making files folder in var/user")
+        os.makedirs(path)
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+    if not os.path.exists(path + "/" + filename):
+        logger.info("no creds file making creds file")
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+
+def convertDStoJSON(ds):
+    j = dict()
+    for x in ds:
+        j[x["key"]] = x["value"]
+    return j
+
+def convertJSONtoDS(j):
+    d = []
+    for key in j.keys():
+        d.append({"key": key, "value": j[key]})
+    return d
+
+def checkCredentialConfig():
+    logger.info("CHECKING CONFIG")
+    cfgpath = "/var/user/cfg/device_supervisor/device_supervisor.cfg"
+    credspath = "/var/user/files/creds.json"
+    cfg = dict()
+    with open(cfgpath, "r") as f:
+        cfg = json.load(f)
+        clouds = cfg.get("clouds")
+        logger.info(clouds)
+        #if not configured then try to configure from stored values
+        if clouds[0]["args"]["clientId"] == "unknown" or clouds[0]["args"]["username"] == "unknown" or not clouds[0]["args"]["passwd"] or clouds[0]["args"]["passwd"] == "unknown":
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                creds = json.load(c)
+                if creds:
+                    logger.info("updating config with stored data")
+                    clouds[0]["args"]["clientId"] = creds["clientId"]
+                    clouds[0]["args"]["username"] = creds["userName"]
+                    clouds[0]["args"]["passwd"] = creds["password"]
+                    cfg["clouds"] = clouds
+                    cfg = checkParameterConfig(cfg)
+                    with open(cfgpath, "w", encoding='utf-8') as n:
+                        json.dump(cfg, n, indent=1, ensure_ascii=False)
+                    reboot()
+        else:
+            #assuming clouds is filled out, if data is different then assume someone typed in something new and store it, if creds is empty fill with clouds' data
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                logger.info("updating stored file with new data")
+                cfg = checkParameterConfig(cfg)
+                with open(cfgpath, "w", encoding='utf-8') as n:
+                    json.dump(cfg, n, indent=1, ensure_ascii=False)
+                creds = json.load(c)
+                if creds:
+                    if creds["clientId"] != clouds[0]["args"]["clientId"]:
+                        creds["clientId"] = clouds[0]["args"]["clientId"]
+                    if creds["userName"] != clouds[0]["args"]["username"]:
+                        creds["userName"] = clouds[0]["args"]["username"]
+                    if creds["password"] != clouds[0]["args"]["passwd"]:
+                        creds["password"] = clouds[0]["args"]["passwd"]
+                else:
+                    creds["clientId"] = clouds[0]["args"]["clientId"]
+                    creds["userName"] = clouds[0]["args"]["username"]
+                    creds["password"] = clouds[0]["args"]["passwd"]
+                with open(credspath, "w") as cw:
+                    json.dump(creds,cw)
+
+def checkParameterConfig(cfg):
+    logger.info("Checking Parameters!!!!")
+    paramspath = "/var/user/files/params.json"
+    cfgparams = convertDStoJSON(cfg.get("labels"))
+    #check stored values 
+    checkFileExist("params.json")
+    with open(paramspath, "r") as f:
+        logger.info("Opened param storage file")
+        params = json.load(f)
+        if params:
+            if cfgparams != params:
+                #go through each param
+                #if not "unknown" and cfg and params aren't the same take from cfg likely updated manually
+                #if key in cfg but not in params copy to params
+                logger.info("equalizing params between cfg and stored")
+                for key in cfgparams.keys():
+                    try:
+                        if cfgparams[key] != params[key] and cfgparams[key] != "unknown":
+                            params[key] = cfgparams[key]
+                    except:
+                        params[key] = cfgparams[key]
+                cfg["labels"] = convertJSONtoDS(params)
+                _set_global_args(convertJSONtoDS(params))
+                with open(paramspath, "w") as p:
+                    json.dump(params, p)
+        else:
+            with open(paramspath, "w") as p:
+                logger.info("initializing param file with params in memory")
+                json.dump(convertDStoJSON(get_params()), p)
+                cfg["labels"] = get_params()
+    
+    return cfg
 
 lwtData = {
     "init":False,
@@ -18,7 +128,7 @@ def lwt(mac):
             lwtData["client"].will_set("meshify/db/194/_/mainHP/" + mac + ":00:00/connected",json.dumps({"value":False}))
             lwtData["init"] = True
             logger.info("Connecting to MQTT Broker for LWT purposes!!!!!!!")
-            lwtData["client"].connect("mq194.imistaway.net",1883, 600)
+        lwtData["client"].connect("mq194.imistaway.net",1883, 600)
         lwtData["client"].publish("meshify/db/194/_/mainHP/" + mac + ":00:00/connected", json.dumps({"value":True}))
     except Exception as e:
         logger.error("LWT DID NOT DO THE THING")
@@ -28,6 +138,7 @@ def sendData(message):
     #logger.debug(message)
     mac = __topic__.split("/")[-1] #':'.join(re.findall('..', '%012x' % uuid.getnode()))
     lwt(mac)
+    checkCredentialConfig()
     for measure in message["measures"]:
         try:
             logger.debug(measure)
@@ -40,8 +151,6 @@ def sendData(message):
                 publish(__topic__ + ":01:99/" + measure["name"], json.dumps({"value": measure["value"]}), __qos__)
         except Exception as e:
             logger.error(e)
-        
-        #publish(__topic__, json.dumps({measure["name"]: measure["value"]}), __qos__)
 
 def convert_int(plc_tag, value):
     well_status_codes = {

Pub_Sub/advvfdipp/mistaway/v3/pub/sendData.py

@@ -1,9 +1,120 @@
-# Enter your python code.
-import json
+import json, uuid, os
 from common.Logger import logger
 from quickfaas.remotebus import publish
-import re, uuid
 from paho.mqtt import client
+from quickfaas.global_dict import get as get_params
+from quickfaas.global_dict import _set_global_args
+
+def reboot():
+    logger.info("!" * 10 + "REBOOTING DEVICE" + "!"*10)
+    r = os.popen("kill -s SIGHUP `cat /var/run/python/supervisord.pid`").read()
+    logger.info(f"REBOOT : {r}")
+
+def checkFileExist(filename):
+    path = "/var/user/files"
+    if not os.path.exists(path):
+        logger.info("no folder making files folder in var/user")
+        os.makedirs(path)
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+    if not os.path.exists(path + "/" + filename):
+        logger.info("no creds file making creds file")
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+
+def convertDStoJSON(ds):
+    j = dict()
+    for x in ds:
+        j[x["key"]] = x["value"]
+    return j
+
+def convertJSONtoDS(j):
+    d = []
+    for key in j.keys():
+        d.append({"key": key, "value": j[key]})
+    return d
+
+def checkCredentialConfig():
+    logger.info("CHECKING CONFIG")
+    cfgpath = "/var/user/cfg/device_supervisor/device_supervisor.cfg"
+    credspath = "/var/user/files/creds.json"
+    cfg = dict()
+    with open(cfgpath, "r") as f:
+        cfg = json.load(f)
+        clouds = cfg.get("clouds")
+        logger.info(clouds)
+        #if not configured then try to configure from stored values
+        if clouds[0]["args"]["clientId"] == "unknown" or clouds[0]["args"]["username"] == "unknown" or not clouds[0]["args"]["passwd"] or clouds[0]["args"]["passwd"] == "unknown":
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                creds = json.load(c)
+                if creds:
+                    logger.info("updating config with stored data")
+                    clouds[0]["args"]["clientId"] = creds["clientId"]
+                    clouds[0]["args"]["username"] = creds["userName"]
+                    clouds[0]["args"]["passwd"] = creds["password"]
+                    cfg["clouds"] = clouds
+                    cfg = checkParameterConfig(cfg)
+                    with open(cfgpath, "w", encoding='utf-8') as n:
+                        json.dump(cfg, n, indent=1, ensure_ascii=False)
+                    reboot()
+        else:
+            #assuming clouds is filled out, if data is different then assume someone typed in something new and store it, if creds is empty fill with clouds' data
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                logger.info("updating stored file with new data")
+                cfg = checkParameterConfig(cfg)
+                with open(cfgpath, "w", encoding='utf-8') as n:
+                    json.dump(cfg, n, indent=1, ensure_ascii=False)
+                creds = json.load(c)
+                if creds:
+                    if creds["clientId"] != clouds[0]["args"]["clientId"]:
+                        creds["clientId"] = clouds[0]["args"]["clientId"]
+                    if creds["userName"] != clouds[0]["args"]["username"]:
+                        creds["userName"] = clouds[0]["args"]["username"]
+                    if creds["password"] != clouds[0]["args"]["passwd"]:
+                        creds["password"] = clouds[0]["args"]["passwd"]
+                else:
+                    creds["clientId"] = clouds[0]["args"]["clientId"]
+                    creds["userName"] = clouds[0]["args"]["username"]
+                    creds["password"] = clouds[0]["args"]["passwd"]
+                with open(credspath, "w") as cw:
+                    json.dump(creds,cw)
+
+def checkParameterConfig(cfg):
+    logger.info("Checking Parameters!!!!")
+    paramspath = "/var/user/files/params.json"
+    cfgparams = convertDStoJSON(cfg.get("labels"))
+    #check stored values 
+    checkFileExist("params.json")
+    with open(paramspath, "r") as f:
+        logger.info("Opened param storage file")
+        params = json.load(f)
+        if params:
+            if cfgparams != params:
+                #go through each param
+                #if not "unknown" and cfg and params aren't the same take from cfg likely updated manually
+                #if key in cfg but not in params copy to params
+                logger.info("equalizing params between cfg and stored")
+                for key in cfgparams.keys():
+                    try:
+                        if cfgparams[key] != params[key] and cfgparams[key] != "unknown":
+                            params[key] = cfgparams[key]
+                    except:
+                        params[key] = cfgparams[key]
+                cfg["labels"] = convertJSONtoDS(params)
+                _set_global_args(convertJSONtoDS(params))
+                with open(paramspath, "w") as p:
+                    json.dump(params, p)
+        else:
+            with open(paramspath, "w") as p:
+                logger.info("initializing param file with params in memory")
+                json.dump(convertDStoJSON(get_params()), p)
+                cfg["labels"] = get_params()
+    
+    return cfg
+
+
 
 lwtData = {
     "init":False,
@@ -13,21 +124,24 @@ def lwt(mac):
     try:
         #if not lwtData["connected"]:
         if not lwtData["init"]:
-            logger.info("INITIALIZING LWT CLIENT")
+            print("INITIALIZING LWT CLIENT")
             lwtData["client"].username_pw_set(username="admin", password="columbus")
-            lwtData["client"].will_set("meshify/db/194/_/mainHP/" + mac + ":00:00/connected",json.dumps({"value":False}))
+            lwtData["client"].will_set("meshify/db/194/_/mainHP/" + mac + ":00:00/connected",json.dumps([{"value":False}]))
+            lwtData["client"].reconnect_delay_set(min_delay=10, max_delay=120)
             lwtData["init"] = True
-            logger.info("Connecting to MQTT Broker for LWT purposes!!!!!!!")
+            print("Connecting to MQTT Broker for LWT purposes!!!!!!!")
             lwtData["client"].connect("mq194.imistaway.net",1883, 600)
-        lwtData["client"].publish("meshify/db/194/_/mainHP/" + mac + ":00:00/connected", json.dumps({"value":True}))
+        lwtData["client"].reconnect()
+        lwtData["client"].publish("meshify/db/194/_/mainHP/" + mac + ":00:00/connected", json.dumps([{"value":True}]))
     except Exception as e:
-        logger.error("LWT DID NOT DO THE THING")
-        logger.error(e)
+        print("LWT DID NOT DO THE THING")
+        print(e)
 
 def sendData(message):
     #logger.debug(message)
-    mac = __topic__.split("/")[-1] #':'.join(re.findall('..', '%012x' % uuid.getnode()))
+    mac = __topic__.split("/")[-1]
     lwt(mac)
+    checkCredentialConfig()
     for measure in message["measures"]:
         try:
             logger.debug(measure)
@@ -41,7 +155,6 @@ def sendData(message):
         except Exception as e:
             logger.error(e)
         
-        #publish(__topic__, json.dumps({measure["name"]: measure["value"]}), __qos__)
 
 def convert_int(plc_tag, value):
     well_status_codes = {

Pub_Sub/flowmeterskid/mistaway/v1/pub/sendData.py

@@ -0,0 +1,253 @@
+import json, os, uuid
+from datetime import datetime as dt
+from common.Logger import logger
+from quickfaas.remotebus import publish
+from paho.mqtt import client
+from quickfaas.global_dict import get as get_params
+from quickfaas.global_dict import _set_global_args
+
+def reboot():
+    #basic = Basic()
+    logger.info("!" * 10 + "REBOOTING DEVICE" + "!"*10)
+    r = os.popen("kill -s SIGHUP `cat /var/run/python/supervisord.pid`").read()
+    logger.info(f"REBOOT : {r}")
+
+def checkFileExist(filename):
+    path = "/var/user/files"
+    if not os.path.exists(path):
+        logger.info("no folder making files folder in var/user")
+        os.makedirs(path)
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+    if not os.path.exists(path + "/" + filename):
+        logger.info("no creds file making creds file")
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+
+def convertDStoJSON(ds):
+    j = dict()
+    for x in ds:
+        j[x["key"]] = x["value"]
+    return j
+
+def convertJSONtoDS(j):
+    d = []
+    for key in j.keys():
+        d.append({"key": key, "value": j[key]})
+    return d
+
+def checkCredentialConfig():
+    logger.info("CHECKING CONFIG")
+    cfgpath = "/var/user/cfg/device_supervisor/device_supervisor.cfg"
+    credspath = "/var/user/files/creds.json"
+    cfg = dict()
+    with open(cfgpath, "r") as f:
+        cfg = json.load(f)
+        clouds = cfg.get("clouds")
+        logger.info(clouds)
+        #if not configured then try to configure from stored values
+        if clouds[0]["args"]["clientId"] == "unknown" or clouds[0]["args"]["username"] == "unknown" or not clouds[0]["args"]["passwd"] or clouds[0]["args"]["passwd"] == "unknown":
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                creds = json.load(c)
+                if creds:
+                    logger.info("updating config with stored data")
+                    clouds[0]["args"]["clientId"] = creds["clientId"]
+                    clouds[0]["args"]["username"] = creds["userName"]
+                    clouds[0]["args"]["passwd"] = creds["password"]
+                    cfg["clouds"] = clouds
+                    cfg = checkParameterConfig(cfg)
+                    with open(cfgpath, "w", encoding='utf-8') as n:
+                        json.dump(cfg, n, indent=1, ensure_ascii=False)
+                    reboot()
+        else:
+            #assuming clouds is filled out, if data is different then assume someone typed in something new and store it, if creds is empty fill with clouds' data
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                logger.info("updating stored file with new data")
+                cfg = checkParameterConfig(cfg)
+                with open(cfgpath, "w", encoding='utf-8') as n:
+                    json.dump(cfg, n, indent=1, ensure_ascii=False)
+                creds = json.load(c)
+                if creds:
+                    if creds["clientId"] != clouds[0]["args"]["clientId"]:
+                        creds["clientId"] = clouds[0]["args"]["clientId"]
+                    if creds["userName"] != clouds[0]["args"]["username"]:
+                        creds["userName"] = clouds[0]["args"]["username"]
+                    if creds["password"] != clouds[0]["args"]["passwd"]:
+                        creds["password"] = clouds[0]["args"]["passwd"]
+                else:
+                    creds["clientId"] = clouds[0]["args"]["clientId"]
+                    creds["userName"] = clouds[0]["args"]["username"]
+                    creds["password"] = clouds[0]["args"]["passwd"]
+                with open(credspath, "w") as cw:
+                    json.dump(creds,cw)
+
+def checkParameterConfig(cfg):
+    logger.info("Checking Parameters!!!!")
+    paramspath = "/var/user/files/params.json"
+    cfgparams = convertDStoJSON(cfg.get("labels"))
+    #check stored values 
+    checkFileExist("params.json")
+    with open(paramspath, "r") as f:
+        logger.info("Opened param storage file")
+        params = json.load(f)
+        if params:
+            if cfgparams != params:
+                #go through each param
+                #if not "unknown" and cfg and params aren't the same take from cfg likely updated manually
+                #if key in cfg but not in params copy to params
+                logger.info("equalizing params between cfg and stored")
+                for key in cfgparams.keys():
+                    try:
+                        if cfgparams[key] != params[key] and cfgparams[key] != "unknown":
+                            params[key] = cfgparams[key]
+                    except:
+                        params[key] = cfgparams[key]
+                cfg["labels"] = convertJSONtoDS(params)
+                _set_global_args(convertJSONtoDS(params))
+                with open(paramspath, "w") as p:
+                    json.dump(params, p)
+        else:
+            with open(paramspath, "w") as p:
+                logger.info("initializing param file with params in memory")
+                json.dump(convertDStoJSON(get_params()), p)
+                cfg["labels"] = get_params()
+    
+    return cfg
+
+
+
+
+payload = {}
+
+try:
+    with open("/var/user/files/totalizers.json", "r") as t:
+        totalizers = json.load(t)
+    if not totalizers:
+        logger.info("-----INITIALIZING TOTALIZERS-----")
+        totalizers = {
+            "day": 0,
+            "month": 0,
+            "lifetime": 0,
+            "dayHolding": 0,
+            "monthHolding": 0
+        }
+except:
+    totalizers = {
+            "day": 0,
+            "month": 0,
+            "lifetime": 0,
+            "dayHolding": 0,
+            "monthHolding": 0
+        }
+
+lwtData = {
+    "init":False,
+    "client": client.Client(client_id=str(uuid.uuid4()), clean_session=True, userdata=None, protocol=client.MQTTv311, transport="tcp")
+}
+def lwt(mac):
+    try:
+        #if not lwtData["connected"]:
+        if not lwtData["init"]:
+            print("INITIALIZING LWT CLIENT")
+            lwtData["client"].username_pw_set(username="admin", password="columbus")
+            lwtData["client"].will_set("meshify/db/194/_/mainHP/" + mac + ":00:00/connected",json.dumps([{"value":False}]))
+            lwtData["client"].reconnect_delay_set(min_delay=10, max_delay=120)
+            lwtData["init"] = True
+            print("Connecting to MQTT Broker for LWT purposes!!!!!!!")
+            lwtData["client"].connect("mq194.imistaway.net",1883, 600)
+        lwtData["client"].reconnect()
+        lwtData["client"].publish("meshify/db/194/_/mainHP/" + mac + ":00:00/connected", json.dumps([{"value":True}]))
+    except Exception as e:
+        print("LWT DID NOT DO THE THING")
+        print(e)
+
+def sendData(message,wizard_api):
+    logger.debug(message)
+    mac = __topic__.split("/")[-1] #':'.join(re.findall('..', '%012x' % uuid.getnode()))
+    lwt(mac)
+    checkCredentialConfig()
+    try:
+        publishFlowrate( message["values"]["flowmonitor"]["flowrate"]["raw_data"], message["values"]["flowmonitor"]["flow_unit"]["raw_data"])
+        totalizeDay(message["values"]["flowmonitor"]["totalizer_1"]["raw_data"],message["values"]["flowmonitor"]["totalizer_1_unit"]["raw_data"])
+        totalizeMonth(message["values"]["flowmonitor"]["totalizer_1"]["raw_data"],message["values"]["flowmonitor"]["totalizer_1_unit"]["raw_data"])
+        
+    except Exception as e:
+        logger.error(e)
+    
+
+def saveTotalizers():
+    try:
+        with open("/var/user/files/totalizers.json", "w") as t:
+            json.dump(totalizers,t)
+    except Exception as e:
+        logger.error(e)
+
+
+def publishFlowrate(fr, unit):
+    if unit == 45:
+        publish(__topic__ + ":01:40/" + "gpm_flow", json.dumps([{"value": f"{fr}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "bpd_flow", json.dumps([{"value": f"{fr*((60*24)/42)}"}]),__qos__)
+    elif unit == 63:
+        publish(__topic__ + ":01:40/" + "bpd_flow", json.dumps([{"value": f"{fr}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "gpm_flow", json.dumps([{"value": f"{fr * (42/(24*60))}"}]),__qos__)
+
+
+def totalizeDay(lifetime,unit):
+    now = dt.now()
+    reset = False
+    value = lifetime - totalizers["dayHolding"]
+    if not int(now.strftime("%d")) == int(totalizers["day"]):
+        totalizers["dayHolding"] = lifetime
+        totalizers["day"] = int(now.strftime("%d"))
+        saveTotalizers()
+        reset = True
+    if unit == 11:
+        publish(__topic__ + ":01:40/" + "gal_total", json.dumps([{"value": f"{value}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "bbl_total", json.dumps([{"value": f"{value/42}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "lifetime_flow_meter_gal", json.dumps([{"value": f"{lifetime}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "lifetime_flow_meter_bbls", json.dumps([{"value": f"{lifetime/42}"}]),__qos__)
+        if reset:
+            publish(__topic__ + ":01:40/" + "gal_total", json.dumps([{"value": f"{0}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "bbl_total", json.dumps([{"value": f"{0}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "gal_total_yesterday", json.dumps([{"value": f"{value}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "bbl_total_yesterday", json.dumps([{"value": f"{value/42}"}]),__qos__)
+    elif unit == 15:
+        publish(__topic__ + ":01:40/" + "bbl_total", json.dumps([{"value": f"{value}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "gal_total", json.dumps([{"value": f"{value*42}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "lifetime_flow_meter_bbls", json.dumps([{"value": f"{lifetime}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "lifetime_flow_meter_gal", json.dumps([{"value": f"{lifetime*42}"}]),__qos__)
+        if reset:
+            publish(__topic__ + ":01:40/" + "bbl_total", json.dumps([{"value": f"{0}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "gal_total", json.dumps([{"value": f"{0}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "bbl_total_yesterday", json.dumps([{"value": f"{value}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "gal_total_yesterday", json.dumps([{"value": f"{value*42}"}]),__qos__)
+
+
+
+def totalizeMonth(lifetime, unit):
+    now = dt.now()
+    reset = False
+    value = lifetime - totalizers["monthHolding"]
+    if not int(now.strftime("%m")) == int(totalizers["month"]):
+        totalizers["monthHolding"] = lifetime
+        totalizers["month"] = now.strftime("%m")
+        saveTotalizers()
+        reset = True
+    if unit == 11:
+        publish(__topic__ + ":01:40/" + "gal_total_thismonth", json.dumps([{"value": f"{value}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "bbl_total_thismonth", json.dumps([{"value": f"{value/42}"}]),__qos__)
+        if reset:
+            publish(__topic__ + ":01:40/" + "gal_total_thismonth", json.dumps([{"value": f"{0}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "bbl_total_thismonth", json.dumps([{"value": f"{0}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "gal_total_lastmonth", json.dumps([{"value": f"{value}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "bbl_total_lastmonth", json.dumps([{"value": f"{value/42}"}]),__qos__)
+    elif unit == 15:
+        publish(__topic__ + ":01:40/" + "bbl_total_thismonth", json.dumps([{"value": f"{value}"}]),__qos__)
+        publish(__topic__ + ":01:40/" + "gal_total_thismonth", json.dumps([{"value": f"{value*42}"}]),__qos__)
+        if reset:
+            publish(__topic__ + ":01:40/" + "bbl_total_thismonth", json.dumps([{"value": f"{0}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "gal_total_thismonth", json.dumps([{"value": f"{0}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "bbl_total_lastmonth", json.dumps([{"value": f"{value}"}]),__qos__)
+            publish(__topic__ + ":01:40/" + "gal_total_lastmonth", json.dumps([{"value": f"{value*42}"}]),__qos__)

Pub_Sub/flowmeterskid/thingsboard/pub/sendData.py

@@ -1,9 +1,120 @@
-# Enter your python code.
-import json
+import json, os
 from datetime import datetime as dt
 from common.Logger import logger
 from quickfaas.remotebus import publish
-from mobiuspi_lib.gps import GPS 
+from mobiuspi_lib.gps import GPS
+from quickfaas.global_dict import get as get_params
+from quickfaas.global_dict import _set_global_args
+
+def reboot():
+    #basic = Basic()
+    logger.info("!" * 10 + "REBOOTING DEVICE" + "!"*10)
+    r = os.popen("kill -s SIGHUP `cat /var/run/python/supervisord.pid`").read()
+    logger.info(f"REBOOT : {r}")
+
+def checkFileExist(filename):
+    path = "/var/user/files"
+    if not os.path.exists(path):
+        logger.info("no folder making files folder in var/user")
+        os.makedirs(path)
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+    if not os.path.exists(path + "/" + filename):
+        logger.info("no creds file making creds file")
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+
+def convertDStoJSON(ds):
+    j = dict()
+    for x in ds:
+        j[x["key"]] = x["value"]
+    return j
+
+def convertJSONtoDS(j):
+    d = []
+    for key in j.keys():
+        d.append({"key": key, "value": j[key]})
+    return d
+
+def checkCredentialConfig():
+    logger.info("CHECKING CONFIG")
+    cfgpath = "/var/user/cfg/device_supervisor/device_supervisor.cfg"
+    credspath = "/var/user/files/creds.json"
+    cfg = dict()
+    with open(cfgpath, "r") as f:
+        cfg = json.load(f)
+        clouds = cfg.get("clouds")
+        logger.info(clouds)
+        #if not configured then try to configure from stored values
+        if clouds[0]["args"]["clientId"] == "unknown" or clouds[0]["args"]["username"] == "unknown" or not clouds[0]["args"]["passwd"] or clouds[0]["args"]["passwd"] == "unknown":
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                creds = json.load(c)
+                if creds:
+                    logger.info("updating config with stored data")
+                    clouds[0]["args"]["clientId"] = creds["clientId"]
+                    clouds[0]["args"]["username"] = creds["userName"]
+                    clouds[0]["args"]["passwd"] = creds["password"]
+                    cfg["clouds"] = clouds
+                    cfg = checkParameterConfig(cfg)
+                    with open(cfgpath, "w", encoding='utf-8') as n:
+                        json.dump(cfg, n, indent=1, ensure_ascii=False)
+                    reboot()
+        else:
+            #assuming clouds is filled out, if data is different then assume someone typed in something new and store it, if creds is empty fill with clouds' data
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                logger.info("updating stored file with new data")
+                cfg = checkParameterConfig(cfg)
+                with open(cfgpath, "w", encoding='utf-8') as n:
+                    json.dump(cfg, n, indent=1, ensure_ascii=False)
+                creds = json.load(c)
+                if creds:
+                    if creds["clientId"] != clouds[0]["args"]["clientId"]:
+                        creds["clientId"] = clouds[0]["args"]["clientId"]
+                    if creds["userName"] != clouds[0]["args"]["username"]:
+                        creds["userName"] = clouds[0]["args"]["username"]
+                    if creds["password"] != clouds[0]["args"]["passwd"]:
+                        creds["password"] = clouds[0]["args"]["passwd"]
+                else:
+                    creds["clientId"] = clouds[0]["args"]["clientId"]
+                    creds["userName"] = clouds[0]["args"]["username"]
+                    creds["password"] = clouds[0]["args"]["passwd"]
+                with open(credspath, "w") as cw:
+                    json.dump(creds,cw)
+
+def checkParameterConfig(cfg):
+    logger.info("Checking Parameters!!!!")
+    paramspath = "/var/user/files/params.json"
+    cfgparams = convertDStoJSON(cfg.get("labels"))
+    #check stored values 
+    checkFileExist("params.json")
+    with open(paramspath, "r") as f:
+        logger.info("Opened param storage file")
+        params = json.load(f)
+        if params:
+            if cfgparams != params:
+                #go through each param
+                #if not "unknown" and cfg and params aren't the same take from cfg likely updated manually
+                #if key in cfg but not in params copy to params
+                logger.info("equalizing params between cfg and stored")
+                for key in cfgparams.keys():
+                    try:
+                        if cfgparams[key] != params[key] and cfgparams[key] != "unknown":
+                            params[key] = cfgparams[key]
+                    except:
+                        params[key] = cfgparams[key]
+                cfg["labels"] = convertJSONtoDS(params)
+                _set_global_args(convertJSONtoDS(params))
+                with open(paramspath, "w") as p:
+                    json.dump(params, p)
+        else:
+            with open(paramspath, "w") as p:
+                logger.info("initializing param file with params in memory")
+                json.dump(convertDStoJSON(get_params()), p)
+                cfg["labels"] = get_params()
+    
+    return cfg
 
 payload = {}
 
@@ -41,6 +152,7 @@ except:
 
 def sendData(message,wizard_api):
     logger.debug(message)
+    checkCredentialConfig()
     payload = {"ts": (round(dt.timestamp(dt.now())/600)*600)*1000, "values": {}}
     resetPayload = {"ts": "", "values": {}}
     for measure in message["values"]["flowmeter"].keys():

Pub_Sub/plcfreshwater/v1/pub/sendData.py

@@ -0,0 +1,188 @@
+import json, os, uuid
+from common.Logger import logger
+from quickfaas.remotebus import publish
+from paho.mqtt import client
+from quickfaas.global_dict import get as get_params
+from quickfaas.global_dict import _set_global_args
+
+def reboot():
+    #basic = Basic()
+    logger.info("!" * 10 + "REBOOTING DEVICE" + "!"*10)
+    r = os.popen("kill -s SIGHUP `cat /var/run/python/supervisord.pid`").read()
+    logger.info(f"REBOOT : {r}")
+
+def checkFileExist(filename):
+    path = "/var/user/files"
+    if not os.path.exists(path):
+        logger.info("no folder making files folder in var/user")
+        os.makedirs(path)
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+    if not os.path.exists(path + "/" + filename):
+        logger.info("no creds file making creds file")
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+
+def convertDStoJSON(ds):
+    j = dict()
+    for x in ds:
+        j[x["key"]] = x["value"]
+    return j
+
+def convertJSONtoDS(j):
+    d = []
+    for key in j.keys():
+        d.append({"key": key, "value": j[key]})
+    return d
+
+def checkCredentialConfig():
+    logger.info("CHECKING CONFIG")
+    cfgpath = "/var/user/cfg/device_supervisor/device_supervisor.cfg"
+    credspath = "/var/user/files/creds.json"
+    cfg = dict()
+    with open(cfgpath, "r") as f:
+        cfg = json.load(f)
+        clouds = cfg.get("clouds")
+        logger.info(clouds)
+        #if not configured then try to configure from stored values
+        if clouds[0]["args"]["clientId"] == "unknown" or clouds[0]["args"]["username"] == "unknown" or not clouds[0]["args"]["passwd"] or clouds[0]["args"]["passwd"] == "unknown":
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                creds = json.load(c)
+                if creds:
+                    logger.info("updating config with stored data")
+                    clouds[0]["args"]["clientId"] = creds["clientId"]
+                    clouds[0]["args"]["username"] = creds["userName"]
+                    clouds[0]["args"]["passwd"] = creds["password"]
+                    cfg["clouds"] = clouds
+                    cfg = checkParameterConfig(cfg)
+                    with open(cfgpath, "w", encoding='utf-8') as n:
+                        json.dump(cfg, n, indent=1, ensure_ascii=False)
+                    reboot()
+        else:
+            #assuming clouds is filled out, if data is different then assume someone typed in something new and store it, if creds is empty fill with clouds' data
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                logger.info("updating stored file with new data")
+                cfg = checkParameterConfig(cfg)
+                with open(cfgpath, "w", encoding='utf-8') as n:
+                    json.dump(cfg, n, indent=1, ensure_ascii=False)
+                creds = json.load(c)
+                if creds:
+                    if creds["clientId"] != clouds[0]["args"]["clientId"]:
+                        creds["clientId"] = clouds[0]["args"]["clientId"]
+                    if creds["userName"] != clouds[0]["args"]["username"]:
+                        creds["userName"] = clouds[0]["args"]["username"]
+                    if creds["password"] != clouds[0]["args"]["passwd"]:
+                        creds["password"] = clouds[0]["args"]["passwd"]
+                else:
+                    creds["clientId"] = clouds[0]["args"]["clientId"]
+                    creds["userName"] = clouds[0]["args"]["username"]
+                    creds["password"] = clouds[0]["args"]["passwd"]
+                with open(credspath, "w") as cw:
+                    json.dump(creds,cw)
+
+def checkParameterConfig(cfg):
+    logger.info("Checking Parameters!!!!")
+    paramspath = "/var/user/files/params.json"
+    cfgparams = convertDStoJSON(cfg.get("labels"))
+    #check stored values 
+    checkFileExist("params.json")
+    with open(paramspath, "r") as f:
+        logger.info("Opened param storage file")
+        params = json.load(f)
+        if params:
+            if cfgparams != params:
+                #go through each param
+                #if not "unknown" and cfg and params aren't the same take from cfg likely updated manually
+                #if key in cfg but not in params copy to params
+                logger.info("equalizing params between cfg and stored")
+                for key in cfgparams.keys():
+                    try:
+                        if cfgparams[key] != params[key] and cfgparams[key] != "unknown":
+                            params[key] = cfgparams[key]
+                    except:
+                        params[key] = cfgparams[key]
+                cfg["labels"] = convertJSONtoDS(params)
+                _set_global_args(convertJSONtoDS(params))
+                with open(paramspath, "w") as p:
+                    json.dump(params, p)
+        else:
+            with open(paramspath, "w") as p:
+                logger.info("initializing param file with params in memory")
+                json.dump(convertDStoJSON(get_params()), p)
+                cfg["labels"] = get_params()
+    
+    return cfg
+
+
+lwtData = {
+    "init":False,
+    "client": client.Client(client_id=str(uuid.uuid4()), clean_session=True, userdata=None, protocol=client.MQTTv311, transport="tcp")
+}
+def lwt(mac):
+    try:
+        #if not lwtData["connected"]:
+        if not lwtData["init"]:
+            print("INITIALIZING LWT CLIENT")
+            lwtData["client"].username_pw_set(username="admin", password="columbus")
+            lwtData["client"].will_set("meshify/db/194/_/mainHP/" + mac + ":00:00/connected",json.dumps([{"value":False}]))
+            lwtData["client"].reconnect_delay_set(min_delay=10, max_delay=120)
+            lwtData["init"] = True
+            print("Connecting to MQTT Broker for LWT purposes!!!!!!!")
+            lwtData["client"].connect("mq194.imistaway.net",1883, 600)
+        lwtData["client"].reconnect()
+        lwtData["client"].publish("meshify/db/194/_/mainHP/" + mac + ":00:00/connected", json.dumps([{"value":True}]))
+    except Exception as e:
+        print("LWT DID NOT DO THE THING")
+        print(e)
+
+def sendData(message):
+    #logger.debug(message)
+    mac = __topic__.split("/")[-1] #':'.join(re.findall('..', '%012x' % uuid.getnode()))
+    lwt(mac)
+    checkCredentialConfig()
+    plc_ping = os.system("ping -c 1 192.168.1.101 > /dev/null 2>&1")
+    if plc_ping == 0:
+        publish(__topic__ + ":01:99/" + "plc_ping", json.dumps({"value": "OK"}), __qos__)
+    else:
+        publish(__topic__ + ":01:99/" + "plc_ping", json.dumps({"value": "Comms Error to PLC"}), __qos__)
+    for measure in message["measures"]:
+        try:
+            logger.debug(measure)
+            if measure["name"] in ["raw_hand_input", "raw_auto_input", "raw_run_status", "raw_local_start","raw_overload_status"]:
+                logger.debug("Converting DINT/BOOL to STRING")
+                value = convert_int(measure["name"], measure["value"])
+                logger.debug("Converted {} to {}".format(measure["value"], value))
+                publish(__topic__ + ":01:99/" + measure["name"], json.dumps({"value": value}), __qos__)
+            else:
+                publish(__topic__ + ":01:99/" + measure["name"], json.dumps({"value": measure["value"]}), __qos__)
+        except Exception as e:
+            logger.error(e)
+
+def convert_int(plc_tag, value):
+    input_codes = {
+        0: "Off",
+        1: "On"
+    }
+
+    run_status_codes = {
+        0: "Stopped",
+        1: "Running"
+    }
+
+    overload_codes = {
+        0: "Good",
+        1: "Down on Overload Tripped"
+    }
+    
+    plc_tags = {
+        "raw_hand_input": input_codes.get(value, "Invalid Code"),
+        "raw_auto_input": input_codes.get(value, "Invalid Code"),
+        "raw_run_status": run_status_codes.get(value, "Invalid Code"),
+        "raw_overload_status": overload_codes.get(value, "Invalid Code")
+    }
+
+    return plc_tags.get(plc_tag, "Invalid Tag")
+
+    

Pub_Sub/plcfreshwater/v1/sub/receiveCommand.py

@@ -0,0 +1,87 @@
+# Enter your python code.
+import json
+import os
+from quickfaas.measure  import recall
+from common.Logger import logger
+
+def sync(mac,value, wizard_api):
+    #get new values and send
+    try:
+        data = recall()#json.loads(recall().decode("utf-8"))
+    except Exception as e:
+        logger.error(e)
+    logger.info(data)
+    plc_ping = os.system("ping -c 1 192.168.1.101 > /dev/null 2>&1")
+    if plc_ping == 0:
+        publish(__topic__ + ":01:99/" + "plc_ping", json.dumps({"value": "OK"}), __qos__)
+    else:
+        publish(__topic__ + ":01:99/" + "plc_ping", json.dumps({"value": "Comms Error to PLC"}), __qos__)
+    for controller in data:
+        for measure in controller["measures"]:
+            #publish measure
+            topic = "meshify/db/194/_/plcfreshwater/" + mac + "/" + measure["name"]
+            if measure["name"] in ["raw_hand_input", "raw_auto_input", "raw_run_status", "raw_local_start","raw_overload_status"]:
+                payload = [{"value": convert_int(measure["name"], measure["value"])}]
+            else:
+                payload = [{"value": measure["value"]}]
+            logger.debug("Sending on topic: {}".format(topic))
+            logger.debug("Sending value: {}".format(payload))
+            wizard_api.mqtt_publish(topic, json.dumps(payload))
+def writeplctag(mac, value, wizard_api):
+    try:
+        value = json.loads(value.replace("'",'"'))
+        logger.debug(value)
+        message = {"plcfreshwater":{value["tag"]: value["val"]}}
+        wizard_api.write_plc_values(message)
+    except Exception as e:
+        logger.debug(e)
+    
+def receiveCommand(topic, payload, wizard_api):
+    logger.debug(topic)
+    logger.debug(json.loads(payload))
+    p = json.loads(payload)[0]
+    command = p["payload"]["name"].split(".")[1]
+    commands = {
+        "sync": sync,
+        "writeplctag": writeplctag,
+    }
+    commands[command](p["mac"].lower(),p["payload"]["value"], wizard_api)
+    #logger.debug(command)
+    ack(p["msgId"], p["mac"], command, p["payload"]["name"].split(".")[1], p["payload"]["value"], wizard_api)
+
+def ack(msgid, mac, name, command, value, wizard_api):
+    #logger.debug(mac)
+    macsquish = "".join(mac.split(":")[:-2])
+    maclower = ":".join(mac.split(":")[:-2])
+    maclower = maclower.lower()
+    #logger.debug(msgid)
+    #logger.debug(mac)
+    #logger.debug(name)
+    #logger.debug(value)
+    wizard_api.mqtt_publish("meshify/responses/" + str(msgid), json.dumps([{"value": "{} Success Setting: {} To: {}".format(macsquish,name, value), "msgid": str(msgid)}]))
+    wizard_api.mqtt_publish("meshify/db/194/_/mainMeshify/" + maclower + ":00:00/commands", json.dumps([{"value": {"status": "success", "value": str(value), "channel": command}, "msgid": str(msgid)}]))
+
+def convert_int(plc_tag, value):
+    input_codes = {
+        0: "Off",
+        1: "On"
+    }
+
+    run_status_codes = {
+        0: "Stopped",
+        1: "Running"
+    }
+
+    overload_codes = {
+        0: "Good",
+        1: "Down on Overload Tripped"
+    }
+    
+    plc_tags = {
+        "raw_hand_input": input_codes.get(value, "Invalid Code"),
+        "raw_auto_input": input_codes.get(value, "Invalid Code"),
+        "raw_run_status": run_status_codes.get(value, "Invalid Code"),
+        "raw_overload_status": overload_codes.get(value, "Invalid Code")
+    }
+
+    return plc_tags.get(plc_tag, "Invalid Tag")

Pub_Sub/recycle_train/mistaway/v2/pub/sendData.py

@@ -0,0 +1,152 @@
+import json, os, uuid
+from common.Logger import logger
+from quickfaas.remotebus import publish
+from paho.mqtt import client
+from quickfaas.global_dict import get as get_params
+from quickfaas.global_dict import _set_global_args
+
+def reboot():
+    #basic = Basic()
+    logger.info("!" * 10 + "REBOOTING DEVICE" + "!"*10)
+    r = os.popen("kill -s SIGHUP `cat /var/run/python/supervisord.pid`").read()
+    logger.info(f"REBOOT : {r}")
+
+def checkFileExist(filename):
+    path = "/var/user/files"
+    if not os.path.exists(path):
+        logger.info("no folder making files folder in var/user")
+        os.makedirs(path)
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+    if not os.path.exists(path + "/" + filename):
+        logger.info("no creds file making creds file")
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+
+def convertDStoJSON(ds):
+    j = dict()
+    for x in ds:
+        j[x["key"]] = x["value"]
+    return j
+
+def convertJSONtoDS(j):
+    d = []
+    for key in j.keys():
+        d.append({"key": key, "value": j[key]})
+    return d
+
+def checkCredentialConfig():
+    logger.info("CHECKING CONFIG")
+    cfgpath = "/var/user/cfg/device_supervisor/device_supervisor.cfg"
+    credspath = "/var/user/files/creds.json"
+    cfg = dict()
+    with open(cfgpath, "r") as f:
+        cfg = json.load(f)
+        clouds = cfg.get("clouds")
+        logger.info(clouds)
+        #if not configured then try to configure from stored values
+        if clouds[0]["args"]["clientId"] == "unknown" or clouds[0]["args"]["username"] == "unknown" or not clouds[0]["args"]["passwd"] or clouds[0]["args"]["passwd"] == "unknown":
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                creds = json.load(c)
+                if creds:
+                    logger.info("updating config with stored data")
+                    clouds[0]["args"]["clientId"] = creds["clientId"]
+                    clouds[0]["args"]["username"] = creds["userName"]
+                    clouds[0]["args"]["passwd"] = creds["password"]
+                    cfg["clouds"] = clouds
+                    cfg = checkParameterConfig(cfg)
+                    with open(cfgpath, "w", encoding='utf-8') as n:
+                        json.dump(cfg, n, indent=1, ensure_ascii=False)
+                    reboot()
+        else:
+            #assuming clouds is filled out, if data is different then assume someone typed in something new and store it, if creds is empty fill with clouds' data
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                logger.info("updating stored file with new data")
+                cfg = checkParameterConfig(cfg)
+                with open(cfgpath, "w", encoding='utf-8') as n:
+                    json.dump(cfg, n, indent=1, ensure_ascii=False)
+                creds = json.load(c)
+                if creds:
+                    if creds["clientId"] != clouds[0]["args"]["clientId"]:
+                        creds["clientId"] = clouds[0]["args"]["clientId"]
+                    if creds["userName"] != clouds[0]["args"]["username"]:
+                        creds["userName"] = clouds[0]["args"]["username"]
+                    if creds["password"] != clouds[0]["args"]["passwd"]:
+                        creds["password"] = clouds[0]["args"]["passwd"]
+                else:
+                    creds["clientId"] = clouds[0]["args"]["clientId"]
+                    creds["userName"] = clouds[0]["args"]["username"]
+                    creds["password"] = clouds[0]["args"]["passwd"]
+                with open(credspath, "w") as cw:
+                    json.dump(creds,cw)
+
+def checkParameterConfig(cfg):
+    logger.info("Checking Parameters!!!!")
+    paramspath = "/var/user/files/params.json"
+    cfgparams = convertDStoJSON(cfg.get("labels"))
+    #check stored values 
+    checkFileExist("params.json")
+    with open(paramspath, "r") as f:
+        logger.info("Opened param storage file")
+        params = json.load(f)
+        if params:
+            if cfgparams != params:
+                #go through each param
+                #if not "unknown" and cfg and params aren't the same take from cfg likely updated manually
+                #if key in cfg but not in params copy to params
+                logger.info("equalizing params between cfg and stored")
+                for key in cfgparams.keys():
+                    try:
+                        if cfgparams[key] != params[key] and cfgparams[key] != "unknown":
+                            params[key] = cfgparams[key]
+                    except:
+                        params[key] = cfgparams[key]
+                cfg["labels"] = convertJSONtoDS(params)
+                _set_global_args(convertJSONtoDS(params))
+                with open(paramspath, "w") as p:
+                    json.dump(params, p)
+        else:
+            with open(paramspath, "w") as p:
+                logger.info("initializing param file with params in memory")
+                json.dump(convertDStoJSON(get_params()), p)
+                cfg["labels"] = get_params()
+    
+    return cfg
+
+lwtData = {
+    "init":False,
+    "client": client.Client(client_id=str(uuid.uuid4()), clean_session=True, userdata=None, protocol=client.MQTTv311, transport="tcp")
+}
+def lwt(mac):
+    try:
+        #if not lwtData["connected"]:
+        if not lwtData["init"]:
+            print("INITIALIZING LWT CLIENT")
+            lwtData["client"].username_pw_set(username="admin", password="columbus")
+            lwtData["client"].will_set("meshify/db/194/_/mainHP/" + mac + ":00:00/connected",json.dumps([{"value":False}]))
+            lwtData["client"].reconnect_delay_set(min_delay=10, max_delay=120)
+            lwtData["init"] = True
+            print("Connecting to MQTT Broker for LWT purposes!!!!!!!")
+            lwtData["client"].connect("mq194.imistaway.net",1883, 600)
+        lwtData["client"].reconnect()
+        lwtData["client"].publish("meshify/db/194/_/mainHP/" + mac + ":00:00/connected", json.dumps([{"value":True}]))
+    except Exception as e:
+        print("LWT DID NOT DO THE THING")
+        print(e)
+
+def sendData(message):
+    #logger.debug(message)
+    mac = __topic__.split("/")[-1] #':'.join(re.findall('..', '%012x' % uuid.getnode()))
+    lwt(mac)
+    checkCredentialConfig()
+    for measure in message["measures"]:
+        try:
+            logger.debug(measure)
+            publish(__topic__ + ":01:99/" + measure["name"], json.dumps({"value": measure["value"]}), __qos__)
+        except Exception as e:
+            logger.error(e)
+
+
+    

Pub_Sub/recycle_train/mistaway/v2/recycletrain_ma_v2.cfg

@@ -635,7 +635,7 @@
     ],
     "misc": {
         "maxAlarmRecordSz": 2000,
-        "logLvl": "DEBUG",
+        "logLvl": "INFO",
         "coms": [
             {
                 "name": "rs232",
@@ -661,7 +661,7 @@
             "args": {
                 "host": "mq194.imistaway.net",
                 "port": 1883,
-                "clientId": "sv-inhand-demo",
+                "clientId": "unknown",
                 "auth": 1,
                 "tls": 0,
                 "cleanSession": 1,
@@ -672,8 +672,8 @@
                 "rootCA": "",
                 "verifyServer": 0,
                 "verifyClient": 0,
-                "username": "admin",
-                "passwd": "columbus",
+                "username": "unknown",
+                "passwd": "unknown",
                 "authType": 1
             },
             "name": "default"
@@ -718,14 +718,6 @@
         {
             "key": "MAC",
             "value": "00:18:05:1a:e5:36"
-        },
-        {
-            "key": "MAC_UPPER",
-            "value": "00:18:05:1A:E5:37"
-        },
-        {
-            "key": "MAC_LOWER",
-            "value": "00:18:05:1a:e5:37"
         }
     ],
     "modbusSlave": {

Pub_Sub/recycle_train/v2/pub/sendData.py

@@ -1,41 +0,0 @@
-# Enter your python code.
-import json
-from common.Logger import logger
-from quickfaas.remotebus import publish
-import re, uuid
-from paho.mqtt import client
-
-lwtData = {
-    "init":False,
-    "client": client.Client(client_id=str(uuid.uuid4()), clean_session=True, userdata=None, protocol=client.MQTTv311, transport="tcp")
-}
-def lwt(mac):
-    try:
-        #if not lwtData["connected"]:
-        if not lwtData["init"]:
-            logger.info("INITIALIZING LWT CLIENT")
-            lwtData["client"].username_pw_set(username="admin", password="columbus")
-            lwtData["client"].will_set("meshify/db/194/_/mainHP/" + mac + ":00:00/connected",json.dumps({"value":False}))
-            lwtData["init"] = True
-            logger.info("Connecting to MQTT Broker for LWT purposes!!!!!!!")
-            lwtData["client"].connect("mq194.imistaway.net",1883, 600)
-        lwtData["client"].publish("meshify/db/194/_/mainHP/" + mac + ":00:00/connected", json.dumps({"value":True}))
-    except Exception as e:
-        logger.error("LWT DID NOT DO THE THING")
-        logger.error(e)
-
-def sendData(message):
-    #logger.debug(message)
-    mac = __topic__.split("/")[-1] #':'.join(re.findall('..', '%012x' % uuid.getnode()))
-    lwt(mac)
-    for measure in message["measures"]:
-        try:
-            logger.debug(measure)
-            publish(__topic__ + ":01:99/" + measure["name"], json.dumps({"value": measure["value"]}), __qos__)
-        except Exception as e:
-            logger.error(e)
-        
-        #publish(__topic__, json.dumps({measure["name"]: measure["value"]}), __qos__)
-
-
-    

Pub_Sub/rigpump/mistaway/v4/pub/sendData.py

@@ -0,0 +1,210 @@
+import json, os, uuid
+from common.Logger import logger
+from quickfaas.remotebus import publish
+from paho.mqtt import client
+from mobiuspi_lib.gps import GPS
+from quickfaas.global_dict import get as get_params
+from quickfaas.global_dict import _set_global_args
+
+def reboot():
+    #basic = Basic()
+    logger.info("!" * 10 + "REBOOTING DEVICE" + "!"*10)
+    r = os.popen("kill -s SIGHUP `cat /var/run/python/supervisord.pid`").read()
+    logger.info(f"REBOOT : {r}")
+
+def checkFileExist(filename):
+    path = "/var/user/files"
+    if not os.path.exists(path):
+        logger.info("no folder making files folder in var/user")
+        os.makedirs(path)
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+    if not os.path.exists(path + "/" + filename):
+        logger.info("no creds file making creds file")
+        with open(path + "/" + filename, "a") as f:
+            json.dump({}, f)
+
+def convertDStoJSON(ds):
+    j = dict()
+    for x in ds:
+        j[x["key"]] = x["value"]
+    return j
+
+def convertJSONtoDS(j):
+    d = []
+    for key in j.keys():
+        d.append({"key": key, "value": j[key]})
+    return d
+
+def checkCredentialConfig():
+    logger.info("CHECKING CONFIG")
+    cfgpath = "/var/user/cfg/device_supervisor/device_supervisor.cfg"
+    credspath = "/var/user/files/creds.json"
+    cfg = dict()
+    with open(cfgpath, "r") as f:
+        cfg = json.load(f)
+        clouds = cfg.get("clouds")
+        logger.info(clouds)
+        #if not configured then try to configure from stored values
+        if clouds[0]["args"]["clientId"] == "unknown" or clouds[0]["args"]["username"] == "unknown" or not clouds[0]["args"]["passwd"] or clouds[0]["args"]["passwd"] == "unknown":
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                creds = json.load(c)
+                if creds:
+                    logger.info("updating config with stored data")
+                    clouds[0]["args"]["clientId"] = creds["clientId"]
+                    clouds[0]["args"]["username"] = creds["userName"]
+                    clouds[0]["args"]["passwd"] = creds["password"]
+                    cfg["clouds"] = clouds
+                    cfg = checkParameterConfig(cfg)
+                    with open(cfgpath, "w", encoding='utf-8') as n:
+                        json.dump(cfg, n, indent=1, ensure_ascii=False)
+                    reboot()
+        else:
+            #assuming clouds is filled out, if data is different then assume someone typed in something new and store it, if creds is empty fill with clouds' data
+            checkFileExist("creds.json")
+            with open(credspath, "r") as c:
+                logger.info("updating stored file with new data")
+                cfg = checkParameterConfig(cfg)
+                with open(cfgpath, "w", encoding='utf-8') as n:
+                    json.dump(cfg, n, indent=1, ensure_ascii=False)
+                creds = json.load(c)
+                if creds:
+                    if creds["clientId"] != clouds[0]["args"]["clientId"]:
+                        creds["clientId"] = clouds[0]["args"]["clientId"]
+                    if creds["userName"] != clouds[0]["args"]["username"]:
+                        creds["userName"] = clouds[0]["args"]["username"]
+                    if creds["password"] != clouds[0]["args"]["passwd"]:
+                        creds["password"] = clouds[0]["args"]["passwd"]
+                else:
+                    creds["clientId"] = clouds[0]["args"]["clientId"]
+                    creds["userName"] = clouds[0]["args"]["username"]
+                    creds["password"] = clouds[0]["args"]["passwd"]
+                with open(credspath, "w") as cw:
+                    json.dump(creds,cw)
+
+def checkParameterConfig(cfg):
+    logger.info("Checking Parameters!!!!")
+    paramspath = "/var/user/files/params.json"
+    cfgparams = convertDStoJSON(cfg.get("labels"))
+    #check stored values 
+    checkFileExist("params.json")
+    with open(paramspath, "r") as f:
+        logger.info("Opened param storage file")
+        params = json.load(f)
+        if params:
+            if cfgparams != params:
+                #go through each param
+                #if not "unknown" and cfg and params aren't the same take from cfg likely updated manually
+                #if key in cfg but not in params copy to params
+                logger.info("equalizing params between cfg and stored")
+                for key in cfgparams.keys():
+                    try:
+                        if cfgparams[key] != params[key] and cfgparams[key] != "unknown":
+                            params[key] = cfgparams[key]
+                    except:
+                        params[key] = cfgparams[key]
+                cfg["labels"] = convertJSONtoDS(params)
+                _set_global_args(convertJSONtoDS(params))
+                with open(paramspath, "w") as p:
+                    json.dump(params, p)
+        else:
+            with open(paramspath, "w") as p:
+                logger.info("initializing param file with params in memory")
+                json.dump(convertDStoJSON(get_params()), p)
+                cfg["labels"] = get_params()
+    
+    return cfg
+
+lwtData = {
+    "init":False,
+    "client": client.Client(client_id=str(uuid.uuid4()), clean_session=True, userdata=None, protocol=client.MQTTv311, transport="tcp")
+}
+def lwt(mac):
+    try:
+        #if not lwtData["connected"]:
+        if not lwtData["init"]:
+            print("INITIALIZING LWT CLIENT")
+            lwtData["client"].username_pw_set(username="admin", password="columbus")
+            lwtData["client"].will_set("meshify/db/194/_/mainHP/" + mac + ":00:00/connected",json.dumps([{"value":False}]))
+            lwtData["client"].reconnect_delay_set(min_delay=10, max_delay=120)
+            lwtData["init"] = True
+            print("Connecting to MQTT Broker for LWT purposes!!!!!!!")
+            lwtData["client"].connect("mq194.imistaway.net",1883, 600)
+        lwtData["client"].reconnect()
+        lwtData["client"].publish("meshify/db/194/_/mainHP/" + mac + ":00:00/connected", json.dumps([{"value":True}]))
+    except Exception as e:
+        print("LWT DID NOT DO THE THING")
+        print(e)
+
+def getGPS(mac):
+    # Create a gps instance
+    gps = GPS()
+
+    # Retrieve GPS information
+    position_status = gps.get_position_status()
+    logger.debug("position_status: ")
+    logger.debug(position_status)
+    latitude = position_status["latitude"].split(" ")
+    longitude = position_status["longitude"].split(" ")
+    lat_dec = int(latitude[0][:-1]) + (float(latitude[1][:-1])/60)
+    lon_dec = int(longitude[0][:-1]) + (float(longitude[1][:-1])/60)
+    if latitude[2] == "S":
+        lat_dec = lat_dec * -1
+    if longitude[2] == "W":
+        lon_dec = lon_dec * -1
+    #lat_dec = round(lat_dec, 7)
+    #lon_dec = round(lon_dec, 7)
+    logger.info("HERE IS THE GPS COORDS")
+    logger.info(f"LATITUDE: {lat_dec}, LONGITUDE: {lon_dec}")
+    topic = f"meshify/db/194/_/M1/{mac}:00:30/gps"
+    publish(topic, json.dumps([{"value":f"{lat_dec:.8f},{lon_dec:.8f}"}]), __qos__)
+
+
+def sendData(message):
+    #logger.debug(message)
+    mac = __topic__.split("/")[-1] #':'.join(re.findall('..', '%012x' % uuid.getnode()))
+    lwt(mac)
+    getGPS(mac)
+    checkCredentialConfig()
+    for measure in message["measures"]:
+        try:
+            logger.debug(measure)
+            if measure["name"] in ["auto_manual", "auto_control_mode", "device_status"]:
+                logger.debug("Converting DINT/BOOL to STRING")
+                value = convert_int(measure["name"], measure["value"])
+                logger.debug("Converted {} to {}".format(measure["value"], value))
+                publish(__topic__ + ":01:99/" + measure["name"], json.dumps({"value": value}), __qos__)
+            else:
+                publish(__topic__ + ":01:99/" + measure["name"], json.dumps({"value": measure["value"]}), __qos__)
+        except Exception as e:
+            logger.error(e)
+        
+
+def convert_int(plc_tag, value):
+    auto_manual = {
+        0: "Manual",
+        1: "Auto"
+    }
+
+    auto_control_mode = {
+        0: "Pressure",
+        1: "Flow"
+    }
+
+    device_status = {
+        1: "Running",
+        64: "Idle",
+        128: "Overpressure",
+        1024: "Faulted"
+    }
+    
+    plc_tags = {
+        "auto_manual": auto_manual.get(value, "Invalid Code"),
+        "auto_control_mode": auto_control_mode.get(value, "Invalid Code"),
+        "device_status": device_status.get(value, "Invalid Code"),
+    }
+
+    return plc_tags.get(plc_tag, "Invalid Tag")
+
+    

Pub_Sub/rigpump/mistaway/v4/rigpump_ma_v4.cfg

@@ -231,7 +231,7 @@
     ],
     "misc": {
         "maxAlarmRecordSz": 2000,
-        "logLvl": "DEBUG",
+        "logLvl": "INFO",
         "coms": [
             {
                 "name": "rs232",
@@ -257,7 +257,7 @@
             "args": {
                 "host": "mq194.imistaway.net",
                 "port": 1883,
-                "clientId": "sv-inhand-demo",
+                "clientId": "unknown",
                 "auth": 1,
                 "tls": 0,
                 "cleanSession": 1,
@@ -268,8 +268,8 @@
                 "rootCA": "",
                 "verifyServer": 0,
                 "verifyClient": 0,
-                "username": "admin",
-                "passwd": "columbus",
+                "username": "unknown",
+                "passwd": "unknown",
                 "authType": 1
             },
             "name": "default"
@@ -314,14 +314,6 @@
         {
             "key": "MAC",
             "value": "00:18:05:1a:e5:36"
-        },
-        {
-            "key": "MAC_UPPER",
-            "value": "00:18:05:1A:E5:37"
-        },
-        {
-            "key": "MAC_LOWER",
-            "value": "00:18:05:1a:e5:37"
         }
     ],
     "modbusSlave": {

Pub_Sub/rigpump/v4/pub/sendData.py

@@ -1,98 +0,0 @@
-# Enter your python code.
-import json
-from common.Logger import logger
-from quickfaas.remotebus import publish
-import re, uuid
-from paho.mqtt import client
-from mobiuspi_lib.gps import GPS 
-
-lwtData = {
-    "init":False,
-    "client": client.Client(client_id=str(uuid.uuid4()), clean_session=True, userdata=None, protocol=client.MQTTv311, transport="tcp")
-}
-def lwt(mac):
-    try:
-        #if not lwtData["connected"]:
-        if not lwtData["init"]:
-            logger.info("INITIALIZING LWT CLIENT")
-            lwtData["client"].username_pw_set(username="admin", password="columbus")
-            lwtData["client"].will_set("meshify/db/194/_/mainHP/" + mac + ":00:00/connected",json.dumps({"value":False}))
-            lwtData["init"] = True
-            logger.info("Connecting to MQTT Broker for LWT purposes!!!!!!!")
-            lwtData["client"].connect("mq194.imistaway.net",1883, 600)
-        lwtData["client"].publish("meshify/db/194/_/mainHP/" + mac + ":00:00/connected", json.dumps({"value":True}))
-    except Exception as e:
-        logger.error("LWT DID NOT DO THE THING")
-        logger.error(e)
-
-def getGPS(mac):
-    # Create a gps instance
-    gps = GPS()
-
-    # Retrieve GPS information
-    position_status = gps.get_position_status()
-    logger.debug("position_status: ")
-    logger.debug(position_status)
-    latitude = position_status["latitude"].split(" ")
-    longitude = position_status["longitude"].split(" ")
-    lat_dec = int(latitude[0][:-1]) + (float(latitude[1][:-1])/60)
-    lon_dec = int(longitude[0][:-1]) + (float(longitude[1][:-1])/60)
-    if latitude[2] == "S":
-        lat_dec = lat_dec * -1
-    if longitude[2] == "W":
-        lon_dec = lon_dec * -1
-    #lat_dec = round(lat_dec, 7)
-    #lon_dec = round(lon_dec, 7)
-    logger.info("HERE IS THE GPS COORDS")
-    logger.info(f"LATITUDE: {lat_dec}, LONGITUDE: {lon_dec}")
-    topic = f"meshify/db/194/_/M1/{mac}:00:30/gps"
-    publish(topic, json.dumps([{"value":f"{lat_dec:.8f},{lon_dec:.8f}"}]), __qos__)
-
-
-def sendData(message):
-    #logger.debug(message)
-    mac = __topic__.split("/")[-1] #':'.join(re.findall('..', '%012x' % uuid.getnode()))
-    lwt(mac)
-    getGPS(mac)
-    for measure in message["measures"]:
-        try:
-            logger.debug(measure)
-            if measure["name"] in ["auto_manual", "auto_control_mode", "device_status"]:
-                logger.debug("Converting DINT/BOOL to STRING")
-                value = convert_int(measure["name"], measure["value"])
-                logger.debug("Converted {} to {}".format(measure["value"], value))
-                publish(__topic__ + ":01:99/" + measure["name"], json.dumps({"value": value}), __qos__)
-            else:
-                publish(__topic__ + ":01:99/" + measure["name"], json.dumps({"value": measure["value"]}), __qos__)
-        except Exception as e:
-            logger.error(e)
-        
-        #publish(__topic__, json.dumps({measure["name"]: measure["value"]}), __qos__)
-
-def convert_int(plc_tag, value):
-    auto_manual = {
-        0: "Manual",
-        1: "Auto"
-    }
-
-    auto_control_mode = {
-        0: "Pressure",
-        1: "Flow"
-    }
-
-    device_status = {
-        1: "Running",
-        64: "Idle",
-        128: "Overpressure",
-        1024: "Faulted"
-    }
-    
-    plc_tags = {
-        "auto_manual": auto_manual.get(value, "Invalid Code"),
-        "auto_control_mode": auto_control_mode.get(value, "Invalid Code"),
-        "device_status": device_status.get(value, "Invalid Code"),
-    }
-
-    return plc_tags.get(plc_tag, "Invalid Tag")
-
-