[sbus] fix sat issues

Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
2025-01-10 15:11:59 +01:00 · 2025-01-08 21:37:24 +02:00 · 2025-01-08 21:37:24 +02:00 · d1fa64fb69
commit d1fa64fb69
parent 31c409f6ce
15 changed files with 52 additions and 24 deletions
--- a/bundles/org.openhab.binding.sbus/pom.xml
+++ b/bundles/org.openhab.binding.sbus/pom.xml
@ -19,8 +19,28 @@
      <groupId>ro.ciprianpascu</groupId>
      <artifactId>j2sbus</artifactId>
      <version>1.5.4</version>
+      <scope>compile</scope>
    </dependency>
  </dependencies>

+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>6.0.0</version>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              ro.ciprianpascu.sbus.facade,
+              *
+            </Import-Package>
+            <Embed-Dependency>j2sbus;scope=compile</Embed-Dependency>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+

 </project>
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/BindingConstants.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/BindingConstants.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/AbstractSbusHandler.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/AbstractSbusHandler.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusBridgeHandler.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusBridgeHandler.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
@ -68,10 +68,8 @@ public class SbusBridgeHandler extends BaseBridgeHandler {
                        "Sbus service not available");
                return;
            }
-
            service.initialize(config.host, config.port);
            updateStatus(ThingStatus.ONLINE);
-
        } catch (Exception e) {
            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage());
        }
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusHandlerFactory.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusHandlerFactory.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusRgbwHandler.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusRgbwHandler.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusService.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusService.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
@ -84,5 +84,5 @@ public interface SbusService {
     */
    void close();

-    void initialize(String host, int port);
+    void initialize(String host, int port) throws Exception;
 }
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusSwitchHandler.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusSwitchHandler.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusTemperatureHandler.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/SbusTemperatureHandler.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/config/SbusBridgeConfig.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/config/SbusBridgeConfig.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/config/SbusChannelConfig.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/config/SbusChannelConfig.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/config/SbusDeviceConfig.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/config/SbusDeviceConfig.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/config/TemperatureChannelConfig.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/handler/config/TemperatureChannelConfig.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/internal/SbusServiceImpl.java
+++ b/bundles/org.openhab.binding.sbus/src/main/java/org/openhab/binding/sbus/internal/SbusServiceImpl.java
@ -1,4 +1,4 @@
-/*
+/**
 * Copyright (c) 2010-2025 Contributors to the openHAB project
 *
 * See the NOTICE file(s) distributed with this work for additional
--- a/bundles/org.openhab.binding.sbus/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.sbus/src/main/resources/OH-INF/thing/thing-types.xml
@ -17,8 +17,10 @@
 				<label>SubnetId</label>
 				<description>Slave subnet id. Can take any value between 1 and 255. 255 for broadcast.</description>
 				<default>1</default>
-				<min>1</min>
-				<max>255</max>
+				<options>
+					<option value="1">1</option>
+					<option value="255">255</option>
+				</options>
 			</parameter>
 			<parameter name="id" type="integer" required="true">
 				<label>Device ID</label>
@ -28,6 +30,7 @@
 				<label>Refresh Interval</label>
 				<description>Refresh interval in seconds</description>
 				<default>30</default>
+				<unitLabel>s</unitLabel>
 			</parameter>
 		</config-description>
 	</thing-type>
@ -44,8 +47,10 @@
 				<label>SubnetId</label>
 				<description>Slave subnet id. Can take any value between 1 and 255. 255 for broadcast.</description>
 				<default>1</default>
-				<min>1</min>
-				<max>255</max>
+				<options>
+					<option value="1">1</option>
+					<option value="255">255</option>
+				</options>
 			</parameter>
 			<parameter name="id" type="integer" required="true">
 				<label>Device ID</label>
@ -55,6 +60,7 @@
 				<label>Refresh Interval</label>
 				<description>Refresh interval in seconds</description>
 				<default>30</default>
+				<unitLabel>s</unitLabel>
 			</parameter>
 		</config-description>
 	</thing-type>
@ -71,8 +77,10 @@
 				<label>SubnetId</label>
 				<description>Slave subnet id. Can take any value between 1 and 255. 255 for broadcast.</description>
 				<default>1</default>
-				<min>1</min>
-				<max>255</max>
+				<options>
+					<option value="1">1</option>
+					<option value="255">255</option>
+				</options>
 			</parameter>
 			<parameter name="id" type="integer" required="true">
 				<label>Device ID</label>
@ -82,6 +90,7 @@
 				<label>Refresh Interval</label>
 				<description>Refresh interval in seconds</description>
 				<default>30</default>
+				<unitLabel>s</unitLabel>
 			</parameter>
 		</config-description>
 	</thing-type>
@ -114,7 +123,8 @@
 				<label>Timer</label>
 				<description>Timer in seconds to automatically turn off the switch (0 = disabled)</description>
 				<default>0</default>
-				<min>0</min>
+				<advanced>true</advanced>
+				<unitLabel>s</unitLabel>
 			</parameter>
 		</config-description>
 	</channel-type>