Shelly EM #18: Compensate missing timestamp/lastUpdate with system

timestamp (like for sensors) Signed-off-by: Markus Michels <[email protected]>
markus7017 · Dec 30, 2019 · 31e7d61 · 31e7d61
1 parent 9d9001a
commit 31e7d61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...inding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyApiJsonDTO.java b/...inding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyApiJsonDTO.java
@@ -310,7 +310,6 @@ public static class ShellySettingsEMeter { // ShellyEM meter
         public Double total; // Total consumed energy, Wh
         @SerializedName("total_returned")
         public Double totalReturned; // Total returned energy, Wh
-        public Long timestamp;
     }
 
     public static class ShellySettingsUpdate {

diff --git a/...ding.shelly/src/main/java/org/openhab/binding/shelly/internal/coap/ShellyCoapHandler.java b/...ding.shelly/src/main/java/org/openhab/binding/shelly/internal/coap/ShellyCoapHandler.java
@@ -389,6 +389,9 @@ private void handleStatusUpdate(String devId, String payload, int serial) throws
                         String mGroup = profile.numMeters == 1 ? CHANNEL_GROUP_METER : CHANNEL_GROUP_METER + rIndex;
                         updateChannel(updates, mGroup, CHANNEL_METER_CURRENTWATTS,
                                 toQuantityType(s.value, DIGITS_WATT, SmartHomeUnits.WATT));
+                        if (profile.isEMeter) {
+                            updateChannel(updates, mGroup, CHANNEL_LAST_UPDATE, getTimestamp());
+                        }
                         break;
                     case "o": // Overtemp
                         // will be handled by status update

diff --git a/...ng.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyComponents.java b/...ng.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyComponents.java
@@ -111,8 +111,7 @@ public static boolean updateMeters(ShellyBaseHandler th, ShellySettingsStatus st
                             updated |= th.updateChannel(groupName, CHANNEL_EMETER_VOLTAGE,
                                     toQuantityType(getDouble(emeter.voltage), DIGITS_VOLT, SmartHomeUnits.VOLT));
                             if (updated) {
-                                th.updateChannel(groupName, CHANNEL_LAST_UPDATE,
-                                        getTimestamp(getString(profile.settings.timezone), getLong(emeter.timestamp)));
+                                th.updateChannel(groupName, CHANNEL_LAST_UPDATE, getTimestamp());
                             }
                             m++;
                         }