Remove water level lookup tables

mrbungle64 · Mar 5, 2020 · 40f3cb1 · 40f3cb1
1 parent 5d2466c
commit 40f3cb1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 38 deletions.
diff --git a/library/ecovacsConstants_950type.js b/library/ecovacsConstants_950type.js
@@ -49,20 +49,6 @@ exports.FAN_SPEED_FROM_ECOVACS = {
     2: 4     //veryhigh
 };
 
-exports.WATER_LEVEL_TO_ECOVACS = {
-    'low': 1,
-    'medium': 2,
-    'high': 3,
-    'max': 4
-};
-
-exports.WATER_LEVEL_FROM_ECOVACS = {
-    '1': 'low',
-    '2': 'medium',
-    '3': 'high',
-    '4': 'max'
-};
-
 exports.CHARGE_MODE_TO_ECOVACS = {
     'return': 'go',
     'returning': 'returning',

diff --git a/library/ecovacsConstants_non950type.js b/library/ecovacsConstants_non950type.js
@@ -38,20 +38,6 @@ exports.FAN_SPEED_TO_ECOVACS = {
     'high': 'strong'
 };
 
-exports.WATER_LEVEL_TO_ECOVACS = {
-    'low': '1',
-    'medium': '2',
-    'high': '3',
-    'max': '4'
-};
-
-exports.WATER_LEVEL_FROM_ECOVACS = {
-    '1': 'low',
-    '2': 'medium',
-    '3': 'high',
-    '4': 'max'
-};
-
 exports.FAN_SPEED_FROM_ECOVACS = {
     'standard': 'normal',
     'strong': 'high'

diff --git a/library/ecovacsXMPP.js b/library/ecovacsXMPP.js
@@ -72,7 +72,8 @@ class EcovacsXMPP extends EventEmitter {
                         }
                     }
                     if (secondChild.attrs.hasOwnProperty('v')) {
-                        if (dictionary.WATER_LEVEL_FROM_ECOVACS[secondChild.attrs.v]) {
+                        let waterLevel = parseInt(secondChild.attrs.v);
+                        if ((waterLevel >= 1) && (waterLevel <= 4)) {
                             command = 'WaterLevel';
                         }
                     }

diff --git a/library/vacBotCommand_950type.js b/library/vacBotCommand_950type.js
@@ -166,11 +166,9 @@ class SetCleanSpeed extends VacBotCommand_950type {
         });
     }
 }
+
 class SetWaterLevel extends VacBotCommand_950type {
     constructor(level) {
-        if (constants_type.WATER_LEVEL_TO_ECOVACS.hasOwnProperty(level)) {
-            level = constants_type.WATER_LEVEL_TO_ECOVACS[level];
-        }
         super('setWaterInfo', {
             'amount': level
         });
@@ -182,6 +180,7 @@ class GetWaterInfo extends VacBotCommand_950type {
         super('getWaterInfo');
     }
 }
+
 class GetPosition extends VacBotCommand_950type {
     constructor() {
         super('getPos', ["chargePos", "deebotPos"]);

diff --git a/library/vacBotCommand_non950type.js b/library/vacBotCommand_non950type.js
@@ -169,9 +169,6 @@ class GetCleanSpeed extends VacBotCommand_non950type {
 
 class SetWaterLevel extends VacBotCommand_non950type {
     constructor(level) {
-        if (constants_type.WATER_LEVEL_TO_ECOVACS.hasOwnProperty(level)) {
-            level = constants_type.WATER_LEVEL_TO_ECOVACS[level];
-        }
         super('SetWaterPermeability', {
             'v': level
         });

diff --git a/library/vacBot_950type.js b/library/vacBot_950type.js
@@ -240,7 +240,7 @@ class VacBot_950type {
 
   _handle_water_level(event) {
     this.water_level = event['resultData']['amount'];
-    tools.envLog("[VacBot] *** water_level = " + constants_type.WATER_LEVEL_FROM_ECOVACS[this.water_level] + " (" + this.water_level + ")");
+    tools.envLog("[VacBot] *** water_level = %s", this.water_level);
   }
 
   _handle_relocation_state(event) {
@@ -269,7 +269,7 @@ class VacBot_950type {
     this.water_level = event['resultData']['amount'];
     this.waterbox_info = event['resultData']['enable'];
     tools.envLog("[VacBot] *** waterbox_info = " + this.waterbox_info);
-    tools.envLog("[VacBot] *** water_level = " + constants_type.WATER_LEVEL_FROM_ECOVACS[this.water_level] + " (" + this.water_level + ")");
+    tools.envLog("[VacBot] *** water_level = " + this.water_level);
   }
 
   _handle_charge_state(event) { //has to be checked

diff --git a/library/vacBot_non950type.js b/library/vacBot_non950type.js
@@ -197,7 +197,7 @@ class VacBot_non950type {
   _handle_water_level(event) {
     if ((event.attrs) && (event.attrs['v'])) {
       this.water_level = event.attrs['v'];
-      tools.envLog("[VacBot] *** water_level = " + dictionary.WATER_LEVEL_FROM_ECOVACS[this.water_level] + " (" + this.water_level + ")");
+      tools.envLog("[VacBot] *** water_level = %s", this.water_level);
     }
   }