File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed
Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -275,14 +275,16 @@ async def _read_data(self) -> MeterData:
275275 return self .get_data ()
276276
277277 def _sensors_2_meter_data (self ) -> MeterData :
278- # TODO: check if this is correct, may need to consider battery power
279- consumption = self ._sensors [pysmaplus .definitions_webconnect .grid_power .key ].value
278+ overall_power = self ._sensors [pysmaplus .definitions_webconnect .grid_power .key ].value
279+ power_from_grid = self ._sensors [pysmaplus .definitions_webconnect .metering_power_absorbed .key ].value
280+ power_to_grid = self ._sensors [pysmaplus .definitions_webconnect .metering_power_supplied .key ].value
280281
281282 pv = self ._sensors [pysmaplus .definitions_webconnect .pv_power .key ].value
282283
283284 # + from grid, - to grid
284- grid = self ._sensors [pysmaplus .definitions_webconnect .metering_power_absorbed .key ].value
285- grid -= self ._sensors [pysmaplus .definitions_webconnect .metering_power_supplied .key ].value
285+ grid = power_from_grid - power_to_grid
286+
287+ consumption = overall_power - power_to_grid
286288
287289 # battery charging is considered as home consumption
288290 energy_to_grid = self ._sensors [pysmaplus .definitions_webconnect .metering_total_yield .key ].value * 1000
You can’t perform that action at this time.
0 commit comments