Skip to content

Commit

Permalink
[amazonechocontrol] Import SmartHomeJ fork
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
3 people committed Dec 24, 2024
1 parent 86762e0 commit d361a61
Show file tree
Hide file tree
Showing 244 changed files with 12,724 additions and 9,540 deletions.
2 changes: 2 additions & 0 deletions bundles/org.openhab.binding.amazonechocontrol/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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
511 changes: 318 additions & 193 deletions bundles/org.openhab.binding.amazonechocontrol/README.md

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions bundles/org.openhab.binding.amazonechocontrol/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
<version>1.1.6.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<feature name="openhab-binding-amazonechocontrol" description="Amazon Echo Control Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<bundle dependency="true">mvn:org.apache.velocity/velocity-engine-core/2.3</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.amazonechocontrol/${project.version}</bundle>
</feature>
</features>
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ public class AccountHandlerConfig {
public int discoverSmartHome = 0;
public int pollingIntervalSmartHomeAlexa = 60;
public int pollingIntervalSmartSkills = 120;
public int activityRequestDelay = 10;
}
Loading

0 comments on commit d361a61

Please sign in to comment.