Fixing Open Close Sensor and Presence Sensor Inits

Spriter · Oct 29, 2016 · a923822 · a923822
1 parent e649f2f
commit a923822
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/Sources/Base/BridgeResourceModels/Sensors/OpenCloseSensor/OpenCloseSensor.swift b/Sources/Base/BridgeResourceModels/Sensors/OpenCloseSensor/OpenCloseSensor.swift
@@ -11,8 +11,8 @@ import Gloss
 
 public class OpenCloseSensor: PartialSensor {
 
-    let config: GenericFlagSensorConfig
-    let state: GenericFlagSensorState
+    let config: OpenCloseSensorConfig
+    let state: OpenCloseSensorState
 
     required public init?(sensor: Sensor) {
 
@@ -24,11 +24,11 @@ public class OpenCloseSensor: PartialSensor {
             return nil
         }
 
-        guard let config: GenericFlagSensorConfig = GenericFlagSensorConfig(sensorConfig: sensorConfig) else {
+        guard let config: OpenCloseSensorConfig = OpenCloseSensorConfig(sensorConfig: sensorConfig) else {
             return nil
         }
 
-        guard let state: GenericFlagSensorState = GenericFlagSensorState(state: sensorState) else {
+        guard let state: OpenCloseSensorState = OpenCloseSensorState(state: sensorState) else {
             return nil
         }
 
@@ -40,11 +40,11 @@ public class OpenCloseSensor: PartialSensor {
 
     public required init?(json: JSON) {
 
-        guard let config: GenericFlagSensorConfig = "config" <~~ json else {
+        guard let config: OpenCloseSensorConfig = "config" <~~ json else {
             return nil
         }
 
-        guard let state: GenericFlagSensorState = "state" <~~ json else {
+        guard let state: OpenCloseSensorState = "state" <~~ json else {
             return nil
         }
 
@@ -64,4 +64,4 @@ public func ==(lhs: OpenCloseSensor, rhs: OpenCloseSensor) -> Bool {
         lhs.modelId == rhs.modelId &&
         lhs.manufacturerName == rhs.manufacturerName &&
         lhs.swVersion == rhs.swVersion
-}
+}
diff --git a/Sources/Base/BridgeResourceModels/Sensors/PresenceSensor/PresenceSensor.swift b/Sources/Base/BridgeResourceModels/Sensors/PresenceSensor/PresenceSensor.swift
@@ -11,8 +11,8 @@ import Gloss
 
 public class PresenceSensor: PartialSensor {
 
-    let config: GenericFlagSensorConfig
-    let state: GenericFlagSensorState
+    let config: PresenceSensorConfig
+    let state: PresenceSensorState
 
     required public init?(sensor: Sensor) {
 
@@ -24,11 +24,11 @@ public class PresenceSensor: PartialSensor {
             return nil
         }
 
-        guard let config: GenericFlagSensorConfig = GenericFlagSensorConfig(sensorConfig: sensorConfig) else {
+        guard let config: PresenceSensorConfig = PresenceSensorConfig(sensorConfig: sensorConfig) else {
             return nil
         }
 
-        guard let state: GenericFlagSensorState = GenericFlagSensorState(state: sensorState) else {
+        guard let state: PresenceSensorState = PresenceSensorState(state: sensorState) else {
             return nil
         }
 
@@ -40,11 +40,11 @@ public class PresenceSensor: PartialSensor {
 
     public required init?(json: JSON) {
 
-        guard let config: GenericFlagSensorConfig = "config" <~~ json else {
+        guard let config: PresenceSensorConfig = "config" <~~ json else {
             return nil
         }
 
-        guard let state: GenericFlagSensorState = "state" <~~ json else {
+        guard let state: PresenceSensorState = "state" <~~ json else {
             return nil
         }