diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d6583f5..858b6d7 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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 diff --git a/solax/inverters/x3_hybrid_g4.py b/solax/inverters/x3_hybrid_g4.py index d4a15b3..89fa795 100644 --- a/solax/inverters/x3_hybrid_g4.py +++ b/solax/inverters/x3_hybrid_g4.py @@ -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": ( diff --git a/tests/samples/expected_values.py b/tests/samples/expected_values.py index 36c7f05..7f19963 100644 --- a/tests/samples/expected_values.py +++ b/tests/samples/expected_values.py @@ -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,