Add updated Topaz Product Identifiers to NestProductIdentifiers

Add updated Topaz Product Identifiers to WeaveDeviceManager FilterIdentifyResponse

Author: Misha Burshteyn

src/device-manager/WeaveDeviceManager.cpp

@@ -3003,7 +3003,11 @@ WEAVE_ERROR WeaveDeviceManager::FilterIdentifyResponse(IdentifyResponseMessage &
             else if (criteria.TargetProductId == kProductWildcardId_NestProtect)
             {
                 if (respMsg.DeviceDesc.ProductId != kNestWeaveProduct_Topaz &&
-                    respMsg.DeviceDesc.ProductId != kNestWeaveProduct_Topaz2)
+                    respMsg.DeviceDesc.ProductId != kNestWeaveProduct_Topaz2 &&
+                    respMsg.DeviceDesc.ProductId != kNestWeaveProduct_Topaz1LinePowered &&
+                    respMsg.DeviceDesc.ProductId != kNestWeaveProduct_Topaz1BatteryPowered &&
+                    respMsg.DeviceDesc.ProductId != kNestWeaveProduct_Topaz2LinePowered &&
+                    respMsg.DeviceDesc.ProductId != kNestWeaveProduct_Topaz2BatteryPowered)
                     ExitNow();
             }
             else if (criteria.TargetProductId == kProductWildcardId_NestCam)

src/lib/profiles/vendor/nestlabs/device-description/NestProductIdentifiers.hpp

@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2014 Nest Labs, Inc.
+ *    Copyright (c) 2014-2018 Nest Labs, Inc.
  *    All rights reserved.
  *
  *    This document is the property of Nest. It is considered
@@ -46,11 +46,11 @@ enum NestWeaveProductId
     kNestWeaveProduct_DiamondBackplate           = 0x0002,
     kNestWeaveProduct_Diamond2                   = 0x0003,
     kNestWeaveProduct_Diamond2Backplate          = 0x0004,
-    kNestWeaveProduct_Topaz                      = 0x0005,
+    kNestWeaveProduct_Topaz                      = 0x0005,  // DEPRECATED -- Use kNestWeaveProduct_Topaz1LinePowered or kNestWeaveProduct_Topaz1BatteryPowered
     kNestWeaveProduct_AmberBackplate             = 0x0006,
     kNestWeaveProduct_Amber                      = 0x0007,  // DEPRECATED -- Use kNestWeaveProduct_AmberHeatLink
     kNestWeaveProduct_AmberHeatLink              = 0x0007,
-    kNestWeaveProduct_Topaz2                     = 0x0009,
+    kNestWeaveProduct_Topaz2                     = 0x0009,  // DEPRECATED -- Use kNestWeaveProduct_Topaz2LinePowered or kNestWeaveProduct_Topaz2BatteryPowered
     kNestWeaveProduct_Diamond3                   = 0x000A,
     kNestWeaveProduct_Diamond3Backplate          = 0x000B,
     kNestWeaveProduct_Quartz                     = 0x000D,
@@ -60,6 +60,10 @@ enum NestWeaveProductId
     kNestWeaveProduct_BlackQuartz                = 0x0012,
     kNestWeaveProduct_Onyx                       = 0x0014,
     kNestWeaveProduct_OnyxBackplate              = 0x0015,
+    kNestWeaveProduct_Topaz1LinePowered          = 0x001E,
+    kNestWeaveProduct_Topaz1BatteryPowered       = 0x001F,
+    kNestWeaveProduct_Topaz2LinePowered          = 0x0020,
+    kNestWeaveProduct_Topaz2BatteryPowered       = 0x0021,
     kNestWeaveProduct_SDKSampleBorderRouter      = 0xFE05,
     kNestWeaveProduct_SDKSampleLightActuator     = 0xFE06,
     kNestWeaveProduct_SDKSampleButtonSensor      = 0xFE07,