Merge branch 'openhab:main' into openhab#13456-hue-clip2

andrewfg · Jun 26, 2023 · e8442d2 · e8442d2
2 parents 77cd411 + 6311483
commit e8442d2
Show file tree

Hide file tree

Showing 264 changed files with 13,928 additions and 936 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -24,6 +24,7 @@
 /bundles/org.openhab.binding.ambientweather/ @mhilbush
 /bundles/org.openhab.binding.amplipi/ @kaikreuzer
 /bundles/org.openhab.binding.androiddebugbridge/ @GiviMAD
+/bundles/org.openhab.binding.androidtv/ @morph166955
 /bundles/org.openhab.binding.anel/ @paphko
 /bundles/org.openhab.binding.anthem/ @mhilbush
 /bundles/org.openhab.binding.astro/ @gerrieg
@@ -267,6 +268,7 @@
 /bundles/org.openhab.binding.pjlinkdevice/ @nils
 /bundles/org.openhab.binding.playstation/ @FluBBaOfWard
 /bundles/org.openhab.binding.plclogo/ @falkena
+/bundles/org.openhab.binding.plex/ @aronbeurskens
 /bundles/org.openhab.binding.plugwise/ @wborn
 /bundles/org.openhab.binding.plugwiseha/ @lsiepel
 /bundles/org.openhab.binding.powermax/ @lolodomo

diff --git a/bom/openhab-addons/pom.xml b/bom/openhab-addons/pom.xml
@@ -111,6 +111,11 @@
       <artifactId>org.openhab.binding.androiddebugbridge</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.androidtv</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.anel</artifactId>
@@ -1326,6 +1331,11 @@
       <artifactId>org.openhab.binding.plclogo</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.plex</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.plugwise</artifactId>
@@ -1956,6 +1966,11 @@
       <artifactId>org.openhab.persistence.influxdb</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.persistence.inmemory</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.persistence.jdbc</artifactId>

diff --git a/bundles/org.openhab.automation.jsscripting/README.md b/bundles/org.openhab.automation.jsscripting/README.md
@@ -1109,7 +1109,7 @@ Operations and conditions can also optionally take functions:
 
 ```javascript
 rules.when().item("F1_light").changed().then(event => {
-    console.log(event);
+  console.log(event);
 }).build("Test Rule", "My Test Rule");
 ```
 
@@ -1225,21 +1225,22 @@ The `event` object provides some information about that trigger.
 
 This table gives an overview over the `event` object:
 
-| Property Name     | Trigger Types                                        | Description                                                                         | Rules DSL Equivalent   |
-|-------------------|------------------------------------------------------|-------------------------------------------------------------------------------------|------------------------|
-| `oldState`        | `ItemStateChangeTrigger`, `GroupStateChangeTrigger`  | Previous state of Item or Group that triggered event                                | `previousState`        |
-| `newState`        | `ItemStateChangeTrigger`, `GroupStateChangeTrigger`  | New state of Item or Group that triggered event                                     | N/A                    |
-| `receivedState`   | `ItemStateUpdateTrigger`, `GroupStateUpdateTrigger`  | State of Item that triggered event                                                  | `triggeringItem.state` |
-| `receivedCommand` | `ItemCommandTrigger`, `GroupCommandTrigger`          | Command that triggered event                                                        | `receivedCommand`      |
-| `itemName`        | `Item****Trigger`, `Group****Trigger`                | Name of Item that triggered event                                                   | `triggeringItem.name`  |
-| `receivedEvent`   | `ChannelEventTrigger`                                | Channel event that triggered event                                                  | N/A                    |
-| `channelUID`      | `ChannelEventTrigger`                                | UID of channel that triggered event                                                 | N/A                    |
-| `oldStatus`       | `ThingStatusChangeTrigger`                           | Previous state of Thing that triggered event                                        | N/A                    |
-| `newStatus`       | `ThingStatusChangeTrigger`                           | New state of Thing that triggered event                                             | N/A                    |
-| `status`          | `ThingStatusUpdateTrigger`                           | State of Thing that triggered event                                                 | N/A                    |
-| `thingUID`        | `Thing****Trigger`                                   | UID of Thing that triggered event                                                   | N/A                    |
-| `eventType`       | all except `PWMTrigger`, `PIDTrigger`, time triggers | Type of event that triggered event (change, command, triggered, update)             | N/A                    |
-| `triggerType`     | all except `PWMTrigger`, `PIDTrigger`, time triggers | Type of trigger that triggered event                                                | N/A                    |
+| Property Name     | Trigger Types                                        | Description                                                             | Rules DSL Equivalent   |
+|-------------------|------------------------------------------------------|-------------------------------------------------------------------------|------------------------|
+| `oldState`        | `ItemStateChangeTrigger`, `GroupStateChangeTrigger`  | Previous state of Item or Group that triggered event                    | `previousState`        |
+| `newState`        | `ItemStateChangeTrigger`, `GroupStateChangeTrigger`  | New state of Item or Group that triggered event                         | N/A                    |
+| `receivedState`   | `ItemStateUpdateTrigger`, `GroupStateUpdateTrigger`  | State of Item that triggered event                                      | `triggeringItem.state` |
+| `receivedCommand` | `ItemCommandTrigger`, `GroupCommandTrigger`          | Command that triggered event                                            | `receivedCommand`      |
+| `itemName`        | `Item****Trigger`, `Group****Trigger`                | Name of Item that triggered event                                       | `triggeringItem.name`  |
+| `groupName`       | `Group****Trigger`                                   | Name of the group whose member triggered event                          | N/A                    |
+| `receivedEvent`   | `ChannelEventTrigger`                                | Channel event that triggered event                                      | N/A                    |
+| `channelUID`      | `ChannelEventTrigger`                                | UID of channel that triggered event                                     | N/A                    |
+| `oldStatus`       | `ThingStatusChangeTrigger`                           | Previous state of Thing that triggered event                            | N/A                    |
+| `newStatus`       | `ThingStatusChangeTrigger`                           | New state of Thing that triggered event                                 | N/A                    |
+| `status`          | `ThingStatusUpdateTrigger`                           | State of Thing that triggered event                                     | N/A                    |
+| `thingUID`        | `Thing****Trigger`                                   | UID of Thing that triggered event                                       | N/A                    |
+| `eventType`       | all except `PWMTrigger`, `PIDTrigger`, time triggers | Type of event that triggered event (change, command, triggered, update) | N/A                    |
+| `triggerType`     | all except `PWMTrigger`, `PIDTrigger`, time triggers | Type of trigger that triggered event                                    | N/A                    |
 
 All properties are typeof `string`.
 

diff --git a/bundles/org.openhab.automation.jsscripting/doc/rule-config.png b/bundles/org.openhab.automation.jsscripting/doc/rule-config.png
diff --git a/bundles/org.openhab.automation.jsscripting/doc/rule-engines.png b/bundles/org.openhab.automation.jsscripting/doc/rule-engines.png
diff --git a/bundles/org.openhab.automation.jsscripting/doc/rule-script.png b/bundles/org.openhab.automation.jsscripting/doc/rule-script.png
diff --git a/bundles/org.openhab.automation.jsscripting/doc/settings.png b/bundles/org.openhab.automation.jsscripting/doc/settings.png
diff --git a/bundles/org.openhab.automation.jsscripting/pom.xml b/bundles/org.openhab.automation.jsscripting/pom.xml
@@ -24,7 +24,7 @@
     </bnd.importpackage>
     <graal.version>22.0.0.2</graal.version> <!-- DO NOT UPGRADE: 22.0.0.2 is the latest version working on armv7l / OpenJDK 11.0.16 & armv7l / Zulu 17.0.5+8 -->
     <oh.version>${project.version}</oh.version>
-    <ohjs.version>openhab@4.3.0</ohjs.version>
+    <ohjs.version>openhab@4.4.0</ohjs.version>
   </properties>
 
   <build>
@@ -67,7 +67,7 @@
             </goals>
             <configuration>
               <!--suppress UnresolvedMavenProperty -->
-              <arguments>install ${ohjs.version} webpack@5.75.0 webpack-cli@4.10.0</arguments> <!-- webpack-cli >= 5.0.0 doesn't properly process the given entrypoint -->
+              <arguments>install ${ohjs.version} webpack@^5.87.0 webpack-cli@^5.1.4</arguments> <!-- webpack & webpack-cli versions should match to the ones from openhab-js -->
             </configuration>
           </execution>
           <execution>
@@ -77,8 +77,8 @@
             </goals>
             <configuration>
               <!--suppress UnresolvedMavenProperty -->
-              <arguments>webpack -c ./node_modules/openhab/@globals-webpack.config.js --entry
-                ./node_modules/openhab/@openhab-globals.js -o ./dist</arguments>
+              <arguments>webpack -c ./node_modules/openhab/build/@globals-webpack.config.js --entry-reset --entry
+                ./node_modules/openhab/build/@openhab-globals.js -o ./dist</arguments>
             </configuration>
           </execution>
           <execution>
@@ -87,7 +87,9 @@
               <goal>npx</goal>
             </goals>
             <configuration>
-              <arguments>webpack -c ./node_modules/openhab/webpack.config.js --entry ./node_modules/openhab/ -o ./dist</arguments>
+              <!--suppress UnresolvedMavenProperty -->
+              <arguments>webpack -c ./node_modules/openhab/build/webpack.config.js --entry-reset --entry
+                ./node_modules/openhab/ -o ./dist</arguments>
             </configuration>
           </execution>
         </executions>

diff --git a/bundles/org.openhab.automation.jsscriptingnashorn/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.automation.jsscriptingnashorn/src/main/resources/OH-INF/addon/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon:addon id="jsscripting" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<addon:addon id="jsscriptingnashorn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:addon="https://openhab.org/schemas/addon/v1.0.0"
 	xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
 

diff --git a/...coder/src/main/java/org/openhab/binding/alarmdecoder/internal/handler/ADThingHandler.java b/...coder/src/main/java/org/openhab/binding/alarmdecoder/internal/handler/ADThingHandler.java
@@ -85,7 +85,6 @@ public void bridgeStatusChanged(ThingStatusInfo bridgeStatusInfo) {
         if (bridgeStatus == ThingStatus.ONLINE
                 && getThing().getStatusInfo().getStatusDetail() == ThingStatusDetail.BRIDGE_OFFLINE) {
             initDeviceState();
-
         } else if (bridgeStatus == ThingStatus.OFFLINE) {
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.BRIDGE_OFFLINE);
         }

diff --git a/...coder/src/main/java/org/openhab/binding/alarmdecoder/internal/protocol/KeypadMessage.java b/...coder/src/main/java/org/openhab/binding/alarmdecoder/internal/protocol/KeypadMessage.java
@@ -82,7 +82,6 @@ public KeypadMessage(String message) throws IllegalArgumentException {
             this.nbeeps = Integer.parseInt(parts.get(0).substring(6, 7));
             this.lower = Integer.parseInt(parts.get(0).substring(7, 17), 2);
             this.status = ((upper & 0x1F) << 13) | ((nbeeps & 0x3) << 10) | lower;
-
         } catch (NumberFormatException e) {
             throw new IllegalArgumentException("keypad msg contains invalid number: " + e.getMessage(), e);
         }

diff --git a/...rol/src/main/java/org/openhab/binding/amazonechocontrol/internal/WebSocketConnection.java b/...rol/src/main/java/org/openhab/binding/amazonechocontrol/internal/WebSocketConnection.java
@@ -488,7 +488,6 @@ int computeChecksum(byte[] data, int exclusionStart, int exclusionEnd) {
                     sum += toUnsignedInt((data[index] & 0xFF) << ((index & 3 ^ 3) << 3));
                     overflow += computeBits(sum, 32);
                     sum = toUnsignedInt((int) sum & (int) 4294967295L);
-
                 } else {
                     index = exclusionEnd - 1;
                 }

diff --git a/bundles/org.openhab.binding.androidtv/NOTICE b/bundles/org.openhab.binding.androidtv/NOTICE
@@ -0,0 +1,13 @@
+This content is produced and maintained by the openHAB project.
+
+* Project home: https://www.openhab.org
+
+== Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License 2.0 which is available at
+https://www.eclipse.org/legal/epl-2.0/.
+
+== Source Code
+
+https://github.com/openhab/openhab-addons