forked from openhab/openhab-addons
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[deconz] Add Pairing/Scene actions, new devices and improve code (ope…
…nhab#14622) * port changes * update instructions * Incorporate review comments from openhab#14134 * new improvements (mostly Java 17 changes) * further improvements Signed-off-by: Jan N. Klug <github@klug.nrw>
- Loading branch information
1 parent
4fcc747
commit fa7f5d1
Showing
48 changed files
with
1,816 additions
and
826 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
...inding.deconz/src/main/java/org/openhab/binding/deconz/internal/action/BridgeActions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /** | ||
| * Copyright (c) 2010-2023 Contributors to the openHAB project | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| */ | ||
| package org.openhab.binding.deconz.internal.action; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| import org.eclipse.jdt.annotation.NonNullByDefault; | ||
| import org.eclipse.jdt.annotation.Nullable; | ||
| import org.eclipse.jetty.http.HttpMethod; | ||
| import org.openhab.binding.deconz.internal.Util; | ||
| import org.openhab.binding.deconz.internal.handler.DeconzBridgeHandler; | ||
| import org.openhab.core.automation.annotation.ActionInput; | ||
| import org.openhab.core.automation.annotation.RuleAction; | ||
| import org.openhab.core.thing.binding.ThingActions; | ||
| import org.openhab.core.thing.binding.ThingActionsScope; | ||
| import org.openhab.core.thing.binding.ThingHandler; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * The {@link BridgeActions} provides actions for managing scenes in groups | ||
| * | ||
| * @author Jan N. Klug - Initial contribution | ||
| */ | ||
| @ThingActionsScope(name = "deconz") | ||
| @NonNullByDefault | ||
| public class BridgeActions implements ThingActions { | ||
| private final Logger logger = LoggerFactory.getLogger(BridgeActions.class); | ||
|
|
||
| private @Nullable DeconzBridgeHandler handler; | ||
|
|
||
| @RuleAction(label = "@text/action.permit-join-network.label", description = "@text/action.permit-join-network.description") | ||
| public void permitJoin( | ||
| @ActionInput(name = "duration", label = "@text/action.permit-join-network.duration.label", description = "@text/action.permit-join-network.duration.description") @Nullable Integer duration) { | ||
| DeconzBridgeHandler handler = this.handler; | ||
|
|
||
| if (handler == null) { | ||
| logger.warn("Deconz BridgeActions service ThingHandler is null!"); | ||
| return; | ||
| } | ||
|
|
||
| int searchDuration = Util.constrainToRange(Objects.requireNonNullElse(duration, 120), 1, 240); | ||
|
|
||
| Object object = Map.of("permitjoin", searchDuration); | ||
| handler.sendObject("config", object, HttpMethod.PUT).thenAccept(v -> { | ||
| if (v.getResponseCode() != java.net.HttpURLConnection.HTTP_OK) { | ||
| logger.warn("Sending {} via PUT to config failed: {} - {}", object, v.getResponseCode(), v.getBody()); | ||
| } else { | ||
| logger.trace("Result code={}, body={}", v.getResponseCode(), v.getBody()); | ||
| logger.info("Enabled device searching for {} seconds on bridge {}.", searchDuration, | ||
| handler.getThing().getUID()); | ||
| } | ||
| }).exceptionally(e -> { | ||
| logger.warn("Sending {} via PUT to config failed: {} - {}", object, e.getClass(), e.getMessage()); | ||
| return null; | ||
| }); | ||
| } | ||
|
|
||
| public static void permitJoin(ThingActions actions, @Nullable Integer duration) { | ||
| if (actions instanceof BridgeActions bridgeActions) { | ||
| bridgeActions.permitJoin(duration); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void setThingHandler(@Nullable ThingHandler handler) { | ||
| if (handler instanceof DeconzBridgeHandler) { | ||
| this.handler = (DeconzBridgeHandler) handler; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public @Nullable ThingHandler getThingHandler() { | ||
| return handler; | ||
| } | ||
| } |
Oops, something went wrong.