Identify Door Sensors from database

Author: ocdtrekkie

App.config

@@ -41,9 +41,6 @@
       <setting name="Insteon_AlarmAddr" serializeAs="String">
         <value />
       </setting>
-      <setting name="Insteon_DoorSensorAddr" serializeAs="String">
-        <value />
-      </setting>
       <setting name="Insteon_Enable" serializeAs="String">
         <value>False</value>
       </setting>
@@ -92,12 +89,6 @@
       <setting name="Mail_Username" serializeAs="String">
         <value />
       </setting>
-      <setting name="Insteon_BackDoorSensorAddr" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="Insteon_WakeLightAddr" serializeAs="String">
-        <value />
-      </setting>
       <setting name="Converse_BotName" serializeAs="String">
         <value>Sarah</value>
       </setting>

My Project/Settings.Designer.vb

@@ -11,9 +11,6 @@
     <Setting Name="Insteon_AlarmAddr" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="Insteon_DoorSensorAddr" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="Insteon_Enable" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -62,12 +59,6 @@
     <Setting Name="Mail_Username" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="Insteon_BackDoorSensorAddr" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="Insteon_WakeLightAddr" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="Converse_BotName" Type="System.String" Scope="User">
       <Value Profile="(Default)">Sarah</Value>
     </Setting>

My Project/Settings.settings

@@ -523,7 +523,7 @@
                         strTemp = strTemp & InsteonThermostatResponse(Command1, Command2, FromAddress)
                     ElseIf (FromAddress = My.Settings.Insteon_ThermostatAddr OrElse FromAddress = My.Settings.Insteon_ThermostatSlaveAddr) AndAlso Command1 = 106 Then ' TODO: Detect this by device model
                         strTemp = strTemp & InsteonThermostatResponse(Command1, Command2, FromAddress)
-                    ElseIf (FromAddress = My.Settings.Insteon_DoorSensorAddr OrElse FromAddress = My.Settings.Insteon_BackDoorSensorAddr) AndAlso ToAddress = "0.0.1" Then ' TODO: Detect this by device model
+                    ElseIf ToAddress = "0.0.1" AndAlso IsDoorSensor(FromAddress) Then
                         strTemp = strTemp & InsteonDoorSensorResponse(Command1, Command2)
                     ElseIf Flags = 203 AndAlso x(ms + 5) = 0 AndAlso x(ms + 6) = 0 AndAlso IsSmokeBridge(FromAddress) Then
                         strTemp = strTemp & InsteonSmokeBridgeResponse(x(ms + 7))
@@ -1212,6 +1212,25 @@
         Return False
     End Function
 
+    ''' <summary>
+    ''' Returns true if address is for a Door Sensor
+    ''' </summary>
+    ''' <param name="strAddress">Insteon address in XX.XX.XX format</param>
+    ''' <returns>True if in database as a door sensor</returns>
+    Function IsDoorSensor(ByVal strAddress As String) As Boolean
+        Dim devcat As Integer = 0
+        Dim subcat As Integer = 0
+
+        modDatabase.ExecuteScalar("SELECT DevCat FROM INSTEON_DEVICES WHERE Address = '" + strAddress + "'", devcat)
+        modDatabase.ExecuteScalar("SELECT SubCat FROM INSTEON_DEVICES WHERE Address = '" + strAddress + "'", subcat)
+
+        If devcat = 16 AndAlso (subcat = 2 OrElse subcat = 17) Then
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+
     ''' <summary>
     ''' Returns true if address is for a Smoke Bridge
     ''' </summary>