Skip to content

Commit 1286e5d

Browse files
CoMPaTechbouwew
authored andcommitted
Update actual 442 data without produced bug
1 parent b4c4b3c commit 1286e5d

File tree

13 files changed

+1164
-1637
lines changed

13 files changed

+1164
-1637
lines changed

tests/test_smile.py

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,10 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None):
443443
if key_1 != key_2:
444444
continue
445445

446+
_LOGGER.info(
447+
"%s",
448+
f" + Testing {key_1} ({val_1} should be {val_2})",
449+
)
446450
assert val_1 == val_2
447451
asserts += 1
448452
else:
@@ -5061,11 +5065,11 @@ async def test_connect_p1v4(self):
50615065

50625066
@pytest.mark.asyncio
50635067
async def test_connect_p1v4_442_single(self):
5064-
"""Test a P1 firmware 4 single-phase setup."""
5068+
"""Test a P1 firmware 4.4 single-phase setup."""
50655069
testdata = {
50665070
"a455b61e52394b2db5081ce025a430f3": {
50675071
"dev_class": "gateway",
5068-
"firmware": "4.4.0",
5072+
"firmware": "4.4.2",
50695073
"hardware": "AME Smile 2.0 board",
50705074
"location": "a455b61e52394b2db5081ce025a430f3",
50715075
"mac_address": "012345670001",
@@ -5082,22 +5086,22 @@ async def test_connect_p1v4_442_single(self):
50825086
"vendor": "SHENZHEN KAIFA TECHNOLOGY (CHENGDU) CO., LTD.",
50835087
"available": True,
50845088
"sensors": {
5085-
"net_electricity_point": 581,
5086-
"electricity_consumed_peak_point": 581,
5087-
"electricity_consumed_off_peak_point": 0,
5088-
"net_electricity_cumulative": 30718.064,
5089-
"electricity_consumed_peak_cumulative": 13523.584,
5090-
"electricity_consumed_off_peak_cumulative": 17194.48,
5091-
"electricity_consumed_peak_interval": 9,
5092-
"electricity_consumed_off_peak_interval": 0,
5089+
"net_electricity_point": 421,
5090+
"electricity_consumed_peak_point": 0,
5091+
"electricity_consumed_off_peak_point": 421,
5092+
"net_electricity_cumulative": 31610.113,
5093+
"electricity_consumed_peak_cumulative": 13966.608,
5094+
"electricity_consumed_off_peak_cumulative": 17643.505,
5095+
"electricity_consumed_peak_interval": 0,
5096+
"electricity_consumed_off_peak_interval": 21,
50935097
"electricity_produced_peak_point": 0,
50945098
"electricity_produced_off_peak_point": 0,
50955099
"electricity_produced_peak_cumulative": 0.0,
50965100
"electricity_produced_off_peak_cumulative": 0.0,
50975101
"electricity_produced_peak_interval": 0,
50985102
"electricity_produced_off_peak_interval": 0,
5099-
"electricity_phase_one_consumed": 0,
5100-
"electricity_phase_one_produced": 581,
5103+
"electricity_phase_one_consumed": 413,
5104+
"electricity_phase_one_produced": 0,
51015105
},
51025106
},
51035107
}
@@ -5110,7 +5114,7 @@ async def test_connect_p1v4_442_single(self):
51105114
_LOGGER.info(" # Assert type = power")
51115115
assert smile.smile_type == "power"
51125116
_LOGGER.info(" # Assert version")
5113-
assert smile.smile_version[0] == "4.4.0"
5117+
assert smile.smile_version[0] == "4.4.2"
51145118
_LOGGER.info(" # Assert legacy")
51155119
assert not smile._smile_legacy
51165120

@@ -5128,7 +5132,7 @@ async def test_connect_p1v4_442_triple(self):
51285132
testdata = {
51295133
"03e65b16e4b247a29ae0d75a78cb492e": {
51305134
"dev_class": "gateway",
5131-
"firmware": "4.4.0",
5135+
"firmware": "4.4.2",
51325136
"hardware": "AME Smile 2.0 board",
51335137
"location": "03e65b16e4b247a29ae0d75a78cb492e",
51345138
"mac_address": "012345670001",
@@ -5145,31 +5149,31 @@ async def test_connect_p1v4_442_triple(self):
51455149
"vendor": "XEMEX NV",
51465150
"available": True,
51475151
"sensors": {
5148-
"net_electricity_point": 2422,
5149-
"electricity_consumed_peak_point": 2422,
5150-
"electricity_consumed_off_peak_point": 0,
5151-
"net_electricity_cumulative": 220806.738,
5152-
"electricity_consumed_peak_cumulative": 154585.221,
5153-
"electricity_consumed_off_peak_cumulative": 66221.517,
5152+
"net_electricity_point": 5553,
5153+
"electricity_consumed_peak_point": 0,
5154+
"electricity_consumed_off_peak_point": 5553,
5155+
"net_electricity_cumulative": 231866.539,
5156+
"electricity_consumed_peak_cumulative": 161328.641,
5157+
"electricity_consumed_off_peak_cumulative": 70537.898,
51545158
"electricity_consumed_peak_interval": 0,
5155-
"electricity_consumed_off_peak_interval": 0,
5159+
"electricity_consumed_off_peak_interval": 314,
51565160
"electricity_produced_peak_point": 0,
51575161
"electricity_produced_off_peak_point": 0,
51585162
"electricity_produced_peak_cumulative": 0.0,
51595163
"electricity_produced_off_peak_cumulative": 0.0,
51605164
"electricity_produced_peak_interval": 0,
51615165
"electricity_produced_off_peak_interval": 0,
5162-
"electricity_phase_one_consumed": 0,
5163-
"electricity_phase_two_consumed": 0,
5164-
"electricity_phase_three_consumed": 0,
5165-
"electricity_phase_one_produced": 1737,
5166-
"electricity_phase_two_produced": 200,
5167-
"electricity_phase_three_produced": 486,
5168-
"gas_consumed_cumulative": 15263.4,
5169-
"gas_consumed_interval": 0.0,
5170-
"voltage_phase_one": 230.3,
5171-
"voltage_phase_two": 232.8,
5172-
"voltage_phase_three": 232.6,
5166+
"electricity_phase_one_consumed": 1763,
5167+
"electricity_phase_two_consumed": 1703,
5168+
"electricity_phase_three_consumed": 2080,
5169+
"electricity_phase_one_produced": 0,
5170+
"electricity_phase_two_produced": 0,
5171+
"electricity_phase_three_produced": 0,
5172+
"gas_consumed_cumulative": 16811.37,
5173+
"gas_consumed_interval": 0.06,
5174+
"voltage_phase_one": 233.2,
5175+
"voltage_phase_two": 234.4,
5176+
"voltage_phase_three": 234.7,
51735177
},
51745178
},
51755179
}
@@ -5182,7 +5186,7 @@ async def test_connect_p1v4_442_triple(self):
51825186
_LOGGER.info(" # Assert type = power")
51835187
assert smile.smile_type == "power"
51845188
_LOGGER.info(" # Assert version")
5185-
assert smile.smile_version[0] == "4.4.0"
5189+
assert smile.smile_version[0] == "4.4.2"
51865190
_LOGGER.info(" # Assert legacy")
51875191
assert not smile._smile_legacy
51885192

userdata/p1v4_440beta_single/core.direct_objects.xml

Lines changed: 0 additions & 189 deletions
This file was deleted.

0 commit comments

Comments
 (0)