Skip to content

Commit 4dc0121

Browse files
bouwewbouwew
authored
Merge pull request #842 from plugwise/new-jip
Add new Jip, separate Tom and Floor devices
2 parents 9294556 + 5219928 commit 4dc0121

File tree

17 files changed

+53
-47
lines changed

17 files changed

+53
-47
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v1.11.2
4+
5+
- Add/update model-data for Jip, Tom and Floor via PR [#842](https://github.com/plugwise/python-plugwise/pull/842)
6+
37
## v1.11.1
48

59
- Code optimizations via PR [#837](https://github.com/plugwise/python-plugwise/pull/837), [#838](https://github.com/plugwise/python-plugwise/pull/838), [#839](https://github.com/plugwise/python-plugwise/pull/839), [#840](https://github.com/plugwise/python-plugwise/pull/840), and [#841](https://github.com/plugwise/python-plugwise/pull/841)

‎fixtures/adam_jip/data.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"firmware": "2020-11-04T01:00:00+01:00",
8686
"hardware": "1",
8787
"location": "d58fec52899f4f1c92e4f8fad6d8c48c",
88-
"model": "Tom/Floor",
88+
"model": "Tom",
8989
"model_id": "106-03",
9090
"name": "Tom Logeerkamer",
9191
"sensors": {
@@ -109,7 +109,7 @@
109109
"firmware": "2020-11-04T01:00:00+01:00",
110110
"hardware": "1",
111111
"location": "06aecb3d00354375924f50c47af36bd2",
112-
"model": "Tom/Floor",
112+
"model": "Tom",
113113
"model_id": "106-03",
114114
"name": "Tom Slaapkamer",
115115
"sensors": {
@@ -176,7 +176,7 @@
176176
"firmware": "2020-11-04T01:00:00+01:00",
177177
"hardware": "1",
178178
"location": "13228dab8ce04617af318a2888b3c548",
179-
"model": "Tom/Floor",
179+
"model": "Tom",
180180
"model_id": "106-03",
181181
"name": "Tom Woonkamer",
182182
"sensors": {
@@ -276,7 +276,7 @@
276276
"firmware": "2020-11-04T01:00:00+01:00",
277277
"hardware": "1",
278278
"location": "d27aede973b54be484f6842d1b2802ad",
279-
"model": "Tom/Floor",
279+
"model": "Tom",
280280
"model_id": "106-03",
281281
"name": "Tom Kinderkamer",
282282
"sensors": {

‎fixtures/adam_multiple_devices_per_zone/data.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
"firmware": "2019-03-27T01:00:00+01:00",
194194
"hardware": "1",
195195
"location": "08963fec7c53423ca5680aa4cb502c63",
196-
"model": "Tom/Floor",
196+
"model": "Tom",
197197
"model_id": "106-03",
198198
"name": "Thermostatic Radiator Badkamer 1",
199199
"sensors": {
@@ -334,7 +334,7 @@
334334
"firmware": "2019-03-27T01:00:00+01:00",
335335
"hardware": "1",
336336
"location": "12493538af164a409c6a1c79e38afe1c",
337-
"model": "Tom/Floor",
337+
"model": "Tom",
338338
"model_id": "106-03",
339339
"name": "Bios Cv Thermostatic Radiator ",
340340
"sensors": {
@@ -359,7 +359,7 @@
359359
"firmware": "2019-03-27T01:00:00+01:00",
360360
"hardware": "1",
361361
"location": "c50f167537524366a5af7aa3942feb1e",
362-
"model": "Tom/Floor",
362+
"model": "Tom",
363363
"model_id": "106-03",
364364
"name": "Floor kraan",
365365
"sensors": {
@@ -467,7 +467,7 @@
467467
"firmware": "2019-03-27T01:00:00+01:00",
468468
"hardware": "1",
469469
"location": "82fa13f017d240daa0d0ea1775420f24",
470-
"model": "Tom/Floor",
470+
"model": "Tom",
471471
"model_id": "106-03",
472472
"name": "Thermostatic Radiator Jessie",
473473
"sensors": {
@@ -535,7 +535,7 @@
535535
"firmware": "2019-03-27T01:00:00+01:00",
536536
"hardware": "1",
537537
"location": "446ac08dd04d4eff8ac57489757b7314",
538-
"model": "Tom/Floor",
538+
"model": "Tom",
539539
"model_id": "106-03",
540540
"name": "CV Kraan Garage",
541541
"sensors": {

‎fixtures/adam_plus_anna_new/data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"firmware": "2020-11-04T01:00:00+01:00",
7272
"hardware": "1",
7373
"location": "f871b8c4d63549319221e294e4f88074",
74-
"model": "Tom/Floor",
74+
"model": "Tom",
7575
"model_id": "106-03",
7676
"name": "Tom Badkamer",
7777
"sensors": {

‎fixtures/adam_plus_anna_new_regulation_off/data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"firmware": "2020-11-04T01:00:00+01:00",
4646
"hardware": "1",
4747
"location": "f871b8c4d63549319221e294e4f88074",
48-
"model": "Tom/Floor",
48+
"model": "Tom",
4949
"model_id": "106-03",
5050
"name": "Tom Badkamer",
5151
"sensors": {

‎fixtures/adam_zone_per_device/data.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
"firmware": "2019-03-27T01:00:00+01:00",
191191
"hardware": "1",
192192
"location": "08963fec7c53423ca5680aa4cb502c63",
193-
"model": "Tom/Floor",
193+
"model": "Tom",
194194
"model_id": "106-03",
195195
"name": "Thermostatic Radiator Badkamer",
196196
"sensors": {
@@ -331,7 +331,7 @@
331331
"firmware": "2019-03-27T01:00:00+01:00",
332332
"hardware": "1",
333333
"location": "12493538af164a409c6a1c79e38afe1c",
334-
"model": "Tom/Floor",
334+
"model": "Tom",
335335
"model_id": "106-03",
336336
"name": "Bios Cv Thermostatic Radiator ",
337337
"sensors": {
@@ -356,7 +356,7 @@
356356
"firmware": "2019-03-27T01:00:00+01:00",
357357
"hardware": "1",
358358
"location": "c50f167537524366a5af7aa3942feb1e",
359-
"model": "Tom/Floor",
359+
"model": "Tom",
360360
"model_id": "106-03",
361361
"name": "Floor kraan",
362362
"sensors": {
@@ -464,7 +464,7 @@
464464
"firmware": "2019-03-27T01:00:00+01:00",
465465
"hardware": "1",
466466
"location": "82fa13f017d240daa0d0ea1775420f24",
467-
"model": "Tom/Floor",
467+
"model": "Tom",
468468
"model_id": "106-03",
469469
"name": "Thermostatic Radiator Jessie",
470470
"sensors": {
@@ -532,7 +532,7 @@
532532
"firmware": "2019-03-27T01:00:00+01:00",
533533
"hardware": "1",
534534
"location": "446ac08dd04d4eff8ac57489757b7314",
535-
"model": "Tom/Floor",
535+
"model": "Tom",
536536
"model_id": "106-03",
537537
"name": "CV Kraan Garage",
538538
"sensors": {

‎fixtures/m_adam_cooling/data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"firmware": "2020-11-04T01:00:00+01:00",
6161
"hardware": "1",
6262
"location": "f871b8c4d63549319221e294e4f88074",
63-
"model": "Tom/Floor",
63+
"model": "Tom",
6464
"model_id": "106-03",
6565
"name": "Tom Badkamer",
6666
"sensors": {

‎fixtures/m_adam_heating/data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"firmware": "2020-11-04T01:00:00+01:00",
6666
"hardware": "1",
6767
"location": "f871b8c4d63549319221e294e4f88074",
68-
"model": "Tom/Floor",
68+
"model": "Tom",
6969
"model_id": "106-03",
7070
"name": "Tom Badkamer",
7171
"sensors": {

‎fixtures/m_adam_jip/data.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"firmware": "2020-11-04T01:00:00+01:00",
8585
"hardware": "1",
8686
"location": "d58fec52899f4f1c92e4f8fad6d8c48c",
87-
"model": "Tom/Floor",
87+
"model": "Tom",
8888
"model_id": "106-03",
8989
"name": "Tom Logeerkamer",
9090
"sensors": {
@@ -108,7 +108,7 @@
108108
"firmware": "2020-11-04T01:00:00+01:00",
109109
"hardware": "1",
110110
"location": "06aecb3d00354375924f50c47af36bd2",
111-
"model": "Tom/Floor",
111+
"model": "Tom",
112112
"model_id": "106-03",
113113
"name": "Tom Slaapkamer",
114114
"sensors": {
@@ -175,7 +175,7 @@
175175
"firmware": "2020-11-04T01:00:00+01:00",
176176
"hardware": "1",
177177
"location": "13228dab8ce04617af318a2888b3c548",
178-
"model": "Tom/Floor",
178+
"model": "Tom",
179179
"model_id": "106-03",
180180
"name": "Tom Woonkamer",
181181
"sensors": {
@@ -275,7 +275,7 @@
275275
"firmware": "2020-11-04T01:00:00+01:00",
276276
"hardware": "1",
277277
"location": "d27aede973b54be484f6842d1b2802ad",
278-
"model": "Tom/Floor",
278+
"model": "Tom",
279279
"model_id": "106-03",
280280
"name": "Tom Kinderkamer",
281281
"sensors": {

‎fixtures/m_adam_multiple_devices_per_zone/data.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
"firmware": "2019-03-27T01:00:00+01:00",
187187
"hardware": "1",
188188
"location": "08963fec7c53423ca5680aa4cb502c63",
189-
"model": "Tom/Floor",
189+
"model": "Tom",
190190
"model_id": "106-03",
191191
"name": "Thermostatic Radiator Badkamer 1",
192192
"sensors": {
@@ -327,7 +327,7 @@
327327
"firmware": "2019-03-27T01:00:00+01:00",
328328
"hardware": "1",
329329
"location": "12493538af164a409c6a1c79e38afe1c",
330-
"model": "Tom/Floor",
330+
"model": "Tom",
331331
"model_id": "106-03",
332332
"name": "Bios Cv Thermostatic Radiator ",
333333
"sensors": {
@@ -352,7 +352,7 @@
352352
"firmware": "2019-03-27T01:00:00+01:00",
353353
"hardware": "1",
354354
"location": "c50f167537524366a5af7aa3942feb1e",
355-
"model": "Tom/Floor",
355+
"model": "Tom",
356356
"model_id": "106-03",
357357
"name": "Floor kraan",
358358
"sensors": {
@@ -460,7 +460,7 @@
460460
"firmware": "2019-03-27T01:00:00+01:00",
461461
"hardware": "1",
462462
"location": "82fa13f017d240daa0d0ea1775420f24",
463-
"model": "Tom/Floor",
463+
"model": "Tom",
464464
"model_id": "106-03",
465465
"name": "Thermostatic Radiator Jessie",
466466
"sensors": {
@@ -528,7 +528,7 @@
528528
"firmware": "2019-03-27T01:00:00+01:00",
529529
"hardware": "1",
530530
"location": "446ac08dd04d4eff8ac57489757b7314",
531-
"model": "Tom/Floor",
531+
"model": "Tom",
532532
"model_id": "106-03",
533533
"name": "CV Kraan Garage",
534534
"sensors": {

0 commit comments

Comments
 (0)