From 14247a7c1778cb5f055c0b7d3f6d64fe0d41b700 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20H=C3=B6xter?= Date: Mon, 14 Apr 2025 14:55:37 +0200 Subject: [PATCH] Remove powerDetailsCondensed - no need to make it that complicated --- home/portalmonitor.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/home/portalmonitor.py b/home/portalmonitor.py index 993aa65..20d327c 100755 --- a/home/portalmonitor.py +++ b/home/portalmonitor.py @@ -36,19 +36,6 @@ def isDaylight(lat, lon, toleranceSeconds): return daylight -# Condense the per Panel/Microinverter details down to -# the information we want to print out later on -def powerDetailsCondensed(powerDetails): - powerCondensed = [] - for panel in powerDetails: - panelData = {} - panelData["name"] = panel["SNALIAS"] - panelData["power"] = panel["POWER"] - panelData["timestamp"] = panel["SITETIME"] - powerCondensed.append(panelData) - - return(powerCondensed) - # Query all relevant System Information in one Session def retrieveData(userName, password, stationId): @@ -79,7 +66,7 @@ def retrieveData(userName, password, stationId): 'whereCondition': f"{{\"STATIONID\":\"{stationId}\"}}" }, timeout=(10, 60)).json() - powerDetails = powerDetailsCondensed(r['Data']['QueryResults']) + powerDetails = r['Data']['QueryResults'] r = s.post('https://www.envertecportal.com/apiAccount/Logout', timeout=(20, 40)) @@ -126,9 +113,9 @@ if isDaylight(conf['config'].getfloat('lat'), conf['config'].getfloat('lon'), conf['config']['stationId']) if args.printStatus: - print(f"Reported Total Power: {currentPower[0]}") + print(f"Total Power: {currentPower[0]}") for panel in currentPower[1]: - print(f"{panel['name']}: {panel['power']} - {panel['timestamp']}") + print(f"{panel['SNALIAS']}: {panel['POWER']} - {panel['SITETIME']}") if currentPower == 0: if stateCheck('FAILED', conf['config']['stateFile']): -- 2.39.5