Merge pull request #72 from boriswerner/master

correct creation of cleaninglog.channel
mrbungle64 · May 22, 2020 · 470d343 · 470d343
2 parents 4b9a9f5 + a5a8bfa
commit 470d343
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/mapHelper.js b/lib/mapHelper.js
@@ -81,7 +81,7 @@ function processMaps(adapter, maps) {
                     adapter.createObjectNotExists("map."+extMapId+".mapName", "Name of the map","string", "text", false, mapArray[extMapId]["mapName"], "");
                     // adapter.createObjectNotExists("map."+extMapId+".mapStatus", "Status of the map","string", "indicator.status", false, mapArray[extMapId]["mapStatus"], ""); //meaning of status currently unknown
                     adapter.createObjectNotExists("map."+extMapId+".mapIsAvailable", "Is the map still available?","boolean", "indicator.status", false, true, "");
-                    adapter.createObjectNotExists("map."+extMapId+".mapDeactivationTimestamp", "When was the map deactivated (null if active)","integer", "value.datetime", false, null, "");
+                    adapter.createObjectNotExists("map."+extMapId+".mapDeactivationTimestamp", "When was the map deactivated (null if active)","number", "value.datetime", false, null, "");
                     adapter.createChannelNotExists("map."+extMapId+".spotAreas", "SpotAreas");
                 }
                 delete mapArray[extMapId];
@@ -169,7 +169,7 @@ function processSpotAreas(adapter, spotAreas) {
                     adapter.createChannelNotExists("map." + mapID +".spotAreas."+ extSpotAreaId, "SpotArea "+ extSpotAreaId);
                     adapter.createObjectNotExists("map." + mapID +".spotAreas."+ extSpotAreaId+".spotAreaID", "ID of the SpotArea","string", "text", false, spotAreaArray[extSpotAreaId]["mapSpotAreaID"], "");
                     adapter.createObjectNotExists("map." + mapID +".spotAreas."+ extSpotAreaId+".spotAreaIsAvailable", "Is the SpotArea still available?","boolean", "indicator.status", false, true, "");
-                    adapter.createObjectNotExists("map." + mapID +".spotAreas."+ extSpotAreaId+".spotAreaDeactivationTimestamp", "When was the SpotArea deactivated (null if active)","integer", "value.datetime", false, null, "");
+                    adapter.createObjectNotExists("map." + mapID +".spotAreas."+ extSpotAreaId+".spotAreaDeactivationTimestamp", "When was the SpotArea deactivated (null if active)","number", "value.datetime", false, null, "");
                     adapter.getObject("map." + mapID +".spotAreas."+ extSpotAreaId+".spotAreaName", function (err, obj) {
                         if (!obj) {
                             adapter.createObjectNotExists("map." + mapID +".spotAreas."+ extSpotAreaId+".spotAreaName", "Name of the SpotArea","string", "text", false, null, "");
@@ -208,7 +208,7 @@ function processSpotAreaInfo (adapter, spotArea) {
             adapter.createChannelNotExists("map." + spotArea["mapID"] +".spotAreas."+ spotArea["mapSpotAreaID"],  "SpotArea "+ spotArea["mapSpotAreaID"]);
             adapter.createObjectNotExists("map." + spotArea["mapID"] +".spotAreas."+ spotArea["mapSpotAreaID"]+".spotAreaID", "ID of the SpotArea","string", "text", false, spotArea["mapSpotAreaID"], "");
             adapter.createObjectNotExists("map." + spotArea["mapID"] +".spotAreas."+ spotArea["mapSpotAreaID"]+".spotAreaIsAvailable", "Is the SpotArea still available?","boolean", "indicator.status", false, true, "");
-            adapter.createObjectNotExists("map." + spotArea["mapID"] +".spotAreas."+ spotArea["mapSpotAreaID"]+".spotAreaDeactivationTimestamp", "When was the SpotArea deactivated (null if active)","integer", "value.datetime", false, null, "");
+            adapter.createObjectNotExists("map." + spotArea["mapID"] +".spotAreas."+ spotArea["mapSpotAreaID"]+".spotAreaDeactivationTimestamp", "When was the SpotArea deactivated (null if active)","number", "value.datetime", false, null, "");
             adapter.createObjectNotExists("map." + spotArea["mapID"] +".spotAreas."+ spotArea["mapSpotAreaID"]+".spotAreaName", "Name of the SpotArea","string", "text", false, spotArea["mapSpotAreaName"], "");
         }
 

diff --git a/main.js b/main.js
@@ -1015,7 +1015,7 @@ class EcovacsDeebot extends utils.Adapter {
         }
 
         // cleaning log
-        if (model.isSupportedFeature('cleaninglog')) {
+        if (model.isSupportedFeature('cleaninglog.channel')) {
             await this.createChannelNotExists('cleaninglog', 'Cleaning logs');
         }