Enhancing DUTY CYCLE

Signed-off-by: clinique <gael@lhopital.org>

bundles/org.openhab.binding.freeboxos/pom.xml

@@ -35,7 +35,7 @@
   <parent>
     <groupId>org.openhab.addons.bundles</groupId>
     <artifactId>org.openhab.addons.reactor.bundles</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.binding.freeboxos</artifactId>

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/action/ActivePlayerActions.java

@@ -63,6 +63,7 @@ public static void reboot(ThingActions actions) {
 import org.openhab.binding.freeboxos.internal.handler.ActivePlayerHandler;
 import org.openhab.binding.freeboxos.internal.handler.PlayerHandler;
 import org.openhab.core.automation.annotation.RuleAction;
+import org.openhab.core.thing.binding.ThingActions;
 import org.openhab.core.thing.binding.ThingActionsScope;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,4 +90,8 @@ public void reboot() {
         }
 >>>>>>> 46dadb1 SAT warnings handling
     }
+
+    public static void reboot(ThingActions actions) {
+        ((ActivePlayerActions) actions).reboot();
+    }
 }

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/player/PlayerManager.java

@@ -85,5 +85,4 @@ public void sendKey(String ip, String code, String key, boolean longPress, int c
     public void reboot(int id) throws FreeboxException {
         post(subPaths.get(id), SYSTEM_SUB_PATH, REBOOT_SUB_PATH);
     }
-
 }

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/ApiConsumerHandler.java

@@ -496,7 +496,8 @@ private void startRefreshJob() {
             int refreshInterval = getConfigAs(ApiConsumerConfiguration.class).refreshInterval;
             logger.debug("Scheduling state update every {} seconds for thing {}...", refreshInterval,
                     getThing().getUID());
-            if (thing.getStatusInfo().getStatusDetail() == ThingStatusDetail.DUTY_CYCLE) {
+            ThingStatusDetail detail = thing.getStatusInfo().getStatusDetail();
+            if (ThingStatusDetail.DUTY_CYCLE.equals(detail)) {
                 boolean rebooting = true;
                 while (rebooting) {
                     try {

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/FreeDeviceHandler.java

@@ -161,10 +161,9 @@ public void reboot() {
         try {
             internalCallReboot();
             triggerChannel(new ChannelUID(getThing().getUID(), SYS_INFO, BOX_EVENT), "reboot_requested");
-            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.DUTY_CYCLE,
-                    "System rebooting, will take some seconds...");
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.DUTY_CYCLE, "System rebooting...");
             stopRefreshJob();
-            scheduler.schedule(this::initialize, 10, TimeUnit.SECONDS);
+            scheduler.schedule(this::initialize, 30, TimeUnit.SECONDS);
         } catch (FreeboxException e) {
             logger.warn("Error rebooting device : {}", e.getMessage());
         }

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/PlayerHandler.java

@@ -216,7 +216,7 @@ public void sendKey(String key, boolean longPress, int count) {
                 try {
                     getManager(PlayerManager.class).sendKey(ip, remoteCode, aKey, longPress, count);
                 } catch (FreeboxException e) {
-                    logger.info("Error sending key", e.getMessage());
+                    logger.info("Error sending key : {}", e.getMessage());
                 }
             } else {
                 logger.warn("A remote code must be configured in the on the player thing.");