Skip to content

Commit f68205b

Browse files
committed
Line up other fixtures
1 parent e2bf1fb commit f68205b

33 files changed

+2575
-2594
lines changed
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"a455b61e52394b2db5081ce025a430f3": {
3+
"binary_sensors": {
4+
"plugwise_notification": false
5+
},
6+
"dev_class": "gateway",
7+
"firmware": "4.4.2",
8+
"hardware": "AME Smile 2.0 board",
9+
"location": "a455b61e52394b2db5081ce025a430f3",
10+
"mac_address": "012345670001",
11+
"model": "Gateway",
12+
"model_id": "smile",
13+
"name": "Smile P1",
14+
"notifications": {},
15+
"vendor": "Plugwise"
16+
},
17+
"ba4de7613517478da82dd9b6abea36af": {
18+
"available": true,
19+
"dev_class": "smartmeter",
20+
"location": "a455b61e52394b2db5081ce025a430f3",
21+
"model": "KFM5KAIFA-METER",
22+
"name": "P1",
23+
"sensors": {
24+
"electricity_consumed_off_peak_cumulative": 17643.423,
25+
"electricity_consumed_off_peak_interval": 15,
26+
"electricity_consumed_off_peak_point": 486,
27+
"electricity_consumed_peak_cumulative": 13966.608,
28+
"electricity_consumed_peak_interval": 0,
29+
"electricity_consumed_peak_point": 0,
30+
"electricity_phase_one_consumed": 486,
31+
"electricity_phase_one_produced": 0,
32+
"electricity_produced_off_peak_cumulative": 0.0,
33+
"electricity_produced_off_peak_interval": 0,
34+
"electricity_produced_off_peak_point": 0,
35+
"electricity_produced_peak_cumulative": 0.0,
36+
"electricity_produced_peak_interval": 0,
37+
"electricity_produced_peak_point": 0,
38+
"net_electricity_cumulative": 31610.031,
39+
"net_electricity_point": 486
40+
},
41+
"vendor": "SHENZHEN KAIFA TECHNOLOGY \uff08CHENGDU\uff09 CO., LTD."
42+
}
43+
}

tests/data/anna/anna_elga_2.json

Lines changed: 80 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,85 @@
11
{
2-
"devices": {
3-
"573c152e7d4f4720878222bd75638f5b": {
4-
"available": true,
5-
"binary_sensors": {
6-
"compressor_state": true,
7-
"cooling_enabled": false,
8-
"cooling_state": false,
9-
"dhw_state": false,
10-
"flame_state": true,
11-
"heating_state": true,
12-
"secondary_boiler_state": true
13-
},
14-
"dev_class": "heater_central",
15-
"location": "d34dfe6ab90b410c98068e75de3eb631",
16-
"model": "Generic heater/cooler",
17-
"name": "OpenTherm",
18-
"sensors": {
19-
"domestic_hot_water_setpoint": 60.0,
20-
"intended_boiler_temperature": 58.3,
21-
"modulation_level": 55,
22-
"outdoor_air_temperature": 6.0,
23-
"return_temperature": 35.5,
24-
"water_pressure": 0.5,
25-
"water_temperature": 42.6
26-
},
27-
"switches": {
28-
"dhw_cm_switch": false
29-
},
30-
"vendor": "Techneco"
2+
"573c152e7d4f4720878222bd75638f5b": {
3+
"available": true,
4+
"binary_sensors": {
5+
"compressor_state": true,
6+
"cooling_enabled": false,
7+
"cooling_state": false,
8+
"dhw_state": false,
9+
"flame_state": true,
10+
"heating_state": true,
11+
"secondary_boiler_state": true
3112
},
32-
"ebd90df1ab334565b5895f37590ccff4": {
33-
"active_preset": "home",
34-
"available_schedules": ["Thermostat schedule", "off"],
35-
"climate_mode": "auto",
36-
"control_state": "heating",
37-
"dev_class": "thermostat",
38-
"firmware": "2018-02-08T11:15:53+01:00",
39-
"hardware": "6539-1301-5002",
40-
"location": "d3ce834534114348be628b61b26d9220",
41-
"model": "ThermoTouch",
42-
"name": "Anna",
43-
"preset_modes": ["away", "no_frost", "vacation", "home", "asleep"],
44-
"select_schedule": "Thermostat schedule",
45-
"sensors": {
46-
"cooling_activation_outdoor_temperature": 24.0,
47-
"cooling_deactivation_threshold": 2.0,
48-
"illuminance": 0.5,
49-
"setpoint_high": 30.0,
50-
"setpoint_low": 19.5,
51-
"temperature": 19.2
52-
},
53-
"temperature_offset": {
54-
"lower_bound": -2.0,
55-
"resolution": 0.1,
56-
"setpoint": 0.0,
57-
"upper_bound": 2.0
58-
},
59-
"thermostat": {
60-
"lower_bound": 4.0,
61-
"resolution": 0.1,
62-
"setpoint_high": 30.0,
63-
"setpoint_low": 19.5,
64-
"upper_bound": 30.0
65-
},
66-
"vendor": "Plugwise"
13+
"dev_class": "heater_central",
14+
"location": "d34dfe6ab90b410c98068e75de3eb631",
15+
"model": "Generic heater/cooler",
16+
"name": "OpenTherm",
17+
"sensors": {
18+
"domestic_hot_water_setpoint": 60.0,
19+
"intended_boiler_temperature": 58.3,
20+
"modulation_level": 55,
21+
"outdoor_air_temperature": 6.0,
22+
"return_temperature": 35.5,
23+
"water_pressure": 0.5,
24+
"water_temperature": 42.6
6725
},
68-
"fb49af122f6e4b0f91267e1cf7666d6f": {
69-
"binary_sensors": {
70-
"plugwise_notification": false
71-
},
72-
"dev_class": "gateway",
73-
"firmware": "4.4.1",
74-
"hardware": "AME Smile 2.0 board",
75-
"location": "d34dfe6ab90b410c98068e75de3eb631",
76-
"mac_address": "C4930002FE76",
77-
"model": "Gateway",
78-
"model_id": "smile_thermo",
79-
"name": "Smile Anna",
80-
"notifications": {},
81-
"sensors": {
82-
"outdoor_temperature": 6.38
83-
},
84-
"vendor": "Plugwise"
85-
}
26+
"switches": {
27+
"dhw_cm_switch": false
28+
},
29+
"vendor": "Techneco"
30+
},
31+
"ebd90df1ab334565b5895f37590ccff4": {
32+
"active_preset": "home",
33+
"available_schedules": ["Thermostat schedule", "off"],
34+
"climate_mode": "auto",
35+
"control_state": "heating",
36+
"dev_class": "thermostat",
37+
"firmware": "2018-02-08T11:15:53+01:00",
38+
"hardware": "6539-1301-5002",
39+
"location": "d3ce834534114348be628b61b26d9220",
40+
"model": "ThermoTouch",
41+
"name": "Anna",
42+
"preset_modes": ["away", "no_frost", "vacation", "home", "asleep"],
43+
"select_schedule": "Thermostat schedule",
44+
"sensors": {
45+
"cooling_activation_outdoor_temperature": 24.0,
46+
"cooling_deactivation_threshold": 2.0,
47+
"illuminance": 0.5,
48+
"setpoint_high": 30.0,
49+
"setpoint_low": 19.5,
50+
"temperature": 19.2
51+
},
52+
"temperature_offset": {
53+
"lower_bound": -2.0,
54+
"resolution": 0.1,
55+
"setpoint": 0.0,
56+
"upper_bound": 2.0
57+
},
58+
"thermostat": {
59+
"lower_bound": 4.0,
60+
"resolution": 0.1,
61+
"setpoint_high": 30.0,
62+
"setpoint_low": 19.5,
63+
"upper_bound": 30.0
64+
},
65+
"vendor": "Plugwise"
66+
},
67+
"fb49af122f6e4b0f91267e1cf7666d6f": {
68+
"binary_sensors": {
69+
"plugwise_notification": false
70+
},
71+
"dev_class": "gateway",
72+
"firmware": "4.4.1",
73+
"hardware": "AME Smile 2.0 board",
74+
"location": "d34dfe6ab90b410c98068e75de3eb631",
75+
"mac_address": "C4930002FE76",
76+
"model": "Gateway",
77+
"model_id": "smile_thermo",
78+
"name": "Smile Anna",
79+
"notifications": {},
80+
"sensors": {
81+
"outdoor_temperature": 6.38
82+
},
83+
"vendor": "Plugwise"
8684
}
8785
}
Lines changed: 86 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,91 @@
11
{
2-
"devices": {
3-
"573c152e7d4f4720878222bd75638f5b": {
4-
"available": true,
5-
"binary_sensors": {
6-
"compressor_state": true,
7-
"cooling_enabled": true,
8-
"cooling_state": true,
9-
"dhw_state": false,
10-
"flame_state": false,
11-
"heating_state": false,
12-
"secondary_boiler_state": false
13-
},
14-
"dev_class": "heater_central",
15-
"location": "d34dfe6ab90b410c98068e75de3eb631",
16-
"maximum_boiler_temperature": {
17-
"lower_bound": 0.0,
18-
"resolution": 1.0,
19-
"setpoint": 60.0,
20-
"upper_bound": 100.0
21-
},
22-
"model": "Generic heater/cooler",
23-
"name": "OpenTherm",
24-
"sensors": {
25-
"domestic_hot_water_setpoint": 60.0,
26-
"intended_boiler_temperature": 0.0,
27-
"modulation_level": 0.0,
28-
"outdoor_air_temperature": 30.0,
29-
"return_temperature": 23.4,
30-
"water_pressure": 0.5,
31-
"water_temperature": 22.8
32-
},
33-
"switches": {
34-
"dhw_cm_switch": true
35-
},
36-
"vendor": "Techneco"
2+
"573c152e7d4f4720878222bd75638f5b": {
3+
"available": true,
4+
"binary_sensors": {
5+
"compressor_state": true,
6+
"cooling_enabled": true,
7+
"cooling_state": true,
8+
"dhw_state": false,
9+
"flame_state": false,
10+
"heating_state": false,
11+
"secondary_boiler_state": false
3712
},
38-
"ebd90df1ab334565b5895f37590ccff4": {
39-
"active_preset": "home",
40-
"available_schedules": ["Thermostat schedule", "off"],
41-
"climate_mode": "auto",
42-
"control_state": "cooling",
43-
"dev_class": "thermostat",
44-
"firmware": "2018-02-08T11:15:53+01:00",
45-
"hardware": "6539-1301-5002",
46-
"location": "d3ce834534114348be628b61b26d9220",
47-
"model": "ThermoTouch",
48-
"name": "Anna",
49-
"preset_modes": ["away", "no_frost", "vacation", "home", "asleep"],
50-
"select_schedule": "Thermostat schedule",
51-
"sensors": {
52-
"cooling_activation_outdoor_temperature": 26.0,
53-
"cooling_deactivation_threshold": 3.0,
54-
"illuminance": 0.5,
55-
"setpoint_high": 23.0,
56-
"setpoint_low": 4.0,
57-
"temperature": 24.9
58-
},
59-
"temperature_offset": {
60-
"lower_bound": -2.0,
61-
"resolution": 0.1,
62-
"setpoint": 0.0,
63-
"upper_bound": 2.0
64-
},
65-
"thermostat": {
66-
"lower_bound": 4.0,
67-
"resolution": 0.1,
68-
"setpoint_high": 23.0,
69-
"setpoint_low": 4.0,
70-
"upper_bound": 30.0
71-
},
72-
"vendor": "Plugwise"
13+
"dev_class": "heater_central",
14+
"location": "d34dfe6ab90b410c98068e75de3eb631",
15+
"maximum_boiler_temperature": {
16+
"lower_bound": 0.0,
17+
"resolution": 1.0,
18+
"setpoint": 60.0,
19+
"upper_bound": 100.0
7320
},
74-
"fb49af122f6e4b0f91267e1cf7666d6f": {
75-
"binary_sensors": {
76-
"plugwise_notification": false
77-
},
78-
"dev_class": "gateway",
79-
"firmware": "4.2.1",
80-
"hardware": "AME Smile 2.0 board",
81-
"location": "d34dfe6ab90b410c98068e75de3eb631",
82-
"mac_address": "C4930002FE76",
83-
"model": "Gateway",
84-
"model_id": "smile_thermo",
85-
"name": "Smile Anna",
86-
"notifications": {},
87-
"sensors": {
88-
"outdoor_temperature": 31.0
89-
},
90-
"vendor": "Plugwise"
91-
}
21+
"model": "Generic heater/cooler",
22+
"name": "OpenTherm",
23+
"sensors": {
24+
"domestic_hot_water_setpoint": 60.0,
25+
"intended_boiler_temperature": 0.0,
26+
"modulation_level": 0.0,
27+
"outdoor_air_temperature": 30.0,
28+
"return_temperature": 23.4,
29+
"water_pressure": 0.5,
30+
"water_temperature": 22.8
31+
},
32+
"switches": {
33+
"dhw_cm_switch": true
34+
},
35+
"vendor": "Techneco"
36+
},
37+
"ebd90df1ab334565b5895f37590ccff4": {
38+
"active_preset": "home",
39+
"available_schedules": ["Thermostat schedule", "off"],
40+
"climate_mode": "auto",
41+
"control_state": "cooling",
42+
"dev_class": "thermostat",
43+
"firmware": "2018-02-08T11:15:53+01:00",
44+
"hardware": "6539-1301-5002",
45+
"location": "d3ce834534114348be628b61b26d9220",
46+
"model": "ThermoTouch",
47+
"name": "Anna",
48+
"preset_modes": ["away", "no_frost", "vacation", "home", "asleep"],
49+
"select_schedule": "Thermostat schedule",
50+
"sensors": {
51+
"cooling_activation_outdoor_temperature": 26.0,
52+
"cooling_deactivation_threshold": 3.0,
53+
"illuminance": 0.5,
54+
"setpoint_high": 23.0,
55+
"setpoint_low": 4.0,
56+
"temperature": 24.9
57+
},
58+
"temperature_offset": {
59+
"lower_bound": -2.0,
60+
"resolution": 0.1,
61+
"setpoint": 0.0,
62+
"upper_bound": 2.0
63+
},
64+
"thermostat": {
65+
"lower_bound": 4.0,
66+
"resolution": 0.1,
67+
"setpoint_high": 23.0,
68+
"setpoint_low": 4.0,
69+
"upper_bound": 30.0
70+
},
71+
"vendor": "Plugwise"
72+
},
73+
"fb49af122f6e4b0f91267e1cf7666d6f": {
74+
"binary_sensors": {
75+
"plugwise_notification": false
76+
},
77+
"dev_class": "gateway",
78+
"firmware": "4.2.1",
79+
"hardware": "AME Smile 2.0 board",
80+
"location": "d34dfe6ab90b410c98068e75de3eb631",
81+
"mac_address": "C4930002FE76",
82+
"model": "Gateway",
83+
"model_id": "smile_thermo",
84+
"name": "Smile Anna",
85+
"notifications": {},
86+
"sensors": {
87+
"outdoor_temperature": 31.0
88+
},
89+
"vendor": "Plugwise"
9290
}
9391
}

0 commit comments

Comments
 (0)