Skip to content

Commit

Permalink
Merge pull request #20 from nilrog/master
Browse files Browse the repository at this point in the history
Restoring day energy conversion to kWh and removing two redundant smartmeter sensors.
  • Loading branch information
safepay committed Mar 30, 2020
2 parents e21b13b + a34445e commit c13f580
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions custom_components/fronius_inverter/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@
'smartmeter_voltage_ac_phase_one': ['smartmeter', False, 'Voltage_AC_Phase_1', 'SmartMeter Voltage AC Phase 1', 'V', False, 'mdi:solar-power'],
'smartmeter_voltage_ac_phase_two': ['smartmeter', False, 'Voltage_AC_Phase_2', 'SmartMeter Voltage AC Phase 2', 'V', False, 'mdi:solar-power'],
'smartmeter_voltage_ac_phase_three': ['smartmeter', False, 'Voltage_AC_Phase_3', 'SmartMeter Voltage AC Phase 3', 'V', False, 'mdi:solar-power'],
'smartmeter_energy_ac_absolute_plus': ['smartmeter', False, 'EnergyReal_WAC_Plus_Absolute', 'SmartMeter Energy AC Absolute Plus', 'Wh', 'energy', 'mdi:solar-power'],
'smartmeter_energy_ac_absolute_minus': ['smartmeter', False, 'EnergyReal_WAC_Minus_Absolute', 'SmartMeter Energy AC Absolute Minus', 'Wh', 'energy', 'mdi:solar-power'],
'smartmeter_energy_ac_consumed': ['smartmeter', False, 'EnergyReal_WAC_Sum_Consumed', 'SmartMeter Energy AC Consumed', 'Wh', 'energy', 'mdi:solar-power'],
'smartmeter_energy_ac_sold': ['smartmeter', False, 'EnergyReal_WAC_Sum_Produced', 'SmartMeter Energy AC Sold', 'Wh', 'energy', 'mdi:solar-power']
}
Expand Down Expand Up @@ -269,6 +267,10 @@ async def async_update(self, utcnow=None):
self._state = round(state / 1000, 2)
else:
self._state = round(state, 2)
elif self._json_key == "DAY_ENERGY":
# day energy always gets converted to kWh
_LOGGER.debug("Converting day energy to kWh ({})".format(state))
self._state = round(state / 1000, 2)
else:
_LOGGER.debug("Rounding ({}) to two decimals".format(state))
self._state = round(state, 2)
Expand Down

0 comments on commit c13f580

Please sign in to comment.