Add support for outBatt1

Signed-off-by: Matthew Skinner <matt@pcmus.com>
openhab · May 16, 2021 · 9b2c910 · 9b2c910
1 parent cd44751
commit 9b2c910
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/...g.ipobserver/src/main/java/org/openhab/binding/ipobserver/internal/IpObserverHandler.java b/...g.ipobserver/src/main/java/org/openhab/binding/ipobserver/internal/IpObserverHandler.java
@@ -69,10 +69,10 @@ public class IpObserverHandler extends BaseThingHandler {
     private @Nullable ScheduledFuture<?> pollingFuture = null;
     private IpObserverConfiguration config = new IpObserverConfiguration();
 
-    class ChannelHandler {
+    private class ChannelHandler {
         private IpObserverHandler handler;
         private Channel channel;
-        private String currentState = "";
+        private String previousValue = "";
         private Unit<?> unit;
         private final ArrayList<Class<? extends State>> acceptedDataTypes = new ArrayList<Class<? extends State>>();
 
@@ -84,14 +84,16 @@ class ChannelHandler {
             acceptedDataTypes.add(acceptable);
         }
 
-        public void processMessage(String sensorValue) {
-            if (!sensorValue.equals(this.currentState)) {
-                this.currentState = sensorValue;
+        public void processValue(String sensorValue) {
+            if (!sensorValue.equals(previousValue)) {
+                previousValue = sensorValue;
                 State state = TypeParser.parseState(this.acceptedDataTypes, sensorValue);
-                if (state instanceof QuantityType) {
+                if (state == null) {
+                    return;
+                } else if (state instanceof QuantityType) {
                     handler.updateState(this.channel.getUID(),
                             QuantityType.valueOf(Double.parseDouble(sensorValue), unit));
-                } else if (state != null) {
+                } else {
                     this.handler.updateState(this.channel.getUID(), state);
                 }
             }
@@ -131,23 +133,23 @@ private void parseAndUpdate(String html) {
         String value = doc.select("select[name=inBattSta] option[selected]").val();
         ChannelHandler localUpdater = channelHandlers.get("inBattSta");
         if (localUpdater != null) {
-            localUpdater.processMessage(value);
+            localUpdater.processValue(value);
         }
         value = doc.select("select[name=outBattSta] option[selected]").val();
         localUpdater = channelHandlers.get("outBattSta");
         if (localUpdater != null) {
-            localUpdater.processMessage(value);
+            localUpdater.processValue(value);
         }
 
         Elements elements = doc.select("input");
         for (Element element : elements) {
             String elementName = element.attr("name");
             value = element.attr("value");
-            logger.trace("Found element {}, value is {}", elementName, value);
             if (!value.isEmpty()) {
+                logger.trace("Found element {}, value is {}", elementName, value);
                 localUpdater = channelHandlers.get(elementName);
                 if (localUpdater != null) {
-                    localUpdater.processMessage(value);
+                    localUpdater.processValue(value);
                 }
             }
         }
@@ -225,6 +227,7 @@ private void setupChannels() {
             createChannelHandler(MONTHLY_RAIN, QuantityType.class, ImperialUnits.INCH, "rainofmonthly");
             createChannelHandler(YEARLY_RAIN, QuantityType.class, ImperialUnits.INCH, "rainofyearly");
         } else {
+            logger.debug("Using metric units of measurement for rain.");
             createChannelHandler(HOURLY_RAIN_RATE, QuantityType.class, MetricPrefix.MILLI(SIUnits.METRE),
                     "rainofhourly");
             createChannelHandler(DAILY_RAIN, QuantityType.class, MetricPrefix.MILLI(SIUnits.METRE), "rainofdaily");
@@ -286,6 +289,7 @@ private void setupChannels() {
         createChannelHandler(UV_INDEX, DecimalType.class, SIUnits.CELSIUS, "uvi");
         // was outBattSta1 so some units may use this instead?
         createChannelHandler(OUTDOOR_BATTERY, StringType.class, Units.PERCENT, "outBattSta");
+        createChannelHandler(OUTDOOR_BATTERY, StringType.class, Units.PERCENT, "outBattSta1");
         createChannelHandler(INDOOR_BATTERY, StringType.class, Units.PERCENT, "inBattSta");
         createChannelHandler(LAST_UPDATED_TIME, StringType.class, SIUnits.CELSIUS, "CurrTime");
     }

diff --git a/bundles/org.openhab.binding.ipobserver/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ipobserver/src/main/resources/OH-INF/thing/thing-types.xml
@@ -211,6 +211,7 @@
 		<category>Battery</category>
 		<state readOnly="true">
 			<options>
+				<option value="Normal">Normal</option>
 				<option value="0">Normal</option>
 				<option value="1">Low</option>
 			</options>