Merge branch 'sony-binding-oh3' of https://github.com/andan67/openhab…

…-addons into sony-binding-oh3

CODEOWNERS

@@ -9,6 +9,7 @@
 /bundles/org.openhab.automation.jsscripting/ @jpg0
 /bundles/org.openhab.automation.jythonscripting/ @openhab/add-ons-maintainers
 /bundles/org.openhab.automation.pidcontroller/ @fwolter
+/bundles/org.openhab.automation.pwm/ @fwolter
 /bundles/org.openhab.binding.adorne/ @theiding
 /bundles/org.openhab.binding.ahawastecollection/ @soenkekueper
 /bundles/org.openhab.binding.airq/ @aurelio1
@@ -25,6 +26,7 @@
 /bundles/org.openhab.binding.autelis/ @digitaldan
 /bundles/org.openhab.binding.automower/ @maxpg
 /bundles/org.openhab.binding.avmfritz/ @cweitkamp
+/bundles/org.openhab.binding.benqprojector/ @mlobstein
 /bundles/org.openhab.binding.bigassfan/ @mhilbush
 /bundles/org.openhab.binding.bluetooth/ @cdjackson @cpmeister
 /bundles/org.openhab.binding.bluetooth.airthings/ @paulianttila
@@ -165,6 +167,7 @@
 /bundles/org.openhab.binding.meteoblue/ @9037568
 /bundles/org.openhab.binding.meteostick/ @cdjackson
 /bundles/org.openhab.binding.miele/ @kgoderis
+/bundles/org.openhab.binding.mielecloud/ @BjoernLange
 /bundles/org.openhab.binding.mihome/ @pboos
 /bundles/org.openhab.binding.miio/ @marcelrv
 /bundles/org.openhab.binding.milight/ @davidgraeff
@@ -229,6 +232,7 @@
 /bundles/org.openhab.binding.playstation/ @FluBBaOfWard
 /bundles/org.openhab.binding.plclogo/ @falkena
 /bundles/org.openhab.binding.plugwise/ @wborn
+/bundles/org.openhab.binding.plugwiseha/ @lsiepel
 /bundles/org.openhab.binding.powermax/ @lolodomo
 /bundles/org.openhab.binding.pulseaudio/ @peuter
 /bundles/org.openhab.binding.pushbullet/ @hakan42
@@ -248,7 +252,8 @@
 /bundles/org.openhab.binding.sagercaster/ @clinique
 /bundles/org.openhab.binding.samsungtv/ @paulianttila
 /bundles/org.openhab.binding.satel/ @druciak
-/bundles/org.openhab.binding.senechome/ @vctender @KorbinianP
+/bundles/org.openhab.binding.semsportal/ @itb3
+/bundles/org.openhab.binding.senechome/ @vctender @KorbinianP @eguib
 /bundles/org.openhab.binding.seneye/ @nikotanghe
 /bundles/org.openhab.binding.sensebox/ @hakan42
 /bundles/org.openhab.binding.sensibo/ @seime

bom/openhab-addons/pom.xml

@@ -36,6 +36,11 @@
       <artifactId>org.openhab.automation.pidcontroller</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.automation.pwm</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.adorne</artifactId>
@@ -116,6 +121,11 @@
       <artifactId>org.openhab.binding.avmfritz</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.benqprojector</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.bigassfan</artifactId>
@@ -811,6 +821,11 @@
       <artifactId>org.openhab.binding.miele</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.mielecloud</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.mihome</artifactId>
@@ -1126,6 +1141,11 @@
       <artifactId>org.openhab.binding.plugwise</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.plugwiseha</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.powermax</artifactId>
@@ -1216,6 +1236,11 @@
       <artifactId>org.openhab.binding.satel</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.semsportal</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.senechome</artifactId>

bundles/org.openhab.automation.groovyscripting/README.md

@@ -1,6 +1,6 @@
 # Groovy Scripting
 
-This add-on provides support for [Groovy](https://groovy-lang.org/) 3.0.7 that can be used as a scripting language within automation rules and which eliminates the need to manually install Groovy.
+This add-on provides support for [Groovy](https://groovy-lang.org/) 3.0.8 that can be used as a scripting language within automation rules and which eliminates the need to manually install Groovy.
 
 ## Creating Groovy Scripts
 

bundles/org.openhab.automation.groovyscripting/pom.xml

@@ -16,7 +16,7 @@
 
   <properties>
     <bnd.importpackage>com.ibm.icu.*;resolution:=optional,groovy.runtime.metaclass;resolution:=optional,groovyjarjarantlr4.stringtemplate;resolution:=optional,org.abego.treelayout.*;resolution:=optional,org.apache.ivy.*;resolution:=optional,org.stringtemplate.v4.*;resolution:=optional</bnd.importpackage>
-    <groovy.version>3.0.7</groovy.version>
+    <groovy.version>3.0.8</groovy.version>
   </properties>
 
   <dependencies>

bundles/org.openhab.automation.pidcontroller/README.md

@@ -14,7 +14,12 @@ A PID controller can be used for closed-loop controls. For example:
 
 ## Modules
 
-The PID controller can be used in openHAB's [rule engine](https://www.openhab.org/docs/configuration/rules-dsl.html). This automation provides a trigger and an action module.
+The PID controller can be used in openHAB's [rule engine](https://www.openhab.org/docs/configuration/rules-dsl.html).
+This automation provides a trigger module ("PID controller triggers").
+The return value is used to feed the Action module "Item Action" aka "send a command", which controls the actuator.
+
+To configure a rule, you need to add a Trigger ("PID controller triggers") and an Action ("Item Action").
+Select the Item you like to control in the "Item Action" and leave the command empty.
 
 ### Trigger
 
@@ -32,27 +37,18 @@ This is then transferred to the action module.
 | `kdTimeConstant` | Decimal | D-T1: [Derivative Gain Time Constant](#derivative-time-constant-d-t1-parameter) in sec.                                                            | Y        |
 | `commandItem`    | String  | Send a String "RESET" to this item to reset the I and the D part to 0.                                                                             | N        |
 | `loopTime`       | Decimal | The interval the output value will be updated in milliseconds. Note: the output will also be updated when the input value or the setpoint changes. | Y        |
-
+| `pInspector`     | Item    | Name of the debug Item for the current P part                                                                                                      | N        |
+| `iInspector`     | Item    | Name of the debug Item for the current I part                                                                                                      | N        |
+| `dInspector`     | Item    | Name of the debug Item for the current D part                                                                                                      | N        |
+| `eInspector`     | Item    | Name of the debug Item for the current regulation difference (error)                                                                               | N        |
 
 The `loopTime` should be max a tenth of the system response.
 E.g. the heating needs 10 min to heat up the room, the loop time should be max 1 min.
 Lower values won't harm, but need more calculation resources.
 
-### Action
-
-This module writes the PID controller's output value into the `output` Item and provides debugging abilities.
-
-| Name         | Type | Description                                                          | Required |
-|--------------|------|----------------------------------------------------------------------|----------|
-| `output`     | Item | Name of the output Item (e.g. the valve actuator 0-100%)             | Y        |
-| `pInspector` | Item | Name of the debug Item for the current P part                        | N        |
-| `iInspector` | Item | Name of the debug Item for the current I part                        | N        |
-| `dInspector` | Item | Name of the debug Item for the current D part                        | N        |
-| `eInspector` | Item | Name of the debug Item for the current regulation difference (error) | N        |
-
 You can view the internal P, I and D parts of the controller with the inspector Items.
 These values are useful when tuning the controller.
-They are updated everytime the output is updated.
+They are updated every time the output is updated.
 
 ## Proportional (P) Gain Parameter
 
@@ -112,8 +108,8 @@ This results in quite reasonable working systems in most cases.
 So, this will be described in the following.
 
 To be able to proceed with this method, you need to visualize the input and the output value of the PID controller over time.
-It's also good to visualize the individual P, I and D parts (these are forming the output value) via the inspector Items.
-The visualization can be done by the analyze function in Main UI or by adding a persistence and use Grafana for example.
+It's also good to visualize the individual P, I and D parts (these are forming the output value) via the inspector items.
+The visualization could be done by adding a persistence and use Grafana for example.
 
 After you added a [Rule](https://www.openhab.org/docs/configuration/rules-dsl.html) with above trigger and action module and configured those, proceed with the following steps:
 

bundles/org.openhab.automation.pidcontroller/src/main/java/org/openhab/automation/pidcontroller/internal/PIDControllerConstants.java

@@ -36,5 +36,5 @@ public class PIDControllerConstants {
     public static final String I_INSPECTOR = "iInspector";
     public static final String D_INSPECTOR = "dInspector";
     public static final String E_INSPECTOR = "eInspector";
-    public static final String OUTPUT = "output";
+    public static final String COMMAND = "command";
 }

bundles/org.openhab.automation.pidcontroller/src/main/java/org/openhab/automation/pidcontroller/internal/factory/PIDControllerModuleHandlerFactory.java

@@ -17,9 +17,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.automation.pidcontroller.internal.handler.PIDControllerActionHandler;
 import org.openhab.automation.pidcontroller.internal.handler.PIDControllerTriggerHandler;
-import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.handler.BaseModuleHandlerFactory;
@@ -39,8 +37,7 @@
 @Component(service = ModuleHandlerFactory.class, configurationPid = "action.pidcontroller")
 @NonNullByDefault
 public class PIDControllerModuleHandlerFactory extends BaseModuleHandlerFactory {
-    private static final Collection<String> TYPES = Set.of(PIDControllerTriggerHandler.MODULE_TYPE_ID,
-            PIDControllerActionHandler.MODULE_TYPE_ID);
+    private static final Collection<String> TYPES = Set.of(PIDControllerTriggerHandler.MODULE_TYPE_ID);
     private ItemRegistry itemRegistry;
     private EventPublisher eventPublisher;
     private BundleContext bundleContext;
@@ -63,8 +60,6 @@ public Collection<String> getTypes() {
         switch (module.getTypeUID()) {
             case PIDControllerTriggerHandler.MODULE_TYPE_ID:
                 return new PIDControllerTriggerHandler((Trigger) module, itemRegistry, eventPublisher, bundleContext);
-            case PIDControllerActionHandler.MODULE_TYPE_ID:
-                return new PIDControllerActionHandler((Action) module, itemRegistry, eventPublisher);
         }
 
         return null;