changes

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

@@ -0,0 +1,194 @@
+# Enter your python code.
+import json
+from common.Logger import logger
+from quickfaas.remotebus import publish
+import re, uuid
+from paho.mqtt import client
+
+
+def sendData(message):
+    #logger.debug(message)
+    payload = {}
+    for measure in message["measures"]:
+        try:
+            logger.debug(measure)
+            if measure["name"] in ["wellstatus","pidcontrolmode","downholesensorstatus","alarmflowrate","alarmintakepressure","alarmintaketemperature","alarmtubingpressure","alarmvfd","alarmlockout","alarmfluidlevel","runpermissive","startpermissive","last_vfd_fault_code","vfd_fault", "flowmeter_fault"]:
+                logger.debug("Converting DINT/BOOL to STRING")
+                value = convert_int(measure["name"], measure["value"])
+                logger.debug("Converted {} to {}".format(measure["value"], value))
+                payload[measure["name"]] = value
+                payload[measure["name"] + "_int"] = measure["value"]
+            else:
+                payload[measure["name"]] = measure["value"] 
+        except Exception as e:
+            logger.error(e)
+        
+    publish(__topic__, json.dumps(payload), __qos__)
+
+def convert_int(plc_tag, value):
+    well_status_codes = {
+        0: "Running",
+        1: "Pumped Off",
+        2: "Alarmed",
+        3: "Locked Out",
+        4: "Stopped"
+    }
+
+    pid_control_codes = {
+        0: "Flow",
+        1: "Fluid Level",
+        2: "Tubing Pressure",
+        3: "Manual"
+    }
+
+    downhole_codes = {
+        0: "OK",
+        1: "Connecting",
+        2: "Open Circuit",
+        3: "Shorted",
+        4: "Cannot Decode"
+    }
+
+    permissive_codes = {
+        0: "OK",
+        1: "Flow",
+        2: "Intake Pressure",
+        3: "Intake Temperature",
+        4: "Tubing Pressure",
+        5: "VFD",
+        6: "Fluid Level",
+        7: "Min. Downtime"
+    }
+
+    alarm_codes = {
+        0: "OK",
+        1: "Alarm"
+    }
+
+    alarm_vfd_codes = {
+        0: "OK",
+        1: "Locked Out"
+    }
+
+    vfd_fault_codes = {
+        0: "No Fault",
+        2: "Auxiliary Input",
+        3: "Power Loss",
+        4: "UnderVoltage",
+        5: "OverVoltage",
+        7: "Motor Overload",
+        8: "Heatsink OverTemp",
+        9: "Thermister OverTemp",
+        10: "Dynamic Brake OverTemp",
+        12: "Hardware OverCurrent",
+        13: "Ground Fault",
+        14: "Ground Warning",
+        15: "Load Loss",
+        17: "Input Phase Loss",
+        18: "Motor PTC Trip",
+        19: "Task Overrun",
+        20: "Torque Prove Speed Band",
+        21: "Output Phase Loss",
+        24: "Decel Inhibit",
+        25: "OverSpeed Limit",
+        26: "Brake Slipped",
+        27: "Torque Prove Conflict",
+        28: "TP Encls Confict",
+        29: "Analog In Loss",
+        33: "Auto Restarts Exhausted",
+        35: "IPM OverCurrent",
+        36: "SW OverCurrent",
+        38: "Phase U to Ground",
+        39: "Phase V to Ground",
+        40: "Phase W to Ground",
+        41: "Phase UV Short",
+        42: "Phase VW Short",
+        43: "Phase WU Short",
+        44: "Phase UNeg to Ground",
+        45: "Phase VNeg to Ground",
+        46: "Phase WNeg to Ground",
+        48: "System Defaulted",
+        49: "Drive Powerup",
+        51: "Clear Fault Queue",
+        55: "Control Board Overtemp",
+        59: "Invalid Code",
+        61: "Shear Pin 1",
+        62: "Shear Pin 2",
+        64: "Drive Overload",
+        66: "OW Torque Level",
+        67: "Pump Off",
+        71: "Port 1 Adapter",
+        72: "Port 2 Adapter",
+        73: "Port 3 Adapter",
+        74: "Port 4 Adapter",
+        75: "Port 5 Adapter",
+        76: "Port 6 Adapter",
+        77: "IR Volts Range",
+        78: "FluxAmps Ref Range",
+        79: "Excessive Load",
+        80: "AutoTune Aborted",
+        81: "Port 1 DPI Loss",
+        82: "Port 2 DPI Loss",
+        83: "Port 3 DPI Loss",
+        84: "Port 4 DPI Loss",
+        85: "Port 5 DPI Loss",
+        86: "Port 6 DPI Loss",
+        87: "IXo Voltage Range",
+        91: "Primary Velocity Feedback Loss",
+        93: "Hardware Enable Check",
+        94: "Alternate Velocity Feedback Loss",
+        95: "Auxiliary Velocity Feedback Loss",
+        96: "Position Feedback Loss",
+        97: "Auto Tach Switch",
+        100: "Parameter Checksum",
+        101: "Power Down NVS Blank",
+        102: "NVS Not Blank",
+        103: "Power Down NVS Incompatible",
+        104: "Power Board Checksum",
+        106: "Incompat MCB-PB",
+        107: "Replaced MCB-PB",
+        108: "Analog Calibration Checksum",
+        110: "Invalid Power Board Data",
+        111: "Power Board Invalid ID",
+        112: "Power Board App Min Version",
+        113: "Tracking DataError",
+        115: "Power Down Table Full",
+        116: "Power Down Entry Too Large",
+        117: "Power Down Data Checksum",
+        118: "Power Board Power Down Checksum",
+        124: "App ID Changed",
+        125: "Using Backup App",
+        134: "Start on Power Up",
+        137: "External Precharge Error",
+        138: "Precharge Open",
+        141: "Autotune Enc Angle",
+        142: "Autotune Speed Restricted",
+        143: "Autotune Current Regulator",
+        144: "Autotune Inertia",
+        145: "Autotune Travel",
+        13035: "Net IO Timeout",
+        13037: "Net IO Timeout"
+
+    }
+
+    plc_tags = {
+        "wellstatus": well_status_codes.get(value, "Invalid Code"),
+        "pidcontrolmode": pid_control_codes.get(value, "Invalid Code"),
+        "downholesensorstatus": downhole_codes.get(value, "Invalid Code"),
+        "alarmflowrate": alarm_codes.get(value, "Invalid Code"),
+        "alarmintakepressure": alarm_codes.get(value, "Invalid Code"),
+        "alarmintaketemperature": alarm_codes.get(value, "Invalid Code"),
+        "alarmtubingpressure": alarm_codes.get(value, "Invalid Code"),
+        "alarmvfd": alarm_codes.get(value, "Invalid Code"),
+        "alarmlockout": alarm_vfd_codes.get(value, "Invalid Code"),
+        "alarmfluidlevel": alarm_codes.get(value, "Invalid Code"),
+        "runpermissive": permissive_codes.get(value, "Invalid Code"),
+        "startpermissive": permissive_codes.get(value, "Invalid Code"),
+        "last_vfd_fault_code": vfd_fault_codes.get(value, "Invalid Code"),
+        "vfd_fault": vfd_fault_codes.get(value, "Invalid Code"),
+        "flowmeter_fault": alarm_codes.get(value, "Invalid Code")
+    }
+
+    return plc_tags.get(plc_tag, "Invalid Tag")
+
+    

Pub_Sub/advvfdipp/thingsboard/v2/sub/receiveCommand.py

@@ -0,0 +1,258 @@
+# Enter your python code.
+import json
+import time
+from quickfaas.measure  import recall
+from common.Logger import logger
+
+def sync(wizard_api):
+    #get new values and send
+    payload = {}
+    topic = "v1/devices/me/telemetry"
+    try:
+        data = recall()#json.loads(recall().decode("utf-8"))
+    except Exception as e:
+        logger.error(e)
+    logger.info(data)
+    for controller in data:
+        for measure in controller["measures"]:
+            #publish measure
+            if measure["name"] in ["wellstatus","pidcontrolmode","downholesensorstatus","alarmflowrate","alarmintakepressure","alarmintaketemperature","alarmtubingpressure","alarmvfd","alarmlockout","alarmfluidlevel","runpermissive","startpermissive","last_vfd_fault_code","vfd_fault", "flowmeter_fault"]:
+                payload[measure["name"]] = convert_int(measure["name"], measure["value"])
+                payload[measure["name"]+ "_int"] = measure["value"]
+            else:
+                payload[measure["name"]] = 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(value, wizard_api):
+    try:
+        #value = json.loads(value.replace("'",'"'))
+        logger.debug(value)
+        message = {"advvfdipp":{value["measurement"]: value["value"]}}
+        resp = wizard_api.write_plc_values(message)
+        #logger.debug("RETURN FROM WRITE: {}".format(resp))
+        return True
+    except Exception as e:
+        logger.debug(e)
+        return False
+    
+def receiveCommand(topic, payload, wizard_api):
+    try:
+        logger.debug(topic)
+        logger.debug(json.loads(payload))
+        p = json.loads(payload)
+        command = p["method"]
+        commands = {
+            "sync": sync,
+            "writeplctag": writeplctag,
+        }   
+        if command == "setPLCTag":
+            result = commands["writeplctag"](p["params"],wizard_api)
+        elif command == "changeSetpoint":
+            try:
+                params_type = {"measurement": "pidcontrolmode", "value": p["params"]["setpointType"]}
+                if params_type["value"]:
+                    commands["writeplctag"](params_type, wizard_api)
+                    time.sleep(2)
+            except:
+                pass
+            try:
+                modes = {0: "flowsetpoint", 1: "fluidlevelsetpoint", 2: "tubingpressuresetpoint", 3: "manualfrequencysetpoint"}
+                params_value = {"value": p["params"]["setpointValue"]}
+                if params_value["value"]:
+                    params_value["measurement"] = modes[getMode()]
+                    commands["writeplctag"](params_value, wizard_api)
+            except Exception as e:
+                logger.debug("DID NOT WRITE SETPOINT")
+                logger.debug(e)
+                
+        #logger.debug(command)
+        ack(topic.split("/")[-1], wizard_api)
+        time.sleep(5)
+        sync(wizard_api)
+    except Exception as e:
+        logger.debug(e)
+    
+
+def ack(msgid, wizard_api):
+    #logger.debug(msgid)
+    #logger.debug(mac)
+    #logger.debug(name)
+    #logger.debug(value)
+    wizard_api.mqtt_publish("v1/devices/me/rpc/response/" + str(msgid), json.dumps({"msg": {"time": time.time()}, "metadata": "", "msgType": ""}))
+
+def getMode():
+    try:
+        data = recall()
+        for controller in data:
+            for measure in controller["measures"]:
+                if measure["name"] == "pidcontrolmode":
+                    return measure["value"]
+    except:
+        return None
+
+def convert_int(plc_tag, value):
+    well_status_codes = {
+        0: "Running",
+        1: "Pumped Off",
+        2: "Alarmed",
+        3: "Locked Out",
+        4: "Stopped"
+    }
+
+    pid_control_codes = {
+        0: "Flow",
+        1: "Fluid Level",
+        2: "Tubing Pressure",
+        3: "Manual"
+    }
+
+    downhole_codes = {
+        0: "OK",
+        1: "Connecting",
+        2: "Open Circuit",
+        3: "Shorted",
+        4: "Cannot Decode"
+    }
+
+    permissive_codes = {
+        0: "OK",
+        1: "Flow",
+        2: "Intake Pressure",
+        3: "Intake Temperature",
+        4: "Tubing Pressure",
+        5: "VFD",
+        6: "Fluid Level",
+        7: "Min. Downtime"
+    }
+
+    alarm_codes = {
+        0: "OK",
+        1: "Alarm"
+    }
+
+    alarm_vfd_codes = {
+        0: "OK",
+        1: "Locked Out"
+    }
+
+    vfd_fault_codes = {
+        0: "No Fault",
+        2: "Auxiliary Input",
+        3: "Power Loss",
+        4: "UnderVoltage",
+        5: "OverVoltage",
+        7: "Motor Overload",
+        8: "Heatsink OverTemp",
+        9: "Thermister OverTemp",
+        10: "Dynamic Brake OverTemp",
+        12: "Hardware OverCurrent",
+        13: "Ground Fault",
+        14: "Ground Warning",
+        15: "Load Loss",
+        17: "Input Phase Loss",
+        18: "Motor PTC Trip",
+        19: "Task Overrun",
+        20: "Torque Prove Speed Band",
+        21: "Output Phase Loss",
+        24: "Decel Inhibit",
+        25: "OverSpeed Limit",
+        26: "Brake Slipped",
+        27: "Torque Prove Conflict",
+        28: "TP Encls Confict",
+        29: "Analog In Loss",
+        33: "Auto Restarts Exhausted",
+        35: "IPM OverCurrent",
+        36: "SW OverCurrent",
+        38: "Phase U to Ground",
+        39: "Phase V to Ground",
+        40: "Phase W to Ground",
+        41: "Phase UV Short",
+        42: "Phase VW Short",
+        43: "Phase WU Short",
+        44: "Phase UNeg to Ground",
+        45: "Phase VNeg to Ground",
+        46: "Phase WNeg to Ground",
+        48: "System Defaulted",
+        49: "Drive Powerup",
+        51: "Clear Fault Queue",
+        55: "Control Board Overtemp",
+        59: "Invalid Code",
+        61: "Shear Pin 1",
+        62: "Shear Pin 2",
+        64: "Drive Overload",
+        66: "OW Torque Level",
+        67: "Pump Off",
+        71: "Port 1 Adapter",
+        72: "Port 2 Adapter",
+        73: "Port 3 Adapter",
+        74: "Port 4 Adapter",
+        75: "Port 5 Adapter",
+        76: "Port 6 Adapter",
+        77: "IR Volts Range",
+        78: "FluxAmps Ref Range",
+        79: "Excessive Load",
+        80: "AutoTune Aborted",
+        81: "Port 1 DPI Loss",
+        82: "Port 2 DPI Loss",
+        83: "Port 3 DPI Loss",
+        84: "Port 4 DPI Loss",
+        85: "Port 5 DPI Loss",
+        86: "Port 6 DPI Loss",
+        87: "IXo Voltage Range",
+        91: "Primary Velocity Feedback Loss",
+        93: "Hardware Enable Check",
+        94: "Alternate Velocity Feedback Loss",
+        95: "Auxiliary Velocity Feedback Loss",
+        96: "Position Feedback Loss",
+        97: "Auto Tach Switch",
+        100: "Parameter Checksum",
+        101: "Power Down NVS Blank",
+        102: "NVS Not Blank",
+        103: "Power Down NVS Incompatible",
+        104: "Power Board Checksum",
+        106: "Incompat MCB-PB",
+        107: "Replaced MCB-PB",
+        108: "Analog Calibration Checksum",
+        110: "Invalid Power Board Data",
+        111: "Power Board Invalid ID",
+        112: "Power Board App Min Version",
+        113: "Tracking DataError",
+        115: "Power Down Table Full",
+        116: "Power Down Entry Too Large",
+        117: "Power Down Data Checksum",
+        118: "Power Board Power Down Checksum",
+        124: "App ID Changed",
+        125: "Using Backup App",
+        134: "Start on Power Up",
+        137: "External Precharge Error",
+        138: "Precharge Open",
+        141: "Autotune Enc Angle",
+        142: "Autotune Speed Restricted",
+        143: "Autotune Current Regulator",
+        144: "Autotune Inertia",
+        145: "Autotune Travel",
+        13035: "Net IO Timeout",
+        13037: "Net IO Timeout"
+
+    }
+
+    plc_tags = {
+        "wellstatus": well_status_codes.get(value, "Invalid Code"),
+        "pidcontrolmode": pid_control_codes.get(value, "Invalid Code"),
+        "downholesensorstatus": downhole_codes.get(value, "Invalid Code"),
+        "alarmflowrate": alarm_codes.get(value, "Invalid Code"),
+        "alarmintakepressure": alarm_codes.get(value, "Invalid Code"),
+        "alarmintaketemperature": alarm_codes.get(value, "Invalid Code"),
+        "alarmtubingpressure": alarm_codes.get(value, "Invalid Code"),
+        "alarmvfd": alarm_codes.get(value, "Invalid Code"),
+        "alarmlockout": alarm_vfd_codes.get(value, "Invalid Code"),
+        "alarmfluidlevel": alarm_codes.get(value, "Invalid Code"),
+        "runpermissive": permissive_codes.get(value, "Invalid Code"),
+        "startpermissive": permissive_codes.get(value, "Invalid Code"),
+        "last_vfd_fault_code": vfd_fault_codes.get(value, "Invalid Code"),
+        "vfd_fault": vfd_fault_codes.get(value, "Invalid Code"),
+        "flowmeter_fault": alarm_codes.get(value, "Invalid Code")
+    }
+
+    return plc_tags.get(plc_tag, "Invalid Tag")

Pub_Sub/convert_config.py

@@ -32,9 +32,9 @@ def write_config(path, config, pub, sub):
 root = os.getcwd()
 devicetype = "advvfdipp"
 startversion = 1
-deviceconfig = "device_supervisor_" + devicetype +"v" + str(startversion) + ".cfg"
+deviceconfig = "device_supervisor_" + devicetype + "_tb_" +"v" + str(startversion) + ".cfg"
 
 #write_code(root + "/" + devicetype + "/v" + str(startversion) + "/pub" + "/sendData.py", get_config_pub(root + "/" + devicetype + "/v" + str(startversion) + "/" + deviceconfig))
 #write_code(root + "/" + devicetype + "/v" + str(startversion) + "/sub" + "/receiveCommand.py", get_config_sub(root + "/" + devicetype + "/v" + str(startversion) + "/" + deviceconfig))
 
-write_config(root + "/" + devicetype + "/guidon/v" + str(startversion + 1) + "/device_supervisor_" + devicetype + "v" + str(startversion + 1) + ".cfg", get_config(root + "/" + devicetype + "/guidon/v" + str(startversion) + "/device_supervisor_" + devicetype + "v" + str(startversion) + ".cfg"), code_to_string(root + "/" + devicetype + "/guidon/v" + str(startversion + 1) + "/pub" + "/sendData.py"), code_to_string(root + "/" + devicetype + "/guidon/v" + str(startversion + 1) + "/sub" + "/receiveCommand.py"))
+write_config(root + "/" + devicetype + "/thingsboard/v" + str(startversion + 1) + "/device_supervisor_" + devicetype + "v" + str(startversion + 1) + ".cfg", get_config(root + "/" + devicetype + "/thingsboard/v" + str(startversion) + "/device_supervisor_" + devicetype + "_tb_v" + str(startversion) + ".cfg"), code_to_string(root + "/" + devicetype + "/thingsboard/v" + str(startversion + 1) + "/pub" + "/sendData.py"), code_to_string(root + "/" + devicetype + "/thingsboard/v" + str(startversion + 1) + "/sub" + "/receiveCommand.py"))

Pub_Sub/flowmeterskid/flowmeter.py

@@ -0,0 +1,148 @@
+# Enter your python code.
+import json
+from datetime import datetime as dt
+from common.Logger import logger
+from quickfaas.remotebus import publish
+from mobiuspi_lib.gps import GPS 
+
+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,
+            "week": 0,
+            "month": 0,
+            "year": 0,
+            "lifetime": 0,
+            "dayHolding": 0,
+            "weekHolding": 0,
+            "monthHolding": 0,
+            "yearHolding": 0
+        }
+except:
+    totalizers = {
+            "day": 0,
+            "week": 0,
+            "month": 0,
+            "year": 0,
+            "lifetime": 0,
+            "dayHolding": 0,
+            "weekHolding": 0,
+            "monthHolding": 0,
+            "yearHolding": 0
+        }
+
+
+
+
+def sendData(message,wizard_api):
+    logger.debug(message)
+    payload = {"ts": (round(dt.timestamp(dt.now())/600)*600)*1000, "values": {}}
+    resetPayload = {"ts": "", "values": {}}
+    for measure in message["values"]["flowmeter"].keys():
+        try:
+            if measure in ["totalizer_1"]:
+                payload["values"]["day_volume"], dayReset = totalizeDay(message["values"]["flowmeter"][measure]["raw_data"])
+                payload["values"]["week_volume"], weekReset = totalizeWeek(message["values"]["flowmeter"][measure]["raw_data"])
+                payload["values"]["month_volume"], monthReset = totalizeMonth(message["values"]["flowmeter"][measure]["raw_data"])
+                payload["values"]["year_volume"], yearReset = totalizeYear(message["values"]["flowmeter"][measure]["raw_data"])
+            payload["values"][measure] = message["values"]["flowmeter"][measure]["raw_data"]
+        except Exception as e:
+            logger.error(e)
+    try:
+        payload["values"]["latitude"], payload["values"]["longitude"], payload["values"]["speed"] =  getGPS()
+    except:
+        logger.error("Could not get GPS coordinates")
+    publish(__topic__, json.dumps(payload), __qos__)
+
+    if dayReset:
+        resetPayload["values"]["day_volume"] = 0
+    if weekReset:
+        resetPayload["values"]["week_volume"] = 0
+    if monthReset:
+        resetPayload["values"]["month_volume"] = 0
+    if yearReset:
+        resetPayload["values"]["year_volume"] = 0 
+
+    if resetPayload["values"]:
+        resetPayload["ts"] = 1 + (round(dt.timestamp(dt.now())/600)*600)*1000
+        publish(__topic__, json.dumps(resetPayload), __qos__) 
+
+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 getGPS():
+    # 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}")
+    speedKnots = position_status["speed"].split(" ")
+    speedMPH = float(speedKnots[0]) * 1.151
+    return (f"{lat_dec:.8f}",f"{lon_dec:.8f}",f"{speedMPH:.2f}")
+
+def totalizeDay(lifetime):
+    now = dt.fromtimestamp(round(dt.timestamp(dt.now())/600)*600)
+    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
+    return (value,reset)
+
+def totalizeWeek(lifetime):
+    now = dt.fromtimestamp(round(dt.timestamp(dt.now())/600)*600)
+    reset = False
+    value = lifetime - totalizers["weekHolding"]
+    if not now.strftime("%U") == totalizers["week"] and now.strftime("%a") == "Sun":
+        totalizers["weekHolding"] = lifetime
+        totalizers["week"] = now.strftime("%U")
+        saveTotalizers()
+        reset = True
+    return (value, reset)
+
+def totalizeMonth(lifetime):
+    now = dt.fromtimestamp(round(dt.timestamp(dt.now())/600)*600)
+    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
+    return (value,reset)
+
+def totalizeYear(lifetime):
+    now = dt.fromtimestamp(round(dt.timestamp(dt.now())/600)*600)
+    reset = False
+    value = lifetime - totalizers["yearHolding"]
+    if not int(now.strftime("%Y")) == int(totalizers["year"]):
+        totalizers["yearHolding"] = lifetime
+        totalizers["year"] = now.strftime("%Y")
+        saveTotalizers()
+        reset = True
+    return (value, reset)