Fix logic/syntax bugs with switch statements matching multiple values

After a bit of tinkering, I figured out the cause of Issues trympet#18, trympet#22, and trympet#23. The OR (||) conditional for multiple case values was not working as intended -- they only matched the first value in each case instead of any of the values separated by ||. Converting those to use the fall-through feature of the switch statement resolved the problems.
drakkhen · Sep 10, 2021 · b2ef622 · b2ef622
1 parent f526bc2
commit b2ef622
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/util/vehicle.ts b/src/util/vehicle.ts
@@ -117,31 +117,31 @@ export class Vehicle extends VehicleApi {
             : this.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         break;
 
-      case VolvoSensorBindings.DOOR_TAILGATE ||
-        VolvoSensorBindings.DOOR_FRONT_LEFT ||
-        VolvoSensorBindings.DOOR_FRONT_RIGHT ||
-        VolvoSensorBindings.DOOR_REAR_LEFT ||
-        VolvoSensorBindings.DOOR_REAR_RIGHT:
+      case VolvoSensorBindings.DOOR_TAILGATE:
+      case VolvoSensorBindings.DOOR_FRONT_LEFT:
+      case VolvoSensorBindings.DOOR_FRONT_RIGHT:
+      case VolvoSensorBindings.DOOR_REAR_LEFT:
+      case VolvoSensorBindings.DOOR_REAR_RIGHT:
         value = 
           this.state[VolvoSensorBindings.GROUP_DOORS][sensor]
             ? this.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
             : this.Characteristic.ContactSensorState.CONTACT_DETECTED;
         break;
 
-      case VolvoSensorBindings.WINDOW_FRONT_LEFT ||
-        VolvoSensorBindings.WINDOW_FRONT_RIGHT ||
-        VolvoSensorBindings.WINDOW_REAR_LEFT ||
-        VolvoSensorBindings.WINDOW_REAR_RIGHT:
+      case VolvoSensorBindings.WINDOW_FRONT_LEFT:
+      case VolvoSensorBindings.WINDOW_FRONT_RIGHT:
+      case VolvoSensorBindings.WINDOW_REAR_LEFT:
+      case VolvoSensorBindings.WINDOW_REAR_RIGHT:
         value = 
           this.state[VolvoSensorBindings.GROUP_WINDOWS][sensor]
             ? this.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
             : this.Characteristic.ContactSensorState.CONTACT_DETECTED;
         break;
 
-      case VolvoSensorBindings.TYRE_FRONT_LEFT ||
-        VolvoSensorBindings.TYRE_FRONT_RIGHT ||
-        VolvoSensorBindings.TYRE_REAR_LEFT ||
-        VolvoSensorBindings.TYRE_REAR_RIGHT:
+      case VolvoSensorBindings.TYRE_FRONT_LEFT:
+      case VolvoSensorBindings.TYRE_FRONT_RIGHT:
+      case VolvoSensorBindings.TYRE_REAR_LEFT:
+      case VolvoSensorBindings.TYRE_REAR_RIGHT:
         value =
           this.state[VolvoSensorBindings.GROUP_TYRE][sensor] === "Normal"
             ? this.Characteristic.AirQuality.GOOD