Add support for multiple mowers

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
openhab · Apr 6, 2023 · db85956 · db85956
1 parent 392f1ee
commit db85956
Show file tree

Hide file tree

Showing 12 changed files with 617 additions and 328 deletions.
diff --git a/bundles/org.openhab.binding.boschindego/README.md b/bundles/org.openhab.binding.boschindego/README.md
@@ -4,28 +4,38 @@ This is the Binding for Bosch Indego Connect lawn mowers.
 Thank´s to zazaz-de who found out how the API works.
 His [Java Library](https://github.com/zazaz-de/iot-device-bosch-indego-controller) made this Binding possible.
 
+## Discovery
+
+When the bridge is authorized, the binding can automatically discover Indego mowers connected to the SingleKey ID account.
+
 ## Thing Configuration
 
-Currently the binding supports  _**indego**_  mowers as a thing type with these configuration parameters:
+### `account` Bridge Configuration
 
-| Parameter          | Description                                                       | Default |
-|--------------------|-------------------------------------------------------------------|---------|
-| refresh            | The number of seconds between refreshing device state when idle   | 180     |
-| stateActiveRefresh | The number of seconds between refreshing device state when active | 30      |
-| cuttingTimeRefresh | The number of minutes between refreshing last/next cutting time   | 60      |
+There are no parameters for the bridge.
+However, the bridge is used for managing the [SingleKey ID](https://singlekey-id.com/) digital identity.
 
-### Authorization
+#### Authorization
 
 To authorize, please follow these steps:
 
-- In your browser, go to the [Bosch SingleKey ID login page](https://prodindego.b2clogin.com/prodindego.onmicrosoft.com/b2c_1a_signup_signin/oauth2/v2.0/authorize?redirect_uri=com.bosch.indegoconnect://login&client_id=65bb8c9d-1070-4fb4-aa95-853618acc876&response_type=code&scope=openid%20offline_access%20https://prodindego.onmicrosoft.com/indego-mobile-api/Indego.Mower.User).
-- Select "Bosch ID", enter your e-mail address and password and clock "Log-in".
+- In your browser, go to the [Bosch Indego login page](https://prodindego.b2clogin.com/prodindego.onmicrosoft.com/b2c_1a_signup_signin/oauth2/v2.0/authorize?redirect_uri=com.bosch.indegoconnect://login&client_id=65bb8c9d-1070-4fb4-aa95-853618acc876&response_type=code&scope=openid%20offline_access%20https://prodindego.onmicrosoft.com/indego-mobile-api/Indego.Mower.User).
+- Select "Bosch ID", enter your e-mail address and password and click "Log-in".
 - In your browser, open Developer Tools.
-- With developer tools showing in the right, go to [Bosch SingleKey ID login page](https://prodindego.b2clogin.com/prodindego.onmicrosoft.com/b2c_1a_signup_signin/oauth2/v2.0/authorize?redirect_uri=com.bosch.indegoconnect://login&client_id=65bb8c9d-1070-4fb4-aa95-853618acc876&response_type=code&scope=openid%20offline_access%20https://prodindego.onmicrosoft.com/indego-mobile-api/Indego.Mower.User) again.
+- With developer tools showing in the right, go to [Bosch Indego login page](https://prodindego.b2clogin.com/prodindego.onmicrosoft.com/b2c_1a_signup_signin/oauth2/v2.0/authorize?redirect_uri=com.bosch.indegoconnect://login&client_id=65bb8c9d-1070-4fb4-aa95-853618acc876&response_type=code&scope=openid%20offline_access%20https://prodindego.onmicrosoft.com/indego-mobile-api/Indego.Mower.User) again.
 - "Please wait..." should now be displayed.
 - Find the `authresp` and copy the code: `com.bosch.indegoconnect://login/?code=<copy this>`
 - Use the openHAB console to authorize with this code: `openhab:boschindego authorize <paste code>`
 
+### `indego` Thing Configuration
+
+| Parameter          | Description                                                       | Default | Required |
+|--------------------|-------------------------------------------------------------------|---------|----------|
+| serialNumber       | The serial number of the connected Indego mower                   |         | yes      |
+| refresh            | The number of seconds between refreshing device state when idle   | 180     | no       |
+| stateActiveRefresh | The number of seconds between refreshing device state when active | 30      | no       |
+| cuttingTimeRefresh | The number of minutes between refreshing last/next cutting time   | 60      | no       |
+
 ## Channels
 
 | Channel            | Item Type                | Description                                                                                                                         | Writeable |
@@ -90,7 +100,10 @@ To authorize, please follow these steps:
 ### `indego.things` File
 
 ```java
-boschindego:indego:lawnmower [username="mail@example.com", password="idontneedtocutthelawnagain", refresh=120]
+Bridge boschindego:account:singlekey {
+    Things:
+        Thing indego lawnmower [serialNumber="1234567890", refresh=120]
+}
 ```
 
 ### `indego.items` File

diff --git a/...o/src/main/java/org/openhab/binding/boschindego/internal/BoschIndegoBindingConstants.java b/...o/src/main/java/org/openhab/binding/boschindego/internal/BoschIndegoBindingConstants.java
@@ -29,6 +29,7 @@ public class BoschIndegoBindingConstants {
     public static final String BINDING_ID = "boschindego";
 
     // List of all Thing Type UIDs
+    public static final ThingTypeUID THING_TYPE_ACCOUNT = new ThingTypeUID(BINDING_ID, "account");
     public static final ThingTypeUID THING_TYPE_INDEGO = new ThingTypeUID(BINDING_ID, "indego");
 
     // List of all Channel ids
@@ -47,7 +48,7 @@ public class BoschIndegoBindingConstants {
     public static final String GARDEN_SIZE = "gardenSize";
     public static final String GARDEN_MAP = "gardenMap";
 
-    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_INDEGO);
+    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_ACCOUNT, THING_TYPE_INDEGO);
 
     // Bosch SingleKey ID OAuth2
     private static final String BSK_BASE_URI = "https://prodindego.b2clogin.com/prodindego.onmicrosoft.com/b2c_1a_signup_signin/oauth2/v2.0/";

diff --git a/...ego/src/main/java/org/openhab/binding/boschindego/internal/BoschIndegoHandlerFactory.java b/...ego/src/main/java/org/openhab/binding/boschindego/internal/BoschIndegoHandlerFactory.java
@@ -12,17 +12,23 @@
  */
 package org.openhab.binding.boschindego.internal;
 
-import static org.openhab.binding.boschindego.internal.BoschIndegoBindingConstants.THING_TYPE_INDEGO;
+import static org.openhab.binding.boschindego.internal.BoschIndegoBindingConstants.*;
+
+import java.util.Hashtable;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.client.HttpClient;
+import org.openhab.binding.boschindego.internal.discovery.IndegoDiscoveryService;
+import org.openhab.binding.boschindego.internal.handler.BoschAccountHandler;
 import org.openhab.binding.boschindego.internal.handler.BoschIndegoHandler;
 import org.openhab.core.auth.client.oauth2.OAuthFactory;
+import org.openhab.core.config.discovery.DiscoveryService;
 import org.openhab.core.i18n.LocaleProvider;
 import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.io.net.http.HttpClientFactory;
+import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.Thing;
 import org.openhab.core.thing.ThingTypeUID;
 import org.openhab.core.thing.binding.BaseThingHandlerFactory;
@@ -70,8 +76,14 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
     protected @Nullable ThingHandler createHandler(Thing thing) {
         ThingTypeUID thingTypeUID = thing.getThingTypeUID();
 
-        if (THING_TYPE_INDEGO.equals(thingTypeUID)) {
-            return new BoschIndegoHandler(thing, httpClient, oAuthFactory, translationProvider, timeZoneProvider);
+        if (THING_TYPE_ACCOUNT.equals(thingTypeUID)) {
+            var accountHandler = new BoschAccountHandler((Bridge) thing, httpClient, oAuthFactory);
+            var discoveryService = new IndegoDiscoveryService(accountHandler);
+            bundleContext.registerService(DiscoveryService.class.getName(), discoveryService, new Hashtable<>());
+
+            return accountHandler;
+        } else if (THING_TYPE_INDEGO.equals(thingTypeUID)) {
+            return new BoschIndegoHandler(thing, httpClient, translationProvider, timeZoneProvider);
         }
 
         return null;