[amazonechocontrol] Import SmartHomeJ fork #17935
Conversation
|
I would prefer if you backport all changes. I just don't have time for that at the Moment. I can help if Problems occur. |
|
Sure, I can help you with that. I still need to test my other use cases besides DnD. I'll work on the rest of them over the next two weeks. Do you prefer if I stuff it all into a single PR, or do PR per "topic" that happened in smarthomej? Tangentially- what are your plans for the Tuya binding? I'd be happy to work on porting that into the main distro as well. |
|
@ccutrer I think that it would be better to do single PR because some of the PR had issues that were later fixed together in another PR. What I did when backporting other changes is to just replace the openhab version with the smarthomej version, rename the directory, do a search&replace for |
|
Regarding Tuya: fine with me. |
lsiepel
added
the
enhancement
ccutrer
force-pushed
the
amazonechocontrol-dnd
branch
from
2e344cb to
d361a61
Compare
ccutrer
changed the title
|
@J-N-K: okay, full binding ported in. Honestly, the hardest conflict was the README, since both sides had had significant work there. 🤞 I kept the essence of updates on both sides. I definitely kept the recent color temperature work from the openHAB side from @andrewfg. Let me know if I need to change any of the copyright/notices to better reference credit from the SmartHomeJ fork. |
J-N-K
added
rebuild
| @@ -11,3 +11,5 @@ https://www.eclipse.org/legal/epl-2.0/. | |||
| == Source Code | |||
|
|
|||
| https://github.com/openhab/openhab-addons | |||
|
|
|||
| Parts of this code have been forked from https://github.com/smarthomej/addons | |||
| * | ||
| * @author Jan N. Klug - Initial contribution | ||
| */ | ||
| @NonNullByDefault({}) |
There was a problem hiding this comment.
Note to the reviewer: This is necessary because the eclipse compiler does not handle null annotations on records properly.
|
Amazing work, THANK YOU! |
|
This PR seems to have many conflicts, can you fix them @ccutrer ? |
|
This pull request has been mentioned on openHAB Community. There might be relevant details there: https://community.openhab.org/t/oh-configuration-for-alexa-devices/161501/15 |
Both forks have diverged a reasonable amount. Basically, I started with the SmartHomeJ fork since it is the more stable version, and has had more changes. I first resolved the thing-types.xml, in particular the thingTypeVersions, and merged the update instructions.xml - in such a way that coming from either the openHAB fork or the SmartHomeJ fork should result in the same structure. Then I made sure it compiled, resolving missing classes that were previously in smarthomej.common - using BaseDynamicCommandDescriptionProvider, and essentially re-implemented SimpleDynamicStateDescriptionProvider and ResourceUtil. Then I went through the history since the fork in openHAB, and applied individual significant commits (mostly manually, since they were almost all small, and easier to apply manually than resolve merge conflicts). "prepare for next version", "apply spotless", I18n updates, etc. commits were ignored (`mvn i18n:generate-default-translations` was run to make sure it was up to date, and non EN translations were fully reverted to their prior state in the openHAB fork to ensure future CrowdIn updates will work correctly). Several commits were omitted entirely, since they were either implemented orthogonally in SmartHomeJ (thermostat and humidity handlers) or no longer releveant (SmartHomeJ completely removed AccountServlet in an HTTP/2 refactor). Note: the only breaking change coming from the SmartHomeJ fork is that the humidity channel id changed to relativeHumidity (handled by an update instruction) Co-authored-by: Jan N. Klug <[email protected]> Co-authored-by: Tom Blum <[email protected]> Signed-off-by: Cody Cutrer <[email protected]>
ccutrer
force-pushed
the
amazonechocontrol-dnd
branch
from
d361a61 to
aeb5186
Compare
Fixed. It was all the files removed in this PR that had the copyright updated in main. I rebased (and updated the copyright header in the new files). |
Both forks have diverged a reasonable amount. Basically, I started with the SmartHomeJ fork since it is the more stable version, and has had more changes. I first resolved the thing-types.xml, in particular the thingTypeVersions, and merged the update instructions.xml - in such a way that coming from either the openHAB fork or the SmartHomeJ fork should result in the same structure. Then I made sure it compiled, resolving missing classes that were previously in smarthomej.common - using BaseDynamicCommandDescriptionProvider, and essentially re-implemented SimpleDynamicStateDescriptionProvider and ResourceUtil. Then I went through the history since the fork in openHAB, and applied individual significant commits (mostly manually, since they were almost all small, and easier to apply manually than resolve merge conflicts). "prepare for next version", "apply spotless", I18n updates, etc. commits were ignored (
mvn i18n:generate-default-translationswas run to make sure it was up to date, and non EN translations were fully reverted to their prior state in the openHAB fork to ensure future CrowdIn updates will work correctly). Several commits were omitted entirely, since they were either implemented orthogonally in SmartHomeJ (thermostat and humidity handlers) or no longer releveant (SmartHomeJ completely removed AccountServlet in an HTTP/2 refactor).Note: the only breaking change coming from the SmartHomeJ fork is that the humidity channel id changed to relativeHumidity (handled by an update instruction)