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.

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

Sensor names: Remove trailing whitespace #177

Merged
merged 2 commits into from
Nov 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion solax/inverters/x3_hybrid_g4.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def response_decoder(cls):
"EPS 1 Power": (29, Units.W, to_signed),
"EPS 2 Power": (30, Units.W, to_signed),
"EPS 3 Power": (31, Units.W, to_signed),
"Grid Power ": (pack_u16(34, 35), Units.W, to_signed32),
"Grid Power": (pack_u16(34, 35), Units.W, to_signed32),
# 'Battery Voltage' is twice in the json response and covered with 169, 170 below.
# "Battery Voltage": (39, Units.V, div100),
"Battery Current": (40, Units.A, twoway_div100),
Expand Down
2 changes: 1 addition & 1 deletion solax/inverters/x3_mic_pro_g2.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def response_decoder(cls):
"Run Mode": (21, Units.NONE, X3MicProG2._decode_run_mode),
"Total Yield": (pack_u16(22, 23), Total(Units.KWH), div10),
"Daily Yield": (24, DailyTotal(Units.KWH), div10),
"Feed-in Power ": (pack_u16(72, 73), Units.W, to_signed32),
"Feed-in Power": (pack_u16(72, 73), Units.W, to_signed32),
"Total Feed-in Energy": (pack_u16(74, 75), Total(Units.KWH), div100),
"Total Consumption": (pack_u16(76, 77), Total(Units.KWH), div100),
}
Expand Down
2 changes: 1 addition & 1 deletion solax/inverters/x3_ultra.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def response_decoder(cls):
"EPS 1 Power": (29, Units.W, to_signed),
"EPS 2 Power": (30, Units.W, to_signed),
"EPS 3 Power": (31, Units.W, to_signed),
"Grid Power ": (pack_u16(34, 35), Units.W, to_signed32),
"Grid Power": (pack_u16(34, 35), Units.W, to_signed32),
"Battery 1 Voltage": (39, Units.V, div10),
"Battery 2 Voltage": (132, Units.V, div10),
"Battery 1 Current": (40, Units.A, twoway_div100),
Expand Down
6 changes: 3 additions & 3 deletions tests/samples/expected_values.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
"EPS 1 Power": 0.0,
"EPS 2 Power": 0.0,
"EPS 3 Power": 0.0,
"Grid Power ": -152.0,
"Grid Power": -152.0,
"Battery Current": 0.0,
"Battery Power": 0.0,
"Load/Generator Power": 342.0,
Expand Down Expand Up @@ -336,7 +336,7 @@
"Run Mode": "Normal",
"Total Yield": 795.7,
"Daily Yield": 20.0,
"Feed-in Power ": 2707.0,
"Feed-in Power": 2707.0,
"Total Feed-in Energy": 657.24,
"Total Consumption": 307.33,
}
Expand Down Expand Up @@ -621,7 +621,7 @@
"EPS 1 Power": 0.0,
"EPS 2 Power": 0.0,
"EPS 3 Power": 0.0,
"Grid Power ": 52.0,
"Grid Power": 52.0,
"Battery 1 Voltage": 213.8,
"Battery 2 Voltage": 212.9,
"Battery 1 Current": 9.6,
Expand Down