Skip to content

Commit 2e67e54

Browse files
bouwewbouwew
authored
Merge pull request #230 from plugwise/beta440
P1 Beta FW Userdata
2 parents 7690bf2 + 9cc954e commit 2e67e54

File tree

11 files changed

+2262
-1
lines changed

11 files changed

+2262
-1
lines changed

‎scripts/pre-commit.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ grep -r --include="*.xml" '<short_id>' userdata/* | grep -v 'abcdefgh' && echo "
33
grep -r --include="*.xml" '<wifi_ip>' userdata/* | grep -v '_ip></wifi' | grep -v '127.0.0.' && echo "COMMIT REJECTED, found a WIFI ip address, modify domain_objects and set wifi_ip to 127.0.0.1!" && exit 1
44
grep -r --include="*.xml" 'lan_ip>' userdata/* | grep -v '_ip></lan' | grep -v '127.0.0.' && echo "COMMIT REJECTED, found a LAN ip address, modify domain_objects and set lan_ip to 127.0.0.1!" && exit 1
55
grep -Er --include="*.xml" "([0-9]{1,3}[\.]){3}[0-9]{1,3}" userdata/* | grep -Ev '127.0.0.|0.0.0.0' && echo "COMMIT REJECTED, found ip addresses in the logging, modify domain_objects and set them to 127.0.0.1!" && exit 1
6-
grep -r --include="*.xml" '<hostname>' userdata/* | grep -v 'smile000000' | grep -v 'stretch000000' && echo "COMMIT REJECTED, found a Smile(/Stretch) hostname, modify system_status or domain_objects and set hostname to smile000000!" && exit 1
6+
grep -r --include="*.xml" '<hostname>' userdata/* | grep -Ev 'smile000000|stretch000000' && echo "COMMIT REJECTED, found a Smile(/Stretch) hostname, modify system_status or domain_objects and set hostname to smile000000!" && exit 1
77
grep -r --include="*.xml" '<longitude>' userdata/* | grep -v '4.49' && echo "COMMIT REJECTED, found your hometown, modify domain_objects and set longitude to 4.49 (that is: Plugwise HQ)!" && exit 1
88
grep -r --include="*.xml" '<latitude>' userdata/* | grep -v '52.21' && echo "COMMIT REJECTED, found your hometown, modify domain_objects and set latitude to 52.21 (that is: Plugwise HQ)!" && exit 1
99
grep -r --include="*.xml" '<city>' userdata/* | grep -v 'Sassenheim' && echo "COMMIT REJECTED, found your hometown, modify domain_objects and set city to Sassenheim (that is: Plugwise HQ)!" && exit 1

‎userdata/p1v4_440beta_single/core.appliances.xml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<appliances>
3+
<appliance id='ba4de7613517478da82dd9b6abea36af'>
4+
<name>Gateway</name>
5+
<description>Container for variables logged about the Gateway in general.</description>
6+
<type>gateway</type>
7+
<created_date>2019-11-19T10:21:26.199+01:00</created_date>
8+
<modified_date>2022-10-17T22:25:24.001+02:00</modified_date>
9+
<deleted_date></deleted_date>
10+
<groups/>
11+
<logs>
12+
<point_log id='400e04683dd94718ada7ff8a8c1d7466'>
13+
<type>signal_strength</type>
14+
<unit>dBm</unit>
15+
<updated_date>2022-10-17T22:25:23.958+02:00</updated_date>
16+
<last_consecutive_log_date>2022-10-17T22:25:23.958+02:00</last_consecutive_log_date>
17+
<interval/>
18+
<signal_strength id='cb6934a63ceb43be9fb69db78f2065d0'/>
19+
<period start_date="2022-10-17T22:25:23.958+02:00" end_date="2022-10-17T22:25:23.958+02:00">
20+
<measurement log_date="2022-10-17T22:25:23.958+02:00">-71.00</measurement>
21+
</period>
22+
</point_log>
23+
<point_log id='4de35aefb34f498caf5cc595fc6df60b'>
24+
<type>link_quality</type>
25+
<unit></unit>
26+
<updated_date>2022-10-17T22:25:23.958+02:00</updated_date>
27+
<last_consecutive_log_date>2022-10-17T22:25:23.958+02:00</last_consecutive_log_date>
28+
<interval/>
29+
<link_quality id='332138ddfe334e4397b9523d67c05a56'/>
30+
<period start_date="2022-10-17T22:25:23.958+02:00" end_date="2022-10-17T22:25:23.958+02:00">
31+
<measurement log_date="2022-10-17T22:25:23.958+02:00">39</measurement>
32+
</period>
33+
</point_log>
34+
<point_log id='7c4e66de4d234a3ab161280d8d7e9ab3'>
35+
<type>wlan_state</type>
36+
<unit></unit>
37+
<updated_date>2022-10-17T22:25:23.959+02:00</updated_date>
38+
<last_consecutive_log_date>2022-10-17T22:25:23.959+02:00</last_consecutive_log_date>
39+
<interval/>
40+
<network_state id='4e078f2fae014cbab9f067ca66e80d55'/>
41+
<period start_date="2022-10-17T22:25:23.959+02:00" end_date="2022-10-17T22:25:23.959+02:00">
42+
<measurement log_date="2022-10-17T22:25:23.959+02:00">up</measurement>
43+
</period>
44+
</point_log>
45+
<point_log id='8032d845eee04dffab189be92589af0c'>
46+
<type>lan_state</type>
47+
<unit></unit>
48+
<updated_date>2022-10-17T22:24:43.343+02:00</updated_date>
49+
<last_consecutive_log_date>2022-10-17T22:24:43.343+02:00</last_consecutive_log_date>
50+
<interval/>
51+
<network_state id='11622002070241b088be817459e6180f'/>
52+
<period start_date="2022-10-17T22:24:43.343+02:00" end_date="2022-10-17T22:24:43.343+02:00">
53+
<measurement log_date="2022-10-17T22:24:43.343+02:00">down</measurement>
54+
</period>
55+
</point_log>
56+
<point_log id='ca05724c5fd14d8b8b07acc71331689b'>
57+
<type>lan_ip_address</type>
58+
<unit></unit>
59+
<updated_date>2022-10-17T22:24:43+02:00</updated_date>
60+
<last_consecutive_log_date>2022-10-17T22:24:43+02:00</last_consecutive_log_date>
61+
<interval/>
62+
<network_address id='f494dafd525a469b8e8da82ce8a34240'/>
63+
<period start_date="2022-10-17T22:24:43+02:00" end_date="2022-10-17T22:24:43+02:00">
64+
<measurement log_date="2022-10-17T22:24:43+02:00">0.0.0.0</measurement>
65+
</period>
66+
</point_log>
67+
<point_log id='d4524db60fee4a13b70c8c29f3b04b92'>
68+
<type>wlan_ip_address</type>
69+
<unit></unit>
70+
<updated_date>2022-10-17T22:25:23+02:00</updated_date>
71+
<last_consecutive_log_date>2022-10-17T22:25:23+02:00</last_consecutive_log_date>
72+
<interval/>
73+
<network_address id='cc36809b562c419686ebcaee95f36c7a'/>
74+
<period start_date="2022-10-17T22:25:23+02:00" end_date="2022-10-17T22:25:23+02:00">
75+
<measurement log_date="2022-10-17T22:25:23+02:00">127.0.0.1</measurement>
76+
</period>
77+
</point_log>
78+
</logs>
79+
<actuator_functionalities/>
80+
</appliance>
81+
</appliances>

‎userdata/p1v4_440beta_single/core.direct_objects.xml‎

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<direct_objects>
3+
<location id='a455b61e52394b2db5081ce025a430f3'>
4+
<name>Home</name>
5+
<description>A building with a smart meter.</description>
6+
<type>building</type>
7+
<created_date>2020-03-12T16:41:36.227+01:00</created_date>
8+
<modified_date>2022-10-17T22:26:17.799+02:00</modified_date>
9+
<deleted_date></deleted_date>
10+
<preset>home</preset>
11+
<clients/>
12+
<appliances/>
13+
<logs>
14+
<point_log id='0b7f59abfd35452f825dbf9daebf2cc5'>
15+
<type>electricity_phase_one_produced</type>
16+
<unit>W</unit>
17+
<updated_date>2022-10-17T22:26:13+02:00</updated_date>
18+
<last_consecutive_log_date>2022-10-17T22:26:13+02:00</last_consecutive_log_date>
19+
<interval/>
20+
<electricity_point_meter id='ea1bf1abc10d434da54dd9e528d6cc97'/>
21+
<period start_date="2022-10-17T22:26:13+02:00" end_date="2022-10-17T22:26:13+02:00">
22+
<measurement log_date="2022-10-17T22:26:13+02:00">579.00</measurement>
23+
</period>
24+
</point_log>
25+
<point_log id='104e84a3e0364545a889270deee21e94'>
26+
<type>electricity_consumed</type>
27+
<unit>W</unit>
28+
<updated_date>2022-10-17T22:26:13+02:00</updated_date>
29+
<last_consecutive_log_date>2022-10-17T22:26:13+02:00</last_consecutive_log_date>
30+
<interval/>
31+
<electricity_point_meter id='b0618815236d47a2b093a1a7ba83991d'/>
32+
<period start_date="2022-10-17T22:26:13+02:00" end_date="2022-10-17T22:26:13+02:00">
33+
<measurement log_date="2022-10-17T22:26:13+02:00" tariff="nl_offpeak">0.00</measurement>
34+
<measurement log_date="2022-10-17T22:26:13+02:00" tariff="nl_peak">579.00</measurement>
35+
</period>
36+
</point_log>
37+
<cumulative_log id='32b0afe1dd324aea87f46d2e699dbd56'>
38+
<type>electricity_produced</type>
39+
<unit>Wh</unit>
40+
<updated_date>2022-10-17T22:26:00+02:00</updated_date>
41+
<last_consecutive_log_date>2022-10-17T22:26:00+02:00</last_consecutive_log_date>
42+
<interval/>
43+
<electricity_cumulative_meter id='1fa5f5772e464e5cbcb595101adaf8e5'/>
44+
<period start_date="2022-10-17T22:26:00+02:00" end_date="2022-10-17T22:26:00+02:00">
45+
<measurement log_date="2022-10-17T22:26:00+02:00" tariff="nl_peak">0.00</measurement>
46+
<measurement log_date="2022-10-17T22:26:00+02:00" tariff="nl_offpeak">0.00</measurement>
47+
</period>
48+
</cumulative_log>
49+
<point_log id='5a61bcd0bcdf442a993444c51c0c6f26'>
50+
<type>electricity_phase_one_consumed</type>
51+
<unit>W</unit>
52+
<updated_date>2022-10-17T22:26:13+02:00</updated_date>
53+
<last_consecutive_log_date>2022-10-17T22:26:13+02:00</last_consecutive_log_date>
54+
<interval/>
55+
<electricity_point_meter id='ea1bf1abc10d434da54dd9e528d6cc97'/>
56+
<period start_date="2022-10-17T22:26:13+02:00" end_date="2022-10-17T22:26:13+02:00">
57+
<measurement log_date="2022-10-17T22:26:13+02:00">0.00</measurement>
58+
</period>
59+
</point_log>
60+
<point_log id='6b58aa7f2cd0406bacdc53ac7ecae168'>
61+
<type>electricity_produced</type>
62+
<unit>W</unit>
63+
<updated_date>2022-10-17T22:26:13+02:00</updated_date>
64+
<last_consecutive_log_date>2022-10-17T22:26:13+02:00</last_consecutive_log_date>
65+
<interval/>
66+
<electricity_point_meter id='b0618815236d47a2b093a1a7ba83991d'/>
67+
<period start_date="2022-10-17T22:26:13+02:00" end_date="2022-10-17T22:26:13+02:00">
68+
<measurement log_date="2022-10-17T22:26:13+02:00" tariff="nl_offpeak">0.00</measurement>
69+
<measurement log_date="2022-10-17T22:26:13+02:00" tariff="nl_peak">0.00</measurement>
70+
</period>
71+
</point_log>
72+
<cumulative_log id='7b7ad634b0b647f0bbf848ac5657ea8f'>
73+
<type>electricity_consumed</type>
74+
<unit>Wh</unit>
75+
<updated_date>2022-10-17T22:26:00+02:00</updated_date>
76+
<last_consecutive_log_date>2022-10-17T22:26:00+02:00</last_consecutive_log_date>
77+
<interval/>
78+
<electricity_cumulative_meter id='1fa5f5772e464e5cbcb595101adaf8e5'/>
79+
<period start_date="2022-10-17T22:26:00+02:00" end_date="2022-10-17T22:26:00+02:00">
80+
<measurement log_date="2022-10-17T22:26:00+02:00" tariff="nl_peak">13523584.00</measurement>
81+
<measurement log_date="2022-10-17T22:26:00+02:00" tariff="nl_offpeak">17194480.00</measurement>
82+
</period>
83+
</cumulative_log>
84+
<interval_log id='859d091cb8e444b5bc084a41a9fd401c'>
85+
<type>electricity_produced</type>
86+
<unit>Wh</unit>
87+
<updated_date>2022-10-17T22:25:00+02:00</updated_date>
88+
<last_consecutive_log_date>2022-10-17T22:20:00+02:00</last_consecutive_log_date>
89+
<interval>PT5M</interval>
90+
<electricity_interval_meter id='b3e07d45b7354d189cd0d5d41a4f80d7'/>
91+
<period start_date="2022-10-17T22:25:00+02:00" end_date="2022-10-17T22:25:00+02:00" interval="PT5M">
92+
<measurement log_date="2022-10-17T22:25:00+02:00" tariff="nl_peak">0.00</measurement>
93+
<measurement log_date="2022-10-17T22:25:00+02:00" tariff="nl_offpeak">0.00</measurement>
94+
</period>
95+
</interval_log>
96+
<interval_log id='babf35c6d9c746179475a6c0ce086f37'>
97+
<type>electricity_consumed</type>
98+
<unit>Wh</unit>
99+
<updated_date>2022-10-17T22:25:00+02:00</updated_date>
100+
<last_consecutive_log_date>2022-10-17T22:20:00+02:00</last_consecutive_log_date>
101+
<interval>PT5M</interval>
102+
<electricity_interval_meter id='b3e07d45b7354d189cd0d5d41a4f80d7'/>
103+
<period start_date="2022-10-17T22:25:00+02:00" end_date="2022-10-17T22:25:00+02:00" interval="PT5M">
104+
<measurement log_date="2022-10-17T22:25:00+02:00" tariff="nl_peak">9.00</measurement>
105+
<measurement log_date="2022-10-17T22:25:00+02:00" tariff="nl_offpeak">0.00</measurement>
106+
</period>
107+
</interval_log>
108+
</logs>
109+
<actuator_functionalities/>
110+
</location>
111+
<appliance id='ba4de7613517478da82dd9b6abea36af'>
112+
<name>Gateway</name>
113+
<description>Container for variables logged about the Gateway in general.</description>
114+
<type>gateway</type>
115+
<created_date>2019-11-19T10:21:26.199+01:00</created_date>
116+
<modified_date>2022-10-17T22:25:24.001+02:00</modified_date>
117+
<deleted_date></deleted_date>
118+
<groups/>
119+
<logs>
120+
<point_log id='400e04683dd94718ada7ff8a8c1d7466'>
121+
<type>signal_strength</type>
122+
<unit>dBm</unit>
123+
<updated_date>2022-10-17T22:25:23.958+02:00</updated_date>
124+
<last_consecutive_log_date>2022-10-17T22:25:23.958+02:00</last_consecutive_log_date>
125+
<interval/>
126+
<signal_strength id='cb6934a63ceb43be9fb69db78f2065d0'/>
127+
<period start_date="2022-10-17T22:25:23.958+02:00" end_date="2022-10-17T22:25:23.958+02:00">
128+
<measurement log_date="2022-10-17T22:25:23.958+02:00">-71.00</measurement>
129+
</period>
130+
</point_log>
131+
<point_log id='4de35aefb34f498caf5cc595fc6df60b'>
132+
<type>link_quality</type>
133+
<unit></unit>
134+
<updated_date>2022-10-17T22:25:23.958+02:00</updated_date>
135+
<last_consecutive_log_date>2022-10-17T22:25:23.958+02:00</last_consecutive_log_date>
136+
<interval/>
137+
<link_quality id='332138ddfe334e4397b9523d67c05a56'/>
138+
<period start_date="2022-10-17T22:25:23.958+02:00" end_date="2022-10-17T22:25:23.958+02:00">
139+
<measurement log_date="2022-10-17T22:25:23.958+02:00">39</measurement>
140+
</period>
141+
</point_log>
142+
<point_log id='7c4e66de4d234a3ab161280d8d7e9ab3'>
143+
<type>wlan_state</type>
144+
<unit></unit>
145+
<updated_date>2022-10-17T22:25:23.959+02:00</updated_date>
146+
<last_consecutive_log_date>2022-10-17T22:25:23.959+02:00</last_consecutive_log_date>
147+
<interval/>
148+
<network_state id='4e078f2fae014cbab9f067ca66e80d55'/>
149+
<period start_date="2022-10-17T22:25:23.959+02:00" end_date="2022-10-17T22:25:23.959+02:00">
150+
<measurement log_date="2022-10-17T22:25:23.959+02:00">up</measurement>
151+
</period>
152+
</point_log>
153+
<point_log id='8032d845eee04dffab189be92589af0c'>
154+
<type>lan_state</type>
155+
<unit></unit>
156+
<updated_date>2022-10-17T22:24:43.343+02:00</updated_date>
157+
<last_consecutive_log_date>2022-10-17T22:24:43.343+02:00</last_consecutive_log_date>
158+
<interval/>
159+
<network_state id='11622002070241b088be817459e6180f'/>
160+
<period start_date="2022-10-17T22:24:43.343+02:00" end_date="2022-10-17T22:24:43.343+02:00">
161+
<measurement log_date="2022-10-17T22:24:43.343+02:00">down</measurement>
162+
</period>
163+
</point_log>
164+
<point_log id='ca05724c5fd14d8b8b07acc71331689b'>
165+
<type>lan_ip_address</type>
166+
<unit></unit>
167+
<updated_date>2022-10-17T22:24:43+02:00</updated_date>
168+
<last_consecutive_log_date>2022-10-17T22:24:43+02:00</last_consecutive_log_date>
169+
<interval/>
170+
<network_address id='f494dafd525a469b8e8da82ce8a34240'/>
171+
<period start_date="2022-10-17T22:24:43+02:00" end_date="2022-10-17T22:24:43+02:00">
172+
<measurement log_date="2022-10-17T22:24:43+02:00">0.0.0.0</measurement>
173+
</period>
174+
</point_log>
175+
<point_log id='d4524db60fee4a13b70c8c29f3b04b92'>
176+
<type>wlan_ip_address</type>
177+
<unit></unit>
178+
<updated_date>2022-10-17T22:25:23+02:00</updated_date>
179+
<last_consecutive_log_date>2022-10-17T22:25:23+02:00</last_consecutive_log_date>
180+
<interval/>
181+
<network_address id='cc36809b562c419686ebcaee95f36c7a'/>
182+
<period start_date="2022-10-17T22:25:23+02:00" end_date="2022-10-17T22:25:23+02:00">
183+
<measurement log_date="2022-10-17T22:25:23+02:00">127.0.0.1</measurement>
184+
</period>
185+
</point_log>
186+
</logs>
187+
<actuator_functionalities/>
188+
</appliance>
189+
</direct_objects>

0 commit comments

Comments
 (0)