Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 8
Solution for Plug set as type = heater_central#630
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
50 commits
Select commit
Hold shift + click to select a range
d173730
Add g-o-userdata
bouwew 3e8f1f8
Add quick test for adam_g_o userdata
bouwew 9149dee
Remove
bouwew 956f06c
Add
bouwew f6ebe34
Fix
bouwew e72481e
Fix test too
bouwew f9bde42
Add files
bouwew 5030633
Update dev_class for Plugs to avoid double use
bouwew b4e7eed
Update related dev_classes
bouwew d8a6ea3
Save updated fixtures
bouwew 9313dfe
Update test-case
bouwew 5d0ba4b
Extend adam_g_o.json
bouwew 48b25dc
Save updated fixtures
bouwew 11f87ab
Clean up
bouwew 37d01cd
Debug
bouwew 07a212d
More debug
bouwew 841a7bf
Try
bouwew b4a266c
Try 2
bouwew 5cdae53
More debug
bouwew 2d64157
Try 3
bouwew cd62399
More debug
bouwew f703b86
Fix
bouwew 74f82a1
Clean up
bouwew 923c811
Save updated fixture
bouwew 882f39e
Update test-json
bouwew 7b57bd4
Change userdata for testing solution for Issue #739
bouwew b159da6
Update related test-json
bouwew b47d1bb
Save updated fixture
bouwew 5a3a917
More cleanup
bouwew e9eb5e0
Update CHANGELOG
bouwew 70afb23
Bump to v1.4.2a0 test-version
bouwew fd836e9
Timeout is always provided from the frontend
bouwew 44678e8
Fix relevant test-code
bouwew c359525
Cleanup
bouwew f9d27d6
Bump to a1
bouwew d2e0808
Implement heater_cental filtering for legacy
bouwew 6f4964d
Implement suggestion
bouwew 70f25b9
Debug logging & full test-output
bouwew 9f56393
Fix
bouwew 943f99a
Updates
bouwew fb85f19
Update stretch23.json
bouwew 97c9552
Remove debugging, back to short test-output
bouwew e567afe
Add/update comments
bouwew 5a688bc
No need to remove heater_central without active device
bouwew 52299f4
Bump to a2
bouwew 676ac6d
Optimize
bouwew 79ed6b7
Proper sorting of main arguments
bouwew 9fdcd19
Fix
bouwew e830d65
Revert removal of input typing
bouwew 1c8a271
More sorting of arguments
bouwew File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -2,7 +2,7 @@ | ||
| "devices": { | ||
| "02cf28bfec924855854c544690a609ef": { | ||
| "available": true, | ||
| "dev_class": "vcr", | ||
| "dev_class": "vcr_plug", | ||
bouwew marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -23,7 +23,7 @@ | ||
| }, | ||
| "21f2b542c49845e6bb416884c55778d6": { | ||
| "available": true, | ||
| "dev_class": "game_console", | ||
| "dev_class": "game_console_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -44,7 +44,7 @@ | ||
| }, | ||
| "4a810418d5394b3f82727340b91ba740": { | ||
| "available": true, | ||
| "dev_class": "router", | ||
| "dev_class": "router_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -65,7 +65,7 @@ | ||
| }, | ||
| "675416a629f343c495449970e2ca37b5": { | ||
| "available": true, | ||
| "dev_class": "router", | ||
| "dev_class": "router_plug", | ||
bouwew marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -164,7 +164,7 @@ | ||
| }, | ||
| "78d1126fc4c743db81b61c20e88342a7": { | ||
| "available": true, | ||
| "dev_class": "central_heating_pump", | ||
| "dev_class": "central_heating_pump_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "c50f167537524366a5af7aa3942feb1e", | ||
| "model": "Plug", | ||
| @@ -198,7 +198,7 @@ | ||
| }, | ||
| "a28f588dc4a049a483fd03a30361ad3a": { | ||
| "available": true, | ||
| "dev_class": "settop", | ||
| "dev_class": "settop_plug", | ||
bouwew marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -321,7 +321,7 @@ | ||
| }, | ||
| "cd0ddb54ef694e11ac18ed1cbce5dbbd": { | ||
| "available": true, | ||
| "dev_class": "vcr", | ||
| "dev_class": "vcr_plug", | ||
bouwew marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -27,7 +27,7 @@ | ||
| }, | ||
| "aa6b0002df0a46e1b1eb94beb61eddfe": { | ||
| "available": true, | ||
| "dev_class": "hometheater", | ||
| "dev_class": "hometheater_plug", | ||
bouwew marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "45d410adf8fd461e85cebf16d5ead542", | ||
| "model": "Plug", | ||
| @@ -99,7 +99,7 @@ | ||
| }, | ||
| "f2be121e4a9345ac83c6e99ed89a98be": { | ||
| "available": true, | ||
| "dev_class": "computer_desktop", | ||
| "dev_class": "computer_desktop_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "5ccb6c41a7d9403988d261ceee04239f", | ||
| "name": "Work-PC", | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -55,7 +55,7 @@ | ||
| }, | ||
| "2568cc4b9c1e401495d4741a5f89bee1": { | ||
| "available": true, | ||
| "dev_class": "hometheater", | ||
| "dev_class": "hometheater_plug", | ||
bouwew marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "firmware": "2020-11-10T01:00:00+01:00", | ||
| "location": "f2bf9048bef64cc5b6d5110154e33c81", | ||
| "model": "Plug", | ||
| @@ -76,7 +76,7 @@ | ||
| }, | ||
| "29542b2b6a6a4169acecc15c72a599b8": { | ||
| "available": true, | ||
| "dev_class": "computer_desktop", | ||
| "dev_class": "computer_desktop_plug", | ||
| "firmware": "2020-11-10T01:00:00+01:00", | ||
| "location": "f2bf9048bef64cc5b6d5110154e33c81", | ||
| "model": "Plug", | ||
| @@ -97,7 +97,7 @@ | ||
| }, | ||
| "67d73d0bd469422db25a618a5fb8eeb0": { | ||
| "available": true, | ||
| "dev_class": "zz_misc", | ||
| "dev_class": "heater_central_plug", | ||
| "location": "b4f211175e124df59603412bafa77a34", | ||
| "model": "Aqara Smart Plug", | ||
| "model_id": "lumi.plug.maeu01", | ||
| @@ -114,7 +114,7 @@ | ||
| }, | ||
| "854f8a9b0e7e425db97f1f110e1ce4b3": { | ||
| "available": true, | ||
| "dev_class": "central_heating_pump", | ||
| "dev_class": "central_heating_pump_plug", | ||
| "firmware": "2020-11-10T01:00:00+01:00", | ||
| "location": "f2bf9048bef64cc5b6d5110154e33c81", | ||
| "model": "Plug", | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -2,7 +2,7 @@ | ||
| "devices": { | ||
| "02cf28bfec924855854c544690a609ef": { | ||
| "available": true, | ||
| "dev_class": "vcr", | ||
| "dev_class": "vcr_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -23,7 +23,7 @@ | ||
| }, | ||
| "21f2b542c49845e6bb416884c55778d6": { | ||
| "available": true, | ||
| "dev_class": "game_console", | ||
| "dev_class": "game_console_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -44,7 +44,7 @@ | ||
| }, | ||
| "4a810418d5394b3f82727340b91ba740": { | ||
| "available": true, | ||
| "dev_class": "router", | ||
| "dev_class": "router_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -65,7 +65,7 @@ | ||
| }, | ||
| "675416a629f343c495449970e2ca37b5": { | ||
| "available": true, | ||
| "dev_class": "router", | ||
| "dev_class": "router_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -164,7 +164,7 @@ | ||
| }, | ||
| "78d1126fc4c743db81b61c20e88342a7": { | ||
| "available": true, | ||
| "dev_class": "central_heating_pump", | ||
| "dev_class": "central_heating_pump_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "c50f167537524366a5af7aa3942feb1e", | ||
| "model": "Plug", | ||
| @@ -198,7 +198,7 @@ | ||
| }, | ||
| "a28f588dc4a049a483fd03a30361ad3a": { | ||
| "available": true, | ||
| "dev_class": "settop", | ||
| "dev_class": "settop_plug", | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
| @@ -321,7 +321,7 @@ | ||
| }, | ||
| "cd0ddb54ef694e11ac18ed1cbce5dbbd": { | ||
| "available": true, | ||
| "dev_class": "vcr", | ||
| "dev_class": "vcr_plug", | ||
bouwew marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. bouwew marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "firmware": "2019-06-21T02:00:00+02:00", | ||
| "location": "cd143c07248f491493cea0533bc3d669", | ||
| "model": "Plug", | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -332,11 +332,31 @@ | ||
| }, | ||
| "vendor": "Plugwise", | ||
| "zigbee_mac_address": "ABCD012345670A04" | ||
| }, | ||
| "fead900a56d3430bb2d53d891f7c0656": { | ||
| "dev_class": "heater_central_plug", | ||
| "firmware": "2011-06-27T10:52:18+02:00", | ||
| "hardware": "6539-0701-4026", | ||
| "location": "0000aaaa0000aaaa0000aaaa0000aa00", | ||
| "model": "Circle type F", | ||
| "name": "CV-ketel 25F6789", | ||
| "sensors": { | ||
| "electricity_consumed": 1.56, | ||
| "electricity_consumed_interval": 0.04, | ||
| "electricity_produced": 0.0, | ||
| "electricity_produced_interval": 0.0 | ||
| }, | ||
| "switches": { | ||
| "lock": true, | ||
| "relay": true | ||
| }, | ||
| "vendor": "Plugwise", | ||
| "zigbee_mac_address": "ABCD012345670A06" | ||
| } | ||
| }, | ||
| "gateway": { | ||
| "gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00", | ||
| "item_count": 229, | ||
| "item_count": 243, | ||
bouwew marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "smile_name": "Stretch" | ||
| } | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.