Skip to content
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

[amazonechocontrol] add support for smarthome devices #7969

Merged
merged 124 commits into from
Jul 7, 2020

Conversation

J-N-K
Copy link
Member

@J-N-K J-N-K commented Jun 21, 2020

This is a follow-up to the abandoned PR #6140 and includes mainly the changes from the PR and some improvements. All feature credits go to @lkn94 and @mgeramb, I merely fixed some codestyle issues and resolved merge conflicts.

Also-By: Lukas Knoeller lukask@hobbyblogging.de
Also-By: Michael Geramb mail@michael-geramb.at

Signed-Off-By: Jan N. Klug jan.n.klug@rub.de

Michael Geramb and others added 30 commits May 11, 2019 13:12
Fix json parsing
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Improve error handling
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Remove unused Exception
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)

Signed-off-by: Michael Geramb <mail@michael-geramb.at>
Added new functions for the binding
Formatting change
Signed-off-by: Michael Geramb <mail@michael-geramb.at>
Fix for Announcment Channel
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Fix for Announcment Channel
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Fix for Announcment Channel
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Fix for Announcment Channel
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Fix for Announcment Channel
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Bugfixed amazon echo/smart home discovery
Fix for Announcment Channel
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
@J-N-K
Copy link
Member Author

J-N-K commented Jun 30, 2020

@cpmeister From the code point of view this could be merged. It‘s just the problem with the not signed-off commits from @lkn94. I don’t know how to proceed here.

@kaikreuzer
Copy link
Member

@lkn94 May I ask you to simply add your "sign-off" of your commits here on this PR as a comment? We will then add this into the squashed commit when merging the work here.

Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
@TravisBuddy
Copy link

Travis tests were successful

Hey @J-N-K,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

@lkn94
Copy link

lkn94 commented Jul 6, 2020

Also-by: Michael Geramb mail@michael-geramb.at
Signed-off-by: Lukas Knöller lukask@hobbyblogging.de

@J-N-K
Copy link
Member Author

J-N-K commented Jul 6, 2020

Thanks @lkn94 and @mgeramb for your tremendous work here. @cpmeister, we can merge now. Thanks.

@openhab openhab deleted a comment from TravisBuddy Jul 7, 2020
@openhab openhab deleted a comment from TravisBuddy Jul 7, 2020
@lkn94
Copy link

lkn94 commented Jul 7, 2020

@J-N-K Thanks for your improvements and the time you spent with this binding! ;)

@cpmeister cpmeister merged commit 8fe3e73 into openhab:2.5.x Jul 7, 2020
@cpmeister cpmeister added this to the 2.5.7 milestone Jul 7, 2020
@cweitkamp
Copy link
Contributor

cweitkamp commented Jul 9, 2020

Unfortunately this PR breaks the openHAB 3 Add-ons build. The interfaces DiscoveryServiceCallback and ExtendedDiscoveryService are deprecated and already removed from OHC (see openhab/openhab-core#1424).

@J-N-K
Copy link
Member Author

J-N-K commented Jul 9, 2020

Please exclude it for now and I‘ll refactor this ASAP.

@J-N-K J-N-K deleted the SmartHome branch July 9, 2020 17:33
knikhilwiz pushed a commit to knikhilwiz/openhab2-addons that referenced this pull request Jul 12, 2020
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (openhab#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
CSchlipp pushed a commit to CSchlipp/openhab-addons that referenced this pull request Jul 26, 2020
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (openhab#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
Signed-off-by: CSchlipp <christian@schlipp.de>
MPH80 pushed a commit to MPH80/openhab-addons that referenced this pull request Aug 3, 2020
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (openhab#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
Signed-off-by: MPH80 <michael@hazelden.me>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (openhab#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (openhab#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (openhab#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (openhab#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
DaanMeijer pushed a commit to DaanMeijer/openhab-addons that referenced this pull request Sep 1, 2020
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (openhab#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
Signed-off-by: Daan Meijer <daan@studioseptember.nl>
markus7017 pushed a commit to markus7017/openhab-addons that referenced this pull request Sep 19, 2020
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (openhab#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
community approved enhancement An enhancement or new feature for an existing add-on
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants