use .values() in solarwatt

tking · Dec 16, 2021 · e41b390 · e41b390
1 parent e24d661
commit e41b390
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/bezug_solarwatt/solarwatt.py b/modules/bezug_solarwatt/solarwatt.py
@@ -34,7 +34,7 @@ def DebugLog(message):
             bezugw = int(item["tagValues"]["PowerConsumedFromGrid"]["value"])
 
         for item in sresponse["result"]["items"].values():
-            einspeisungw = int(sresponse["result"]["items"][item]["tagValues"]["PowerOut"]["value"])
+            einspeisungw = int(item["tagValues"]["PowerOut"]["value"])
         bezugwatt = bezugw - einspeisungw
 if solarwattmethod == 1:  # Abruf über Gateway
     sresponse = requests.get('http://'+speicher1_ip2+':8080/', timeout=3).json()

diff --git a/modules/wr_solarwatt/solarwatt.py b/modules/wr_solarwatt/solarwatt.py
@@ -22,9 +22,9 @@ def DebugLog(message):
 
 sresponse = requests.get('http://'+speicher1_ip+'/rest/kiwigrid/wizard/devices', timeout=3).json()
 
-for item in sresponse["result"]["items"]:
+for item in sresponse["result"]["items"].values():
     try:
-        pvwatt = int(sresponse["result"]["items"][item]["tagValues"]["PowerProduced"]["value"])
+        pvwatt = int(item["tagValues"]["PowerProduced"]["value"])
         break
     except KeyError:
         pass