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

Corrected feed-in and consumed energy source and type for x3-hybrid-g4 #178

Merged
merged 3 commits into from
Nov 23, 2024
Merged

Corrected feed-in and consumed energy source and type for x3-hybrid-g4 #178

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
cb0f916
Corrected feed-in and consumed energy source and type for x3-hybrid-g4
darmach Nov 23, 2024
e74e224
Tests - corrected expected values for consumed energy
darmach Nov 23, 2024
5825dbd
Added 'today' postfix to daily feed-in and consumed energy
darmach Nov 23, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
name: .coverage-${{ matrix.python-version }}
path: .coverage.${{ matrix.python-version }}
if-no-files-found: error
include-hidden-files: true

coverage:
runs-on: ubuntu-latest
Expand Down
8 changes: 4 additions & 4 deletions solax/inverters/x3_hybrid_g4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ def response_decoder(cls):
"PV Energy total": (pack_u16(80, 81), Total(Units.KWH), div10),
"EPS Energy total": (pack_u16(83, 84), Total(Units.KWH), div10),
"EPS Energy today": (85, DailyTotal(Units.KWH), div10),
"Feed-in Energy": (pack_u16(86, 87), Total(Units.KWH), div100),
"Consumed Energy": (pack_u16(88, 89), Total(Units.KWH), div100),
"Feed-in Energy total": (pack_u16(90, 91), Total(Units.KWH), div100),
"Consumed Energy total": (pack_u16(92, 93), Total(Units.KWH), div100),
"Feed-in Energy today": (pack_u16(90, 91), DailyTotal(Units.KWH), div100),
"Consumed Energy today": (pack_u16(92, 93), DailyTotal(Units.KWH), div100),
"Feed-in Energy total": (pack_u16(86, 87), Total(Units.KWH), div100),
"Consumed Energy total": (pack_u16(88, 89), Total(Units.KWH), div100),
"Battery Remaining Capacity": (103, Units.PERCENT),
"Battery Temperature": (105, Units.C, to_signed),
"Battery Remaining Energy": (
Expand Down
6 changes: 3 additions & 3 deletions tests/samples/expected_values.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,10 @@
"PV Energy total": 3.4,
"EPS Energy total": 0.0,
"EPS Energy today": 0.0,
"Feed-in Energy": 0.0,
"Consumed Energy": 20.09,
"Feed-in Energy today": 0.0,
"Consumed Energy today": 2.09,
"Feed-in Energy total": 0.0,
"Consumed Energy total": 2.09,
"Consumed Energy total": 20.09,
"Battery Remaining Capacity": 30.0,
"Battery Temperature": 22.0,
"Battery Remaining Energy": 3.3,
Expand Down