Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release of v1.10 #7

Merged
merged 3 commits into from
Jan 3, 2023
Merged

Release of v1.10 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad312a4
Check if AC Sum measurement exists.
bjosa Dec 23, 2022
5ecde4b
fix: Add more checks to the meter data
SirUli Jan 1, 2023
dd34041
fix: Prepare v1.10 release
SirUli Jan 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 22 additions & 11 deletions fronius-smartmeter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,19 +257,30 @@ def _update(self):
self._dbusservice["/Ac/L2/Energy/Reverse"] = None
self._dbusservice["/Ac/L3/Energy/Forward"] = None
self._dbusservice["/Ac/L3/Energy/Reverse"] = None
self._dbusservice["/Ac/Frequency"] = meter_data["Frequency_Phase_Average"]
self._dbusservice["/Ac/L1/Voltage"] = meter_data["Voltage_AC_Phase_1"]
self._dbusservice["/Ac/L2/Voltage"] = meter_data["Voltage_AC_Phase_2"]
self._dbusservice["/Ac/L3/Voltage"] = meter_data["Voltage_AC_Phase_3"]
self._dbusservice["/Ac/Current"] = meter_data["Current_AC_Sum"]
self._dbusservice["/Ac/L1/Current"] = meter_data["Current_AC_Phase_1"]
self._dbusservice["/Ac/L2/Current"] = meter_data["Current_AC_Phase_2"]
self._dbusservice["/Ac/L3/Current"] = meter_data["Current_AC_Phase_3"]
if "Frequency_Phase_Average" in meter_data:
self._dbusservice["/Ac/Frequency"] = meter_data["Frequency_Phase_Average"]
if "Voltage_AC_Phase_1" in meter_data:
self._dbusservice["/Ac/L1/Voltage"] = meter_data["Voltage_AC_Phase_1"]
if "Voltage_AC_Phase_2" in meter_data:
self._dbusservice["/Ac/L2/Voltage"] = meter_data["Voltage_AC_Phase_2"]
if "Voltage_AC_Phase_3" in meter_data:
self._dbusservice["/Ac/L3/Voltage"] = meter_data["Voltage_AC_Phase_3"]
if "Current_AC_Sum" in meter_data:
self._dbusservice["/Ac/Current"] = meter_data["Current_AC_Sum"]
if "Current_AC_Phase_1" in meter_data:
self._dbusservice["/Ac/L1/Current"] = meter_data["Current_AC_Phase_1"]
if "Current_AC_Phase_2" in meter_data:
self._dbusservice["/Ac/L2/Current"] = meter_data["Current_AC_Phase_2"]
if "Current_AC_Phase_3" in meter_data:
self._dbusservice["/Ac/L3/Current"] = meter_data["Current_AC_Phase_3"]
# positive: consumption, negative: feed into grid
self._dbusservice["/Ac/Power"] = meter_consumption
self._dbusservice["/Ac/L1/Power"] = meter_data["PowerReal_P_Phase_1"]
self._dbusservice["/Ac/L2/Power"] = meter_data["PowerReal_P_Phase_2"]
self._dbusservice["/Ac/L3/Power"] = meter_data["PowerReal_P_Phase_3"]
if "PowerReal_P_Phase_1" in meter_data:
self._dbusservice["/Ac/L1/Power"] = meter_data["PowerReal_P_Phase_1"]
if "PowerReal_P_Phase_2" in meter_data:
self._dbusservice["/Ac/L2/Power"] = meter_data["PowerReal_P_Phase_2"]
if "PowerReal_P_Phase_3" in meter_data:
self._dbusservice["/Ac/L3/Power"] = meter_data["PowerReal_P_Phase_3"]
self._dbusservice["/Ac/Energy/Forward"] = (
float(meter_data["EnergyReal_WAC_Sum_Consumed"]) / 1000.0
)
Expand Down
2 changes: 1 addition & 1 deletion version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.9
v1.10