From b47a1b6d51ee6bc72d974d9145a25bf42cda327e Mon Sep 17 00:00:00 2001 From: britkat1980 <69121158+britkat1980@users.noreply.github.com> Date: Sat, 4 Nov 2023 19:58:25 +0000 Subject: [PATCH] 2.4.0 --- GivTCP/GivLUT.py | 1 + GivTCP/evc.py | 2 +- GivTCP/palm_settings.py | 4 ++-- GivTCP/read.py | 3 ++- buildx.bat | 2 +- givtcp-vuejs/public/favicon.ico | Bin 4286 -> 176750 bytes startup.py | 12 ++++++++++++ 7 files changed, 19 insertions(+), 5 deletions(-) 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 df36fcfb72584e00488330b560ebcf34a41c64c2..9f3c9e037f8c003531330c3cfb83d0e1f4260a84 100644 GIT binary patch literal 176750 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 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")