fix(vendor.dreame): The L10S Pro does not support the CollisionAvoida…

…ntNavigationControlCapability
Hypfer · Jul 29, 2023 · c3405bd · c3405bd
1 parent 5f26145
commit c3405bd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/backend/lib/robots/dreame/DreameL10SProValetudoRobot.js b/backend/lib/robots/dreame/DreameL10SProValetudoRobot.js
@@ -134,8 +134,7 @@ class DreameL10SProValetudoRobot extends DreameGen2LidarValetudoRobot {
         [
             capabilities.DreameCarpetModeControlCapability,
             capabilities.DreameKeyLockCapability,
-            capabilities.DreameObstacleAvoidanceControlCapability,
-            capabilities.DreameCollisionAvoidantNavigationControlCapability,
+            capabilities.DreameObstacleAvoidanceControlCapability
         ].forEach(capability => {
             this.registerCapability(new capability({robot: this}));
         });

diff --git a/backend/lib/robots/dreame/capabilities/DreameCarpetSensorModeControlCapability.js b/backend/lib/robots/dreame/capabilities/DreameCarpetSensorModeControlCapability.js
@@ -1,6 +1,7 @@
 const CarpetSensorModeControlCapability = require("../../../core/capabilities/CarpetSensorModeControlCapability");
 const DreameMiotHelper = require("../DreameMiotHelper");
 const DreameMiotServices = require("../DreameMiotServices");
+const Logger = require("../../../Logger");
 
 /**
  * @extends CarpetSensorModeControlCapability<import("../DreameValetudoRobot")>
@@ -39,13 +40,17 @@ class DreameCarpetSensorModeControlCapability extends CarpetSensorModeControlCap
                     case 1:
                         return CarpetSensorModeControlCapability.MODE.AVOID;
                     default:
-                        throw new Error(`Received invalid mode ${modeRes}`);
+                        Logger.warn(`Received invalid mode ${modeRes}`);
+
+                        return CarpetSensorModeControlCapability.MODE.OFF;
                 }
             } else {
                 return CarpetSensorModeControlCapability.MODE.AVOID;
             }
         } else {
-            throw new Error(`Received invalid sensor state ${sensorRes}`);
+            Logger.warn(`The carpet sensor reports error code ${sensorRes}. Toggle the carpet sensor mode to reset.`);
+
+            return CarpetSensorModeControlCapability.MODE.OFF;
         }
     }
 

diff --git a/backend/lib/robots/roborock/capabilities/RoborockCarpetSensorModeControlCapability.js b/backend/lib/robots/roborock/capabilities/RoborockCarpetSensorModeControlCapability.js
@@ -1,4 +1,5 @@
 const CarpetSensorModeControlCapability = require("../../../core/capabilities/CarpetSensorModeControlCapability");
+const Logger = require("../../../Logger");
 
 /**
  * @extends CarpetSensorModeControlCapability<import("../RoborockValetudoRobot")>
@@ -28,7 +29,9 @@ class RoborockCarpetSensorModeControlCapability extends CarpetSensorModeControlC
             case 0:
                 return CarpetSensorModeControlCapability.MODE.AVOID;
             default:
-                throw new Error(`Received invalid value ${res?.[0]?.carpet_clean_mode}`);
+                Logger.warn(`Received invalid value ${res?.[0]?.carpet_clean_mode}`);
+
+                return CarpetSensorModeControlCapability.MODE.OFF;
         }
     }