GH-32: Update Thermostat Supported mode attribute

ATTRIBUTE_COMMAND_CLASS_THERMOSTAT_SUPPORTED_MODES is now a uint32_t to allow easy mapping to .uam.

WARNING : This change will break existing Thermostat Supported Modes attribute. Either undefined reported value or include the device again.

Forwarded: #32
Bug-SiliconLabs: UIC-3069
Bug-Github: #32

Author: silabs-borisl

applications/zpc/components/zpc_attribute_store/src/zpc_attribute_store_type_registration.cpp

@@ -289,7 +289,7 @@ static const std::vector<attribute_schema_t> attribute_schema = {
   /////////////////////////////////////////////////////////////////////
   {ATTRIBUTE_COMMAND_CLASS_THERMOSTAT_MODE_VERSION,   "Thermostat Mode Version",   ATTRIBUTE_ENDPOINT_ID,   U8_STORAGE_TYPE},
   {ATTRIBUTE_COMMAND_CLASS_THERMOSTAT_MODE,   "Thermostat Mode",   ATTRIBUTE_ENDPOINT_ID,   I32_STORAGE_TYPE},
-  {ATTRIBUTE_COMMAND_CLASS_THERMOSTAT_SUPPORTED_MODES,   "Thermostat Supported Modes",   ATTRIBUTE_ENDPOINT_ID,   BYTE_ARRAY_STORAGE_TYPE},
+  {ATTRIBUTE_COMMAND_CLASS_THERMOSTAT_SUPPORTED_MODES,   "Thermostat Supported Modes",   ATTRIBUTE_ENDPOINT_ID,   U32_STORAGE_TYPE},
   /////////////////////////////////////////////////////////////////////
   //         Thermostat Setpoint Command Class attributes
   /////////////////////////////////////////////////////////////////////

applications/zpc/components/zwave_command_classes/src/zwave_command_class_thermostat_mode.c

@@ -189,12 +189,23 @@ static sl_status_t zwave_command_class_thermostat_mode_handle_supported_report(
 
   uint8_t bitmask_length
     = frame_length - THERMOSTAT_MODE_SUPPORTED_REPORT_BITMASK_INDEX;
+  uint32_t supported_thermostat_bitmask = 0x0000;
 
-  attribute_store_set_node_attribute_value(
-    supported_modes_node,
-    REPORTED_ATTRIBUTE,
-    &frame_data[THERMOSTAT_MODE_SUPPORTED_REPORT_BITMASK_INDEX],
-    bitmask_length);
+  // Since we are using uint32_t we can't have more that 4 bit mask
+  if (bitmask_length > 4) {
+    sl_log_error(LOG_TAG,
+                 "Supported Thermostat Mode type Bit Mask length is not supported\n");
+    return SL_STATUS_NOT_SUPPORTED;
+  }
+
+  for (int i = bitmask_length; i > 0; i--) {
+    supported_thermostat_bitmask
+      = (supported_thermostat_bitmask << 8) | frame_data[1 + i];
+  }
+
+  attribute_store_set_reported(supported_modes_node,
+                               &supported_thermostat_bitmask,
+                               sizeof(supported_thermostat_bitmask));
 
   return SL_STATUS_OK;
 }

applications/zpc/components/zwave_command_classes/test/zwave_command_class_thermostat_mode_test.c

@@ -371,31 +371,29 @@ void test_thermostat_mode_incoming_supported_report_happy_case()
     ATTRIBUTE_COMMAND_CLASS_THERMOSTAT_SUPPORTED_MODES,
     endpoint_id_node);
 
+  uint8_t bit1 = 0b0000101;
+  uint8_t bit2 = 0b0000011;
+  uint8_t bit3 = 0b1111111;
   const uint8_t incoming_report_frame[] = {COMMAND_CLASS_THERMOSTAT_MODE_V3,
                                            THERMOSTAT_MODE_SUPPORTED_REPORT_V3,
-                                           1,
-                                           3,
-                                           4,
-                                           5,
-                                           6};
+                                           bit1,
+                                           bit2,
+                                           bit3};
 
   TEST_ASSERT_EQUAL(
     SL_STATUS_OK,
     thermostat_mode_handler.control_handler(&connection_info,
                                             incoming_report_frame,
                                             sizeof(incoming_report_frame)));
 
-  uint8_t received_bitmask[20]    = {};
-  uint8_t received_bitmask_length = 0;
-  attribute_store_get_node_attribute_value(supported_modes_node,
-                                           REPORTED_ATTRIBUTE,
-                                           received_bitmask,
-                                           &received_bitmask_length);
-
-  TEST_ASSERT_EQUAL(5, received_bitmask_length);
-  TEST_ASSERT_EQUAL_UINT8_ARRAY(&incoming_report_frame[2],
-                                received_bitmask,
-                                received_bitmask_length);
+  uint32_t received_bitmask  = 0;
+  attribute_store_get_reported(supported_modes_node,
+                               &received_bitmask,
+                               sizeof(received_bitmask));
+
+  TEST_ASSERT_EQUAL_MESSAGE((bit3) << 16 | (bit2) << 8 | bit1,
+                            received_bitmask,
+                            "Received Bitmask mismatch");
 }
 
 void test_thermostat_mode_incoming_supported_report_too_short()