diff --git a/GivTCP/GivLUT.py b/GivTCP/GivLUT.py index 5cf2c920..b07fc0b0 100644 --- a/GivTCP/GivLUT.py +++ b/GivTCP/GivLUT.py @@ -103,6 +103,7 @@ class GivLUT: "Last_Updated_Time":GEType("sensor","timestamp","","","",False,False,False), "Time_Since_Last_Update":GEType("sensor","","",0,10000,True,False,False), "status":GEType("sensor","string","","","",False,False,False), + "GivTCP_Version":GEType("sensor","string","","","",False,False,False), "Export_Energy_Total_kWh":GEType("sensor","energy","",0,maxTotalEnergy,False,True,True), "Battery_Throughput_Total_kWh":GEType("sensor","energy","",0,maxTotalEnergy,False,True,True), "AC_Charge_Energy_Total_kWh":GEType("sensor","energy","",0,maxTotalEnergy,False,True,True), diff --git a/GivTCP/evc.py b/GivTCP/evc.py index 9366b98e..deda8e70 100644 --- a/GivTCP/evc.py +++ b/GivTCP/evc.py @@ -312,7 +312,7 @@ def getEVCCache(): evcRegCache= pickle.load(inp) return json.dumps(evcRegCache) else: - return json.dumps("No EVC data found") + return json.dumps("No EVC data found",indent=4) def setChargeMode(mode): if mode=="enable": diff --git a/GivTCP/palm_settings.py b/GivTCP/palm_settings.py index f32c1bb0..36d8df31 100644 --- a/GivTCP/palm_settings.py +++ b/GivTCP/palm_settings.py @@ -102,11 +102,11 @@ class GE: # Start time for Overnight Charge # start_time = os.getenv('NIGHTRATESTART') - start_time = GiV_Settings.NIGHTRATESTART + start_time = GiV_Settings.night_rate_start # End time for Overnight Charge # end_time = os.getenv('DAYRATESTART') - end_time = GiV_Settings.DAYRATESTART + end_time = GiV_Settings.day_rate_start # SolCast PV forecast generator. Up to two arrays are supported with a forecast for each diff --git a/GivTCP/read.py b/GivTCP/read.py index 5276aa09..9bc2e8ee 100644 --- a/GivTCP/read.py +++ b/GivTCP/read.py @@ -69,7 +69,8 @@ def getData(fullrefresh): # Read from Inverter put in cache multi_output['Last_Updated_Time'] = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc).isoformat() multi_output['status'] = "online" - multi_output['Time_Since_Last_Update'] = 0 + multi_output['Time_Since_Last_Update'] = 0 + multi_output['GivTCP_Version']= "2.3.153" except: e = sys.exc_info() consecFails(e) diff --git a/buildx.bat b/buildx.bat index 86bbaeec..b34b3a9d 100644 --- a/buildx.bat +++ b/buildx.bat @@ -1,3 +1,3 @@ -docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-dev:2.3.151 -t britkat/giv_tcp-dev:latest --push . +docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-dev:2.3.153 -t britkat/giv_tcp-dev:latest --push . ::docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-dev:latest --push . ::docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-ma:latest -t britkat/giv_tcp-ma:2.3.3 --push . diff --git a/givtcp-vuejs/public/favicon.ico b/givtcp-vuejs/public/favicon.ico index df36fcfb..9f3c9e03 100644 Binary files a/givtcp-vuejs/public/favicon.ico and b/givtcp-vuejs/public/favicon.ico differ diff --git a/startup.py b/startup.py index 805ca96c..e113bb55 100644 --- a/startup.py +++ b/startup.py @@ -305,6 +305,18 @@ def getInvDeets(HOST): outp.write(" Debug_File_Location=\""+os.getenv("CACHELOCATION")+"/log_inv_"+str(inv)+".log\"\n") outp.write(" inverter_num=\""+str(inv)+"\"\n") + outp.write(" GE_API=\""+str(os.getenv("CACHELOCATION")+"\"\n")) + outp.write(" PALM_WINTER=\""+str(os.getenv("PALM_WINTER")+"\"\n")) + outp.write(" PALM_SHOULDER=\""+str(os.getenv("PALM_SHOULDER")+"\"\n")) + outp.write(" PALM_MIN_SOC_TARGET=\""+str(os.getenv("PALM_MIN_SOC_TARGET")+"\"\n")) + outp.write(" PALM_MAX_SOC_TARGET=\""+str(os.getenv("PALM_MAX_SOC_TARGET")+"\"\n")) + outp.write(" PALM_BATT_RESERVE=\""+str(os.getenv("PALM_BATT_RESERVE")+"\"\n")) + outp.write(" PALM_BATT_UTILISATION=\""+str(os.getenv("PALM_BATT_UTILISATION")+"\"\n")) + outp.write(" SOLCASTAPI=\""+str(os.getenv("SOLCASTAPI")+"\"\n")) + outp.write(" SOLCASTSITEID=\""+str(os.getenv("SOLCASTSITEID")+"\"\n")) + outp.write(" SOLCASTSITEID2=\""+str(os.getenv("SOLCASTSITEID2")+"\"\n")) + outp.write(" PALM_WEIGHT=\""+str(os.getenv("PALM_WEIGHT")+"\"\n")) + outp.write(" evc_enable=\""+os.getenv("EVC_ENABLE")+"\"\n") outp.write(" evc_ip_address=\""+os.getenv("EVC_IP_ADDRESS")+"\"\n") outp.write(" evc_self_run_timer="+os.getenv("EVC_SELF_RUN_TIMER")+"\n")