diff --git a/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp b/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp index e8566516e3f21a..4eedd8d2244805 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp +++ b/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp @@ -129,7 +129,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_BARRIER_CONTROL_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_BARRIER_CONTROL_CLUSTER_ID); return; } } @@ -178,7 +178,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_BASIC_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_BASIC_CLUSTER_ID); return; } } @@ -369,7 +369,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_BINDING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_BINDING_CLUSTER_ID); return; } } @@ -1460,7 +1460,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_COLOR_CONTROL_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_COLOR_CONTROL_CLUSTER_ID); return; } } @@ -1580,7 +1580,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); return; } } @@ -2987,7 +2987,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DOOR_LOCK_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DOOR_LOCK_CLUSTER_ID); return; } } @@ -3183,7 +3183,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -3549,7 +3549,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GROUPS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GROUPS_CLUSTER_ID); return; } } @@ -3661,7 +3661,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_IAS_ZONE_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_IAS_ZONE_CLUSTER_ID); return; } } @@ -3775,7 +3775,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_IDENTIFY_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_IDENTIFY_CLUSTER_ID); return; } } @@ -4305,7 +4305,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); return; } } @@ -4360,7 +4360,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_LOW_POWER_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_LOW_POWER_CLUSTER_ID); return; } } @@ -5049,7 +5049,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -5330,7 +5330,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_OTA_PROVIDER_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OTA_PROVIDER_CLUSTER_ID); return; } } @@ -5397,7 +5397,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_ON_OFF_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_ON_OFF_CLUSTER_ID); return; } } @@ -5904,7 +5904,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -6406,7 +6406,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_SCENES_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_SCENES_CLUSTER_ID); return; } } @@ -6473,7 +6473,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_TEST_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_TEST_CLUSTER_ID); return; } } @@ -6501,8 +6501,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -6570,7 +6570,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/examples/all-clusters-app/all-clusters-common/gen/attribute-size.cpp b/examples/all-clusters-app/all-clusters-common/gen/attribute-size.cpp index 6dcc8ed0840c10..fecc91a024d21d 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/attribute-size.cpp +++ b/examples/all-clusters-app/all-clusters-common/gen/attribute-size.cpp @@ -195,14 +195,14 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo // Struct _DeviceType _DeviceType * entry = reinterpret_cast<_DeviceType *>(write ? src : dest); copyListMember(write ? dest : (uint8_t *) &entry->type, write ? (uint8_t *) &entry->type : src, write, &entryOffset, - sizeof(entry->type)); // DEVICE_TYPE_ID + sizeof(entry->type)); // DEVTYPE_ID copyListMember(write ? dest : (uint8_t *) &entry->revision, write ? (uint8_t *) &entry->revision : src, write, &entryOffset, sizeof(entry->revision)); // INT16U break; } case 0x0001: // server list { - entryLength = 2; + entryLength = 4; if (((index - 1) * entryLength) > (am->size - entryLength)) { ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); @@ -214,7 +214,7 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } case 0x0002: // client list { - entryLength = 2; + entryLength = 4; if (((index - 1) * entryLength) > (am->size - entryLength)) { ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); @@ -226,14 +226,14 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } case 0x0003: // parts list { - entryLength = 1; + entryLength = 2; if (((index - 1) * entryLength) > (am->size - entryLength)) { ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); return 0; } entryOffset = static_cast(entryOffset + ((index - 1) * entryLength)); - copyListMember(dest, src, write, &entryOffset, entryLength); // ENDPOINT_ID + copyListMember(dest, src, write, &entryOffset, entryLength); // ENDPOINT_NO break; } } @@ -826,15 +826,15 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut break; case 0x0001: // server list // chip::ClusterId - entryLength = 2; + entryLength = 4; break; case 0x0002: // client list // chip::ClusterId - entryLength = 2; + entryLength = 4; break; case 0x0003: // parts list // chip::EndpointId - entryLength = 1; + entryLength = 2; break; } break; @@ -952,7 +952,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp index d8cded87c63a3e..ec91e67794a2c8 100644 --- a/examples/all-clusters-app/esp32/main/main.cpp +++ b/examples/all-clusters-app/esp32/main/main.cpp @@ -376,7 +376,7 @@ void SetupInitialLevelControlValues(chip::EndpointId endpointId) uint8_t level = UINT8_MAX; emberAfWriteAttribute(endpointId, ZCL_LEVEL_CONTROL_CLUSTER_ID, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, &level, - ZCL_DATA8_ATTRIBUTE_TYPE); + ZCL_INT8U_ATTRIBUTE_TYPE); } void SetupPretendDevices() diff --git a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp b/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp index 188ba5d02f477f..829363d09f3a16 100644 --- a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp +++ b/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp @@ -135,7 +135,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); return; } } @@ -331,7 +331,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -861,7 +861,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); return; } } @@ -1550,7 +1550,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -1617,7 +1617,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_ON_OFF_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_ON_OFF_CLUSTER_ID); return; } } @@ -2124,7 +2124,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -2153,8 +2153,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -2186,7 +2186,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/examples/bridge-app/bridge-common/gen/attribute-size.cpp b/examples/bridge-app/bridge-common/gen/attribute-size.cpp index 49a727c361421a..0aab22b1138da0 100644 --- a/examples/bridge-app/bridge-common/gen/attribute-size.cpp +++ b/examples/bridge-app/bridge-common/gen/attribute-size.cpp @@ -95,14 +95,14 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo // Struct _DeviceType _DeviceType * entry = reinterpret_cast<_DeviceType *>(write ? src : dest); copyListMember(write ? dest : (uint8_t *) &entry->type, write ? (uint8_t *) &entry->type : src, write, &entryOffset, - sizeof(entry->type)); // DEVICE_TYPE_ID + sizeof(entry->type)); // DEVTYPE_ID copyListMember(write ? dest : (uint8_t *) &entry->revision, write ? (uint8_t *) &entry->revision : src, write, &entryOffset, sizeof(entry->revision)); // INT16U break; } case 0x0001: // server list { - entryLength = 2; + entryLength = 4; if (((index - 1) * entryLength) > (am->size - entryLength)) { ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); @@ -114,7 +114,7 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } case 0x0002: // client list { - entryLength = 2; + entryLength = 4; if (((index - 1) * entryLength) > (am->size - entryLength)) { ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); @@ -126,14 +126,14 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } case 0x0003: // parts list { - entryLength = 1; + entryLength = 2; if (((index - 1) * entryLength) > (am->size - entryLength)) { ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); return 0; } entryOffset = static_cast(entryOffset + ((index - 1) * entryLength)); - copyListMember(dest, src, write, &entryOffset, entryLength); // ENDPOINT_ID + copyListMember(dest, src, write, &entryOffset, entryLength); // ENDPOINT_NO break; } } @@ -442,15 +442,15 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut break; case 0x0001: // server list // chip::ClusterId - entryLength = 2; + entryLength = 4; break; case 0x0002: // client list // chip::ClusterId - entryLength = 2; + entryLength = 4; break; case 0x0003: // parts list // chip::EndpointId - entryLength = 1; + entryLength = 2; break; } break; @@ -511,7 +511,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index 32a582df6a58c6..9fde456358579f 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -307,7 +307,7 @@ EmberAfStatus HandleWriteOnOffAttribute(Device * dev, chip::AttributeId attribut return EMBER_ZCL_STATUS_SUCCESS; } -EmberAfStatus HandleReadDescriptorAttribute(uint8_t endpointIndex, chip::AttributeId attributeId, uint8_t * buffer, +EmberAfStatus HandleReadDescriptorAttribute(uint16_t endpointIndex, chip::AttributeId attributeId, uint8_t * buffer, uint16_t maxReadLength) { if ((maxReadLength <= kDescriptorAttributeArraySize) && (attributeId < kDescriptorAttributeCount)) @@ -331,7 +331,7 @@ EmberAfStatus HandleReadFixedLabelAttribute(Device * dev, EmberAfAttributeMetada return EMBER_ZCL_STATUS_FAILURE; } -EmberAfStatus HandleWriteDescriptorAttribute(uint8_t endpointIndex, EmberAfAttributeMetadata * am, uint8_t * buffer, +EmberAfStatus HandleWriteDescriptorAttribute(uint16_t endpointIndex, EmberAfAttributeMetadata * am, uint8_t * buffer, uint16_t length, int32_t index) { chip::AttributeId attributeId = am->attributeId; @@ -349,7 +349,7 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode, uint8_t * buffer, uint16_t maxReadLength, int32_t index) { - uint8_t endpointIndex = emberAfGetDynamicIndexFromEndpoint(endpoint); + uint16_t endpointIndex = emberAfGetDynamicIndexFromEndpoint(endpoint); EmberAfStatus ret = EMBER_ZCL_STATUS_FAILURE; @@ -382,7 +382,7 @@ EmberAfStatus emberAfExternalAttributeWriteCallback(EndpointId endpoint, Cluster EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode, uint8_t * buffer, int32_t index) { - uint8_t endpointIndex = emberAfGetDynamicIndexFromEndpoint(endpoint); + uint16_t endpointIndex = emberAfGetDynamicIndexFromEndpoint(endpoint); EmberAfStatus ret = EMBER_ZCL_STATUS_FAILURE; @@ -519,12 +519,12 @@ int main(int argc, char * argv[]) // Set starting endpoint id where dynamic endpoints will be assigned, which // will be the next consecutive endpoint id after the last fixed endpoint. gFirstDynamicEndpointId = static_cast( - static_cast(emberAfEndpointFromIndex(static_cast(emberAfFixedEndpointCount() - 1))) + 1); + static_cast(emberAfEndpointFromIndex(static_cast(emberAfFixedEndpointCount() - 1))) + 1); gCurrentEndpointId = gFirstDynamicEndpointId; // Disable last fixed endpoint, which is used as a placeholder for all of the // supported clusters so that ZAP will generated the requisite code. - emberAfEndpointEnableDisable(emberAfEndpointFromIndex(static_cast(emberAfFixedEndpointCount() - 1)), false); + emberAfEndpointEnableDisable(emberAfEndpointFromIndex(static_cast(emberAfFixedEndpointCount() - 1)), false); // Add lights 1..3 --> will be mapped to ZCL endpoints 2, 3, 4 AddDeviceEndpoint(&Light1, &bridgedLightEndpoint, DEVICE_TYPE_LO_ON_OFF_LIGHT); diff --git a/examples/chip-tool/commands/clusters/Commands.h b/examples/chip-tool/commands/clusters/Commands.h index cb358e34b01bbf..88032120ce9dfa 100644 --- a/examples/chip-tool/commands/clusters/Commands.h +++ b/examples/chip-tool/commands/clusters/Commands.h @@ -768,7 +768,7 @@ static void OnDescriptorServerListListAttributeResponse(void * context, uint16_t for (uint16_t i = 0; i < count; i++) { - ChipLogProgress(chipTool, "CLUSTER_ID[%" PRIu16 "]: %" PRIu16 "", i, entries[i]); + ChipLogProgress(chipTool, "CLUSTER_ID[%" PRIu16 "]: %" PRIu32 "", i, entries[i]); } ModelCommand * command = reinterpret_cast(context); @@ -781,7 +781,7 @@ static void OnDescriptorClientListListAttributeResponse(void * context, uint16_t for (uint16_t i = 0; i < count; i++) { - ChipLogProgress(chipTool, "CLUSTER_ID[%" PRIu16 "]: %" PRIu16 "", i, entries[i]); + ChipLogProgress(chipTool, "CLUSTER_ID[%" PRIu16 "]: %" PRIu32 "", i, entries[i]); } ModelCommand * command = reinterpret_cast(context); @@ -794,7 +794,7 @@ static void OnDescriptorPartsListListAttributeResponse(void * context, uint16_t for (uint16_t i = 0; i < count; i++) { - ChipLogProgress(chipTool, "ENDPOINT_ID[%" PRIu16 "]: %" PRIu8 "", i, entries[i]); + ChipLogProgress(chipTool, "ENDPOINT_NO[%" PRIu16 "]: %" PRIu16 "", i, entries[i]); } ModelCommand * command = reinterpret_cast(context); @@ -3488,8 +3488,8 @@ class BindingBind : public ModelCommand { AddArgument("NodeId", 0, UINT64_MAX, &mNodeId); AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); - AddArgument("EndpointId", 0, UINT8_MAX, &mEndpointId); - AddArgument("ClusterId", 0, UINT16_MAX, &mClusterId); + AddArgument("EndpointId", 0, UINT16_MAX, &mEndpointId); + AddArgument("ClusterId", 0, UINT32_MAX, &mClusterId); ModelCommand::AddArguments(); } ~BindingBind() @@ -3528,8 +3528,8 @@ class BindingUnbind : public ModelCommand { AddArgument("NodeId", 0, UINT64_MAX, &mNodeId); AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); - AddArgument("EndpointId", 0, UINT8_MAX, &mEndpointId); - AddArgument("ClusterId", 0, UINT16_MAX, &mClusterId); + AddArgument("EndpointId", 0, UINT16_MAX, &mEndpointId); + AddArgument("ClusterId", 0, UINT32_MAX, &mClusterId); ModelCommand::AddArguments(); } ~BindingUnbind() @@ -14379,7 +14379,7 @@ class ScenesAddScene : public ModelCommand AddArgument("SceneId", 0, UINT8_MAX, &mSceneId); AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("SceneName", &mSceneName); - AddArgument("ClusterId", 0, UINT16_MAX, &mClusterId); + AddArgument("ClusterId", 0, UINT32_MAX, &mClusterId); AddArgument("Length", 0, UINT8_MAX, &mLength); AddArgument("Value", 0, UINT8_MAX, &mValue); ModelCommand::AddArguments(); diff --git a/examples/chip-tool/commands/clusters/ModelCommand.cpp b/examples/chip-tool/commands/clusters/ModelCommand.cpp index 0da04008b5ed57..d33508e66e67b1 100644 --- a/examples/chip-tool/commands/clusters/ModelCommand.cpp +++ b/examples/chip-tool/commands/clusters/ModelCommand.cpp @@ -26,7 +26,7 @@ using namespace ::chip; void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Controller, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, + ChipLogDetail(Controller, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, aCommandId, aEndPointId); ChipLogError( Controller, diff --git a/examples/lighting-app/efr32/src/ZclCallbacks.cpp b/examples/lighting-app/efr32/src/ZclCallbacks.cpp index 57b704602353ea..d2b6ea90e341d8 100644 --- a/examples/lighting-app/efr32/src/ZclCallbacks.cpp +++ b/examples/lighting-app/efr32/src/ZclCallbacks.cpp @@ -34,13 +34,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - EFR32_LOG("Unknown cluster ID: %d", clusterId); + EFR32_LOG("Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - EFR32_LOG("Unknown attribute ID: %d", attributeId); + EFR32_LOG("Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/lighting-app/k32w/main/ZclCallbacks.cpp b/examples/lighting-app/k32w/main/ZclCallbacks.cpp index df89e54b75ce19..97fbfc5da08af2 100644 --- a/examples/lighting-app/k32w/main/ZclCallbacks.cpp +++ b/examples/lighting-app/k32w/main/ZclCallbacks.cpp @@ -33,13 +33,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp b/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp index 188ba5d02f477f..829363d09f3a16 100644 --- a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp +++ b/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp @@ -135,7 +135,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); return; } } @@ -331,7 +331,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -861,7 +861,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); return; } } @@ -1550,7 +1550,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -1617,7 +1617,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_ON_OFF_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_ON_OFF_CLUSTER_ID); return; } } @@ -2124,7 +2124,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -2153,8 +2153,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -2186,7 +2186,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/examples/lighting-app/lighting-common/gen/attribute-size.cpp b/examples/lighting-app/lighting-common/gen/attribute-size.cpp index f0e947f1bbfe84..48a8a647502a3e 100644 --- a/examples/lighting-app/lighting-common/gen/attribute-size.cpp +++ b/examples/lighting-app/lighting-common/gen/attribute-size.cpp @@ -383,7 +383,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/examples/lighting-app/linux/main.cpp b/examples/lighting-app/linux/main.cpp index 09e1fef2a20068..eb4376bbef3bda 100644 --- a/examples/lighting-app/linux/main.cpp +++ b/examples/lighting-app/linux/main.cpp @@ -46,13 +46,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp index 917b3d73782d93..8f2f90eb212e8c 100644 --- a/examples/lighting-app/nrfconnect/main/AppTask.cpp +++ b/examples/lighting-app/nrfconnect/main/AppTask.cpp @@ -552,7 +552,7 @@ void AppTask::UpdateClusterState() uint8_t level = LightingMgr().GetLevel(); status = emberAfWriteAttribute(1, ZCL_LEVEL_CONTROL_CLUSTER_ID, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, &level, - ZCL_DATA8_ATTRIBUTE_TYPE); + ZCL_INT8U_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp index f2bc5db4c35be8..82e0cf4090f10d 100644 --- a/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp @@ -32,13 +32,13 @@ using namespace chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { - ChipLogProgress(Zcl, "Cluster callback: %d", clusterId); + ChipLogProgress(Zcl, "Cluster callback: %" PRIx32, clusterId); if (clusterId == ZCL_ON_OFF_CLUSTER_ID) { if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } @@ -49,7 +49,7 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (attributeId != ZCL_CURRENT_LEVEL_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } @@ -65,7 +65,7 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId } else { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } } diff --git a/examples/lighting-app/qpg6100/src/AppTask.cpp b/examples/lighting-app/qpg6100/src/AppTask.cpp index 6a61b79167e82e..f7a29bb8984d29 100644 --- a/examples/lighting-app/qpg6100/src/AppTask.cpp +++ b/examples/lighting-app/qpg6100/src/AppTask.cpp @@ -462,7 +462,7 @@ void AppTask::UpdateClusterState(void) newValue = LightingMgr().GetLevel(); status = emberAfWriteAttribute(1, ZCL_LEVEL_CONTROL_CLUSTER_ID, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_DATA8_ATTRIBUTE_TYPE); + (uint8_t *) &newValue, ZCL_INT8U_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/lighting-app/qpg6100/src/ZclCallbacks.cpp b/examples/lighting-app/qpg6100/src/ZclCallbacks.cpp index f8504775b80bba..47ee6975e5d97f 100644 --- a/examples/lighting-app/qpg6100/src/ZclCallbacks.cpp +++ b/examples/lighting-app/qpg6100/src/ZclCallbacks.cpp @@ -38,7 +38,7 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } @@ -48,7 +48,7 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (attributeId != ZCL_CURRENT_LEVEL_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } @@ -64,7 +64,7 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId } else { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } } diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp index 2ba8d88aef4410..06fa73b75d653b 100644 --- a/examples/lighting-app/telink/src/AppTask.cpp +++ b/examples/lighting-app/telink/src/AppTask.cpp @@ -322,7 +322,7 @@ void AppTask::UpdateClusterState() uint8_t level = LightingMgr().GetLevel(); status = emberAfWriteAttribute(1, ZCL_LEVEL_CONTROL_CLUSTER_ID, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, &level, - ZCL_DATA8_ATTRIBUTE_TYPE); + ZCL_INT8U_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/lighting-app/telink/src/ZclCallbacks.cpp b/examples/lighting-app/telink/src/ZclCallbacks.cpp index 59fe494cd58e99..02c6346da00351 100644 --- a/examples/lighting-app/telink/src/ZclCallbacks.cpp +++ b/examples/lighting-app/telink/src/ZclCallbacks.cpp @@ -32,13 +32,13 @@ using namespace chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { - ChipLogProgress(Zcl, "Cluster callback: %d", clusterId); + ChipLogProgress(Zcl, "Cluster callback: %" PRIx32, clusterId); if (clusterId == ZCL_ON_OFF_CLUSTER_ID) { if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } @@ -49,7 +49,7 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (attributeId != ZCL_CURRENT_LEVEL_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } @@ -65,7 +65,7 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId } else { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } } diff --git a/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index ade8c656c5ed75..bc9b20d978d201 100644 --- a/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -34,13 +34,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/lock-app/efr32/src/ZclCallbacks.cpp b/examples/lock-app/efr32/src/ZclCallbacks.cpp index 1ed3b13965a7b6..8007395ffd3e87 100644 --- a/examples/lock-app/efr32/src/ZclCallbacks.cpp +++ b/examples/lock-app/efr32/src/ZclCallbacks.cpp @@ -34,13 +34,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - EFR32_LOG("Unknown cluster ID: %d", clusterId); + EFR32_LOG("Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - EFR32_LOG("Unknown attribute ID: %d", attributeId); + EFR32_LOG("Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/lock-app/k32w/main/ZclCallbacks.cpp b/examples/lock-app/k32w/main/ZclCallbacks.cpp index 44d1b03e4df78b..bebceb8b75ebdd 100644 --- a/examples/lock-app/k32w/main/ZclCallbacks.cpp +++ b/examples/lock-app/k32w/main/ZclCallbacks.cpp @@ -33,13 +33,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp b/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp index c2c21f1ec95b55..4c7374d6c714eb 100644 --- a/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp +++ b/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp @@ -135,7 +135,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); return; } } @@ -331,7 +331,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -1020,7 +1020,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -1087,7 +1087,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_ON_OFF_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_ON_OFF_CLUSTER_ID); return; } } @@ -1594,7 +1594,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -1623,8 +1623,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -1653,7 +1653,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/examples/lock-app/lock-common/gen/attribute-size.cpp b/examples/lock-app/lock-common/gen/attribute-size.cpp index f0e947f1bbfe84..48a8a647502a3e 100644 --- a/examples/lock-app/lock-common/gen/attribute-size.cpp +++ b/examples/lock-app/lock-common/gen/attribute-size.cpp @@ -383,7 +383,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp index 5227345d70e43e..80171954e56b07 100644 --- a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp @@ -34,13 +34,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/lock-app/qpg6100/src/ZclCallbacks.cpp b/examples/lock-app/qpg6100/src/ZclCallbacks.cpp index 62f4ffb3aeb0f8..df12228eb7aca5 100644 --- a/examples/lock-app/qpg6100/src/ZclCallbacks.cpp +++ b/examples/lock-app/qpg6100/src/ZclCallbacks.cpp @@ -35,13 +35,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index 4d9ffce008408a..79d2aea6fb310c 100644 --- a/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -35,13 +35,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/pump-app/nrfconnect/main/ZclCallbacks.cpp b/examples/pump-app/nrfconnect/main/ZclCallbacks.cpp index af75ebc3529b9a..ae5d6b9cb382ce 100644 --- a/examples/pump-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/pump-app/nrfconnect/main/ZclCallbacks.cpp @@ -33,16 +33,16 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) { - ChipLogProgress(Zcl, "%s: %d %d %d %d", __FUNCTION__, endpoint, clusterId, attributeId, *value); + ChipLogProgress(Zcl, "%s: %" PRIx16 " %" PRIx32 " %" PRIx32 " %d", __FUNCTION__, endpoint, clusterId, attributeId, *value); if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } @@ -105,7 +105,7 @@ void emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} bool emberAfAttributeReadAccessCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, uint16_t manufacturerCode, chip::AttributeId attributeId) { - ChipLogProgress(Zcl, "%s: %d %d %d %d", __FUNCTION__, endpoint, clusterId, manufacturerCode, attributeId); + ChipLogProgress(Zcl, "%s: %d %" PRIx32 " %" PRIx32 " %d", __FUNCTION__, endpoint, clusterId, manufacturerCode, attributeId); return true; } @@ -120,7 +120,7 @@ EmberAfStatus emberAfExternalAttributeWriteCallback(chip::EndpointId endpoint, c bool emberAfAttributeWriteAccessCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, uint16_t manufacturerCode, chip::AttributeId attributeId) { - ChipLogProgress(Zcl, "%s: %d %d %d %d", __FUNCTION__, endpoint, clusterId, manufacturerCode, attributeId); + ChipLogProgress(Zcl, "%s: %d %" PRIx32 " %" PRIx32 " %d", __FUNCTION__, endpoint, clusterId, manufacturerCode, attributeId); return true; } @@ -171,44 +171,44 @@ EmberAfAttributeWritePermission emberAfAllowNetworkWriteAttributeCallback(chip:: bool emberAfReadAttributesResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfWriteAttributesResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfConfigureReportingResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfReportAttributesCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfDefaultResponseCallback(chip::ClusterId clusterId, chip::CommandId commandId, EmberAfStatus status) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen, bool extended) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } diff --git a/examples/pump-app/pump-common/gen/CHIPClientCallbacks.cpp b/examples/pump-app/pump-common/gen/CHIPClientCallbacks.cpp index 51eeeb0a86f312..8a0f831d8f3469 100644 --- a/examples/pump-app/pump-common/gen/CHIPClientCallbacks.cpp +++ b/examples/pump-app/pump-common/gen/CHIPClientCallbacks.cpp @@ -407,8 +407,8 @@ app::CHIPDeviceCallbacksMgr & gCallbacks = app::CHIPDeviceCallbacksMgr::GetInsta bool emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status) { ChipLogProgress(Zcl, "DefaultResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); - ChipLogProgress(Zcl, " CommandId: 0x%02x", commandId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); + ChipLogProgress(Zcl, " CommandId: 0x%08x", commandId); LogStatus(status); GET_RESPONSE_CALLBACKS("emberAfDefaultResponseCallback"); @@ -516,7 +516,7 @@ bool IMReadReportAttributesResponseCallback(const app::ReadClient * apReadClient return true; } - uint16_t attributeId = aPath.mFieldId; // attribId + chip::AttributeId attributeId = aPath.mFieldId; // attribId ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); LogIMStatus(status); @@ -540,7 +540,7 @@ bool IMReadReportAttributesResponseCallback(const app::ReadClient * apReadClient bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "WriteAttributesResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfWriteAttributesResponseCallback"); @@ -559,9 +559,9 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa } else { - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); Callback::Callback * cb = Callback::Callback::FromCancelable(onFailureCallback); @@ -584,7 +584,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "ConfigureReportingResponseCallback:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfConfigureReportingResponseCallback"); @@ -607,9 +607,9 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me uint8_t direction = chip::Encoding::Read8(message); // reportingRole ChipLogProgress(Zcl, " direction: 0x%02x", direction); - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); Callback::Callback * cb = Callback::Callback::FromCancelable(onFailureCallback); @@ -632,7 +632,7 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "ReadReportingConfigurationResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfReadReportingConfigurationResponseCallback"); @@ -643,9 +643,9 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId uint8_t direction = chip::Encoding::Read8(message); // reportingRole ChipLogProgress(Zcl, " direction: 0x%02x", direction); - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); if (direction == EMBER_ZCL_REPORTING_DIRECTION_REPORTED) { @@ -686,7 +686,7 @@ bool emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discove bool extended) { ChipLogProgress(Zcl, "DiscoverAttributesResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " extended: %d", extended); @@ -695,9 +695,9 @@ bool emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discove // struct discoverAttributesResponseRecord[] while (messageLen) { - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); CHECK_MESSAGE_LENGTH(1); uint8_t attributeType = chip::Encoding::Read8(message); // zclType @@ -713,14 +713,14 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint1 CommandId * commandIds, uint16_t commandIdCount) { ChipLogProgress(Zcl, "DiscoverCommandsGeneratedResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " manufacturerCode: 0x%04x", manufacturerCode); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " commandIdCount: %" PRIu16, commandIdCount); for (uint16_t i = 0; i < commandIdCount; i++) { - ChipLogProgress(Zcl, " commandId: 0x%02x", *commandIds++); + ChipLogProgress(Zcl, " commandId: 0x%08x", *commandIds++); } GET_RESPONSE_CALLBACKS("emberAfDiscoverCommandsGeneratedResponseCallback"); @@ -733,14 +733,14 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 CommandId * commandIds, uint16_t commandIdCount) { ChipLogProgress(Zcl, "DiscoverCommandsReceivedResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " manufacturerCode: 0x%04x", manufacturerCode); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " commandIdCount: %" PRIu16, commandIdCount); for (uint16_t i = 0; i < commandIdCount; i++) { - ChipLogProgress(Zcl, " commandId: 0x%02x", *commandIds++); + ChipLogProgress(Zcl, " commandId: 0x%08x", *commandIds++); } GET_RESPONSE_CALLBACKS("emberAfDiscoverCommandsGeneratedResponseCallback"); @@ -777,13 +777,13 @@ static EmberAfStatus PrepareListFromTLV(TLV::TLVReader * tlvData, const uint8_t bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "emberAfReportAttributeCallback:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); ChipLogProgress(Zcl, " Source NodeId: %" PRIu64, sourceId); EndpointId endpointId = emberAfCurrentCommand()->apsFrame->sourceEndpoint; - ChipLogProgress(Zcl, " Source EndpointId: 0x%04x", endpointId); + ChipLogProgress(Zcl, " Source EndpointId: 0x%08x", endpointId); // TODO onFailureCallback is just here because of the CHECK_MESSAGE_LENGTH macro. It needs to be removed. Callback::Cancelable * onFailureCallback = nullptr; @@ -791,8 +791,8 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin while (messageLen) { CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); GET_REPORT_CALLBACK("emberAfReportAttributesCallback"); diff --git a/examples/pump-app/pump-common/gen/IMClusterCommandHandler.cpp b/examples/pump-app/pump-common/gen/IMClusterCommandHandler.cpp index e4b9faaac09a02..511f2ea0e2d6cf 100644 --- a/examples/pump-app/pump-common/gen/IMClusterCommandHandler.cpp +++ b/examples/pump-app/pump-common/gen/IMClusterCommandHandler.cpp @@ -64,7 +64,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_BASIC_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_BASIC_CLUSTER_ID); return; } } @@ -184,7 +184,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); return; } } @@ -380,7 +380,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -910,7 +910,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); return; } } @@ -1540,7 +1540,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -1607,7 +1607,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_ON_OFF_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_ON_OFF_CLUSTER_ID); return; } } @@ -2114,7 +2114,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -2143,8 +2143,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -2179,7 +2179,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/examples/pump-app/pump-common/gen/attribute-size.cpp b/examples/pump-app/pump-common/gen/attribute-size.cpp index f0e947f1bbfe84..48a8a647502a3e 100644 --- a/examples/pump-app/pump-common/gen/attribute-size.cpp +++ b/examples/pump-app/pump-common/gen/attribute-size.cpp @@ -383,7 +383,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/examples/pump-app/pump-common/gen/encoder.cpp b/examples/pump-app/pump-common/gen/encoder.cpp index 33d3cc55fc3266..ffad8712795a9c 100644 --- a/examples/pump-app/pump-common/gen/encoder.cpp +++ b/examples/pump-app/pump-common/gen/encoder.cpp @@ -134,7 +134,7 @@ constexpr EndpointId kSourceEndpoint = 1; PacketBufferHandle encodeFlowMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverFlowMeasurementAttributes", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -144,7 +144,7 @@ PacketBufferHandle encodeFlowMeasurementClusterDiscoverAttributes(uint8_t seqNum PacketBufferHandle encodeFlowMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -155,9 +155,9 @@ PacketBufferHandle encodeFlowMeasurementClusterConfigureMeasuredValueAttribute(u COMMAND_HEADER("ReportFlowMeasurementMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -171,7 +171,7 @@ PacketBufferHandle encodeFlowMeasurementClusterConfigureMeasuredValueAttribute(u PacketBufferHandle encodeFlowMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementMinMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -181,7 +181,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadMinMeasuredValueAttribute(uin PacketBufferHandle encodeFlowMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementMaxMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -191,7 +191,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadMaxMeasuredValueAttribute(uin PacketBufferHandle encodeFlowMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementClusterRevision", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -210,7 +210,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadClusterRevisionAttribute(uint PacketBufferHandle encodePressureMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverPressureMeasurementAttributes", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -220,7 +220,7 @@ PacketBufferHandle encodePressureMeasurementClusterDiscoverAttributes(uint8_t se PacketBufferHandle encodePressureMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -231,9 +231,9 @@ PacketBufferHandle encodePressureMeasurementClusterConfigureMeasuredValueAttribu COMMAND_HEADER("ReportPressureMeasurementMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -247,7 +247,7 @@ PacketBufferHandle encodePressureMeasurementClusterConfigureMeasuredValueAttribu PacketBufferHandle encodePressureMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementMinMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -257,7 +257,7 @@ PacketBufferHandle encodePressureMeasurementClusterReadMinMeasuredValueAttribute PacketBufferHandle encodePressureMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementMaxMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -267,7 +267,7 @@ PacketBufferHandle encodePressureMeasurementClusterReadMaxMeasuredValueAttribute PacketBufferHandle encodePressureMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementClusterRevision", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -286,7 +286,7 @@ PacketBufferHandle encodePressureMeasurementClusterReadClusterRevisionAttribute( PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverTemperatureMeasurementAttributes", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -296,7 +296,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t PacketBufferHandle encodeTemperatureMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -308,9 +308,9 @@ PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttr COMMAND_HEADER("ReportTemperatureMeasurementMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -324,7 +324,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttr PacketBufferHandle encodeTemperatureMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementMinMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -334,7 +334,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterReadMinMeasuredValueAttrib PacketBufferHandle encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementMaxMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -344,6 +344,6 @@ PacketBufferHandle encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttrib PacketBufferHandle encodeTemperatureMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementClusterRevision", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index 4d9ffce008408a..79d2aea6fb310c 100644 --- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -35,13 +35,13 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } diff --git a/examples/pump-controller-app/nrfconnect/main/ZclCallbacks.cpp b/examples/pump-controller-app/nrfconnect/main/ZclCallbacks.cpp index 9f282d8f21198d..2e257c1612fde0 100644 --- a/examples/pump-controller-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/pump-controller-app/nrfconnect/main/ZclCallbacks.cpp @@ -33,16 +33,16 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) { - ChipLogProgress(Zcl, "%s: %d %d %d %d", __FUNCTION__, endpoint, clusterId, attributeId, *value); + ChipLogProgress(Zcl, "%s: %d %" PRIx32 " %" PRIx32 " %d", __FUNCTION__, endpoint, clusterId, attributeId, *value); if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { - ChipLogProgress(Zcl, "Unknown cluster ID: %d", clusterId); + ChipLogProgress(Zcl, "Unknown cluster ID: %" PRIx32, clusterId); return; } if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) { - ChipLogProgress(Zcl, "Unknown attribute ID: %d", attributeId); + ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } @@ -95,7 +95,7 @@ void emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} bool emberAfAttributeReadAccessCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, uint16_t manufacturerCode, chip::AttributeId attributeId) { - ChipLogProgress(Zcl, "%s: %d %d %d %d", __FUNCTION__, endpoint, clusterId, manufacturerCode, attributeId); + ChipLogProgress(Zcl, "%s: %d %" PRIx32 " %" PRIx32 " %d", __FUNCTION__, endpoint, clusterId, manufacturerCode, attributeId); return true; } @@ -110,7 +110,7 @@ EmberAfStatus emberAfExternalAttributeWriteCallback(chip::EndpointId endpoint, c bool emberAfAttributeWriteAccessCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, uint16_t manufacturerCode, chip::AttributeId attributeId) { - ChipLogProgress(Zcl, "%s: %d %d %d %d", __FUNCTION__, endpoint, clusterId, manufacturerCode, attributeId); + ChipLogProgress(Zcl, "%s: %d %" PRIx32 " %" PRIx32 " %d", __FUNCTION__, endpoint, clusterId, manufacturerCode, attributeId); return true; } @@ -161,44 +161,44 @@ EmberAfAttributeWritePermission emberAfAllowNetworkWriteAttributeCallback(chip:: bool emberAfReadAttributesResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfWriteAttributesResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfConfigureReportingResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfReportAttributesCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfDefaultResponseCallback(chip::ClusterId clusterId, chip::CommandId commandId, EmberAfStatus status) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen, bool extended) { - ChipLogProgress(Zcl, "%s: %d", __FUNCTION__, clusterId); + ChipLogProgress(Zcl, "%s: %" PRIx32, __FUNCTION__, clusterId); return false; } diff --git a/examples/pump-controller-app/pump-controller-common/gen/CHIPClientCallbacks.cpp b/examples/pump-controller-app/pump-controller-common/gen/CHIPClientCallbacks.cpp index 51eeeb0a86f312..8a0f831d8f3469 100644 --- a/examples/pump-controller-app/pump-controller-common/gen/CHIPClientCallbacks.cpp +++ b/examples/pump-controller-app/pump-controller-common/gen/CHIPClientCallbacks.cpp @@ -407,8 +407,8 @@ app::CHIPDeviceCallbacksMgr & gCallbacks = app::CHIPDeviceCallbacksMgr::GetInsta bool emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status) { ChipLogProgress(Zcl, "DefaultResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); - ChipLogProgress(Zcl, " CommandId: 0x%02x", commandId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); + ChipLogProgress(Zcl, " CommandId: 0x%08x", commandId); LogStatus(status); GET_RESPONSE_CALLBACKS("emberAfDefaultResponseCallback"); @@ -516,7 +516,7 @@ bool IMReadReportAttributesResponseCallback(const app::ReadClient * apReadClient return true; } - uint16_t attributeId = aPath.mFieldId; // attribId + chip::AttributeId attributeId = aPath.mFieldId; // attribId ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); LogIMStatus(status); @@ -540,7 +540,7 @@ bool IMReadReportAttributesResponseCallback(const app::ReadClient * apReadClient bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "WriteAttributesResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfWriteAttributesResponseCallback"); @@ -559,9 +559,9 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa } else { - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); Callback::Callback * cb = Callback::Callback::FromCancelable(onFailureCallback); @@ -584,7 +584,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "ConfigureReportingResponseCallback:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfConfigureReportingResponseCallback"); @@ -607,9 +607,9 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me uint8_t direction = chip::Encoding::Read8(message); // reportingRole ChipLogProgress(Zcl, " direction: 0x%02x", direction); - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); Callback::Callback * cb = Callback::Callback::FromCancelable(onFailureCallback); @@ -632,7 +632,7 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "ReadReportingConfigurationResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfReadReportingConfigurationResponseCallback"); @@ -643,9 +643,9 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId uint8_t direction = chip::Encoding::Read8(message); // reportingRole ChipLogProgress(Zcl, " direction: 0x%02x", direction); - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); if (direction == EMBER_ZCL_REPORTING_DIRECTION_REPORTED) { @@ -686,7 +686,7 @@ bool emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discove bool extended) { ChipLogProgress(Zcl, "DiscoverAttributesResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " extended: %d", extended); @@ -695,9 +695,9 @@ bool emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discove // struct discoverAttributesResponseRecord[] while (messageLen) { - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); CHECK_MESSAGE_LENGTH(1); uint8_t attributeType = chip::Encoding::Read8(message); // zclType @@ -713,14 +713,14 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint1 CommandId * commandIds, uint16_t commandIdCount) { ChipLogProgress(Zcl, "DiscoverCommandsGeneratedResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " manufacturerCode: 0x%04x", manufacturerCode); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " commandIdCount: %" PRIu16, commandIdCount); for (uint16_t i = 0; i < commandIdCount; i++) { - ChipLogProgress(Zcl, " commandId: 0x%02x", *commandIds++); + ChipLogProgress(Zcl, " commandId: 0x%08x", *commandIds++); } GET_RESPONSE_CALLBACKS("emberAfDiscoverCommandsGeneratedResponseCallback"); @@ -733,14 +733,14 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 CommandId * commandIds, uint16_t commandIdCount) { ChipLogProgress(Zcl, "DiscoverCommandsReceivedResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " manufacturerCode: 0x%04x", manufacturerCode); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " commandIdCount: %" PRIu16, commandIdCount); for (uint16_t i = 0; i < commandIdCount; i++) { - ChipLogProgress(Zcl, " commandId: 0x%02x", *commandIds++); + ChipLogProgress(Zcl, " commandId: 0x%08x", *commandIds++); } GET_RESPONSE_CALLBACKS("emberAfDiscoverCommandsGeneratedResponseCallback"); @@ -777,13 +777,13 @@ static EmberAfStatus PrepareListFromTLV(TLV::TLVReader * tlvData, const uint8_t bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "emberAfReportAttributeCallback:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); ChipLogProgress(Zcl, " Source NodeId: %" PRIu64, sourceId); EndpointId endpointId = emberAfCurrentCommand()->apsFrame->sourceEndpoint; - ChipLogProgress(Zcl, " Source EndpointId: 0x%04x", endpointId); + ChipLogProgress(Zcl, " Source EndpointId: 0x%08x", endpointId); // TODO onFailureCallback is just here because of the CHECK_MESSAGE_LENGTH macro. It needs to be removed. Callback::Cancelable * onFailureCallback = nullptr; @@ -791,8 +791,8 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin while (messageLen) { CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); GET_REPORT_CALLBACK("emberAfReportAttributesCallback"); diff --git a/examples/pump-controller-app/pump-controller-common/gen/IMClusterCommandHandler.cpp b/examples/pump-controller-app/pump-controller-common/gen/IMClusterCommandHandler.cpp index d39f9e76d55680..3412e536858a61 100644 --- a/examples/pump-controller-app/pump-controller-common/gen/IMClusterCommandHandler.cpp +++ b/examples/pump-controller-app/pump-controller-common/gen/IMClusterCommandHandler.cpp @@ -64,7 +64,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_BASIC_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_BASIC_CLUSTER_ID); return; } } @@ -184,7 +184,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); return; } } @@ -380,7 +380,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -1069,7 +1069,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -1576,7 +1576,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -1605,8 +1605,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -1635,7 +1635,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/examples/pump-controller-app/pump-controller-common/gen/attribute-size.cpp b/examples/pump-controller-app/pump-controller-common/gen/attribute-size.cpp index f0e947f1bbfe84..48a8a647502a3e 100644 --- a/examples/pump-controller-app/pump-controller-common/gen/attribute-size.cpp +++ b/examples/pump-controller-app/pump-controller-common/gen/attribute-size.cpp @@ -383,7 +383,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/examples/pump-controller-app/pump-controller-common/gen/encoder.cpp b/examples/pump-controller-app/pump-controller-common/gen/encoder.cpp index 79714e791241c2..0e782474f25719 100644 --- a/examples/pump-controller-app/pump-controller-common/gen/encoder.cpp +++ b/examples/pump-controller-app/pump-controller-common/gen/encoder.cpp @@ -148,7 +148,7 @@ constexpr EndpointId kSourceEndpoint = 1; PacketBufferHandle encodeFlowMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverFlowMeasurementAttributes", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -158,7 +158,7 @@ PacketBufferHandle encodeFlowMeasurementClusterDiscoverAttributes(uint8_t seqNum PacketBufferHandle encodeFlowMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -169,9 +169,9 @@ PacketBufferHandle encodeFlowMeasurementClusterConfigureMeasuredValueAttribute(u COMMAND_HEADER("ReportFlowMeasurementMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -185,7 +185,7 @@ PacketBufferHandle encodeFlowMeasurementClusterConfigureMeasuredValueAttribute(u PacketBufferHandle encodeFlowMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementMinMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -195,7 +195,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadMinMeasuredValueAttribute(uin PacketBufferHandle encodeFlowMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementMaxMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -205,7 +205,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadMaxMeasuredValueAttribute(uin PacketBufferHandle encodeFlowMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementClusterRevision", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -230,7 +230,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadClusterRevisionAttribute(uint PacketBufferHandle encodeLevelControlClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverLevelControlAttributes", LEVEL_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -240,7 +240,7 @@ PacketBufferHandle encodeLevelControlClusterDiscoverAttributes(uint8_t seqNum, E PacketBufferHandle encodeLevelControlClusterReadCurrentLevelAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadLevelControlCurrentLevel", LEVEL_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -251,9 +251,9 @@ PacketBufferHandle encodeLevelControlClusterConfigureCurrentLevelAttribute(uint8 COMMAND_HEADER("ReportLevelControlCurrentLevel", LEVEL_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(32) .Put16(minInterval) .Put16(maxInterval); @@ -267,7 +267,7 @@ PacketBufferHandle encodeLevelControlClusterConfigureCurrentLevelAttribute(uint8 PacketBufferHandle encodeLevelControlClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadLevelControlClusterRevision", LEVEL_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -287,7 +287,7 @@ PacketBufferHandle encodeLevelControlClusterReadClusterRevisionAttribute(uint8_t PacketBufferHandle encodeOnOffClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverOnOffAttributes", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -297,7 +297,7 @@ PacketBufferHandle encodeOnOffClusterDiscoverAttributes(uint8_t seqNum, Endpoint PacketBufferHandle encodeOnOffClusterReadOnOffAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOnOffOnOff", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -307,7 +307,7 @@ PacketBufferHandle encodeOnOffClusterReadOnOffAttribute(uint8_t seqNum, Endpoint PacketBufferHandle encodeOnOffClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOnOffClusterRevision", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -326,7 +326,7 @@ PacketBufferHandle encodeOnOffClusterReadClusterRevisionAttribute(uint8_t seqNum PacketBufferHandle encodePressureMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverPressureMeasurementAttributes", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -336,7 +336,7 @@ PacketBufferHandle encodePressureMeasurementClusterDiscoverAttributes(uint8_t se PacketBufferHandle encodePressureMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -347,9 +347,9 @@ PacketBufferHandle encodePressureMeasurementClusterConfigureMeasuredValueAttribu COMMAND_HEADER("ReportPressureMeasurementMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -363,7 +363,7 @@ PacketBufferHandle encodePressureMeasurementClusterConfigureMeasuredValueAttribu PacketBufferHandle encodePressureMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementMinMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -373,7 +373,7 @@ PacketBufferHandle encodePressureMeasurementClusterReadMinMeasuredValueAttribute PacketBufferHandle encodePressureMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementMaxMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -383,7 +383,7 @@ PacketBufferHandle encodePressureMeasurementClusterReadMaxMeasuredValueAttribute PacketBufferHandle encodePressureMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementClusterRevision", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -406,7 +406,7 @@ PacketBufferHandle encodePressureMeasurementClusterReadClusterRevisionAttribute( PacketBufferHandle encodePumpConfigurationAndControlClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverPumpConfigurationAndControlAttributes", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -416,7 +416,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterDiscoverAttributes(ui PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxPressureAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlMaxPressure", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -426,7 +426,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxPressureAttrib PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxSpeedAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlMaxSpeed", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -436,7 +436,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxSpeedAttribute PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxFlowAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlMaxFlow", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -447,7 +447,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadEffectiveOperatio EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlEffectiveOperationMode", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0011); COMMAND_FOOTER(); } @@ -458,7 +458,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadEffectiveControlM EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlEffectiveControlMode", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0012); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0012); COMMAND_FOOTER(); } @@ -468,7 +468,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadEffectiveControlM PacketBufferHandle encodePumpConfigurationAndControlClusterReadCapacityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlCapacity", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0013); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0013); COMMAND_FOOTER(); } @@ -480,9 +480,9 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterConfigureCapacityAttr COMMAND_HEADER("ReportPumpConfigurationAndControlCapacity", PUMP_CONFIG_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0013) + .Put32(0x0013) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -497,7 +497,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadOperationModeAttr EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlOperationMode", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0020); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0020); COMMAND_FOOTER(); } @@ -508,8 +508,8 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterWriteOperationModeAtt COMMAND_HEADER("WritePumpConfigurationAndControlOperationMode", PUMP_CONFIG_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0020) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0020) .Put8(48) .Put8(static_cast(operationMode)); COMMAND_FOOTER(); @@ -522,7 +522,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadClusterRevisionAt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlClusterRevision", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -541,7 +541,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadClusterRevisionAt PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverTemperatureMeasurementAttributes", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -551,7 +551,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t PacketBufferHandle encodeTemperatureMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -563,9 +563,9 @@ PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttr COMMAND_HEADER("ReportTemperatureMeasurementMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -579,7 +579,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttr PacketBufferHandle encodeTemperatureMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementMinMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -589,7 +589,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterReadMinMeasuredValueAttrib PacketBufferHandle encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementMaxMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -599,6 +599,6 @@ PacketBufferHandle encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttrib PacketBufferHandle encodeTemperatureMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementClusterRevision", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } diff --git a/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp b/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp index 7eda9805537635..004f5393e9def8 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp +++ b/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp @@ -135,7 +135,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); return; } } @@ -331,7 +331,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -878,7 +878,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -1385,7 +1385,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -1414,8 +1414,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -1441,7 +1441,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/examples/temperature-measurement-app/esp32/main/gen/attribute-size.cpp b/examples/temperature-measurement-app/esp32/main/gen/attribute-size.cpp index fcaa2ca2f6e773..67024eb6b71a25 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/attribute-size.cpp +++ b/examples/temperature-measurement-app/esp32/main/gen/attribute-size.cpp @@ -203,7 +203,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp b/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp index 1ef26a9f88d268..669ce7d50897e1 100644 --- a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp +++ b/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp @@ -123,7 +123,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_APPLICATION_BASIC_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_APPLICATION_BASIC_CLUSTER_ID); return; } } @@ -295,7 +295,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_AUDIO_OUTPUT_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_AUDIO_OUTPUT_CLUSTER_ID); return; } } @@ -344,7 +344,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_BASIC_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_BASIC_CLUSTER_ID); return; } } @@ -535,7 +535,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_BINDING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_BINDING_CLUSTER_ID); return; } } @@ -715,7 +715,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_CONTENT_LAUNCH_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_CONTENT_LAUNCH_CLUSTER_ID); return; } } @@ -835,7 +835,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID); return; } } @@ -1031,7 +1031,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -1561,7 +1561,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_LEVEL_CONTROL_CLUSTER_ID); return; } } @@ -1835,7 +1835,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_MEDIA_PLAYBACK_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_MEDIA_PLAYBACK_CLUSTER_ID); return; } } @@ -2524,7 +2524,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -2805,7 +2805,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_OTA_PROVIDER_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OTA_PROVIDER_CLUSTER_ID); return; } } @@ -2872,7 +2872,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_ON_OFF_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_ON_OFF_CLUSTER_ID); return; } } @@ -3379,7 +3379,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -3408,8 +3408,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -3462,7 +3462,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/examples/tv-app/tv-common/gen/attribute-size.cpp b/examples/tv-app/tv-common/gen/attribute-size.cpp index ac1bc47eeb71e9..a0ddad482566a7 100644 --- a/examples/tv-app/tv-common/gen/attribute-size.cpp +++ b/examples/tv-app/tv-common/gen/attribute-size.cpp @@ -195,14 +195,14 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo // Struct _DeviceType _DeviceType * entry = reinterpret_cast<_DeviceType *>(write ? src : dest); copyListMember(write ? dest : (uint8_t *) &entry->type, write ? (uint8_t *) &entry->type : src, write, &entryOffset, - sizeof(entry->type)); // DEVICE_TYPE_ID + sizeof(entry->type)); // DEVTYPE_ID copyListMember(write ? dest : (uint8_t *) &entry->revision, write ? (uint8_t *) &entry->revision : src, write, &entryOffset, sizeof(entry->revision)); // INT16U break; } case 0x0001: // server list { - entryLength = 2; + entryLength = 4; if (((index - 1) * entryLength) > (am->size - entryLength)) { ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); @@ -214,7 +214,7 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } case 0x0002: // client list { - entryLength = 2; + entryLength = 4; if (((index - 1) * entryLength) > (am->size - entryLength)) { ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); @@ -226,14 +226,14 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } case 0x0003: // parts list { - entryLength = 1; + entryLength = 2; if (((index - 1) * entryLength) > (am->size - entryLength)) { ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); return 0; } entryOffset = static_cast(entryOffset + ((index - 1) * entryLength)); - copyListMember(dest, src, write, &entryOffset, entryLength); // ENDPOINT_ID + copyListMember(dest, src, write, &entryOffset, entryLength); // ENDPOINT_NO break; } } @@ -718,15 +718,15 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut break; case 0x0001: // server list // chip::ClusterId - entryLength = 2; + entryLength = 4; break; case 0x0002: // client list // chip::ClusterId - entryLength = 2; + entryLength = 4; break; case 0x0003: // parts list // chip::EndpointId - entryLength = 1; + entryLength = 2; break; } break; @@ -818,7 +818,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/examples/window-app/common/gen/IMClusterCommandHandler.cpp b/examples/window-app/common/gen/IMClusterCommandHandler.cpp index 2831c3fe7f0c4d..776574b823c92e 100644 --- a/examples/window-app/common/gen/IMClusterCommandHandler.cpp +++ b/examples/window-app/common/gen/IMClusterCommandHandler.cpp @@ -211,7 +211,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -900,7 +900,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -1407,7 +1407,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -1721,7 +1721,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_WINDOW_COVERING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_WINDOW_COVERING_CLUSTER_ID); return; } } @@ -1749,8 +1749,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -1776,7 +1776,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/examples/window-app/common/gen/attribute-size.cpp b/examples/window-app/common/gen/attribute-size.cpp index f0e947f1bbfe84..48a8a647502a3e 100644 --- a/examples/window-app/common/gen/attribute-size.cpp +++ b/examples/window-app/common/gen/attribute-size.cpp @@ -383,7 +383,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/src/app/CommandHandler.cpp b/src/app/CommandHandler.cpp index 6379cb2ca177b3..fd81fb33c353ec 100644 --- a/src/app/CommandHandler.cpp +++ b/src/app/CommandHandler.cpp @@ -100,7 +100,7 @@ CHIP_ERROR CommandHandler::ProcessCommandDataElement(CommandDataElement::Parser if (CHIP_END_OF_TLV == err) { err = CHIP_NO_ERROR; - ChipLogDetail(DataManagement, "Received command without data for cluster %d", clusterId); + ChipLogDetail(DataManagement, "Received command without data for cluster %" PRIx32, clusterId); } if (CHIP_NO_ERROR == err) { @@ -120,7 +120,7 @@ CHIP_ERROR CommandHandler::ProcessCommandDataElement(CommandDataElement::Parser // TODO: The error code should be updated after #7072 added error codes required by IM. if (err == CHIP_ERROR_INVALID_PROFILE_ID) { - ChipLogDetail(DataManagement, "No Cluster 0x%" PRIx16 " on Endpoint 0x%" PRIx8, clusterId, endpointId); + ChipLogDetail(DataManagement, "No Cluster 0x%" PRIx32 " on Endpoint 0x%" PRIx16, clusterId, endpointId); } AddStatusCode(returnStatusParam, diff --git a/src/app/EventManagement.cpp b/src/app/EventManagement.cpp index 0f5c8adcf73c20..9e30ebacca9bbe 100644 --- a/src/app/EventManagement.cpp +++ b/src/app/EventManagement.cpp @@ -569,8 +569,8 @@ CHIP_ERROR EventManagement::LogEventPrivate(EventLoggingDelegate * apDelegate, E #if CHIP_CONFIG_EVENT_LOGGING_VERBOSE_DEBUG_LOGS ChipLogDetail(EventLogging, - "LogEvent event number: 0x" ChipLogFormatX64 - " schema priority: %u cluster id: 0x%x event id: 0x%x sys timestamp: 0x" ChipLogFormatX64, + "LogEvent event number: 0x" ChipLogFormatX64 " schema priority: %u cluster id: 0x%" PRIx32 + " event id: 0x%" PRIx32 " sys timestamp: 0x" ChipLogFormatX64, ChipLogValueX64(aEventNumber), static_cast(opts.mpEventSchema->mPriority), opts.mpEventSchema->mClusterId, opts.mpEventSchema->mEventId, ChipLogValueX64(opts.mTimestamp.mValue)); #endif // CHIP_CONFIG_EVENT_LOGGING_VERBOSE_DEBUG_LOGS diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp index 2291764920733b..7697bfed89e4fd 100644 --- a/src/app/InteractionModelEngine.cpp +++ b/src/app/InteractionModelEngine.cpp @@ -341,8 +341,8 @@ CHIP_ERROR __attribute__((weak)) WriteSingleClusterData(ClusterInfo & aClusterInfo, TLV::TLVReader & aReader, WriteHandler * apWriteHandler) { ChipLogDetail(DataManagement, - "Received Cluster Attribute: Cluster=%" PRIx16 " NodeId=0x" ChipLogFormatX64 " Endpoint=%" PRIx8 - " FieldId=%" PRIx16 " ListIndex=%" PRIx16, + "Received Cluster Attribute: Cluster=%" PRIx32 " NodeId=0x" ChipLogFormatX64 " Endpoint=%" PRIx16 + " FieldId=%" PRIx32 " ListIndex=%" PRIx16, aClusterInfo.mClusterId, ChipLogValueX64(aClusterInfo.mNodeId), aClusterInfo.mEndpointId, aClusterInfo.mFieldId, aClusterInfo.mListIndex); ChipLogError(DataManagement, diff --git a/src/app/clusters/descriptor/descriptor.cpp b/src/app/clusters/descriptor/descriptor.cpp index e662abb9f39fce..5381cd382f4d2f 100644 --- a/src/app/clusters/descriptor/descriptor.cpp +++ b/src/app/clusters/descriptor/descriptor.cpp @@ -33,7 +33,7 @@ using namespace chip; constexpr const char * kErrorStr = "Descriptor cluster (0x%02x) Error setting '%s' attribute: 0x%02x"; -EmberAfStatus writeAttribute(uint8_t endpoint, AttributeId attributeId, uint8_t * buffer, int32_t index = -1) +EmberAfStatus writeAttribute(EndpointId endpoint, AttributeId attributeId, uint8_t * buffer, int32_t index = -1) { EmberAfAttributeSearchRecord record; record.endpoint = endpoint; @@ -53,7 +53,7 @@ EmberAfStatus writeAttribute(uint8_t endpoint, AttributeId attributeId, uint8_t return emAfReadOrWriteAttribute(&record, NULL, buffer, 0, true, index + 1); } -EmberAfStatus writeClientServerAttribute(uint8_t endpoint, bool server) +EmberAfStatus writeClientServerAttribute(EndpointId endpoint, bool server) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; AttributeId attributeId = server ? ZCL_SERVER_LIST_ATTRIBUTE_ID : ZCL_CLIENT_LIST_ATTRIBUTE_ID; @@ -71,17 +71,17 @@ EmberAfStatus writeClientServerAttribute(uint8_t endpoint, bool server) return writeAttribute(endpoint, attributeId, (uint8_t *) &clusterCount); } -EmberAfStatus writeServerAttribute(uint8_t endpoint) +EmberAfStatus writeServerAttribute(EndpointId endpoint) { return writeClientServerAttribute(endpoint, true); } -EmberAfStatus writeClientAttribute(uint8_t endpoint) +EmberAfStatus writeClientAttribute(EndpointId endpoint) { return writeClientServerAttribute(endpoint, false); } -EmberAfStatus writeDeviceAttribute(uint8_t endpoint, uint8_t index) +EmberAfStatus writeDeviceAttribute(EndpointId endpoint, uint16_t index) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; AttributeId attributeId = ZCL_DEVICE_LIST_ATTRIBUTE_ID; @@ -100,7 +100,7 @@ EmberAfStatus writeDeviceAttribute(uint8_t endpoint, uint8_t index) return writeAttribute(endpoint, attributeId, (uint8_t *) &deviceTypeCount); } -EmberAfStatus writePartsAttribute(uint8_t endpoint) +EmberAfStatus writePartsAttribute(EndpointId endpoint) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; AttributeId attributeId = ZCL_PARTS_LIST_ATTRIBUTE_ID; @@ -109,7 +109,7 @@ EmberAfStatus writePartsAttribute(uint8_t endpoint) if (endpoint == 0x00) { - for (uint8_t endpointIndex = 1; endpointIndex < emberAfEndpointCount(); endpointIndex++) + for (uint16_t endpointIndex = 1; endpointIndex < emberAfEndpointCount(); endpointIndex++) { if (emberAfEndpointIndexIsEnabled(endpointIndex)) { @@ -128,7 +128,7 @@ void emberAfPluginDescriptorServerInitCallback(void) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; - for (uint8_t index = 0; index < emberAfEndpointCount(); index++) + for (uint16_t index = 0; index < emberAfEndpointCount(); index++) { EndpointId endpoint = emberAfEndpointFromIndex(index); if (!emberAfContainsCluster(endpoint, ZCL_DESCRIPTOR_CLUSTER_ID)) diff --git a/src/app/clusters/identify/identify.cpp b/src/app/clusters/identify/identify.cpp index 45391bf5d90d6f..df978dfe6b00cd 100644 --- a/src/app/clusters/identify/identify.cpp +++ b/src/app/clusters/identify/identify.cpp @@ -74,8 +74,8 @@ static EmAfIdentifyState * getIdentifyState(EndpointId endpoint); static EmAfIdentifyState * getIdentifyState(EndpointId endpoint) { - uint8_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ZCL_IDENTIFY_CLUSTER_ID); - return (ep == 0xFF ? NULL : &stateTable[ep]); + uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ZCL_IDENTIFY_CLUSTER_ID); + return (ep == 0xFFFF ? NULL : &stateTable[ep]); } void emberAfIdentifyClusterServerInitCallback(EndpointId endpoint) diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index 88bfc009fe7f47..875eb0a92c6e07 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -138,8 +138,8 @@ static void deactivate(EndpointId endpoint) static EmberAfLevelControlState * getState(EndpointId endpoint) { - uint8_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ZCL_LEVEL_CONTROL_CLUSTER_ID); - return (ep == 0xFF ? NULL : &stateTable[ep]); + uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ZCL_LEVEL_CONTROL_CLUSTER_ID); + return (ep == 0xFFFF ? NULL : &stateTable[ep]); } #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_OPTIONS_ATTRIBUTE) && defined(EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP) diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp index b1eef460458137..d1fd7686e253e4 100644 --- a/src/app/clusters/ota-provider/ota-provider.cpp +++ b/src/app/clusters/ota-provider/ota-provider.cpp @@ -42,15 +42,15 @@ OTAProviderDelegate * gDelegateTable[EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOI OTAProviderDelegate * GetDelegate(chip::EndpointId endpoint) { - uint8_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ZCL_OTA_PROVIDER_CLUSTER_ID); - return (ep == 0xFF ? NULL : gDelegateTable[ep]); + uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ZCL_OTA_PROVIDER_CLUSTER_ID); + return (ep == 0xFFFF ? NULL : gDelegateTable[ep]); } bool SendStatusIfDelegateNull(chip::EndpointId endpointId) { if (GetDelegate(endpointId) == nullptr) { - ChipLogError(Zcl, "No OTAProviderDelegate set for ep:%" PRIu8, endpointId); + ChipLogError(Zcl, "No OTAProviderDelegate set for ep:%" PRIu16, endpointId); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_UNSUP_COMMAND); return true; } @@ -199,8 +199,8 @@ namespace clusters { void OTAProvider::SetDelegate(chip::EndpointId endpointId, OTAProviderDelegate * delegate) { - uint8_t ep = emberAfFindClusterServerEndpointIndex(endpointId, ZCL_OTA_PROVIDER_CLUSTER_ID); - if (ep != 0xFF) + uint16_t ep = emberAfFindClusterServerEndpointIndex(endpointId, ZCL_OTA_PROVIDER_CLUSTER_ID); + if (ep != 0xFFFF) { gDelegateTable[ep] = delegate; } diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp index fb2d023045109a..10d4eb293ac4db 100644 --- a/src/app/clusters/test-cluster-server/test-cluster-server.cpp +++ b/src/app/clusters/test-cluster-server/test-cluster-server.cpp @@ -37,7 +37,7 @@ using namespace chip; constexpr const char * kErrorStr = "Test Cluster: List Octet cluster (0x%02x) Error setting '%s' attribute: 0x%02x"; namespace { -EmberAfStatus writeAttribute(uint8_t endpoint, AttributeId attributeId, uint8_t * buffer, int32_t index = -1) +EmberAfStatus writeAttribute(EndpointId endpoint, AttributeId attributeId, uint8_t * buffer, int32_t index = -1) { EmberAfAttributeSearchRecord record; record.endpoint = endpoint; @@ -57,7 +57,7 @@ EmberAfStatus writeAttribute(uint8_t endpoint, AttributeId attributeId, uint8_t return emAfReadOrWriteAttribute(&record, NULL, buffer, 0, true, index + 1); } -EmberAfStatus writeTestListInt8uAttribute(uint8_t endpoint) +EmberAfStatus writeTestListInt8uAttribute(EndpointId endpoint) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; AttributeId attributeId = ZCL_LIST_ATTRIBUTE_ID; @@ -74,7 +74,7 @@ EmberAfStatus writeTestListInt8uAttribute(uint8_t endpoint) return status; } -EmberAfStatus writeTestListOctetAttribute(uint8_t endpoint) +EmberAfStatus writeTestListOctetAttribute(EndpointId endpoint) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; AttributeId attributeId = ZCL_LIST_OCTET_STRING_ATTRIBUTE_ID; @@ -96,7 +96,7 @@ EmberAfStatus writeTestListOctetAttribute(uint8_t endpoint) return status; } -EmberAfStatus writeTestListStructOctetAttribute(uint8_t endpoint) +EmberAfStatus writeTestListStructOctetAttribute(EndpointId endpoint) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; AttributeId attributeId = ZCL_LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID; diff --git a/src/app/common/gen/attribute-size.h b/src/app/common/gen/attribute-size.h index 5f6113cde621e4..a38edaba8c8fd9 100644 --- a/src/app/common/gen/attribute-size.h +++ b/src/app/common/gen/attribute-size.h @@ -21,20 +21,17 @@ #pragma once // ZCL attribute sizes -ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4, - ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8, - ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3, - ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7, +ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3, ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7, ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3, ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7, - ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2, - ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4, - ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_EPOCH_US_ATTRIBUTE_TYPE, 8, ZCL_EPOCH_S_ATTRIBUTE_TYPE, 4, - ZCL_SYSTIME_US_ATTRIBUTE_TYPE, 8, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE, 2, - ZCL_FIELD_ID_ATTRIBUTE_TYPE, 4, ZCL_EVENT_ID_ATTRIBUTE_TYPE, 4, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1, ZCL_ACTION_ID_ATTRIBUTE_TYPE, - 1, ZCL_TRANS_ID_ATTRIBUTE_TYPE, 4, ZCL_NODE_ID_ATTRIBUTE_TYPE, 8, ZCL_VENDOR_ID_ATTRIBUTE_TYPE, 2, - ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4, ZCL_FABRIC_ID_ATTRIBUTE_TYPE, 8, ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, - ZCL_STATUS_ATTRIBUTE_TYPE, 4, ZCL_DATA_VER_ATTRIBUTE_TYPE, 4, ZCL_EVENT_NO_ATTRIBUTE_TYPE, 8, ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1, - ZCL_FABRIC_IDX_ATTRIBUTE_TYPE, 1, ZCL_IPV4ADR_ATTRIBUTE_TYPE, 4, ZCL_IPV6ADR_ATTRIBUTE_TYPE, 16, + ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_SINGLE_ATTRIBUTE_TYPE, 4, + ZCL_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TOD_ATTRIBUTE_TYPE, 4, ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_ATTRIBUTE_TYPE, 4, + ZCL_EPOCH_US_ATTRIBUTE_TYPE, 8, ZCL_EPOCH_S_ATTRIBUTE_TYPE, 4, ZCL_SYSTIME_US_ATTRIBUTE_TYPE, 8, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, + 4, ZCL_ATTRIB_ID_ATTRIBUTE_TYPE, 4, ZCL_FIELD_ID_ATTRIBUTE_TYPE, 4, ZCL_EVENT_ID_ATTRIBUTE_TYPE, 4, + ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 4, ZCL_ACTION_ID_ATTRIBUTE_TYPE, 1, ZCL_TRANS_ID_ATTRIBUTE_TYPE, 4, ZCL_NODE_ID_ATTRIBUTE_TYPE, + 8, ZCL_VENDOR_ID_ATTRIBUTE_TYPE, 2, ZCL_DEVTYPE_ID_ATTRIBUTE_TYPE, 4, ZCL_FABRIC_ID_ATTRIBUTE_TYPE, 8, + ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_STATUS_ATTRIBUTE_TYPE, 4, ZCL_DATA_VER_ATTRIBUTE_TYPE, 4, ZCL_EVENT_NO_ATTRIBUTE_TYPE, 8, + ZCL_ENDPOINT_NO_ATTRIBUTE_TYPE, 2, ZCL_FABRIC_IDX_ATTRIBUTE_TYPE, 1, ZCL_IPV4ADR_ATTRIBUTE_TYPE, 4, ZCL_IPV6ADR_ATTRIBUTE_TYPE, + 16, diff --git a/src/app/common/gen/attribute-type.h b/src/app/common/gen/attribute-type.h index 644b7c29919769..fab7f566b58f19 100644 --- a/src/app/common/gen/attribute-type.h +++ b/src/app/common/gen/attribute-type.h @@ -24,22 +24,10 @@ enum { ZCL_NO_DATA_ATTRIBUTE_TYPE = 0x00, // No data - ZCL_DATA8_ATTRIBUTE_TYPE = 0x08, // 8-bit data - ZCL_DATA16_ATTRIBUTE_TYPE = 0x09, // 16-bit data - ZCL_DATA24_ATTRIBUTE_TYPE = 0x0A, // 24-bit data - ZCL_DATA32_ATTRIBUTE_TYPE = 0x0B, // 32-bit data - ZCL_DATA40_ATTRIBUTE_TYPE = 0x0C, // 40-bit data - ZCL_DATA48_ATTRIBUTE_TYPE = 0x0D, // 48-bit data - ZCL_DATA56_ATTRIBUTE_TYPE = 0x0E, // 56-bit data - ZCL_DATA64_ATTRIBUTE_TYPE = 0x0F, // 64-bit data ZCL_BOOLEAN_ATTRIBUTE_TYPE = 0x10, // Boolean ZCL_BITMAP8_ATTRIBUTE_TYPE = 0x18, // 8-bit bitmap ZCL_BITMAP16_ATTRIBUTE_TYPE = 0x19, // 16-bit bitmap - ZCL_BITMAP24_ATTRIBUTE_TYPE = 0x1A, // 24-bit bitmap ZCL_BITMAP32_ATTRIBUTE_TYPE = 0x1B, // 32-bit bitmap - ZCL_BITMAP40_ATTRIBUTE_TYPE = 0x1C, // 40-bit bitmap - ZCL_BITMAP48_ATTRIBUTE_TYPE = 0x1D, // 48-bit bitmap - ZCL_BITMAP56_ATTRIBUTE_TYPE = 0x1E, // 56-bit bitmap ZCL_BITMAP64_ATTRIBUTE_TYPE = 0x1F, // 64-bit bitmap ZCL_INT8U_ATTRIBUTE_TYPE = 0x20, // Unsigned 8-bit integer ZCL_INT16U_ATTRIBUTE_TYPE = 0x21, // Unsigned 16-bit integer @@ -59,25 +47,22 @@ enum ZCL_INT64S_ATTRIBUTE_TYPE = 0x2F, // Signed 64-bit integer ZCL_ENUM8_ATTRIBUTE_TYPE = 0x30, // 8-bit enumeration ZCL_ENUM16_ATTRIBUTE_TYPE = 0x31, // 16-bit enumeration - ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE = 0x38, // Semi-precision - ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision - ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision - ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet string - ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character string - ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string - ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long character string - ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // Array + ZCL_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision + ZCL_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision + ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet String + ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character String + ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long Octet String + ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long Character String + ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // List ZCL_STRUCT_ATTRIBUTE_TYPE = 0x4C, // Structure - ZCL_SET_ATTRIBUTE_TYPE = 0x50, // Set - ZCL_BAG_ATTRIBUTE_TYPE = 0x51, // Bag - ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE = 0xE0, // Time of day + ZCL_TOD_ATTRIBUTE_TYPE = 0xE0, // Time of day ZCL_DATE_ATTRIBUTE_TYPE = 0xE1, // Date - ZCL_UTC_TIME_ATTRIBUTE_TYPE = 0xE2, // UTC Time + ZCL_UTC_ATTRIBUTE_TYPE = 0xE2, // UTC Time ZCL_EPOCH_US_ATTRIBUTE_TYPE = 0xE3, // Epoch Microseconds ZCL_EPOCH_S_ATTRIBUTE_TYPE = 0xE4, // Epoch Seconds ZCL_SYSTIME_US_ATTRIBUTE_TYPE = 0xE5, // System Time Microseconds ZCL_CLUSTER_ID_ATTRIBUTE_TYPE = 0xE8, // Cluster ID - ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID + ZCL_ATTRIB_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID ZCL_FIELD_ID_ATTRIBUTE_TYPE = 0xEA, // Field ID ZCL_EVENT_ID_ATTRIBUTE_TYPE = 0xEB, // Event ID ZCL_COMMAND_ID_ATTRIBUTE_TYPE = 0xEC, // Command ID @@ -85,13 +70,13 @@ enum ZCL_TRANS_ID_ATTRIBUTE_TYPE = 0xEF, // Transaction ID ZCL_NODE_ID_ATTRIBUTE_TYPE = 0xF0, // Node ID ZCL_VENDOR_ID_ATTRIBUTE_TYPE = 0xF1, // Vendor ID - ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE = 0xF2, // Device Type ID + ZCL_DEVTYPE_ID_ATTRIBUTE_TYPE = 0xF2, // Device Type ID ZCL_FABRIC_ID_ATTRIBUTE_TYPE = 0xF3, // Fabric ID ZCL_GROUP_ID_ATTRIBUTE_TYPE = 0xF4, // Group ID ZCL_STATUS_ATTRIBUTE_TYPE = 0xF5, // Status Code ZCL_DATA_VER_ATTRIBUTE_TYPE = 0xF6, // Data Version ZCL_EVENT_NO_ATTRIBUTE_TYPE = 0xF7, // Event Number - ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE = 0xF8, // Endpoint Number + ZCL_ENDPOINT_NO_ATTRIBUTE_TYPE = 0xF8, // Endpoint Number ZCL_FABRIC_IDX_ATTRIBUTE_TYPE = 0xF9, // Fabric Index ZCL_IPADR_ATTRIBUTE_TYPE = 0xFA, // IP Address ZCL_IPV4ADR_ATTRIBUTE_TYPE = 0xFB, // IPv4 Address diff --git a/src/app/common/gen/client-command-macro.h b/src/app/common/gen/client-command-macro.h index ff46732d39bde1..50f57677817599 100644 --- a/src/app/common/gen/client-command-macro.h +++ b/src/app/common/gen/client-command-macro.h @@ -4998,7 +4998,7 @@ * Command: Bind * @param nodeId NODE_ID * @param groupId GROUP_ID - * @param endpointId ENDPOINT_ID + * @param endpointId ENDPOINT_NO * @param clusterId CLUSTER_ID */ #define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId) \ @@ -5011,7 +5011,7 @@ * Command: Unbind * @param nodeId NODE_ID * @param groupId GROUP_ID - * @param endpointId ENDPOINT_ID + * @param endpointId ENDPOINT_NO * @param clusterId CLUSTER_ID */ #define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId) \ diff --git a/src/app/decoder.cpp b/src/app/decoder.cpp index 5306f49dcab9eb..3fd6d414ce52ff 100644 --- a/src/app/decoder.cpp +++ b/src/app/decoder.cpp @@ -59,7 +59,8 @@ uint16_t extractApsFrame(uint8_t * buffer, uint16_t buf_length, EmberApsFrame * void printApsFrame(EmberApsFrame * frame) { ChipLogProgress(Zcl, - "\n clusterID %d, sourceEndpoint %d, destinationEndPoint %d, options %d, groupID %d, " + "\n clusterID %" PRIx32 + ", sourceEndpoint %d, destinationEndPoint %d, options %d, groupID %d, " "sequence %d, radius %d\n", frame, frame->clusterId, frame->sourceEndpoint, frame->destinationEndpoint, frame->options, frame->groupId, frame->sequence, frame->radius); diff --git a/src/app/encoder-common.cpp b/src/app/encoder-common.cpp index c27f1e24d031cf..99a022cc46ecde 100644 --- a/src/app/encoder-common.cpp +++ b/src/app/encoder-common.cpp @@ -28,9 +28,9 @@ uint16_t doEncodeApsFrame(BufferWriter & buf, chip::ClusterId clusterId, chip::E uint8_t control_byte = 0; buf.Put(control_byte) // Put in a control byte - .Put16(clusterId) - .Put8(sourceEndpoint) - .Put8(destinationEndpoint) + .Put32(clusterId) + .Put16(sourceEndpoint) + .Put16(destinationEndpoint) .EndianPut(options, sizeof(EmberApsOption)) .Put16(groupId) .Put8(sequence) diff --git a/src/app/reporting/Engine.cpp b/src/app/reporting/Engine.cpp index 102fcde51c108a..c6b8ccfcad2816 100644 --- a/src/app/reporting/Engine.cpp +++ b/src/app/reporting/Engine.cpp @@ -76,7 +76,8 @@ Engine::RetrieveClusterData(AttributeDataElement::Builder & aAttributeDataElemen if (err != CHIP_NO_ERROR) { - ChipLogError(DataManagement, "Error retrieving data from clusterId: %08x, err = %" PRId32, aClusterInfo.mClusterId, err); + ChipLogError(DataManagement, "Error retrieving data from clusterId: %" PRIx32 ", err = %" PRId32, aClusterInfo.mClusterId, + err); } return err; @@ -94,7 +95,8 @@ CHIP_ERROR Engine::BuildSingleReportDataAttributeDataList(ReportData::Builder & if (clusterInfo->IsDirty()) { AttributeDataElement::Builder attributeDataElementBuilder = attributeDataList.CreateAttributeDataElementBuilder(); - ChipLogDetail(DataManagement, " Cluster %u, Field %u is dirty", clusterInfo->mClusterId, clusterInfo->mFieldId); + ChipLogDetail(DataManagement, " Cluster %" PRIx32 ", Field %" PRIx32 " is dirty", clusterInfo->mClusterId, + clusterInfo->mFieldId); // Retrieve data for this cluster instance and clear its dirty flag. err = RetrieveClusterData(attributeDataElementBuilder, *clusterInfo); VerifyOrExit(err == CHIP_NO_ERROR, diff --git a/src/app/reporting/reporting.cpp b/src/app/reporting/reporting.cpp index 506318ba83e149..0947ea2f741d8d 100644 --- a/src/app/reporting/reporting.cpp +++ b/src/app/reporting/reporting.cpp @@ -301,8 +301,8 @@ void emberAfPluginReportingTickEventHandler(void) } } - // Payload is [attribute id:2] [type:1] [data:N]. - emberAfPutInt16uInResp(entry.attributeId); + // Payload is [attribute id:4] [type:1] [data:N]. + emberAfPutInt32uInResp(entry.attributeId); emberAfPutInt8uInResp(dataType); #if (BIGENDIAN_CPU) @@ -412,10 +412,10 @@ bool emberAfConfigureReportingCommandCallback(const EmberAfClusterCommand * cmd) emberAfFillExternalManufacturerSpecificBuffer(frameControl, cmd->apsFrame->clusterId, cmd->mfgCode, ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, ""); - // Each record in the command has at least a one-byte direction and a two- + // Each record in the command has at least a one-byte direction and a four- // byte attribute id. Additional fields are present depending on the value // of the direction field. - while (bufIndex + 3 < cmd->bufLen) + while (bufIndex + 5 < cmd->bufLen) { AttributeId attributeId; EmberAfReportingDirection direction; @@ -423,8 +423,8 @@ bool emberAfConfigureReportingCommandCallback(const EmberAfClusterCommand * cmd) direction = (EmberAfReportingDirection) emberAfGetInt8u(cmd->buffer, bufIndex, cmd->bufLen); bufIndex++; - attributeId = (AttributeId) emberAfGetInt16u(cmd->buffer, bufIndex, cmd->bufLen); - bufIndex = static_cast(bufIndex + 2); + attributeId = (AttributeId) emberAfGetInt32u(cmd->buffer, bufIndex, cmd->bufLen); + bufIndex = static_cast(bufIndex + 4); emberAfReportingPrintln(" - direction:%x, attr:%2x", direction, attributeId); @@ -519,7 +519,7 @@ bool emberAfConfigureReportingCommandCallback(const EmberAfClusterCommand * cmd) { emberAfPutInt8uInResp(status); emberAfPutInt8uInResp(direction); - emberAfPutInt16uInResp(attributeId); + emberAfPutInt32uInResp(attributeId); failures = true; if (status == EMBER_ZCL_STATUS_INVALID_FIELD) { @@ -571,9 +571,9 @@ bool emberAfReadReportingConfigurationCommandCallback(const EmberAfClusterComman emberAfFillExternalManufacturerSpecificBuffer(frameControl, cmd->apsFrame->clusterId, cmd->mfgCode, ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, ""); - // Each record in the command has a one-byte direction and a two-byte + // Each record in the command has a one-byte direction and a four-byte // attribute id. - while (bufIndex + 3 <= cmd->bufLen) + while (bufIndex + 5 <= cmd->bufLen) { AttributeId attributeId; EmberAfAttributeMetadata * metadata = NULL; @@ -584,8 +584,8 @@ bool emberAfReadReportingConfigurationCommandCallback(const EmberAfClusterComman direction = (EmberAfReportingDirection) emberAfGetInt8u(cmd->buffer, bufIndex, cmd->bufLen); bufIndex++; - attributeId = (AttributeId) emberAfGetInt16u(cmd->buffer, bufIndex, cmd->bufLen); - bufIndex = static_cast(bufIndex + 2); + attributeId = (AttributeId) emberAfGetInt32u(cmd->buffer, bufIndex, cmd->bufLen); + bufIndex = static_cast(bufIndex + 4); switch (direction) { @@ -597,14 +597,14 @@ bool emberAfReadReportingConfigurationCommandCallback(const EmberAfClusterComman { emberAfPutInt8uInResp(EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE); emberAfPutInt8uInResp(direction); - emberAfPutInt16uInResp(attributeId); + emberAfPutInt32uInResp(attributeId); continue; } break; default: emberAfPutInt8uInResp(EMBER_ZCL_STATUS_INVALID_FIELD); emberAfPutInt8uInResp(direction); - emberAfPutInt16uInResp(attributeId); + emberAfPutInt32uInResp(attributeId); continue; } @@ -637,13 +637,13 @@ bool emberAfReadReportingConfigurationCommandCallback(const EmberAfClusterComman { emberAfPutInt8uInResp(EMBER_ZCL_STATUS_NOT_FOUND); emberAfPutInt8uInResp(direction); - emberAfPutInt16uInResp(attributeId); + emberAfPutInt32uInResp(attributeId); continue; } // Attribute supported, reportable, report configuration was found. emberAfPutInt8uInResp(EMBER_ZCL_STATUS_SUCCESS); emberAfPutInt8uInResp(direction); - emberAfPutInt16uInResp(attributeId); + emberAfPutInt32uInResp(attributeId); switch (direction) { case EMBER_ZCL_REPORTING_DIRECTION_REPORTED: diff --git a/src/app/tests/TestCommandInteraction.cpp b/src/app/tests/TestCommandInteraction.cpp index 3d7044eda45137..fd14a48bfe174c 100644 --- a/src/app/tests/TestCommandInteraction.cpp +++ b/src/app/tests/TestCommandInteraction.cpp @@ -73,7 +73,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC aCommandId, // CommandId (chip::app::CommandPathFlags::kEndpointIdValid) }; - ChipLogDetail(Controller, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, + ChipLogDetail(Controller, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, aCommandId, aEndPointId); apCommandObj->AddStatusCode(commandPathParams, Protocols::SecureChannel::GeneralStatusCode::kSuccess, diff --git a/src/app/util/af-main-common.cpp b/src/app/util/af-main-common.cpp index 0787914becf89a..da3b9a6d25c823 100644 --- a/src/app/util/af-main-common.cpp +++ b/src/app/util/af-main-common.cpp @@ -206,7 +206,7 @@ static EmberStatus send(const MessageSendDestination & destination, EmberApsFram uint8_t * message, bool broadcast, EmberNodeId alias, uint8_t sequence, EmberAfMessageSentFunction callback) { EmberStatus status; - uint8_t index; + uint16_t index; uint8_t messageSentIndex; uint8_t messageTag = INVALID_MESSAGE_TAG; @@ -245,7 +245,7 @@ static EmberStatus send(const MessageSendDestination & destination, EmberApsFram else { index = emberAfIndexFromEndpoint(apsFrame->sourceEndpoint); - if (index == 0xFF) + if (index == 0xFFFF) { return EMBER_INVALID_ENDPOINT; } diff --git a/src/app/util/af.h b/src/app/util/af.h index 5a993041c6b7da..bad01edcb4961b 100644 --- a/src/app/util/af.h +++ b/src/app/util/af.h @@ -419,29 +419,29 @@ extern EmberAfDefinedEndpoint emAfEndpoints[]; /** * @brief Macro that takes index of endpoint, and returns Zigbee endpoint */ -chip::EndpointId emberAfEndpointFromIndex(uint8_t index); +chip::EndpointId emberAfEndpointFromIndex(uint16_t index); /** * Returns the index of a given endpoint */ -uint8_t emberAfIndexFromEndpoint(chip::EndpointId endpoint); +uint16_t emberAfIndexFromEndpoint(chip::EndpointId endpoint); /** * Returns the index of a given endpoint; Does not ignore disabled endpoints */ -uint8_t emberAfIndexFromEndpointIncludingDisabledEndpoints(chip::EndpointId endpoint); +uint16_t emberAfIndexFromEndpointIncludingDisabledEndpoints(chip::EndpointId endpoint); /** * Returns the endpoint index within a given cluster (Client-side), * looking only for standard clusters. */ -uint8_t emberAfFindClusterClientEndpointIndex(chip::EndpointId endpoint, chip::ClusterId clusterId); +uint16_t emberAfFindClusterClientEndpointIndex(chip::EndpointId endpoint, chip::ClusterId clusterId); /** * Returns the endpoint index within a given cluster (Server-side), * looking only for standard clusters. */ -uint8_t emberAfFindClusterServerEndpointIndex(chip::EndpointId endpoint, chip::ClusterId clusterId); +uint16_t emberAfFindClusterServerEndpointIndex(chip::EndpointId endpoint, chip::ClusterId clusterId); /** * @brief Macro that takes index of endpoint, and returns device Id for it @@ -466,12 +466,12 @@ uint8_t emberAfFindClusterServerEndpointIndex(chip::EndpointId endpoint, chip::C /** * @brief Returns the total number of endpoints (dynamic and pre-compiled). */ -uint8_t emberAfEndpointCount(void); +uint16_t emberAfEndpointCount(void); /** * @brief Returns the number of pre-compiled endpoints. */ -uint8_t emberAfFixedEndpointCount(void); +uint16_t emberAfFixedEndpointCount(void); /** * Data types are either analog or discrete. This makes a difference for @@ -667,7 +667,7 @@ bool emberAfEndpointEnableDisable(chip::EndpointId endpoint, bool enable); /** * @brief Determine if an endpoint at the specified index is enabled or disabled */ -bool emberAfEndpointIndexIsEnabled(uint8_t index); +bool emberAfEndpointIndexIsEnabled(uint16_t index); /** * @brief Returns true if a given ZCL data type is a string type. diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp index 58130c1cfb0e0f..cb51e5824c058b 100644 --- a/src/app/util/attribute-storage.cpp +++ b/src/app/util/attribute-storage.cpp @@ -70,7 +70,7 @@ uint8_t attributeData[ACTUAL_ATTRIBUTE_SIZE]; #endif uint8_t singletonAttributeData[ACTUAL_SINGLETONS_SIZE]; -uint8_t emberEndpointCount = 0; +uint16_t emberEndpointCount = 0; // If we have attributes that are more than 2 bytes, then // we need this data block for the defaults @@ -114,7 +114,7 @@ const uint16_t attributeManufacturerCodeCount = GENERATED_ATTR // Forward declarations // Returns endpoint index within a given cluster -static uint8_t findClusterEndpointIndex(EndpointId endpoint, ClusterId clusterId, uint8_t mask, uint16_t manufacturerCode); +static uint16_t findClusterEndpointIndex(EndpointId endpoint, ClusterId clusterId, uint8_t mask, uint16_t manufacturerCode); #ifdef ZCL_USING_DESCRIPTOR_CLUSTER_SERVER void emberAfPluginDescriptorServerInitCallback(void); @@ -128,7 +128,7 @@ void emberAfEndpointConfigure(void) uint8_t ep; #if !defined(EMBER_SCRIPTED_TEST) - uint8_t fixedEndpoints[] = FIXED_ENDPOINT_ARRAY; + uint16_t fixedEndpoints[] = FIXED_ENDPOINT_ARRAY; uint16_t fixedDeviceIds[] = FIXED_DEVICE_IDS; uint8_t fixedDeviceVersions[] = FIXED_DEVICE_VERSIONS; uint8_t fixedEmberAfEndpointTypes[] = FIXED_ENDPOINT_TYPES; @@ -155,14 +155,14 @@ void emberAfEndpointConfigure(void) #endif } -void emberAfSetDynamicEndpointCount(uint8_t dynamicEndpointCount) +void emberAfSetDynamicEndpointCount(uint16_t dynamicEndpointCount) { - emberEndpointCount = static_cast(FIXED_ENDPOINT_COUNT + dynamicEndpointCount); + emberEndpointCount = static_cast(FIXED_ENDPOINT_COUNT + dynamicEndpointCount); } -uint8_t emberAfGetDynamicIndexFromEndpoint(EndpointId id) +uint16_t emberAfGetDynamicIndexFromEndpoint(EndpointId id) { - uint8_t index; + uint16_t index; for (index = FIXED_ENDPOINT_COUNT; index < MAX_ENDPOINT_COUNT; index++) { if (emAfEndpoints[index].endpoint == id) @@ -170,10 +170,10 @@ uint8_t emberAfGetDynamicIndexFromEndpoint(EndpointId id) return static_cast(index - FIXED_ENDPOINT_COUNT); } } - return 0xFF; + return 0xFFFF; } -EmberAfStatus emberAfSetDynamicEndpoint(uint8_t index, EndpointId id, EmberAfEndpointType * ep, uint16_t deviceId, +EmberAfStatus emberAfSetDynamicEndpoint(uint16_t index, EndpointId id, EmberAfEndpointType * ep, uint16_t deviceId, uint8_t deviceVersion) { auto realIndex = index + FIXED_ENDPOINT_COUNT; @@ -183,9 +183,8 @@ EmberAfStatus emberAfSetDynamicEndpoint(uint8_t index, EndpointId id, EmberAfEnd return EMBER_ZCL_STATUS_INSUFFICIENT_SPACE; } - index = static_cast(realIndex); - - for (uint8_t i = FIXED_ENDPOINT_COUNT; i < MAX_ENDPOINT_COUNT; i++) + index = static_cast(realIndex); + for (uint16_t i = FIXED_ENDPOINT_COUNT; i < MAX_ENDPOINT_COUNT; i++) { if (emAfEndpoints[i].endpoint == id) { @@ -211,7 +210,7 @@ EmberAfStatus emberAfSetDynamicEndpoint(uint8_t index, EndpointId id, EmberAfEnd return EMBER_ZCL_STATUS_SUCCESS; } -EndpointId emberAfClearDynamicEndpoint(uint8_t index) +EndpointId emberAfClearDynamicEndpoint(uint16_t index) { EndpointId ep = 0; @@ -236,17 +235,17 @@ EndpointId emberAfClearDynamicEndpoint(uint8_t index) return ep; } -uint8_t emberAfFixedEndpointCount(void) +uint16_t emberAfFixedEndpointCount(void) { return FIXED_ENDPOINT_COUNT; } -uint8_t emberAfEndpointCount(void) +uint16_t emberAfEndpointCount(void) { return emberEndpointCount; } -bool emberAfEndpointIndexIsEnabled(uint8_t index) +bool emberAfEndpointIndexIsEnabled(uint16_t index) { return (emAfEndpoints[index].bitmask & EMBER_AF_ENDPOINT_ENABLED); } @@ -275,7 +274,7 @@ bool emberAfIsThisDataTypeAListType(EmberAfAttributeType dataType) } // This function is used to call the per-cluster default response callback -void emberAfClusterDefaultResponseWithMfgCodeCallback(EndpointId endpoint, ClusterId clusterId, uint8_t commandId, +void emberAfClusterDefaultResponseWithMfgCodeCallback(EndpointId endpoint, ClusterId clusterId, CommandId commandId, EmberAfStatus status, uint8_t clientServerMask, uint16_t manufacturerCode) { EmberAfCluster * cluster = emberAfFindClusterWithMfgCode(endpoint, clusterId, clientServerMask, manufacturerCode); @@ -813,8 +812,8 @@ bool emberAfContainsClient(EndpointId endpoint, ClusterId clusterId) EmberAfCluster * emberAfFindClusterWithMfgCode(EndpointId endpoint, ClusterId clusterId, EmberAfClusterMask mask, uint16_t manufacturerCode) { - uint8_t ep = emberAfIndexFromEndpoint(endpoint); - if (ep == 0xFF) + uint16_t ep = emberAfIndexFromEndpoint(endpoint); + if (ep == 0xFFFF) { return NULL; } @@ -836,7 +835,7 @@ EmberAfCluster * emberAfFindCluster(EndpointId endpoint, ClusterId clusterId, Em EmberAfCluster * emberAfFindClusterIncludingDisabledEndpointsWithMfgCode(EndpointId endpoint, ClusterId clusterId, EmberAfClusterMask mask, uint16_t manufacturerCode) { - uint8_t ep = emberAfIndexFromEndpointIncludingDisabledEndpoints(endpoint); + uint16_t ep = emberAfIndexFromEndpointIncludingDisabledEndpoints(endpoint); if (ep < MAX_ENDPOINT_COUNT) { return emberAfFindClusterInTypeWithMfgCode(emAfEndpoints[ep].endpointType, clusterId, mask, manufacturerCode); @@ -852,35 +851,36 @@ EmberAfCluster * emberAfFindClusterIncludingDisabledEndpoints(EndpointId endpoin } // Server wrapper for findClusterEndpointIndex. -static uint8_t emberAfFindClusterServerEndpointIndexWithMfgCode(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode) +static uint16_t emberAfFindClusterServerEndpointIndexWithMfgCode(EndpointId endpoint, ClusterId clusterId, + uint16_t manufacturerCode) { return findClusterEndpointIndex(endpoint, clusterId, CLUSTER_MASK_SERVER, manufacturerCode); } // Client wrapper for findClusterEndpointIndex. -uint8_t emberAfFindClusterClientEndpointIndexWithMfgCode(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode) +uint16_t emberAfFindClusterClientEndpointIndexWithMfgCode(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode) { return findClusterEndpointIndex(endpoint, clusterId, CLUSTER_MASK_CLIENT, manufacturerCode); } // Server wrapper for findClusterEndpointIndex // This will ignore manufacturerCode, and return the index for the first server that matches on clusterId -uint8_t emberAfFindClusterServerEndpointIndex(EndpointId endpoint, ClusterId clusterId) +uint16_t emberAfFindClusterServerEndpointIndex(EndpointId endpoint, ClusterId clusterId) { return emberAfFindClusterServerEndpointIndexWithMfgCode(endpoint, clusterId, EMBER_AF_NULL_MANUFACTURER_CODE); } // Client wrapper for findClusterEndpointIndex // This will ignore manufacturerCode, and return the index for the first client that matches on clusterId -uint8_t emberAfFindClusterClientEndpointIndex(EndpointId endpoint, ClusterId clusterId) +uint16_t emberAfFindClusterClientEndpointIndex(EndpointId endpoint, ClusterId clusterId) { return emberAfFindClusterClientEndpointIndexWithMfgCode(endpoint, clusterId, EMBER_AF_NULL_MANUFACTURER_CODE); } // Returns the endpoint index within a given cluster -static uint8_t findClusterEndpointIndex(EndpointId endpoint, ClusterId clusterId, uint8_t mask, uint16_t manufacturerCode) +static uint16_t findClusterEndpointIndex(EndpointId endpoint, ClusterId clusterId, uint8_t mask, uint16_t manufacturerCode) { - uint8_t i, epi = 0; + uint16_t i, epi = 0; if (emberAfFindClusterWithMfgCode(endpoint, clusterId, mask, manufacturerCode) == NULL) { @@ -893,19 +893,19 @@ static uint8_t findClusterEndpointIndex(EndpointId endpoint, ClusterId clusterId { break; } - epi = static_cast(epi + - ((emberAfFindClusterIncludingDisabledEndpointsWithMfgCode(emAfEndpoints[i].endpoint, clusterId, - mask, manufacturerCode) != NULL) - ? 1 - : 0)); + epi = static_cast(epi + + ((emberAfFindClusterIncludingDisabledEndpointsWithMfgCode(emAfEndpoints[i].endpoint, clusterId, + mask, manufacturerCode) != NULL) + ? 1 + : 0)); } return epi; } -static uint8_t findIndexFromEndpoint(EndpointId endpoint, bool ignoreDisabledEndpoints) +static uint16_t findIndexFromEndpoint(EndpointId endpoint, bool ignoreDisabledEndpoints) { - uint8_t epi; + uint16_t epi; for (epi = 0; epi < emberAfEndpointCount(); epi++) { if (emAfEndpoints[epi].endpoint == endpoint && @@ -919,12 +919,12 @@ static uint8_t findIndexFromEndpoint(EndpointId endpoint, bool ignoreDisabledEnd bool emberAfEndpointIsEnabled(EndpointId endpoint) { - uint8_t index = findIndexFromEndpoint(endpoint, - false); // ignore disabled endpoints? + uint16_t index = findIndexFromEndpoint(endpoint, + false); // ignore disabled endpoints? - EMBER_TEST_ASSERT(0xFF != index); + EMBER_TEST_ASSERT(0xFFFF != index); - if (0xFF == index) + if (0xFFFF == index) { return false; } @@ -934,11 +934,11 @@ bool emberAfEndpointIsEnabled(EndpointId endpoint) bool emberAfEndpointEnableDisable(EndpointId endpoint, bool enable) { - uint8_t index = findIndexFromEndpoint(endpoint, - false); // ignore disabled endpoints? + uint16_t index = findIndexFromEndpoint(endpoint, + false); // ignore disabled endpoints? bool currentlyEnabled; - if (0xFF == index) + if (0xFFFF == index) { return false; } @@ -988,20 +988,20 @@ bool emberAfEndpointEnableDisable(EndpointId endpoint, bool enable) } // Returns the index of a given endpoint. Does not consider disabled endpoints. -uint8_t emberAfIndexFromEndpoint(EndpointId endpoint) +uint16_t emberAfIndexFromEndpoint(EndpointId endpoint) { return findIndexFromEndpoint(endpoint, true); // ignore disabled endpoints? } // Returns the index of a given endpoint. Considers disabled endpoints. -uint8_t emberAfIndexFromEndpointIncludingDisabledEndpoints(EndpointId endpoint) +uint16_t emberAfIndexFromEndpointIncludingDisabledEndpoints(EndpointId endpoint) { return findIndexFromEndpoint(endpoint, false); // ignore disabled endpoints? } -EndpointId emberAfEndpointFromIndex(uint8_t index) +EndpointId emberAfEndpointFromIndex(uint16_t index) { return emAfEndpoints[index].endpoint; } @@ -1010,12 +1010,12 @@ EndpointId emberAfEndpointFromIndex(uint8_t index) // otherwise number of client clusters on this endpoint uint8_t emberAfClusterCount(EndpointId endpoint, bool server) { - uint8_t index = emberAfIndexFromEndpoint(endpoint); + uint16_t index = emberAfIndexFromEndpoint(endpoint); uint8_t i, c = 0; EmberAfDefinedEndpoint * de; EmberAfCluster * cluster; - if (index == 0xFF) + if (index == 0xFFFF) { return 0; } @@ -1041,8 +1041,8 @@ uint8_t emberAfClusterCount(EndpointId endpoint, bool server) uint8_t emberAfGetClusterCountForEndpoint(EndpointId endpoint) { - uint8_t index = emberAfIndexFromEndpoint(endpoint); - if (index == 0xFF) + uint16_t index = emberAfIndexFromEndpoint(endpoint); + if (index == 0xFFFF) { return 0; } @@ -1060,10 +1060,10 @@ uint8_t emberAfGetClusterCountForEndpoint(EndpointId endpoint) // Don't mix them. EmberAfCluster * emberAfGetClusterByIndex(EndpointId endpoint, uint8_t clusterIndex) { - uint8_t endpointIndex = emberAfIndexFromEndpoint(endpoint); + uint16_t endpointIndex = emberAfIndexFromEndpoint(endpoint); EmberAfDefinedEndpoint * definedEndpoint; - if (endpointIndex == 0xFF) + if (endpointIndex == 0xFFFF) { return NULL; } @@ -1078,8 +1078,8 @@ EmberAfCluster * emberAfGetClusterByIndex(EndpointId endpoint, uint8_t clusterIn uint16_t emberAfGetDeviceIdForEndpoint(EndpointId endpoint) { - uint8_t endpointIndex = emberAfIndexFromEndpoint(endpoint); - if (endpointIndex == 0xFF) + uint16_t endpointIndex = emberAfIndexFromEndpoint(endpoint); + if (endpointIndex == 0xFFFF) { return 0xFFFF; } @@ -1090,12 +1090,12 @@ uint16_t emberAfGetDeviceIdForEndpoint(EndpointId endpoint) // depending on server toggle. EmberAfCluster * emberAfGetNthCluster(EndpointId endpoint, uint8_t n, bool server) { - uint8_t index = emberAfIndexFromEndpoint(endpoint); + uint16_t index = emberAfIndexFromEndpoint(endpoint); EmberAfDefinedEndpoint * de; uint8_t i, c = 0; EmberAfCluster * cluster; - if (index == 0xFF) + if (index == 0xFFFF) { return NULL; } @@ -1148,10 +1148,11 @@ void emberAfResetAttributes(EndpointId endpoint) void emAfLoadAttributeDefaults(EndpointId endpoint, bool writeTokens) { - uint8_t ep, clusterI, curNetwork = 0 /* emberGetCurrentNetwork() */; + uint16_t ep; + uint8_t clusterI, curNetwork = 0 /* emberGetCurrentNetwork() */; uint16_t attr; uint8_t * ptr; - uint8_t epCount = emberAfEndpointCount(); + uint16_t epCount = emberAfEndpointCount(); for (ep = 0; ep < epCount; ep++) { @@ -1159,7 +1160,7 @@ void emAfLoadAttributeDefaults(EndpointId endpoint, bool writeTokens) if (endpoint != EMBER_BROADCAST_ENDPOINT) { ep = emberAfIndexFromEndpoint(endpoint); - if (ep == 0xFF) + if (ep == 0xFFFF) { return; } diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h index 912e153c7adbf5..7c8b8f01045732 100644 --- a/src/app/util/attribute-storage.h +++ b/src/app/util/attribute-storage.h @@ -210,12 +210,13 @@ EmberAfStatus emAfClusterPreAttributeChangedCallback(chip::EndpointId endpoint, // Calls the default response callback for a specific cluster, and wraps emberAfClusterDefaultResponseWithMfgCodeCallback // with the EMBER_NULL_MANUFACTURER_CODE -void emberAfClusterDefaultResponseCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, uint8_t commandId, +void emberAfClusterDefaultResponseCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::CommandId commandId, EmberAfStatus status, uint8_t clientServerMask); // Calls the default response callback for a specific cluster. -void emberAfClusterDefaultResponseWithMfgCodeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, uint8_t commandId, - EmberAfStatus status, uint8_t clientServerMask, uint16_t manufacturerCode); +void emberAfClusterDefaultResponseWithMfgCodeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, + chip::CommandId commandId, EmberAfStatus status, uint8_t clientServerMask, + uint16_t manufacturerCode); // Calls the message sent callback for a specific cluster, and wraps emberAfClusterMessageSentWithMfgCodeCallback void emberAfClusterMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, uint16_t msgLen, @@ -249,7 +250,7 @@ uint8_t emberAfGetClusterCountForEndpoint(chip::EndpointId endpoint); EmberAfCluster * emberAfGetClusterByIndex(chip::EndpointId endpoint, uint8_t clusterIndex); uint16_t emberAfGetDeviceIdForEndpoint(chip::EndpointId endpoint); -EmberAfStatus emberAfSetDynamicEndpoint(uint8_t index, chip::EndpointId id, EmberAfEndpointType * ep, uint16_t deviceId, +EmberAfStatus emberAfSetDynamicEndpoint(uint16_t index, chip::EndpointId id, EmberAfEndpointType * ep, uint16_t deviceId, uint8_t deviceVersion); -chip::EndpointId emberAfClearDynamicEndpoint(uint8_t index); -uint8_t emberAfGetDynamicIndexFromEndpoint(chip::EndpointId id); +chip::EndpointId emberAfClearDynamicEndpoint(uint16_t index); +uint16_t emberAfGetDynamicIndexFromEndpoint(chip::EndpointId id); diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp index 866052379894d7..b7d2951caf28bc 100644 --- a/src/app/util/attribute-table.cpp +++ b/src/app/util/attribute-table.cpp @@ -214,7 +214,7 @@ bool emberAfReadSequentialAttributesAddToResponse(EndpointId endpoint, ClusterId } else if (discovered < maxAttributeIds) { - emberAfPutInt16uInResp(metadata->attributeId); + emberAfPutInt32uInResp(metadata->attributeId); emberAfPutInt8uInResp(metadata->attributeType); if (includeAccessControl) { @@ -365,7 +365,7 @@ void emberAfRetrieveAttributeAndCraftResponse(EndpointId endpoint, ClusterId clu } else { - emberAfPutInt16uInResp(attrId); + emberAfPutInt32uInResp(attrId); emberAfPutStatusInResp(status); emberAfAttributesPrintln("READ: clus %2x, attr %2x failed %x", clusterId, attrId, status); emberAfAttributesFlush(); @@ -373,7 +373,7 @@ void emberAfRetrieveAttributeAndCraftResponse(EndpointId endpoint, ClusterId clu } // put attribute in least sig byte first - emberAfPutInt16uInResp(attrId); + emberAfPutInt32uInResp(attrId); // attribute is found, so copy in the status and the data type emberAfPutInt8uInResp(EMBER_ZCL_STATUS_SUCCESS); diff --git a/src/app/util/basic-types.h b/src/app/util/basic-types.h index 5097ef8bd299ad..5f6e82111da5d5 100644 --- a/src/app/util/basic-types.h +++ b/src/app/util/basic-types.h @@ -33,17 +33,17 @@ namespace chip { typedef uint8_t ActionId; -typedef uint16_t AttributeId; -typedef uint16_t ClusterId; -typedef uint8_t CommandId; -typedef uint64_t DataVersion; +typedef uint32_t AttributeId; +typedef uint32_t ClusterId; +typedef uint32_t CommandId; +typedef uint32_t DataVersion; typedef uint32_t DeviceTypeId; -typedef uint8_t EndpointId; -typedef uint16_t EventId; +typedef uint16_t EndpointId; +typedef uint32_t EventId; typedef uint64_t EventNumber; typedef uint64_t FabricId; typedef uint8_t FabricIndex; -typedef uint8_t FieldId; +typedef uint32_t FieldId; typedef uint16_t GroupId; typedef uint16_t ListIndex; typedef uint32_t TransactionId; diff --git a/src/app/util/client-api.cpp b/src/app/util/client-api.cpp index b4b2d0c24bf381..53250ea3f7b5db 100644 --- a/src/app/util/client-api.cpp +++ b/src/app/util/client-api.cpp @@ -89,7 +89,10 @@ static uint16_t vFillBuffer(uint8_t * buffer, uint16_t bufferLen, uint8_t frameC buffer[bytes++] = EMBER_HIGH_BYTE(manufacturerCode); } buffer[bytes++] = emberAfNextSequence(); - buffer[bytes++] = commandId; + buffer[bytes++] = EMBER_BYTE_0(commandId); + buffer[bytes++] = EMBER_BYTE_1(commandId); + buffer[bytes++] = EMBER_BYTE_2(commandId); + buffer[bytes++] = EMBER_BYTE_3(commandId); // Each argument comes in as an integer value, a pointer to a buffer, or a // pointer to a buffer followed by an integer length. diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp index 08bc3dd6f8af58..f8cfca2264004c 100644 --- a/src/app/util/ember-compatibility-functions.cpp +++ b/src/app/util/ember-compatibility-functions.cpp @@ -59,32 +59,59 @@ EmberAfAttributeType BaseType(EmberAfAttributeType type) { switch (type) { - case ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE: // Endpoint Id - case ZCL_COMMAND_ID_ATTRIBUTE_TYPE: // Command Id - case ZCL_BITMAP8_ATTRIBUTE_TYPE: // 8-bit bitmap - case ZCL_ENUM8_ATTRIBUTE_TYPE: // 8-bit enumeration - static_assert(std::is_same::value, - "chip::EndpointId is expected to be uint8_t, change this when necessary"); - static_assert(std::is_same::value, - "chip::CommandId is expected to be uint8_t, change this when necessary"); + case ZCL_ACTION_ID_ATTRIBUTE_TYPE: // Action Id + case ZCL_FABRIC_IDX_ATTRIBUTE_TYPE: // Fabric Index + case ZCL_BITMAP8_ATTRIBUTE_TYPE: // 8-bit bitmap + case ZCL_ENUM8_ATTRIBUTE_TYPE: // 8-bit enumeration return ZCL_INT8U_ATTRIBUTE_TYPE; - case ZCL_GROUP_ID_ATTRIBUTE_TYPE: // Group Id - case ZCL_ENUM16_ATTRIBUTE_TYPE: // 16-bit enumeration - case ZCL_BITMAP16_ATTRIBUTE_TYPE: // 16-bit bitmap + case ZCL_ENDPOINT_NO_ATTRIBUTE_TYPE: // Endpoint Number + case ZCL_GROUP_ID_ATTRIBUTE_TYPE: // Group Id + case ZCL_VENDOR_ID_ATTRIBUTE_TYPE: // Vendor Id + case ZCL_ENUM16_ATTRIBUTE_TYPE: // 16-bit enumeration + case ZCL_BITMAP16_ATTRIBUTE_TYPE: // 16-bit bitmap + static_assert(std::is_same::value, + "chip::EndpointId is expected to be uint8_t, change this when necessary"); static_assert(std::is_same::value, "chip::GroupId is expected to be uint16_t, change this when necessary"); return ZCL_INT16U_ATTRIBUTE_TYPE; - case ZCL_BITMAP32_ATTRIBUTE_TYPE: // 32-bit bitmap - case ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE: // Device Type Id + case ZCL_CLUSTER_ID_ATTRIBUTE_TYPE: // Cluster Id + case ZCL_ATTRIB_ID_ATTRIBUTE_TYPE: // Attribute Id + case ZCL_FIELD_ID_ATTRIBUTE_TYPE: // Field Id + case ZCL_EVENT_ID_ATTRIBUTE_TYPE: // Event Id + case ZCL_COMMAND_ID_ATTRIBUTE_TYPE: // Command Id + case ZCL_TRANS_ID_ATTRIBUTE_TYPE: // Transaction Id + case ZCL_DEVTYPE_ID_ATTRIBUTE_TYPE: // Device Type Id + case ZCL_STATUS_ATTRIBUTE_TYPE: // Status Code + case ZCL_DATA_VER_ATTRIBUTE_TYPE: // Data Version + case ZCL_BITMAP32_ATTRIBUTE_TYPE: // 32-bit bitmap + static_assert(std::is_same::value, + "chip::Cluster is expected to be uint32_t, change this when necessary"); + static_assert(std::is_same::value, + "chip::AttributeId is expected to be uint32_t, change this when necessary"); + static_assert(std::is_same::value, + "chip::FieldId is expected to be uint32_t, change this when necessary"); + static_assert(std::is_same::value, + "chip::EventId is expected to be uint32_t, change this when necessary"); + static_assert(std::is_same::value, + "chip::CommandId is expected to be uint32_t, change this when necessary"); + static_assert(std::is_same::value, + "chip::TransactionId is expected to be uint32_t, change this when necessary"); static_assert(std::is_same::value, "chip::DeviceTypeId is expected to be uint32_t, change this when necessary"); + static_assert(std::is_same::value, + "chip::StatusCode is expected to be uint32_t, change this when necessary"); + static_assert(std::is_same::value, + "chip::DataVersion is expected to be uint32_t, change this when necessary"); return ZCL_INT32U_ATTRIBUTE_TYPE; - case ZCL_BITMAP64_ATTRIBUTE_TYPE: // 64-bit bitmap + case ZCL_EVENT_NO_ATTRIBUTE_TYPE: // Event Number case ZCL_FABRIC_ID_ATTRIBUTE_TYPE: // Fabric Id case ZCL_NODE_ID_ATTRIBUTE_TYPE: // Node Id + case ZCL_BITMAP64_ATTRIBUTE_TYPE: // 64-bit bitmap + static_assert(std::is_same::value, + "chip::EventNumber is expected to be uint64_t, change this when necessary"); static_assert(std::is_same::value, "chip::FabricId is expected to be uint64_t, change this when necessary"); static_assert(std::is_same::value, @@ -165,8 +192,8 @@ CHIP_ERROR ReadSingleClusterData(ClusterInfo & aClusterInfo, TLV::TLVWriter * ap static uint8_t data[kAttributeReadBufferSize]; ChipLogDetail(DataManagement, - "Received Cluster Command: Cluster=%" PRIx16 " NodeId=0x" ChipLogFormatX64 " Endpoint=%" PRIx8 " FieldId=%" PRIx16 - " ListIndex=%" PRIx16, + "Received Cluster Command: Cluster=%" PRIx32 " NodeId=0x" ChipLogFormatX64 " Endpoint=%" PRIx16 + " FieldId=%" PRIx32 " ListIndex=%" PRIx16, aClusterInfo.mClusterId, ChipLogValueX64(aClusterInfo.mNodeId), aClusterInfo.mEndpointId, aClusterInfo.mFieldId, aClusterInfo.mListIndex); diff --git a/src/app/util/process-global-message.cpp b/src/app/util/process-global-message.cpp index 2f56c62c0242f5..5eee5f5e9917a8 100644 --- a/src/app/util/process-global-message.cpp +++ b/src/app/util/process-global-message.cpp @@ -75,12 +75,12 @@ bool emAfSyncingTime = false; #define DISC_ATTR_RSP_MAX_ATTRIBUTES \ (((EMBER_AF_MAXIMUM_SEND_PAYLOAD_LENGTH - EMBER_AF_ZCL_MANUFACTURER_SPECIFIC_OVERHEAD /* max ZCL header size */ \ - 1) /* discovery is complete boolean */ \ - / 3) /* size of one discover attributes response entry */ \ + / 5) /* size of one discover attributes response entry */ \ % UINT8_MAX) /* make count fit in an 8 bit integer */ #define DISC_ATTR_EXT_RSP_MAX_ATTRIBUTES \ (((EMBER_AF_MAXIMUM_SEND_PAYLOAD_LENGTH - EMBER_AF_ZCL_MANUFACTURER_SPECIFIC_OVERHEAD /* max ZCL header size */ \ - 1) /* discovery is complete boolean */ \ - / 4) /* size of one discover attributes extended response entry */ \ + / 5) /* size of one discover attributes extended response entry */ \ % UINT8_MAX) /* make count fit in an 8 bit integer */ #if defined(EMBER_AF_SUPPORT_COMMAND_DISCOVERY) @@ -165,18 +165,18 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) uint16_t dataSize; EmberAfStatus status; - emberAfPutInt8uInResp(ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID); + emberAfPutInt32uInResp(ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID); // Go through the message until there are no more attrID/type/data - while (msgIndex < msgLen - 3) + while (msgIndex < msgLen - 5) { - attrId = emberAfGetInt16u(message, msgIndex, msgLen); - dataType = emberAfGetInt8u(message, msgIndex + 2, msgLen); + attrId = emberAfGetInt32u(message, msgIndex, msgLen); + dataType = emberAfGetInt8u(message, msgIndex + 4, msgLen); - dataSize = emberAfAttributeValueSize(clusterId, attrId, dataType, message + msgIndex + 3); + dataSize = emberAfAttributeValueSize(clusterId, attrId, dataType, message + msgIndex + 5); // Check to see if there are dataSize bytes left in the message if it is a string - if (emberAfIsThisDataTypeAStringType(dataType) && (dataSize < msgLen - (msgIndex + 3))) + if (emberAfIsThisDataTypeAStringType(dataType) && (dataSize < msgLen - (msgIndex + 5))) { // This command is malformed status = EMBER_ZCL_STATUS_MALFORMED_COMMAND; @@ -184,7 +184,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) else { status = emberAfVerifyAttributeWrite(cmd->apsFrame->destinationEndpoint, clusterId, attrId, clientServerMask, - cmd->mfgCode, &(message[msgIndex + 3]), dataType); + cmd->mfgCode, &(message[msgIndex + 5]), dataType); } if (status != EMBER_ZCL_STATUS_SUCCESS) @@ -192,7 +192,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) numFailures++; // Write to the response buffer - status and then attrID emberAfPutStatusInResp(status); - emberAfPutInt16uInResp(attrId); + emberAfPutInt32uInResp(attrId); emberAfAttributesPrintln("WRITE: clus %2x attr %2x ", clusterId, attrId); emberAfAttributesPrintln("FAIL %x", status); @@ -204,9 +204,9 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) } } - // Increment past the attribute id (two bytes), the type (one byte), and + // Increment past the attribute id (four bytes), the type (one byte), and // the data (N bytes, including the length byte for strings). - msgIndex = static_cast(msgIndex + 3 + dataSize); + msgIndex = static_cast(msgIndex + 5 + dataSize); } // If there are any failures, send the response and exit if (numFailures > 0) @@ -223,7 +223,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) // DO NOT BREAK from this case // the format of the write attributes cmd is: - // ([attr ID:2] [data type:1] [data:N]) * N + // ([attr ID:4] [data type:1] [data:N]) * N // the format of the write attributes response is: // ([status 1] [attr ID 2]) * n // ONLY errors are reported unless all are successful then a single success @@ -243,28 +243,28 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) // set the cmd byte - this is byte 3 index 2, but since we have // already incremented past the 3 byte ZCL header (our index is at 3), // this gets written to "-1" since 3 - 1 = 2. - emberAfPutInt8uInResp(ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID); + emberAfPutInt32uInResp(ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID); // go through the message until there are no more attrID/type/data - while (msgLen > msgIndex + 3) + while (msgLen > msgIndex + 5) { - attrId = emberAfGetInt16u(message, msgIndex, msgLen); - dataType = emberAfGetInt8u(message, msgIndex + 2, msgLen); + attrId = emberAfGetInt32u(message, msgIndex, msgLen); + dataType = emberAfGetInt8u(message, msgIndex + 4, msgLen); - dataSize = emberAfAttributeValueSize(clusterId, attrId, dataType, message + msgIndex + 3); + dataSize = emberAfAttributeValueSize(clusterId, attrId, dataType, message + msgIndex + 5); // the data is sent little endian over-the-air, it needs to be // inserted into the table big endian for the EM250 and little // endian for the EZSP hosts. This means for the EM250 the data // needs to be reversed before sending to writeAttributes #if (BIGENDIAN_CPU) - if (dataSize <= msgLen - (msgIndex + 3) && dataSize <= ATTRIBUTE_LARGEST) + if (dataSize <= msgLen - (msgIndex + 5) && dataSize <= ATTRIBUTE_LARGEST) { // strings go over the air as length byte and then in human // readable format. These should not be flipped. if (emberAfIsThisDataTypeAStringType(dataType)) { - memmove(writeData, message + msgIndex + 3, dataSize); + memmove(writeData, message + msgIndex + 5, dataSize); } else { @@ -273,11 +273,11 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) uint16_t i; for (i = 0; i < dataSize; i++) { - writeData[i] = message[msgIndex + 3 + dataSize - i - 1]; + writeData[i] = message[msgIndex + 5 + dataSize - i - 1]; } } #else //(BIGENDIAN_CPU) - if (dataSize <= msgLen - (msgIndex + 3)) + if (dataSize <= msgLen - (msgIndex + 5)) { #endif //(BIGENDIAN_CPU) @@ -286,7 +286,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) #if (BIGENDIAN_CPU) writeData, #else //(BIGENDIAN_CPU) - &(message[msgIndex + 3]), + &(message[msgIndex + 5]), #endif //(BIGENDIAN_CPU) dataType); emberAfAttributesPrint("WRITE: clus %2x attr %2x ", clusterId, attrId); @@ -300,14 +300,14 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) numFailures++; // write to the response buffer - status and then attrID emberAfPutStatusInResp(status); - emberAfPutInt16uInResp(attrId); + emberAfPutInt32uInResp(attrId); emberAfAttributesPrintln("FAIL %x", status); } emberAfCoreFlush(); - // Increment past the attribute id (two bytes), the type (one byte), and + // Increment past the attribute id (four bytes), the type (one byte), and // the data (N bytes, including the length byte for strings). - msgIndex = static_cast(msgIndex + 3 + dataSize); + msgIndex = static_cast(msgIndex + 5 + dataSize); } else { @@ -315,7 +315,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) status = EMBER_ZCL_STATUS_INVALID_VALUE; // write to the response buffer - status and then attrID emberAfPutStatusInResp(status); - emberAfPutInt16uInResp(attrId); + emberAfPutInt32uInResp(attrId); emberAfAttributesPrintln("FAIL %x", status); // size exceeds buffer, terminate loop break; @@ -350,8 +350,8 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) return true; } - // the format of discover is: [start attr ID:2] [max attr IDs:1] - // the format of the response is: [done:1] ([attrID:2] [type:1]) * N + // the format of discover is: [start attr ID:4] [max attr IDs:1] + // the format of the response is: [done:1] ([attrID:4] [type:1]) * N case ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID: case ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID: { AttributeId startingAttributeId; @@ -364,13 +364,13 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) // set the cmd byte - this is byte 3 index 2, but since we have // already incremented past the 3 byte ZCL header (our index is at 3), // this gets written to "-1" since 3 - 1 = 2. - emberAfPutInt8uInResp((zclCmd == ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID - ? ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID - : ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID)); + emberAfPutInt32uInResp((zclCmd == ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID + ? ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID + : ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID)); // get the attrId to start on and the max count - startingAttributeId = emberAfGetInt16u(message, msgIndex, msgLen); - numberAttributes = emberAfGetInt8u(message, msgIndex + 2, msgLen); + startingAttributeId = emberAfGetInt32u(message, msgIndex, msgLen); + numberAttributes = emberAfGetInt8u(message, msgIndex + 4, msgLen); // BUGZID: EMAPPFWKV2-828, EMAPPFWKV2-1401 if (zclCmd == ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID && numberAttributes > DISC_ATTR_RSP_MAX_ATTRIBUTES) @@ -414,7 +414,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) } break; - // ([attribute id:2] [status:1] [type:0/1] [value:0/V])+ + // ([attribute id:4] [status:1] [type:0/1] [value:0/V])+ case ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID: // The "timesync" command in the CLI sends a Read Attributes command for the // Time attribute on another device and then sets a flag. If that flag is @@ -422,10 +422,10 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) // the time to the value in the message. if (clusterId == ZCL_TIME_CLUSTER_ID) { - if (emAfSyncingTime && !cmd->mfgSpecific && msgLen - msgIndex == 8 // attr:2 status:1 type:1 data:4 - && (emberAfGetInt16u(message, msgIndex, msgLen) == ZCL_TIME_ATTRIBUTE_ID) && - (emberAfGetInt8u(message, msgIndex + 2, msgLen) == EMBER_ZCL_STATUS_SUCCESS) && - (emberAfGetInt8u(message, msgIndex + 3, msgLen) == ZCL_UTC_TIME_ATTRIBUTE_TYPE)) + if (emAfSyncingTime && !cmd->mfgSpecific && msgLen - msgIndex == 10 // attr:4 status:1 type:1 data:4 + && (emberAfGetInt32u(message, msgIndex, msgLen) == ZCL_TIME_ATTRIBUTE_ID) && + (emberAfGetInt8u(message, msgIndex + 4, msgLen) == EMBER_ZCL_STATUS_SUCCESS) && + (emberAfGetInt8u(message, msgIndex + 5, msgLen) == ZCL_UTC_ATTRIBUTE_TYPE)) { // emberAfSetTime(emberAfGetInt32u(message, msgIndex + 4, msgLen)); // emberAfDebugPrintln("time sync ok, time: %4x", emberAfGetCurrentTime()); @@ -448,13 +448,13 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) #if defined(EMBER_AF_PLUGIN_KEY_ESTABLISHMENT) if (clusterId == ZCL_KEY_ESTABLISHMENT_CLUSTER_ID && !cmd->mfgSpecific && - msgLen - msgIndex == 6 // attr:2 status:1 type:1 data:2 - && (emberAfGetInt16u(message, msgIndex, msgLen) == ZCL_KEY_ESTABLISHMENT_SUITE_CLIENT_ATTRIBUTE_ID) && - (emberAfGetInt8u(message, msgIndex + 2, msgLen) == EMBER_ZCL_STATUS_SUCCESS) && - ((emberAfGetInt8u(message, msgIndex + 3, msgLen) == ZCL_ENUM16_ATTRIBUTE_TYPE) || - (emberAfGetInt8u(message, msgIndex + 3, msgLen) == ZCL_BITMAP16_ATTRIBUTE_TYPE))) + msgLen - msgIndex == 8 // attr:4 status:1 type:1 data:2 + && (emberAfGetInt32u(message, msgIndex, msgLen) == ZCL_KEY_ESTABLISHMENT_SUITE_CLIENT_ATTRIBUTE_ID) && + (emberAfGetInt8u(message, msgIndex + 4, msgLen) == EMBER_ZCL_STATUS_SUCCESS) && + ((emberAfGetInt8u(message, msgIndex + 5, msgLen) == ZCL_ENUM16_ATTRIBUTE_TYPE) || + (emberAfGetInt8u(message, msgIndex + 5, msgLen) == ZCL_BITMAP16_ATTRIBUTE_TYPE))) { - uint16_t suite = emberAfGetInt16u(message, msgIndex + 4, msgLen); + uint16_t suite = emberAfGetInt16u(message, msgIndex + 6, msgLen); emberAfPluginKeyEstablishmentReadAttributesCallback(suite); } #endif @@ -475,7 +475,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) return true; - // ([status:1] [attribute id:2])+ + // ([status:1] [attribute id:4])+ case ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID: #if defined(EMBER_AF_PLUGIN_TEST_HARNESS) @@ -494,7 +494,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) } return true; - // ([status:1] [direction:1] [attribute id:2])+ + // ([status:1] [direction:1] [attribute id:4])+ case ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID: if (!emberAfConfigureReportingResponseCallback(clusterId, message + msgIndex, static_cast(msgLen - msgIndex))) { @@ -502,7 +502,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) } return true; - // ([status:1] [direction:1] [attribute id:2] [type:0/1] ... + // ([status:1] [direction:1] [attribute id:4] [type:0/1] ... // ... [min interval:0/2] [max interval:0/2] [reportable change:0/V] ... // ... [timeout:0/2])+ case ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID: @@ -513,7 +513,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) } return true; - // ([attribute id:2] [type:1] [data:V])+ + // ([attribute id:4] [type:1] [data:V])+ case ZCL_REPORT_ATTRIBUTES_COMMAND_ID: if (!emberAfReportAttributesCallback(clusterId, message + msgIndex, static_cast(msgLen - msgIndex))) { @@ -521,13 +521,12 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) } return true; - // [command id:1] [status:1] + // [command id:4] [status:1] case ZCL_DEFAULT_RESPONSE_COMMAND_ID: { EmberAfStatus status; CommandId commandId; - commandId = emberAfGetInt8u(message, msgIndex, msgLen); - msgIndex++; - status = (EmberAfStatus) emberAfGetInt8u(message, msgIndex, msgLen); + commandId = emberAfGetInt32u(message, msgIndex, msgLen); + status = (EmberAfStatus) emberAfGetInt8u(message, msgIndex + 4, msgLen); emberAfClusterDefaultResponseWithMfgCodeCallback(cmd->apsFrame->destinationEndpoint, clusterId, commandId, status, clientServerMask, cmd->mfgCode); @@ -535,7 +534,7 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) return true; } - // [discovery complete:1] ([attribute id:2] [type:1])* + // [discovery complete:1] ([attribute id:4] [type:1])* case ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID: case ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID: { bool discoveryComplete = emberAfGetInt8u(message, msgIndex, msgLen); @@ -562,12 +561,12 @@ bool emAfProcessGlobalCommand(EmberAfClusterCommand * cmd) // Ok. This is the command that matters. if (zclCmd == ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID) { - emberAfPutInt8uInResp(ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID); + emberAfPutInt32uInResp(ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID); flag = false; } else { - emberAfPutInt8uInResp(ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID); + emberAfPutInt32uInResp(ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID); flag = true; } savedIndex = appResponseLength; diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp index 09d7e767759195..ab1cc3cb345123 100644 --- a/src/app/util/util.cpp +++ b/src/app/util/util.cpp @@ -158,7 +158,7 @@ EMBER_AF_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS // Device enabled/disabled functions bool emberAfIsDeviceEnabled(EndpointId endpoint) { - uint8_t index; + uint16_t index; #ifdef ZCL_USING_BASIC_CLUSTER_DEVICE_ENABLED_ATTRIBUTE bool deviceEnabled; if (emberAfReadServerAttribute(endpoint, ZCL_BASIC_CLUSTER_ID, ZCL_DEVICE_ENABLED_ATTRIBUTE_ID, (uint8_t *) &deviceEnabled, @@ -168,7 +168,7 @@ bool emberAfIsDeviceEnabled(EndpointId endpoint) } #endif index = emberAfIndexFromEndpoint(endpoint); - if (index != 0xFF && index < sizeof(afDeviceEnabled)) + if (index != 0xFFFF && index < sizeof(afDeviceEnabled)) { return afDeviceEnabled[index]; } @@ -177,8 +177,8 @@ bool emberAfIsDeviceEnabled(EndpointId endpoint) void emberAfSetDeviceEnabled(EndpointId endpoint, bool enabled) { - uint8_t index = emberAfIndexFromEndpoint(endpoint); - if (index != 0xFF && index < sizeof(afDeviceEnabled)) + uint16_t index = emberAfIndexFromEndpoint(endpoint); + if (index != 0xFFFF && index < sizeof(afDeviceEnabled)) { afDeviceEnabled[index] = enabled; } @@ -362,7 +362,7 @@ void emberAfStackDown(void) uint16_t emberAfFindClusterNameIndexWithMfgCode(ClusterId cluster, uint16_t mfgCode) { - static_assert(sizeof(ClusterId) == 2, "May need to adjust our index type or somehow define it in terms of cluster id type"); + static_assert(sizeof(ClusterId) == 4, "May need to adjust our index type or somehow define it in terms of cluster id type"); uint16_t index = 0; while (zclClusterNames[index].id != ZCL_NULL_CLUSTER_ID) { @@ -394,8 +394,8 @@ void emberAfDecodeAndPrintClusterWithMfgCode(ClusterId cluster, uint16_t mfgCode uint16_t index = emberAfFindClusterNameIndexWithMfgCode(cluster, mfgCode); if (index == 0xFFFF) { - static_assert(sizeof(ClusterId) == 2, "Adjust the print formatting"); - emberAfPrint(emberAfPrintActiveArea, "(Unknown clus. [0x%2x])", cluster); + static_assert(sizeof(ClusterId) == 4, "Adjust the print formatting"); + emberAfPrint(emberAfPrintActiveArea, "(Unknown clus. [0x%4x])", cluster); } else { @@ -454,9 +454,9 @@ static void printIncomingZclMessage(const EmberAfClusterCommand * cmd) static bool dispatchZclMessage(EmberAfClusterCommand * cmd) { - uint8_t index = emberAfIndexFromEndpoint(cmd->apsFrame->destinationEndpoint); + uint16_t index = emberAfIndexFromEndpoint(cmd->apsFrame->destinationEndpoint); - if (index == 0xFF) + if (index == 0xFFFF) { emberAfDebugPrint("Drop cluster 0x%2x command 0x%x", cmd->apsFrame->clusterId, cmd->commandId); emberAfDebugPrint(" due to invalid endpoint: "); @@ -519,8 +519,9 @@ bool emberAfProcessMessageIntoZclCmd(EmberApsFrame * apsFrame, EmberIncomingMess { returnCmd->mfgCode = EMBER_AF_NULL_MANUFACTURER_CODE; } - returnCmd->seqNum = message[returnCmd->payloadStartIndex++]; - returnCmd->commandId = message[returnCmd->payloadStartIndex++]; + returnCmd->seqNum = message[returnCmd->payloadStartIndex++]; + returnCmd->commandId = emberAfGetInt32u(message, returnCmd->payloadStartIndex, returnCmd->bufLen); + returnCmd->payloadStartIndex = static_cast(returnCmd->payloadStartIndex + 4); if (returnCmd->payloadStartIndex > returnCmd->bufLen) { emberAfAppPrintln("%pRX pkt malformed: %d < %d", "ERROR: ", returnCmd->bufLen, returnCmd->payloadStartIndex); @@ -845,7 +846,7 @@ EmberStatus emberAfSendDefaultResponseWithCallback(const EmberAfClusterCommand * } emberAfPutInt8uInResp(cmd->seqNum); emberAfPutInt8uInResp(ZCL_DEFAULT_RESPONSE_COMMAND_ID); - emberAfPutInt8uInResp(cmd->commandId); + emberAfPutInt32uInResp(cmd->commandId); emberAfPutStatusInResp(status); prepareForResponse(cmd); @@ -1040,8 +1041,8 @@ bool emberAfIsTypeSigned(EmberAfAttributeType dataType) EmberStatus emberAfEndpointEventControlSetInactive(EmberEventControl * controls, EndpointId endpoint) { - uint8_t index = emberAfIndexFromEndpoint(endpoint); - if (index == 0xFF) + uint16_t index = emberAfIndexFromEndpoint(endpoint); + if (index == 0xFFFF) { return EMBER_INVALID_ENDPOINT; } @@ -1051,14 +1052,14 @@ EmberStatus emberAfEndpointEventControlSetInactive(EmberEventControl * controls, bool emberAfEndpointEventControlGetActive(EmberEventControl * controls, EndpointId endpoint) { - uint8_t index = emberAfIndexFromEndpoint(endpoint); - return (index != 0xFF && emberEventControlGetActive(&controls[index])); + uint16_t index = emberAfIndexFromEndpoint(endpoint); + return (index != 0xFFFF && emberEventControlGetActive(&controls[index])); } EmberStatus emberAfEndpointEventControlSetActive(EmberEventControl * controls, EndpointId endpoint) { - uint8_t index = emberAfIndexFromEndpoint(endpoint); - if (index == 0xFF) + uint16_t index = emberAfIndexFromEndpoint(endpoint); + if (index == 0xFFFF) { return EMBER_INVALID_ENDPOINT; } diff --git a/src/app/zap-templates/common/ChipTypesHelper.js b/src/app/zap-templates/common/ChipTypesHelper.js index 8033e146ac5c6d..c0e512bf8a87e3 100644 --- a/src/app/zap-templates/common/ChipTypesHelper.js +++ b/src/app/zap-templates/common/ChipTypesHelper.js @@ -19,22 +19,22 @@ function asBasicType(type) { switch (type) { case 'chip::ActionId': - case 'chip::CommandId': - case 'chip::EndpointId': case 'chip::FabricIndex': - case 'chip::FieldId': return 'uint8_t'; - case 'chip::AttributeId': - case 'chip::ClusterId': - case 'chip::EventId': + case 'chip::EndpointId': case 'chip::GroupId': case 'chip::VendorId': return 'uint16_t'; - case 'chip::DeviceTypeId': + case 'chip::ClusterId': + case 'chip::AttributeId': + case 'chip::FieldId': + case 'chip::EventId': + case 'chip::CommandId': case 'chip::TransactionId': + case 'chip::DeviceTypeId': case 'chip::StatusCode': - return 'uint32_t'; case 'chip::DataVersion': + return 'uint32_t'; case 'chip::EventNumber': case 'chip::FabricId': case 'chip::NodeId': diff --git a/src/app/zap-templates/common/override.js b/src/app/zap-templates/common/override.js index adb9de13e87f9f..2f6e7a904fbcc1 100644 --- a/src/app/zap-templates/common/override.js +++ b/src/app/zap-templates/common/override.js @@ -19,11 +19,8 @@ function atomicType(arg) { switch (arg.name) { case 'action_id': - case 'attribute_id': case 'cluster_id': case 'command_id': - case 'device_type_id': - case 'endpoint_id': case 'event_id': case 'fabric_id': case 'field_id': @@ -32,8 +29,14 @@ function atomicType(arg) case 'transaction_id': case 'vendor_id': return 'chip::' + arg.name.split('_').map(part => part[0].toUpperCase() + part.substring(1)).join(''); + case 'attrib_id': + return 'chip::AttributeId'; case 'data_ver': return 'chip::DataVersion'; + case 'devtype_id': + return 'chip::DeviceTypeId'; + case 'endpoint_no': + return 'chip::EndpointId'; case 'event_no': return 'chip::EventNumber'; case 'fabric_idx': diff --git a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt index 551c4968ce2dc2..ed8ea47cb420ed 100644 --- a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt +++ b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt @@ -392,8 +392,8 @@ app::CHIPDeviceCallbacksMgr & gCallbacks = app::CHIPDeviceCallbacksMgr::GetInsta bool emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status) { ChipLogProgress(Zcl, "DefaultResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); - ChipLogProgress(Zcl, " CommandId: 0x%02x", commandId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); + ChipLogProgress(Zcl, " CommandId: 0x%08x", commandId); LogStatus(status); GET_RESPONSE_CALLBACKS("emberAfDefaultResponseCallback"); @@ -498,7 +498,7 @@ bool IMReadReportAttributesResponseCallback(const app::ReadClient * apReadClient return true; } - uint16_t attributeId = aPath.mFieldId; // attribId + chip::AttributeId attributeId = aPath.mFieldId; // attribId ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); LogIMStatus(status); @@ -522,7 +522,7 @@ bool IMReadReportAttributesResponseCallback(const app::ReadClient * apReadClient bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "WriteAttributesResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfWriteAttributesResponseCallback"); @@ -540,9 +540,9 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa } else { - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); Callback::Callback * cb = Callback::Callback::FromCancelable(onFailureCallback); cb->mCall(cb->mContext, status); @@ -564,7 +564,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "ConfigureReportingResponseCallback:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfConfigureReportingResponseCallback"); @@ -586,9 +586,9 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me uint8_t direction = chip::Encoding::Read8(message); // reportingRole ChipLogProgress(Zcl, " direction: 0x%02x", direction); - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); Callback::Callback * cb = Callback::Callback::FromCancelable(onFailureCallback); cb->mCall(cb->mContext, status); @@ -610,7 +610,7 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "ReadReportingConfigurationResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfReadReportingConfigurationResponseCallback"); @@ -621,9 +621,9 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId uint8_t direction = chip::Encoding::Read8(message); // reportingRole ChipLogProgress(Zcl, " direction: 0x%02x", direction); - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); if (direction == EMBER_ZCL_REPORTING_DIRECTION_REPORTED) { @@ -662,7 +662,7 @@ bool emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discove bool extended) { ChipLogProgress(Zcl, "DiscoverAttributesResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " extended: %d", extended); @@ -671,9 +671,9 @@ bool emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discove // struct discoverAttributesResponseRecord[] while (messageLen) { - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); CHECK_MESSAGE_LENGTH(1); uint8_t attributeType = chip::Encoding::Read8(message); // zclType @@ -689,14 +689,14 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint1 CommandId * commandIds, uint16_t commandIdCount) { ChipLogProgress(Zcl, "DiscoverCommandsGeneratedResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " manufacturerCode: 0x%04x", manufacturerCode); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " commandIdCount: %" PRIu16, commandIdCount); for (uint16_t i = 0; i < commandIdCount; i++) { - ChipLogProgress(Zcl, " commandId: 0x%02x", *commandIds++); + ChipLogProgress(Zcl, " commandId: 0x%08x", *commandIds++); } GET_RESPONSE_CALLBACKS("emberAfDiscoverCommandsGeneratedResponseCallback"); @@ -709,14 +709,14 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 CommandId * commandIds, uint16_t commandIdCount) { ChipLogProgress(Zcl, "DiscoverCommandsReceivedResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " manufacturerCode: 0x%04x", manufacturerCode); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " commandIdCount: %" PRIu16, commandIdCount); for (uint16_t i = 0; i < commandIdCount; i++) { - ChipLogProgress(Zcl, " commandId: 0x%02x", *commandIds++); + ChipLogProgress(Zcl, " commandId: 0x%08x", *commandIds++); } GET_RESPONSE_CALLBACKS("emberAfDiscoverCommandsGeneratedResponseCallback"); @@ -855,13 +855,13 @@ bool emberAf{{asCamelCased parent.name false}}Cluster{{asCamelCased name false}} bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "emberAfReportAttributeCallback:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); ChipLogProgress(Zcl, " Source NodeId: %" PRIu64, sourceId); EndpointId endpointId = emberAfCurrentCommand()->apsFrame->sourceEndpoint; - ChipLogProgress(Zcl, " Source EndpointId: 0x%04x", endpointId); + ChipLogProgress(Zcl, " Source EndpointId: 0x%08x", endpointId); // TODO onFailureCallback is just here because of the CHECK_MESSAGE_LENGTH macro. It needs to be removed. Callback::Cancelable * onFailureCallback = nullptr; @@ -869,8 +869,8 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin while (messageLen) { CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); GET_REPORT_CALLBACK("emberAfReportAttributesCallback"); diff --git a/src/app/zap-templates/templates/app/attribute-size-src.zapt b/src/app/zap-templates/templates/app/attribute-size-src.zapt index c96b93e8eb5a5b..a0e91c8c7150b5 100644 --- a/src/app/zap-templates/templates/app/attribute-size-src.zapt +++ b/src/app/zap-templates/templates/app/attribute-size-src.zapt @@ -181,7 +181,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/src/app/zap-templates/templates/app/encoder-src.zapt b/src/app/zap-templates/templates/app/encoder-src.zapt index 372672adfe824e..ec97d263725748 100644 --- a/src/app/zap-templates/templates/app/encoder-src.zapt +++ b/src/app/zap-templates/templates/app/encoder-src.zapt @@ -72,8 +72,8 @@ PacketBufferHandle encode{{asCamelCased name false}}ClusterDiscoverAttributes(ui COMMAND_HEADER("Discover{{asCamelCased name false}}Attributes", {{define}}_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID) - .Put16(0x0000) + .Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID) + .Put32(0x0000) .Put8(0xFF); COMMAND_FOOTER(); } @@ -87,8 +87,8 @@ PacketBufferHandle encode{{asCamelCased parent.name false}}ClusterRead{{asCamelC COMMAND_HEADER("Read{{asCamelCased parent.name false}}{{asCamelCased name false}}", {{parent.define}}_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID) - .Put16({{asHex code 4}}); + .Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID) + .Put32({{asHex code 4}}); COMMAND_FOOTER(); } @@ -107,8 +107,8 @@ PacketBufferHandle encode{{asCamelCased parent.name false}}ClusterWrite{{asCamel {{/if}} buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16({{asHex code 4}}) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32({{asHex code 4}}) .Put8({{atomicTypeId}}) {{#if (isString type)}} .Put{{#if (isLongString type)}}16{{/if}}(static_cast<{{#if (isShortString type)}}uint8_t{{else}}uint16_t{{/if}}>({{asCamelCased name}}StrLen)) @@ -127,9 +127,9 @@ PacketBufferHandle encode{{asCamelCased parent.name false}}ClusterConfigure{{asC COMMAND_HEADER("Report{{asCamelCased parent.name false}}{{asCamelCased name false}}", {{parent.define}}_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16({{asHex code 4}}) + .Put32({{asHex code 4}}) .Put8({{atomicTypeId}}) .Put16(minInterval) .Put16(maxInterval); diff --git a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt index 6cda792dba75ec..c32781734ca211 100644 --- a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt +++ b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt @@ -64,7 +64,7 @@ void Dispatch{{asCamelCased side false}}Command(app::Command * apCommandObj, Com (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_{{asDelimitedMacro define}}_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_{{asDelimitedMacro define}}_ID); return; } } @@ -93,7 +93,7 @@ void Dispatch{{asCamelCased side false}}Command(app::Command * apCommandObj, Com void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; @@ -116,7 +116,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml index 58f30094498017..f72201716072b3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml @@ -28,14 +28,14 @@ limitations under the License. Add a binding - + Remove a binding - + diff --git a/src/app/zap-templates/zcl/data-model/chip/chip-types.xml b/src/app/zap-templates/zcl/data-model/chip/chip-types.xml index de5cb8d4f39f66..9acda4d9e7d8b0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/chip-types.xml +++ b/src/app/zap-templates/zcl/data-model/chip/chip-types.xml @@ -16,24 +16,12 @@ limitations under the License. --> - + - - - - - - - - - - - - @@ -53,39 +41,37 @@ limitations under the License. - - - - - - - - + + + + + - - - + + + + - + - - + + - + - + - + diff --git a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml index ac8267b355e315..cbd2879f3136ab 100644 --- a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml @@ -18,7 +18,7 @@ limitations under the License. - + @@ -31,6 +31,6 @@ limitations under the License. device list server list client list - parts list + parts list diff --git a/src/controller/data_model/gen/CHIPClientCallbacks.cpp b/src/controller/data_model/gen/CHIPClientCallbacks.cpp index 4f480dc64b1f9e..f141142e5bf7ac 100644 --- a/src/controller/data_model/gen/CHIPClientCallbacks.cpp +++ b/src/controller/data_model/gen/CHIPClientCallbacks.cpp @@ -407,8 +407,8 @@ app::CHIPDeviceCallbacksMgr & gCallbacks = app::CHIPDeviceCallbacksMgr::GetInsta bool emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status) { ChipLogProgress(Zcl, "DefaultResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); - ChipLogProgress(Zcl, " CommandId: 0x%02x", commandId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); + ChipLogProgress(Zcl, " CommandId: 0x%08x", commandId); LogStatus(status); GET_RESPONSE_CALLBACKS("emberAfDefaultResponseCallback"); @@ -516,7 +516,7 @@ bool IMReadReportAttributesResponseCallback(const app::ReadClient * apReadClient return true; } - uint16_t attributeId = aPath.mFieldId; // attribId + chip::AttributeId attributeId = aPath.mFieldId; // attribId ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); LogIMStatus(status); @@ -540,7 +540,7 @@ bool IMReadReportAttributesResponseCallback(const app::ReadClient * apReadClient bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "WriteAttributesResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfWriteAttributesResponseCallback"); @@ -559,9 +559,9 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa } else { - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); Callback::Callback * cb = Callback::Callback::FromCancelable(onFailureCallback); @@ -584,7 +584,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "ConfigureReportingResponseCallback:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfConfigureReportingResponseCallback"); @@ -607,9 +607,9 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me uint8_t direction = chip::Encoding::Read8(message); // reportingRole ChipLogProgress(Zcl, " direction: 0x%02x", direction); - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); Callback::Callback * cb = Callback::Callback::FromCancelable(onFailureCallback); @@ -632,7 +632,7 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "ReadReportingConfigurationResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); GET_RESPONSE_CALLBACKS("emberAfReadReportingConfigurationResponseCallback"); @@ -643,9 +643,9 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId uint8_t direction = chip::Encoding::Read8(message); // reportingRole ChipLogProgress(Zcl, " direction: 0x%02x", direction); - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); if (direction == EMBER_ZCL_REPORTING_DIRECTION_REPORTED) { @@ -686,7 +686,7 @@ bool emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discove bool extended) { ChipLogProgress(Zcl, "DiscoverAttributesResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " extended: %d", extended); @@ -695,9 +695,9 @@ bool emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discove // struct discoverAttributesResponseRecord[] while (messageLen) { - CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + CHECK_MESSAGE_LENGTH(4); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); CHECK_MESSAGE_LENGTH(1); uint8_t attributeType = chip::Encoding::Read8(message); // zclType @@ -713,14 +713,14 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint1 CommandId * commandIds, uint16_t commandIdCount) { ChipLogProgress(Zcl, "DiscoverCommandsGeneratedResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " manufacturerCode: 0x%04x", manufacturerCode); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " commandIdCount: %" PRIu16, commandIdCount); for (uint16_t i = 0; i < commandIdCount; i++) { - ChipLogProgress(Zcl, " commandId: 0x%02x", *commandIds++); + ChipLogProgress(Zcl, " commandId: 0x%08x", *commandIds++); } GET_RESPONSE_CALLBACKS("emberAfDiscoverCommandsGeneratedResponseCallback"); @@ -733,14 +733,14 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 CommandId * commandIds, uint16_t commandIdCount) { ChipLogProgress(Zcl, "DiscoverCommandsReceivedResponse:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); ChipLogProgress(Zcl, " manufacturerCode: 0x%04x", manufacturerCode); ChipLogProgress(Zcl, " discoveryComplete: %d", discoveryComplete); ChipLogProgress(Zcl, " commandIdCount: %" PRIu16, commandIdCount); for (uint16_t i = 0; i < commandIdCount; i++) { - ChipLogProgress(Zcl, " commandId: 0x%02x", *commandIds++); + ChipLogProgress(Zcl, " commandId: 0x%08x", *commandIds++); } GET_RESPONSE_CALLBACKS("emberAfDiscoverCommandsGeneratedResponseCallback"); @@ -951,9 +951,9 @@ void DescriptorClusterServerListListAttributeFilter(TLV::TLVReader * tlvData, Ca chip::ClusterId data[count]; for (size_t i = 0; i < count; i++) { - CHECK_MESSAGE_LENGTH_VOID(2); - data[i] = emberAfGetInt16u(message, 0, 2); - message += 2; + CHECK_MESSAGE_LENGTH_VOID(4); + data[i] = emberAfGetInt32u(message, 0, 4); + message += 4; } Callback::Callback * cb = Callback::Callback::FromCancelable(onSuccessCallback); @@ -980,9 +980,9 @@ void DescriptorClusterClientListListAttributeFilter(TLV::TLVReader * tlvData, Ca chip::ClusterId data[count]; for (size_t i = 0; i < count; i++) { - CHECK_MESSAGE_LENGTH_VOID(2); - data[i] = emberAfGetInt16u(message, 0, 2); - message += 2; + CHECK_MESSAGE_LENGTH_VOID(4); + data[i] = emberAfGetInt32u(message, 0, 4); + message += 4; } Callback::Callback * cb = Callback::Callback::FromCancelable(onSuccessCallback); @@ -1009,9 +1009,9 @@ void DescriptorClusterPartsListListAttributeFilter(TLV::TLVReader * tlvData, Cal chip::EndpointId data[count]; for (size_t i = 0; i < count; i++) { - CHECK_MESSAGE_LENGTH_VOID(1); - data[i] = emberAfGetInt8u(message, 0, 1); - message += 1; + CHECK_MESSAGE_LENGTH_VOID(2); + data[i] = emberAfGetInt16u(message, 0, 2); + message += 2; } Callback::Callback * cb = Callback::Callback::FromCancelable(onSuccessCallback); @@ -2970,13 +2970,13 @@ bool emberAfTestClusterClusterTestSpecificResponseCallback(chip::app::Command * bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen) { ChipLogProgress(Zcl, "emberAfReportAttributeCallback:"); - ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); + ChipLogProgress(Zcl, " ClusterId: 0x%08x", clusterId); NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); ChipLogProgress(Zcl, " Source NodeId: %" PRIu64, sourceId); EndpointId endpointId = emberAfCurrentCommand()->apsFrame->sourceEndpoint; - ChipLogProgress(Zcl, " Source EndpointId: 0x%04x", endpointId); + ChipLogProgress(Zcl, " Source EndpointId: 0x%08x", endpointId); // TODO onFailureCallback is just here because of the CHECK_MESSAGE_LENGTH macro. It needs to be removed. Callback::Cancelable * onFailureCallback = nullptr; @@ -2984,8 +2984,8 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin while (messageLen) { CHECK_MESSAGE_LENGTH(2); - uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId - ChipLogProgress(Zcl, " attributeId: 0x%04x", attributeId); + AttributeId attributeId = chip::Encoding::LittleEndian::Read32(message); // attribId + ChipLogProgress(Zcl, " attributeId: 0x%08x", attributeId); GET_REPORT_CALLBACK("emberAfReportAttributesCallback"); diff --git a/src/controller/data_model/gen/CHIPClusters.cpp b/src/controller/data_model/gen/CHIPClusters.cpp index 95df537bddf817..87cd9388317640 100644 --- a/src/controller/data_model/gen/CHIPClusters.cpp +++ b/src/controller/data_model/gen/CHIPClusters.cpp @@ -1046,7 +1046,7 @@ CHIP_ERROR BindingCluster::Bind(Callback::Cancelable * onSuccessCallback, Callba SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), nodeId)); // groupId: groupId SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), groupId)); - // endpointId: endpointId + // endpointId: endpointNo SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), endpointId)); // clusterId: clusterId SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), clusterId)); @@ -1094,7 +1094,7 @@ CHIP_ERROR BindingCluster::Unbind(Callback::Cancelable * onSuccessCallback, Call SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), nodeId)); // groupId: groupId SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), groupId)); - // endpointId: endpointId + // endpointId: endpointNo SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), endpointId)); // clusterId: clusterId SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), clusterId)); diff --git a/src/controller/data_model/gen/IMClusterCommandHandler.cpp b/src/controller/data_model/gen/IMClusterCommandHandler.cpp index 2d24b4ca67f1b3..2e990ae8e4204a 100644 --- a/src/controller/data_model/gen/IMClusterCommandHandler.cpp +++ b/src/controller/data_model/gen/IMClusterCommandHandler.cpp @@ -124,7 +124,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_ACCOUNT_LOGIN_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_ACCOUNT_LOGIN_CLUSTER_ID); return; } } @@ -238,7 +238,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_APPLICATION_LAUNCHER_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_APPLICATION_LAUNCHER_CLUSTER_ID); return; } } @@ -417,7 +417,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_CONTENT_LAUNCH_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_CONTENT_LAUNCH_CLUSTER_ID); return; } } @@ -1944,7 +1944,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_DOOR_LOCK_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_DOOR_LOCK_CLUSTER_ID); return; } } @@ -2188,7 +2188,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID); return; } } @@ -2500,7 +2500,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_GROUPS_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_GROUPS_CLUSTER_ID); return; } } @@ -2608,7 +2608,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_IDENTIFY_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_IDENTIFY_CLUSTER_ID); return; } } @@ -2716,7 +2716,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_KEYPAD_INPUT_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_KEYPAD_INPUT_CLUSTER_ID); return; } } @@ -3414,7 +3414,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_MEDIA_PLAYBACK_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_MEDIA_PLAYBACK_CLUSTER_ID); return; } } @@ -3993,7 +3993,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_NETWORK_COMMISSIONING_CLUSTER_ID); return; } } @@ -4198,7 +4198,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_OTA_PROVIDER_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OTA_PROVIDER_CLUSTER_ID); return; } } @@ -4473,7 +4473,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID); return; } @@ -4946,7 +4946,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_SCENES_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_SCENES_CLUSTER_ID); return; } } @@ -5059,7 +5059,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_TV_CHANNEL_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_TV_CHANNEL_CLUSTER_ID); return; } } @@ -5173,7 +5173,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_TARGET_NAVIGATOR_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_TARGET_NAVIGATOR_CLUSTER_ID); return; } } @@ -5281,7 +5281,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command %" PRIx8 " for cluster %" PRIx16, aCommandId, ZCL_TEST_CLUSTER_ID); + ChipLogError(Zcl, "Unknown command %" PRIx32 " for cluster %" PRIx32, aCommandId, ZCL_TEST_CLUSTER_ID); return; } } @@ -5309,8 +5309,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId, chip::TLV::TLVReader & aReader, Command * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId, - aEndPointId); + ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx32 " Command=%" PRIx32 " Endpoint=%" PRIx16, aClusterId, + aCommandId, aEndPointId); Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId); TLV::TLVType dataTlvType; SuccessOrExit(aReader.EnterContainer(dataTlvType)); @@ -5372,7 +5372,7 @@ void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aC (chip::app::CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kNotFound, Protocols::SecureChannel::Id, Protocols::InteractionModel::ProtocolCode::InvalidCommand); - ChipLogError(Zcl, "Unknown cluster %" PRIx16, aClusterId); + ChipLogError(Zcl, "Unknown cluster %" PRIx32, aClusterId); break; } exit: diff --git a/src/controller/data_model/gen/attribute-size.cpp b/src/controller/data_model/gen/attribute-size.cpp index fd86a35c2ee60f..2de85f537275b0 100644 --- a/src/controller/data_model/gen/attribute-size.cpp +++ b/src/controller/data_model/gen/attribute-size.cpp @@ -102,7 +102,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); if (!chip::CanCastTo(totalSize)) { - ChipLogError(Zcl, "Cluster 0x%04x: Size of attribute 0x%02x is too large.", clusterId, attributeId); + ChipLogError(Zcl, "Cluster %" PRIx32 ": Size of attribute %" PRIx32 " is too large.", clusterId, attributeId); return 0; } diff --git a/src/controller/data_model/gen/encoder.cpp b/src/controller/data_model/gen/encoder.cpp index d7af6e385672df..7cf5d06b570dbd 100644 --- a/src/controller/data_model/gen/encoder.cpp +++ b/src/controller/data_model/gen/encoder.cpp @@ -386,7 +386,7 @@ constexpr EndpointId kSourceEndpoint = 1; PacketBufferHandle encodeAccountLoginClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverAccountLoginAttributes", ACCOUNT_LOGIN_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -396,7 +396,7 @@ PacketBufferHandle encodeAccountLoginClusterDiscoverAttributes(uint8_t seqNum, E PacketBufferHandle encodeAccountLoginClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadAccountLoginClusterRevision", ACCOUNT_LOGIN_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -420,7 +420,7 @@ PacketBufferHandle encodeAccountLoginClusterReadClusterRevisionAttribute(uint8_t PacketBufferHandle encodeApplicationBasicClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverApplicationBasicAttributes", APPLICATION_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -430,7 +430,7 @@ PacketBufferHandle encodeApplicationBasicClusterDiscoverAttributes(uint8_t seqNu PacketBufferHandle encodeApplicationBasicClusterReadVendorNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationBasicVendorName", APPLICATION_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -440,7 +440,7 @@ PacketBufferHandle encodeApplicationBasicClusterReadVendorNameAttribute(uint8_t PacketBufferHandle encodeApplicationBasicClusterReadVendorIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationBasicVendorId", APPLICATION_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -450,7 +450,7 @@ PacketBufferHandle encodeApplicationBasicClusterReadVendorIdAttribute(uint8_t se PacketBufferHandle encodeApplicationBasicClusterReadApplicationNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationBasicApplicationName", APPLICATION_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -460,7 +460,7 @@ PacketBufferHandle encodeApplicationBasicClusterReadApplicationNameAttribute(uin PacketBufferHandle encodeApplicationBasicClusterReadProductIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationBasicProductId", APPLICATION_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -470,7 +470,7 @@ PacketBufferHandle encodeApplicationBasicClusterReadProductIdAttribute(uint8_t s PacketBufferHandle encodeApplicationBasicClusterReadApplicationIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationBasicApplicationId", APPLICATION_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0005); COMMAND_FOOTER(); } @@ -480,7 +480,7 @@ PacketBufferHandle encodeApplicationBasicClusterReadApplicationIdAttribute(uint8 PacketBufferHandle encodeApplicationBasicClusterReadCatalogVendorIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationBasicCatalogVendorId", APPLICATION_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0006); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0006); COMMAND_FOOTER(); } @@ -490,7 +490,7 @@ PacketBufferHandle encodeApplicationBasicClusterReadCatalogVendorIdAttribute(uin PacketBufferHandle encodeApplicationBasicClusterReadApplicationSatusAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationBasicApplicationSatus", APPLICATION_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0007); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0007); COMMAND_FOOTER(); } @@ -500,7 +500,7 @@ PacketBufferHandle encodeApplicationBasicClusterReadApplicationSatusAttribute(ui PacketBufferHandle encodeApplicationBasicClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationBasicClusterRevision", APPLICATION_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -518,7 +518,7 @@ PacketBufferHandle encodeApplicationBasicClusterReadClusterRevisionAttribute(uin PacketBufferHandle encodeApplicationLauncherClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverApplicationLauncherAttributes", APPLICATION_LAUNCHER_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -529,7 +529,7 @@ PacketBufferHandle encodeApplicationLauncherClusterReadApplicationLauncherListAt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationLauncherApplicationLauncherList", APPLICATION_LAUNCHER_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -539,7 +539,7 @@ PacketBufferHandle encodeApplicationLauncherClusterReadApplicationLauncherListAt PacketBufferHandle encodeApplicationLauncherClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadApplicationLauncherClusterRevision", APPLICATION_LAUNCHER_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -558,7 +558,7 @@ PacketBufferHandle encodeApplicationLauncherClusterReadClusterRevisionAttribute( PacketBufferHandle encodeAudioOutputClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverAudioOutputAttributes", AUDIO_OUTPUT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -568,7 +568,7 @@ PacketBufferHandle encodeAudioOutputClusterDiscoverAttributes(uint8_t seqNum, En PacketBufferHandle encodeAudioOutputClusterReadAudioOutputListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadAudioOutputAudioOutputList", AUDIO_OUTPUT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -578,7 +578,7 @@ PacketBufferHandle encodeAudioOutputClusterReadAudioOutputListAttribute(uint8_t PacketBufferHandle encodeAudioOutputClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadAudioOutputClusterRevision", AUDIO_OUTPUT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -600,7 +600,7 @@ PacketBufferHandle encodeAudioOutputClusterReadClusterRevisionAttribute(uint8_t PacketBufferHandle encodeBarrierControlClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverBarrierControlAttributes", BARRIER_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -610,7 +610,7 @@ PacketBufferHandle encodeBarrierControlClusterDiscoverAttributes(uint8_t seqNum, PacketBufferHandle encodeBarrierControlClusterReadBarrierMovingStateAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBarrierControlBarrierMovingState", BARRIER_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -620,7 +620,7 @@ PacketBufferHandle encodeBarrierControlClusterReadBarrierMovingStateAttribute(ui PacketBufferHandle encodeBarrierControlClusterReadBarrierSafetyStatusAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBarrierControlBarrierSafetyStatus", BARRIER_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -630,7 +630,7 @@ PacketBufferHandle encodeBarrierControlClusterReadBarrierSafetyStatusAttribute(u PacketBufferHandle encodeBarrierControlClusterReadBarrierCapabilitiesAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBarrierControlBarrierCapabilities", BARRIER_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -640,7 +640,7 @@ PacketBufferHandle encodeBarrierControlClusterReadBarrierCapabilitiesAttribute(u PacketBufferHandle encodeBarrierControlClusterReadBarrierPositionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBarrierControlBarrierPosition", BARRIER_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000A); COMMAND_FOOTER(); } @@ -650,7 +650,7 @@ PacketBufferHandle encodeBarrierControlClusterReadBarrierPositionAttribute(uint8 PacketBufferHandle encodeBarrierControlClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBarrierControlClusterRevision", BARRIER_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -685,7 +685,7 @@ PacketBufferHandle encodeBarrierControlClusterReadClusterRevisionAttribute(uint8 PacketBufferHandle encodeBasicClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverBasicAttributes", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -695,7 +695,7 @@ PacketBufferHandle encodeBasicClusterDiscoverAttributes(uint8_t seqNum, Endpoint PacketBufferHandle encodeBasicClusterReadInteractionModelVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicInteractionModelVersion", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -705,7 +705,7 @@ PacketBufferHandle encodeBasicClusterReadInteractionModelVersionAttribute(uint8_ PacketBufferHandle encodeBasicClusterReadVendorNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicVendorName", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -715,7 +715,7 @@ PacketBufferHandle encodeBasicClusterReadVendorNameAttribute(uint8_t seqNum, End PacketBufferHandle encodeBasicClusterReadVendorIDAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicVendorID", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -725,7 +725,7 @@ PacketBufferHandle encodeBasicClusterReadVendorIDAttribute(uint8_t seqNum, Endpo PacketBufferHandle encodeBasicClusterReadProductNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicProductName", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -735,7 +735,7 @@ PacketBufferHandle encodeBasicClusterReadProductNameAttribute(uint8_t seqNum, En PacketBufferHandle encodeBasicClusterReadProductIDAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicProductID", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0004); COMMAND_FOOTER(); } @@ -745,7 +745,7 @@ PacketBufferHandle encodeBasicClusterReadProductIDAttribute(uint8_t seqNum, Endp PacketBufferHandle encodeBasicClusterReadUserLabelAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicUserLabel", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0005); COMMAND_FOOTER(); } @@ -762,8 +762,8 @@ PacketBufferHandle encodeBasicClusterWriteUserLabelAttribute(uint8_t seqNum, End buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0005) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0005) .Put8(66) .Put(static_cast(userLabelStrLen)) .Put(userLabel.data(), userLabelStrLen); @@ -776,7 +776,7 @@ PacketBufferHandle encodeBasicClusterWriteUserLabelAttribute(uint8_t seqNum, End PacketBufferHandle encodeBasicClusterReadLocationAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicLocation", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0006); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0006); COMMAND_FOOTER(); } @@ -792,8 +792,8 @@ PacketBufferHandle encodeBasicClusterWriteLocationAttribute(uint8_t seqNum, Endp buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0006) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0006) .Put8(66) .Put(static_cast(locationStrLen)) .Put(location.data(), locationStrLen); @@ -806,7 +806,7 @@ PacketBufferHandle encodeBasicClusterWriteLocationAttribute(uint8_t seqNum, Endp PacketBufferHandle encodeBasicClusterReadHardwareVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicHardwareVersion", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0007); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0007); COMMAND_FOOTER(); } @@ -816,7 +816,7 @@ PacketBufferHandle encodeBasicClusterReadHardwareVersionAttribute(uint8_t seqNum PacketBufferHandle encodeBasicClusterReadHardwareVersionStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicHardwareVersionString", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0008); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0008); COMMAND_FOOTER(); } @@ -826,7 +826,7 @@ PacketBufferHandle encodeBasicClusterReadHardwareVersionStringAttribute(uint8_t PacketBufferHandle encodeBasicClusterReadSoftwareVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicSoftwareVersion", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0009); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0009); COMMAND_FOOTER(); } @@ -836,7 +836,7 @@ PacketBufferHandle encodeBasicClusterReadSoftwareVersionAttribute(uint8_t seqNum PacketBufferHandle encodeBasicClusterReadSoftwareVersionStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicSoftwareVersionString", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000A); COMMAND_FOOTER(); } @@ -846,7 +846,7 @@ PacketBufferHandle encodeBasicClusterReadSoftwareVersionStringAttribute(uint8_t PacketBufferHandle encodeBasicClusterReadManufacturingDateAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicManufacturingDate", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000B); COMMAND_FOOTER(); } @@ -856,7 +856,7 @@ PacketBufferHandle encodeBasicClusterReadManufacturingDateAttribute(uint8_t seqN PacketBufferHandle encodeBasicClusterReadPartNumberAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicPartNumber", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000C); COMMAND_FOOTER(); } @@ -866,7 +866,7 @@ PacketBufferHandle encodeBasicClusterReadPartNumberAttribute(uint8_t seqNum, End PacketBufferHandle encodeBasicClusterReadProductURLAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicProductURL", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000D); COMMAND_FOOTER(); } @@ -876,7 +876,7 @@ PacketBufferHandle encodeBasicClusterReadProductURLAttribute(uint8_t seqNum, End PacketBufferHandle encodeBasicClusterReadProductLabelAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicProductLabel", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000E); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000E); COMMAND_FOOTER(); } @@ -886,7 +886,7 @@ PacketBufferHandle encodeBasicClusterReadProductLabelAttribute(uint8_t seqNum, E PacketBufferHandle encodeBasicClusterReadSerialNumberAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicSerialNumber", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000F); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000F); COMMAND_FOOTER(); } @@ -896,7 +896,7 @@ PacketBufferHandle encodeBasicClusterReadSerialNumberAttribute(uint8_t seqNum, E PacketBufferHandle encodeBasicClusterReadLocalConfigDisabledAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicLocalConfigDisabled", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0010); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0010); COMMAND_FOOTER(); } @@ -906,8 +906,8 @@ PacketBufferHandle encodeBasicClusterWriteLocalConfigDisabledAttribute(uint8_t s COMMAND_HEADER("WriteBasicLocalConfigDisabled", BASIC_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0010) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0010) .Put8(16) .Put8(static_cast(localConfigDisabled)); COMMAND_FOOTER(); @@ -919,7 +919,7 @@ PacketBufferHandle encodeBasicClusterWriteLocalConfigDisabledAttribute(uint8_t s PacketBufferHandle encodeBasicClusterReadReachableAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicReachable", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0011); COMMAND_FOOTER(); } @@ -929,7 +929,7 @@ PacketBufferHandle encodeBasicClusterReadReachableAttribute(uint8_t seqNum, Endp PacketBufferHandle encodeBasicClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBasicClusterRevision", BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -948,7 +948,7 @@ PacketBufferHandle encodeBasicClusterReadClusterRevisionAttribute(uint8_t seqNum PacketBufferHandle encodeBinaryInputBasicClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverBinaryInputBasicAttributes", BINARY_INPUT_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -958,7 +958,7 @@ PacketBufferHandle encodeBinaryInputBasicClusterDiscoverAttributes(uint8_t seqNu PacketBufferHandle encodeBinaryInputBasicClusterReadOutOfServiceAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBinaryInputBasicOutOfService", BINARY_INPUT_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0051); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0051); COMMAND_FOOTER(); } @@ -968,8 +968,8 @@ PacketBufferHandle encodeBinaryInputBasicClusterWriteOutOfServiceAttribute(uint8 COMMAND_HEADER("WriteBinaryInputBasicOutOfService", BINARY_INPUT_BASIC_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0051) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0051) .Put8(16) .Put8(static_cast(outOfService)); COMMAND_FOOTER(); @@ -981,7 +981,7 @@ PacketBufferHandle encodeBinaryInputBasicClusterWriteOutOfServiceAttribute(uint8 PacketBufferHandle encodeBinaryInputBasicClusterReadPresentValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBinaryInputBasicPresentValue", BINARY_INPUT_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0055); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0055); COMMAND_FOOTER(); } @@ -991,8 +991,8 @@ PacketBufferHandle encodeBinaryInputBasicClusterWritePresentValueAttribute(uint8 COMMAND_HEADER("WriteBinaryInputBasicPresentValue", BINARY_INPUT_BASIC_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0055) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0055) .Put8(16) .Put8(static_cast(presentValue)); COMMAND_FOOTER(); @@ -1004,9 +1004,9 @@ PacketBufferHandle encodeBinaryInputBasicClusterConfigurePresentValueAttribute(u COMMAND_HEADER("ReportBinaryInputBasicPresentValue", BINARY_INPUT_BASIC_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0055) + .Put32(0x0055) .Put8(16) .Put16(minInterval) .Put16(maxInterval); @@ -1019,7 +1019,7 @@ PacketBufferHandle encodeBinaryInputBasicClusterConfigurePresentValueAttribute(u PacketBufferHandle encodeBinaryInputBasicClusterReadStatusFlagsAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBinaryInputBasicStatusFlags", BINARY_INPUT_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x006F); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x006F); COMMAND_FOOTER(); } @@ -1029,9 +1029,9 @@ PacketBufferHandle encodeBinaryInputBasicClusterConfigureStatusFlagsAttribute(ui COMMAND_HEADER("ReportBinaryInputBasicStatusFlags", BINARY_INPUT_BASIC_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x006F) + .Put32(0x006F) .Put8(24) .Put16(minInterval) .Put16(maxInterval); @@ -1044,7 +1044,7 @@ PacketBufferHandle encodeBinaryInputBasicClusterConfigureStatusFlagsAttribute(ui PacketBufferHandle encodeBinaryInputBasicClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBinaryInputBasicClusterRevision", BINARY_INPUT_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -1062,7 +1062,7 @@ PacketBufferHandle encodeBinaryInputBasicClusterReadClusterRevisionAttribute(uin PacketBufferHandle encodeBindingClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverBindingAttributes", BINDING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -1072,7 +1072,7 @@ PacketBufferHandle encodeBindingClusterDiscoverAttributes(uint8_t seqNum, Endpoi PacketBufferHandle encodeBindingClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBindingClusterRevision", BINDING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -1102,7 +1102,7 @@ PacketBufferHandle encodeBindingClusterReadClusterRevisionAttribute(uint8_t seqN PacketBufferHandle encodeBridgedDeviceBasicClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverBridgedDeviceBasicAttributes", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -1112,7 +1112,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterDiscoverAttributes(uint8_t seq PacketBufferHandle encodeBridgedDeviceBasicClusterReadVendorNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicVendorName", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -1122,7 +1122,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadVendorNameAttribute(uint8_ PacketBufferHandle encodeBridgedDeviceBasicClusterReadVendorIDAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicVendorID", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -1132,7 +1132,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadVendorIDAttribute(uint8_t PacketBufferHandle encodeBridgedDeviceBasicClusterReadProductNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicProductName", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -1142,7 +1142,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadProductNameAttribute(uint8 PacketBufferHandle encodeBridgedDeviceBasicClusterReadUserLabelAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicUserLabel", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0005); COMMAND_FOOTER(); } @@ -1159,8 +1159,8 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterWriteUserLabelAttribute(uint8_ buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0005) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0005) .Put8(66) .Put(static_cast(userLabelStrLen)) .Put(userLabel.data(), userLabelStrLen); @@ -1173,7 +1173,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterWriteUserLabelAttribute(uint8_ PacketBufferHandle encodeBridgedDeviceBasicClusterReadHardwareVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicHardwareVersion", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0007); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0007); COMMAND_FOOTER(); } @@ -1183,7 +1183,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadHardwareVersionAttribute(u PacketBufferHandle encodeBridgedDeviceBasicClusterReadHardwareVersionStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicHardwareVersionString", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0008); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0008); COMMAND_FOOTER(); } @@ -1193,7 +1193,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadHardwareVersionStringAttri PacketBufferHandle encodeBridgedDeviceBasicClusterReadSoftwareVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicSoftwareVersion", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0009); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0009); COMMAND_FOOTER(); } @@ -1203,7 +1203,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadSoftwareVersionAttribute(u PacketBufferHandle encodeBridgedDeviceBasicClusterReadSoftwareVersionStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicSoftwareVersionString", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000A); COMMAND_FOOTER(); } @@ -1213,7 +1213,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadSoftwareVersionStringAttri PacketBufferHandle encodeBridgedDeviceBasicClusterReadManufacturingDateAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicManufacturingDate", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000B); COMMAND_FOOTER(); } @@ -1223,7 +1223,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadManufacturingDateAttribute PacketBufferHandle encodeBridgedDeviceBasicClusterReadPartNumberAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicPartNumber", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000C); COMMAND_FOOTER(); } @@ -1233,7 +1233,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadPartNumberAttribute(uint8_ PacketBufferHandle encodeBridgedDeviceBasicClusterReadProductURLAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicProductURL", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000D); COMMAND_FOOTER(); } @@ -1243,7 +1243,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadProductURLAttribute(uint8_ PacketBufferHandle encodeBridgedDeviceBasicClusterReadProductLabelAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicProductLabel", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000E); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000E); COMMAND_FOOTER(); } @@ -1253,7 +1253,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadProductLabelAttribute(uint PacketBufferHandle encodeBridgedDeviceBasicClusterReadSerialNumberAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicSerialNumber", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000F); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000F); COMMAND_FOOTER(); } @@ -1263,7 +1263,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadSerialNumberAttribute(uint PacketBufferHandle encodeBridgedDeviceBasicClusterReadReachableAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicReachable", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0011); COMMAND_FOOTER(); } @@ -1273,7 +1273,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadReachableAttribute(uint8_t PacketBufferHandle encodeBridgedDeviceBasicClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadBridgedDeviceBasicClusterRevision", BRIDGED_DEVICE_BASIC_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -1353,7 +1353,7 @@ PacketBufferHandle encodeBridgedDeviceBasicClusterReadClusterRevisionAttribute(u PacketBufferHandle encodeColorControlClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverColorControlAttributes", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -1363,7 +1363,7 @@ PacketBufferHandle encodeColorControlClusterDiscoverAttributes(uint8_t seqNum, E PacketBufferHandle encodeColorControlClusterReadCurrentHueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlCurrentHue", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -1373,9 +1373,9 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentHueAttribute(uint8_t COMMAND_HEADER("ReportColorControlCurrentHue", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(32) .Put16(minInterval) .Put16(maxInterval); @@ -1389,7 +1389,7 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentHueAttribute(uint8_t PacketBufferHandle encodeColorControlClusterReadCurrentSaturationAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlCurrentSaturation", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -1400,9 +1400,9 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentSaturationAttribute( COMMAND_HEADER("ReportColorControlCurrentSaturation", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0001) + .Put32(0x0001) .Put8(32) .Put16(minInterval) .Put16(maxInterval); @@ -1416,7 +1416,7 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentSaturationAttribute( PacketBufferHandle encodeColorControlClusterReadRemainingTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlRemainingTime", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -1426,7 +1426,7 @@ PacketBufferHandle encodeColorControlClusterReadRemainingTimeAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadCurrentXAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlCurrentX", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -1436,9 +1436,9 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentXAttribute(uint8_t s COMMAND_HEADER("ReportColorControlCurrentX", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0003) + .Put32(0x0003) .Put8(33) .Put16(minInterval) .Put16(maxInterval); @@ -1452,7 +1452,7 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentXAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadCurrentYAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlCurrentY", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0004); COMMAND_FOOTER(); } @@ -1462,9 +1462,9 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentYAttribute(uint8_t s COMMAND_HEADER("ReportColorControlCurrentY", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0004) + .Put32(0x0004) .Put8(33) .Put16(minInterval) .Put16(maxInterval); @@ -1478,7 +1478,7 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentYAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadDriftCompensationAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlDriftCompensation", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0005); COMMAND_FOOTER(); } @@ -1488,7 +1488,7 @@ PacketBufferHandle encodeColorControlClusterReadDriftCompensationAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadCompensationTextAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlCompensationText", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0006); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0006); COMMAND_FOOTER(); } @@ -1498,7 +1498,7 @@ PacketBufferHandle encodeColorControlClusterReadCompensationTextAttribute(uint8_ PacketBufferHandle encodeColorControlClusterReadColorTemperatureAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorTemperature", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0007); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0007); COMMAND_FOOTER(); } @@ -1509,9 +1509,9 @@ PacketBufferHandle encodeColorControlClusterConfigureColorTemperatureAttribute(u COMMAND_HEADER("ReportColorControlColorTemperature", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0007) + .Put32(0x0007) .Put8(33) .Put16(minInterval) .Put16(maxInterval); @@ -1525,7 +1525,7 @@ PacketBufferHandle encodeColorControlClusterConfigureColorTemperatureAttribute(u PacketBufferHandle encodeColorControlClusterReadColorModeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorMode", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0008); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0008); COMMAND_FOOTER(); } @@ -1535,7 +1535,7 @@ PacketBufferHandle encodeColorControlClusterReadColorModeAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadColorControlOptionsAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorControlOptions", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000F); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000F); COMMAND_FOOTER(); } @@ -1545,8 +1545,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorControlOptionsAttribute(ui COMMAND_HEADER("WriteColorControlColorControlOptions", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x000F) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x000F) .Put8(24) .Put8(static_cast(colorControlOptions)); COMMAND_FOOTER(); @@ -1558,7 +1558,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorControlOptionsAttribute(ui PacketBufferHandle encodeColorControlClusterReadNumberOfPrimariesAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlNumberOfPrimaries", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0010); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0010); COMMAND_FOOTER(); } @@ -1568,7 +1568,7 @@ PacketBufferHandle encodeColorControlClusterReadNumberOfPrimariesAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadPrimary1XAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary1X", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0011); COMMAND_FOOTER(); } @@ -1578,7 +1578,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary1XAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary1YAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary1Y", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0012); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0012); COMMAND_FOOTER(); } @@ -1588,7 +1588,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary1YAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary1IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary1Intensity", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0013); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0013); COMMAND_FOOTER(); } @@ -1598,7 +1598,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary1IntensityAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadPrimary2XAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary2X", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0015); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0015); COMMAND_FOOTER(); } @@ -1608,7 +1608,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary2XAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary2YAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary2Y", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0016); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0016); COMMAND_FOOTER(); } @@ -1618,7 +1618,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary2YAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary2IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary2Intensity", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0017); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0017); COMMAND_FOOTER(); } @@ -1628,7 +1628,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary2IntensityAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadPrimary3XAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary3X", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0019); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0019); COMMAND_FOOTER(); } @@ -1638,7 +1638,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary3XAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary3YAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary3Y", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001A); COMMAND_FOOTER(); } @@ -1648,7 +1648,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary3YAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary3IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary3Intensity", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001B); COMMAND_FOOTER(); } @@ -1658,7 +1658,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary3IntensityAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadPrimary4XAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary4X", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0020); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0020); COMMAND_FOOTER(); } @@ -1668,7 +1668,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary4XAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary4YAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary4Y", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0021); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0021); COMMAND_FOOTER(); } @@ -1678,7 +1678,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary4YAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary4IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary4Intensity", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0022); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0022); COMMAND_FOOTER(); } @@ -1688,7 +1688,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary4IntensityAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadPrimary5XAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary5X", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0024); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0024); COMMAND_FOOTER(); } @@ -1698,7 +1698,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary5XAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary5YAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary5Y", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0025); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0025); COMMAND_FOOTER(); } @@ -1708,7 +1708,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary5YAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary5IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary5Intensity", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0026); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0026); COMMAND_FOOTER(); } @@ -1718,7 +1718,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary5IntensityAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadPrimary6XAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary6X", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0028); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0028); COMMAND_FOOTER(); } @@ -1728,7 +1728,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary6XAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary6YAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary6Y", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0029); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0029); COMMAND_FOOTER(); } @@ -1738,7 +1738,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary6YAttribute(uint8_t seqNu PacketBufferHandle encodeColorControlClusterReadPrimary6IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlPrimary6Intensity", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x002A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x002A); COMMAND_FOOTER(); } @@ -1748,7 +1748,7 @@ PacketBufferHandle encodeColorControlClusterReadPrimary6IntensityAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadWhitePointXAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlWhitePointX", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0030); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0030); COMMAND_FOOTER(); } @@ -1758,8 +1758,8 @@ PacketBufferHandle encodeColorControlClusterWriteWhitePointXAttribute(uint8_t se COMMAND_HEADER("WriteColorControlWhitePointX", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0030) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0030) .Put8(33) .Put16(static_cast(whitePointX)); COMMAND_FOOTER(); @@ -1771,7 +1771,7 @@ PacketBufferHandle encodeColorControlClusterWriteWhitePointXAttribute(uint8_t se PacketBufferHandle encodeColorControlClusterReadWhitePointYAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlWhitePointY", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0031); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0031); COMMAND_FOOTER(); } @@ -1781,8 +1781,8 @@ PacketBufferHandle encodeColorControlClusterWriteWhitePointYAttribute(uint8_t se COMMAND_HEADER("WriteColorControlWhitePointY", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0031) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0031) .Put8(33) .Put16(static_cast(whitePointY)); COMMAND_FOOTER(); @@ -1794,7 +1794,7 @@ PacketBufferHandle encodeColorControlClusterWriteWhitePointYAttribute(uint8_t se PacketBufferHandle encodeColorControlClusterReadColorPointRXAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorPointRX", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0032); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0032); COMMAND_FOOTER(); } @@ -1804,8 +1804,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointRXAttribute(uint8_t s COMMAND_HEADER("WriteColorControlColorPointRX", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0032) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0032) .Put8(33) .Put16(static_cast(colorPointRX)); COMMAND_FOOTER(); @@ -1817,7 +1817,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointRXAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadColorPointRYAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorPointRY", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0033); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0033); COMMAND_FOOTER(); } @@ -1827,8 +1827,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointRYAttribute(uint8_t s COMMAND_HEADER("WriteColorControlColorPointRY", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0033) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0033) .Put8(33) .Put16(static_cast(colorPointRY)); COMMAND_FOOTER(); @@ -1840,7 +1840,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointRYAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadColorPointRIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorPointRIntensity", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0034); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0034); COMMAND_FOOTER(); } @@ -1850,8 +1850,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointRIntensityAttribute(u COMMAND_HEADER("WriteColorControlColorPointRIntensity", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0034) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0034) .Put8(32) .Put8(static_cast(colorPointRIntensity)); COMMAND_FOOTER(); @@ -1863,7 +1863,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointRIntensityAttribute(u PacketBufferHandle encodeColorControlClusterReadColorPointGXAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorPointGX", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0036); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0036); COMMAND_FOOTER(); } @@ -1873,8 +1873,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointGXAttribute(uint8_t s COMMAND_HEADER("WriteColorControlColorPointGX", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0036) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0036) .Put8(33) .Put16(static_cast(colorPointGX)); COMMAND_FOOTER(); @@ -1886,7 +1886,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointGXAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadColorPointGYAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorPointGY", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0037); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0037); COMMAND_FOOTER(); } @@ -1896,8 +1896,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointGYAttribute(uint8_t s COMMAND_HEADER("WriteColorControlColorPointGY", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0037) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0037) .Put8(33) .Put16(static_cast(colorPointGY)); COMMAND_FOOTER(); @@ -1909,7 +1909,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointGYAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadColorPointGIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorPointGIntensity", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0038); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0038); COMMAND_FOOTER(); } @@ -1919,8 +1919,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointGIntensityAttribute(u COMMAND_HEADER("WriteColorControlColorPointGIntensity", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0038) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0038) .Put8(32) .Put8(static_cast(colorPointGIntensity)); COMMAND_FOOTER(); @@ -1932,7 +1932,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointGIntensityAttribute(u PacketBufferHandle encodeColorControlClusterReadColorPointBXAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorPointBX", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x003A); COMMAND_FOOTER(); } @@ -1942,8 +1942,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointBXAttribute(uint8_t s COMMAND_HEADER("WriteColorControlColorPointBX", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x003A) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x003A) .Put8(33) .Put16(static_cast(colorPointBX)); COMMAND_FOOTER(); @@ -1955,7 +1955,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointBXAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadColorPointBYAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorPointBY", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x003B); COMMAND_FOOTER(); } @@ -1965,8 +1965,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointBYAttribute(uint8_t s COMMAND_HEADER("WriteColorControlColorPointBY", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x003B) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x003B) .Put8(33) .Put16(static_cast(colorPointBY)); COMMAND_FOOTER(); @@ -1978,7 +1978,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointBYAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadColorPointBIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorPointBIntensity", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x003C); COMMAND_FOOTER(); } @@ -1988,8 +1988,8 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointBIntensityAttribute(u COMMAND_HEADER("WriteColorControlColorPointBIntensity", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x003C) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x003C) .Put8(32) .Put8(static_cast(colorPointBIntensity)); COMMAND_FOOTER(); @@ -2001,7 +2001,7 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointBIntensityAttribute(u PacketBufferHandle encodeColorControlClusterReadEnhancedCurrentHueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlEnhancedCurrentHue", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4000); COMMAND_FOOTER(); } @@ -2011,7 +2011,7 @@ PacketBufferHandle encodeColorControlClusterReadEnhancedCurrentHueAttribute(uint PacketBufferHandle encodeColorControlClusterReadEnhancedColorModeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlEnhancedColorMode", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4001); COMMAND_FOOTER(); } @@ -2021,7 +2021,7 @@ PacketBufferHandle encodeColorControlClusterReadEnhancedColorModeAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadColorLoopActiveAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorLoopActive", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4002); COMMAND_FOOTER(); } @@ -2031,7 +2031,7 @@ PacketBufferHandle encodeColorControlClusterReadColorLoopActiveAttribute(uint8_t PacketBufferHandle encodeColorControlClusterReadColorLoopDirectionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorLoopDirection", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4003); COMMAND_FOOTER(); } @@ -2041,7 +2041,7 @@ PacketBufferHandle encodeColorControlClusterReadColorLoopDirectionAttribute(uint PacketBufferHandle encodeColorControlClusterReadColorLoopTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorLoopTime", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4004); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4004); COMMAND_FOOTER(); } @@ -2051,7 +2051,7 @@ PacketBufferHandle encodeColorControlClusterReadColorLoopTimeAttribute(uint8_t s PacketBufferHandle encodeColorControlClusterReadColorCapabilitiesAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorCapabilities", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x400A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x400A); COMMAND_FOOTER(); } @@ -2061,7 +2061,7 @@ PacketBufferHandle encodeColorControlClusterReadColorCapabilitiesAttribute(uint8 PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMinAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorTempPhysicalMin", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x400B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x400B); COMMAND_FOOTER(); } @@ -2071,7 +2071,7 @@ PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMinAttribute(ui PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMaxAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlColorTempPhysicalMax", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x400C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x400C); COMMAND_FOOTER(); } @@ -2082,7 +2082,7 @@ PacketBufferHandle encodeColorControlClusterReadCoupleColorTempToLevelMinMiredsA EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlCoupleColorTempToLevelMinMireds", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x400D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x400D); COMMAND_FOOTER(); } @@ -2093,7 +2093,7 @@ PacketBufferHandle encodeColorControlClusterReadStartUpColorTemperatureMiredsAtt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlStartUpColorTemperatureMireds", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4010); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4010); COMMAND_FOOTER(); } @@ -2104,8 +2104,8 @@ PacketBufferHandle encodeColorControlClusterWriteStartUpColorTemperatureMiredsAt COMMAND_HEADER("WriteColorControlStartUpColorTemperatureMireds", COLOR_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x4010) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x4010) .Put8(33) .Put16(static_cast(startUpColorTemperatureMireds)); COMMAND_FOOTER(); @@ -2117,7 +2117,7 @@ PacketBufferHandle encodeColorControlClusterWriteStartUpColorTemperatureMiredsAt PacketBufferHandle encodeColorControlClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadColorControlClusterRevision", COLOR_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2137,7 +2137,7 @@ PacketBufferHandle encodeColorControlClusterReadClusterRevisionAttribute(uint8_t PacketBufferHandle encodeContentLauncherClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverContentLauncherAttributes", CONTENT_LAUNCH_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2147,7 +2147,7 @@ PacketBufferHandle encodeContentLauncherClusterDiscoverAttributes(uint8_t seqNum PacketBufferHandle encodeContentLauncherClusterReadAcceptsHeaderListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadContentLauncherAcceptsHeaderList", CONTENT_LAUNCH_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2157,7 +2157,7 @@ PacketBufferHandle encodeContentLauncherClusterReadAcceptsHeaderListAttribute(ui PacketBufferHandle encodeContentLauncherClusterReadSupportedStreamingTypesAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadContentLauncherSupportedStreamingTypes", CONTENT_LAUNCH_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -2167,7 +2167,7 @@ PacketBufferHandle encodeContentLauncherClusterReadSupportedStreamingTypesAttrib PacketBufferHandle encodeContentLauncherClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadContentLauncherClusterRevision", CONTENT_LAUNCH_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2187,7 +2187,7 @@ PacketBufferHandle encodeContentLauncherClusterReadClusterRevisionAttribute(uint PacketBufferHandle encodeDescriptorClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverDescriptorAttributes", DESCRIPTOR_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2197,7 +2197,7 @@ PacketBufferHandle encodeDescriptorClusterDiscoverAttributes(uint8_t seqNum, End PacketBufferHandle encodeDescriptorClusterReadDeviceListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadDescriptorDeviceList", DESCRIPTOR_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2207,7 +2207,7 @@ PacketBufferHandle encodeDescriptorClusterReadDeviceListAttribute(uint8_t seqNum PacketBufferHandle encodeDescriptorClusterReadServerListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadDescriptorServerList", DESCRIPTOR_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -2217,7 +2217,7 @@ PacketBufferHandle encodeDescriptorClusterReadServerListAttribute(uint8_t seqNum PacketBufferHandle encodeDescriptorClusterReadClientListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadDescriptorClientList", DESCRIPTOR_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -2227,7 +2227,7 @@ PacketBufferHandle encodeDescriptorClusterReadClientListAttribute(uint8_t seqNum PacketBufferHandle encodeDescriptorClusterReadPartsListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadDescriptorPartsList", DESCRIPTOR_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -2237,7 +2237,7 @@ PacketBufferHandle encodeDescriptorClusterReadPartsListAttribute(uint8_t seqNum, PacketBufferHandle encodeDescriptorClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadDescriptorClusterRevision", DESCRIPTOR_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2253,7 +2253,7 @@ PacketBufferHandle encodeDescriptorClusterReadClusterRevisionAttribute(uint8_t s PacketBufferHandle encodeDiagnosticLogsClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverDiagnosticLogsAttributes", DIAGNOSTIC_LOGS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2295,7 +2295,7 @@ PacketBufferHandle encodeDiagnosticLogsClusterDiscoverAttributes(uint8_t seqNum, PacketBufferHandle encodeDoorLockClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverDoorLockAttributes", DOOR_LOCK_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2305,7 +2305,7 @@ PacketBufferHandle encodeDoorLockClusterDiscoverAttributes(uint8_t seqNum, Endpo PacketBufferHandle encodeDoorLockClusterReadLockStateAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadDoorLockLockState", DOOR_LOCK_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2315,9 +2315,9 @@ PacketBufferHandle encodeDoorLockClusterConfigureLockStateAttribute(uint8_t seqN COMMAND_HEADER("ReportDoorLockLockState", DOOR_LOCK_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(48) .Put16(minInterval) .Put16(maxInterval); @@ -2330,7 +2330,7 @@ PacketBufferHandle encodeDoorLockClusterConfigureLockStateAttribute(uint8_t seqN PacketBufferHandle encodeDoorLockClusterReadLockTypeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadDoorLockLockType", DOOR_LOCK_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -2340,7 +2340,7 @@ PacketBufferHandle encodeDoorLockClusterReadLockTypeAttribute(uint8_t seqNum, En PacketBufferHandle encodeDoorLockClusterReadActuatorEnabledAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadDoorLockActuatorEnabled", DOOR_LOCK_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -2350,7 +2350,7 @@ PacketBufferHandle encodeDoorLockClusterReadActuatorEnabledAttribute(uint8_t seq PacketBufferHandle encodeDoorLockClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadDoorLockClusterRevision", DOOR_LOCK_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2372,7 +2372,7 @@ PacketBufferHandle encodeDoorLockClusterReadClusterRevisionAttribute(uint8_t seq PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverEthernetNetworkDiagnosticsAttributes", ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2382,7 +2382,7 @@ PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterDiscoverAttributes(uin PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadPacketRxCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadEthernetNetworkDiagnosticsPacketRxCount", ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -2392,7 +2392,7 @@ PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadPacketRxCountAttri PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadPacketTxCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadEthernetNetworkDiagnosticsPacketTxCount", ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -2402,7 +2402,7 @@ PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadPacketTxCountAttri PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadTxErrCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadEthernetNetworkDiagnosticsTxErrCount", ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0004); COMMAND_FOOTER(); } @@ -2413,7 +2413,7 @@ PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadCollisionCountAttr EndpointId destinationEndpoint) { COMMAND_HEADER("ReadEthernetNetworkDiagnosticsCollisionCount", ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0005); COMMAND_FOOTER(); } @@ -2423,7 +2423,7 @@ PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadCollisionCountAttr PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadOverrunCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadEthernetNetworkDiagnosticsOverrunCount", ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0006); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0006); COMMAND_FOOTER(); } @@ -2434,7 +2434,7 @@ PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadClusterRevisionAtt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadEthernetNetworkDiagnosticsClusterRevision", ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2451,7 +2451,7 @@ PacketBufferHandle encodeEthernetNetworkDiagnosticsClusterReadClusterRevisionAtt PacketBufferHandle encodeFixedLabelClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverFixedLabelAttributes", FIXED_LABEL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2461,7 +2461,7 @@ PacketBufferHandle encodeFixedLabelClusterDiscoverAttributes(uint8_t seqNum, End PacketBufferHandle encodeFixedLabelClusterReadLabelListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFixedLabelLabelList", FIXED_LABEL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2471,7 +2471,7 @@ PacketBufferHandle encodeFixedLabelClusterReadLabelListAttribute(uint8_t seqNum, PacketBufferHandle encodeFixedLabelClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFixedLabelClusterRevision", FIXED_LABEL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2490,7 +2490,7 @@ PacketBufferHandle encodeFixedLabelClusterReadClusterRevisionAttribute(uint8_t s PacketBufferHandle encodeFlowMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverFlowMeasurementAttributes", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2500,7 +2500,7 @@ PacketBufferHandle encodeFlowMeasurementClusterDiscoverAttributes(uint8_t seqNum PacketBufferHandle encodeFlowMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2510,7 +2510,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadMeasuredValueAttribute(uint8_ PacketBufferHandle encodeFlowMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementMinMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -2520,7 +2520,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadMinMeasuredValueAttribute(uin PacketBufferHandle encodeFlowMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementMaxMeasuredValue", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -2530,7 +2530,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadMaxMeasuredValueAttribute(uin PacketBufferHandle encodeFlowMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadFlowMeasurementClusterRevision", FLOW_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2551,7 +2551,7 @@ PacketBufferHandle encodeFlowMeasurementClusterReadClusterRevisionAttribute(uint PacketBufferHandle encodeGeneralCommissioningClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverGeneralCommissioningAttributes", GENERAL_COMMISSIONING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2561,7 +2561,7 @@ PacketBufferHandle encodeGeneralCommissioningClusterDiscoverAttributes(uint8_t s PacketBufferHandle encodeGeneralCommissioningClusterReadFabricIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGeneralCommissioningFabricId", GENERAL_COMMISSIONING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2571,7 +2571,7 @@ PacketBufferHandle encodeGeneralCommissioningClusterReadFabricIdAttribute(uint8_ PacketBufferHandle encodeGeneralCommissioningClusterReadBreadcrumbAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGeneralCommissioningBreadcrumb", GENERAL_COMMISSIONING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -2581,8 +2581,8 @@ PacketBufferHandle encodeGeneralCommissioningClusterWriteBreadcrumbAttribute(uin COMMAND_HEADER("WriteGeneralCommissioningBreadcrumb", GENERAL_COMMISSIONING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0001) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0001) .Put8(39) .Put64(static_cast(breadcrumb)); COMMAND_FOOTER(); @@ -2594,7 +2594,7 @@ PacketBufferHandle encodeGeneralCommissioningClusterWriteBreadcrumbAttribute(uin PacketBufferHandle encodeGeneralCommissioningClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGeneralCommissioningClusterRevision", GENERAL_COMMISSIONING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2612,7 +2612,7 @@ PacketBufferHandle encodeGeneralCommissioningClusterReadClusterRevisionAttribute PacketBufferHandle encodeGeneralDiagnosticsClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverGeneralDiagnosticsAttributes", GENERAL_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2622,7 +2622,7 @@ PacketBufferHandle encodeGeneralDiagnosticsClusterDiscoverAttributes(uint8_t seq PacketBufferHandle encodeGeneralDiagnosticsClusterReadNetworkInterfacesAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGeneralDiagnosticsNetworkInterfaces", GENERAL_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2632,7 +2632,7 @@ PacketBufferHandle encodeGeneralDiagnosticsClusterReadNetworkInterfacesAttribute PacketBufferHandle encodeGeneralDiagnosticsClusterReadRebootCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGeneralDiagnosticsRebootCount", GENERAL_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -2642,7 +2642,7 @@ PacketBufferHandle encodeGeneralDiagnosticsClusterReadRebootCountAttribute(uint8 PacketBufferHandle encodeGeneralDiagnosticsClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGeneralDiagnosticsClusterRevision", GENERAL_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2660,7 +2660,7 @@ PacketBufferHandle encodeGeneralDiagnosticsClusterReadClusterRevisionAttribute(u PacketBufferHandle encodeGroupKeyManagementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverGroupKeyManagementAttributes", GROUP_KEY_MANAGEMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2670,7 +2670,7 @@ PacketBufferHandle encodeGroupKeyManagementClusterDiscoverAttributes(uint8_t seq PacketBufferHandle encodeGroupKeyManagementClusterReadGroupsAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGroupKeyManagementGroups", GROUP_KEY_MANAGEMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2680,7 +2680,7 @@ PacketBufferHandle encodeGroupKeyManagementClusterReadGroupsAttribute(uint8_t se PacketBufferHandle encodeGroupKeyManagementClusterReadGroupKeysAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGroupKeyManagementGroupKeys", GROUP_KEY_MANAGEMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -2690,7 +2690,7 @@ PacketBufferHandle encodeGroupKeyManagementClusterReadGroupKeysAttribute(uint8_t PacketBufferHandle encodeGroupKeyManagementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGroupKeyManagementClusterRevision", GROUP_KEY_MANAGEMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2713,7 +2713,7 @@ PacketBufferHandle encodeGroupKeyManagementClusterReadClusterRevisionAttribute(u PacketBufferHandle encodeGroupsClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverGroupsAttributes", GROUPS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2723,7 +2723,7 @@ PacketBufferHandle encodeGroupsClusterDiscoverAttributes(uint8_t seqNum, Endpoin PacketBufferHandle encodeGroupsClusterReadNameSupportAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGroupsNameSupport", GROUPS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2733,7 +2733,7 @@ PacketBufferHandle encodeGroupsClusterReadNameSupportAttribute(uint8_t seqNum, E PacketBufferHandle encodeGroupsClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadGroupsClusterRevision", GROUPS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2752,7 +2752,7 @@ PacketBufferHandle encodeGroupsClusterReadClusterRevisionAttribute(uint8_t seqNu PacketBufferHandle encodeIdentifyClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverIdentifyAttributes", IDENTIFY_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2762,7 +2762,7 @@ PacketBufferHandle encodeIdentifyClusterDiscoverAttributes(uint8_t seqNum, Endpo PacketBufferHandle encodeIdentifyClusterReadIdentifyTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadIdentifyIdentifyTime", IDENTIFY_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2772,8 +2772,8 @@ PacketBufferHandle encodeIdentifyClusterWriteIdentifyTimeAttribute(uint8_t seqNu COMMAND_HEADER("WriteIdentifyIdentifyTime", IDENTIFY_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0000) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0000) .Put8(33) .Put16(static_cast(identifyTime)); COMMAND_FOOTER(); @@ -2785,7 +2785,7 @@ PacketBufferHandle encodeIdentifyClusterWriteIdentifyTimeAttribute(uint8_t seqNu PacketBufferHandle encodeIdentifyClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadIdentifyClusterRevision", IDENTIFY_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2802,7 +2802,7 @@ PacketBufferHandle encodeIdentifyClusterReadClusterRevisionAttribute(uint8_t seq PacketBufferHandle encodeKeypadInputClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverKeypadInputAttributes", KEYPAD_INPUT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2812,7 +2812,7 @@ PacketBufferHandle encodeKeypadInputClusterDiscoverAttributes(uint8_t seqNum, En PacketBufferHandle encodeKeypadInputClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadKeypadInputClusterRevision", KEYPAD_INPUT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2837,7 +2837,7 @@ PacketBufferHandle encodeKeypadInputClusterReadClusterRevisionAttribute(uint8_t PacketBufferHandle encodeLevelControlClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverLevelControlAttributes", LEVEL_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2847,7 +2847,7 @@ PacketBufferHandle encodeLevelControlClusterDiscoverAttributes(uint8_t seqNum, E PacketBufferHandle encodeLevelControlClusterReadCurrentLevelAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadLevelControlCurrentLevel", LEVEL_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2858,9 +2858,9 @@ PacketBufferHandle encodeLevelControlClusterConfigureCurrentLevelAttribute(uint8 COMMAND_HEADER("ReportLevelControlCurrentLevel", LEVEL_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(32) .Put16(minInterval) .Put16(maxInterval); @@ -2874,7 +2874,7 @@ PacketBufferHandle encodeLevelControlClusterConfigureCurrentLevelAttribute(uint8 PacketBufferHandle encodeLevelControlClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadLevelControlClusterRevision", LEVEL_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2891,7 +2891,7 @@ PacketBufferHandle encodeLevelControlClusterReadClusterRevisionAttribute(uint8_t PacketBufferHandle encodeLowPowerClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverLowPowerAttributes", LOW_POWER_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2901,7 +2901,7 @@ PacketBufferHandle encodeLowPowerClusterDiscoverAttributes(uint8_t seqNum, Endpo PacketBufferHandle encodeLowPowerClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadLowPowerClusterRevision", LOW_POWER_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2922,7 +2922,7 @@ PacketBufferHandle encodeLowPowerClusterReadClusterRevisionAttribute(uint8_t seq PacketBufferHandle encodeMediaInputClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverMediaInputAttributes", MEDIA_INPUT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2932,7 +2932,7 @@ PacketBufferHandle encodeMediaInputClusterDiscoverAttributes(uint8_t seqNum, End PacketBufferHandle encodeMediaInputClusterReadMediaInputListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadMediaInputMediaInputList", MEDIA_INPUT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -2942,7 +2942,7 @@ PacketBufferHandle encodeMediaInputClusterReadMediaInputListAttribute(uint8_t se PacketBufferHandle encodeMediaInputClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadMediaInputClusterRevision", MEDIA_INPUT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -2969,7 +2969,7 @@ PacketBufferHandle encodeMediaInputClusterReadClusterRevisionAttribute(uint8_t s PacketBufferHandle encodeMediaPlaybackClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverMediaPlaybackAttributes", MEDIA_PLAYBACK_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -2979,7 +2979,7 @@ PacketBufferHandle encodeMediaPlaybackClusterDiscoverAttributes(uint8_t seqNum, PacketBufferHandle encodeMediaPlaybackClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadMediaPlaybackClusterRevision", MEDIA_PLAYBACK_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3004,7 +3004,7 @@ PacketBufferHandle encodeMediaPlaybackClusterReadClusterRevisionAttribute(uint8_ PacketBufferHandle encodeNetworkCommissioningClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverNetworkCommissioningAttributes", NETWORK_COMMISSIONING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3014,7 +3014,7 @@ PacketBufferHandle encodeNetworkCommissioningClusterDiscoverAttributes(uint8_t s PacketBufferHandle encodeNetworkCommissioningClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadNetworkCommissioningClusterRevision", NETWORK_COMMISSIONING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3033,7 +3033,7 @@ PacketBufferHandle encodeNetworkCommissioningClusterReadClusterRevisionAttribute PacketBufferHandle encodeOtaSoftwareUpdateProviderClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverOtaSoftwareUpdateProviderAttributes", OTA_PROVIDER_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3044,7 +3044,7 @@ PacketBufferHandle encodeOtaSoftwareUpdateProviderClusterReadClusterRevisionAttr EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOtaSoftwareUpdateProviderClusterRevision", OTA_PROVIDER_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3069,7 +3069,7 @@ PacketBufferHandle encodeOtaSoftwareUpdateProviderClusterReadClusterRevisionAttr PacketBufferHandle encodeOnOffClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverOnOffAttributes", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3079,7 +3079,7 @@ PacketBufferHandle encodeOnOffClusterDiscoverAttributes(uint8_t seqNum, Endpoint PacketBufferHandle encodeOnOffClusterReadOnOffAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOnOffOnOff", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3089,9 +3089,9 @@ PacketBufferHandle encodeOnOffClusterConfigureOnOffAttribute(uint8_t seqNum, End COMMAND_HEADER("ReportOnOffOnOff", ON_OFF_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(16) .Put16(minInterval) .Put16(maxInterval); @@ -3104,7 +3104,7 @@ PacketBufferHandle encodeOnOffClusterConfigureOnOffAttribute(uint8_t seqNum, End PacketBufferHandle encodeOnOffClusterReadGlobalSceneControlAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOnOffGlobalSceneControl", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4000); COMMAND_FOOTER(); } @@ -3114,7 +3114,7 @@ PacketBufferHandle encodeOnOffClusterReadGlobalSceneControlAttribute(uint8_t seq PacketBufferHandle encodeOnOffClusterReadOnTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOnOffOnTime", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4001); COMMAND_FOOTER(); } @@ -3123,8 +3123,8 @@ PacketBufferHandle encodeOnOffClusterWriteOnTimeAttribute(uint8_t seqNum, Endpoi COMMAND_HEADER("WriteOnOffOnTime", ON_OFF_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x4001) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x4001) .Put8(33) .Put16(static_cast(onTime)); COMMAND_FOOTER(); @@ -3136,7 +3136,7 @@ PacketBufferHandle encodeOnOffClusterWriteOnTimeAttribute(uint8_t seqNum, Endpoi PacketBufferHandle encodeOnOffClusterReadOffWaitTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOnOffOffWaitTime", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4002); COMMAND_FOOTER(); } @@ -3145,8 +3145,8 @@ PacketBufferHandle encodeOnOffClusterWriteOffWaitTimeAttribute(uint8_t seqNum, E COMMAND_HEADER("WriteOnOffOffWaitTime", ON_OFF_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x4002) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x4002) .Put8(33) .Put16(static_cast(offWaitTime)); COMMAND_FOOTER(); @@ -3158,7 +3158,7 @@ PacketBufferHandle encodeOnOffClusterWriteOffWaitTimeAttribute(uint8_t seqNum, E PacketBufferHandle encodeOnOffClusterReadStartUpOnOffAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOnOffStartUpOnOff", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x4003); COMMAND_FOOTER(); } @@ -3168,8 +3168,8 @@ PacketBufferHandle encodeOnOffClusterWriteStartUpOnOffAttribute(uint8_t seqNum, COMMAND_HEADER("WriteOnOffStartUpOnOff", ON_OFF_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x4003) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x4003) .Put8(48) .Put8(static_cast(startUpOnOff)); COMMAND_FOOTER(); @@ -3181,7 +3181,7 @@ PacketBufferHandle encodeOnOffClusterWriteStartUpOnOffAttribute(uint8_t seqNum, PacketBufferHandle encodeOnOffClusterReadFeatureMapAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOnOffFeatureMap", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFC); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFC); COMMAND_FOOTER(); } @@ -3191,7 +3191,7 @@ PacketBufferHandle encodeOnOffClusterReadFeatureMapAttribute(uint8_t seqNum, End PacketBufferHandle encodeOnOffClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOnOffClusterRevision", ON_OFF_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3216,7 +3216,7 @@ PacketBufferHandle encodeOnOffClusterReadClusterRevisionAttribute(uint8_t seqNum PacketBufferHandle encodeOperationalCredentialsClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverOperationalCredentialsAttributes", OPERATIONAL_CREDENTIALS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3226,7 +3226,7 @@ PacketBufferHandle encodeOperationalCredentialsClusterDiscoverAttributes(uint8_t PacketBufferHandle encodeOperationalCredentialsClusterReadFabricsListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOperationalCredentialsFabricsList", OPERATIONAL_CREDENTIALS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -3236,7 +3236,7 @@ PacketBufferHandle encodeOperationalCredentialsClusterReadFabricsListAttribute(u PacketBufferHandle encodeOperationalCredentialsClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadOperationalCredentialsClusterRevision", OPERATIONAL_CREDENTIALS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3255,7 +3255,7 @@ PacketBufferHandle encodeOperationalCredentialsClusterReadClusterRevisionAttribu PacketBufferHandle encodePressureMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverPressureMeasurementAttributes", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3265,7 +3265,7 @@ PacketBufferHandle encodePressureMeasurementClusterDiscoverAttributes(uint8_t se PacketBufferHandle encodePressureMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3276,9 +3276,9 @@ PacketBufferHandle encodePressureMeasurementClusterConfigureMeasuredValueAttribu COMMAND_HEADER("ReportPressureMeasurementMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -3292,7 +3292,7 @@ PacketBufferHandle encodePressureMeasurementClusterConfigureMeasuredValueAttribu PacketBufferHandle encodePressureMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementMinMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -3302,7 +3302,7 @@ PacketBufferHandle encodePressureMeasurementClusterReadMinMeasuredValueAttribute PacketBufferHandle encodePressureMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementMaxMeasuredValue", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -3312,7 +3312,7 @@ PacketBufferHandle encodePressureMeasurementClusterReadMaxMeasuredValueAttribute PacketBufferHandle encodePressureMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPressureMeasurementClusterRevision", PRESSURE_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3335,7 +3335,7 @@ PacketBufferHandle encodePressureMeasurementClusterReadClusterRevisionAttribute( PacketBufferHandle encodePumpConfigurationAndControlClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverPumpConfigurationAndControlAttributes", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3345,7 +3345,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterDiscoverAttributes(ui PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxPressureAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlMaxPressure", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3355,7 +3355,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxPressureAttrib PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxSpeedAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlMaxSpeed", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -3365,7 +3365,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxSpeedAttribute PacketBufferHandle encodePumpConfigurationAndControlClusterReadMaxFlowAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlMaxFlow", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -3376,7 +3376,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadEffectiveOperatio EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlEffectiveOperationMode", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0011); COMMAND_FOOTER(); } @@ -3387,7 +3387,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadEffectiveControlM EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlEffectiveControlMode", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0012); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0012); COMMAND_FOOTER(); } @@ -3397,7 +3397,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadEffectiveControlM PacketBufferHandle encodePumpConfigurationAndControlClusterReadCapacityAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlCapacity", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0013); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0013); COMMAND_FOOTER(); } @@ -3409,9 +3409,9 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterConfigureCapacityAttr COMMAND_HEADER("ReportPumpConfigurationAndControlCapacity", PUMP_CONFIG_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0013) + .Put32(0x0013) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -3426,7 +3426,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadOperationModeAttr EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlOperationMode", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0020); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0020); COMMAND_FOOTER(); } @@ -3437,8 +3437,8 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterWriteOperationModeAtt COMMAND_HEADER("WritePumpConfigurationAndControlOperationMode", PUMP_CONFIG_CONTROL_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0020) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0020) .Put8(48) .Put8(static_cast(operationMode)); COMMAND_FOOTER(); @@ -3451,7 +3451,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadClusterRevisionAt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadPumpConfigurationAndControlClusterRevision", PUMP_CONFIG_CONTROL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3470,7 +3470,7 @@ PacketBufferHandle encodePumpConfigurationAndControlClusterReadClusterRevisionAt PacketBufferHandle encodeRelativeHumidityMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverRelativeHumidityMeasurementAttributes", RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3481,7 +3481,7 @@ PacketBufferHandle encodeRelativeHumidityMeasurementClusterReadMeasuredValueAttr EndpointId destinationEndpoint) { COMMAND_HEADER("ReadRelativeHumidityMeasurementMeasuredValue", RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3493,9 +3493,9 @@ PacketBufferHandle encodeRelativeHumidityMeasurementClusterConfigureMeasuredValu COMMAND_HEADER("ReportRelativeHumidityMeasurementMeasuredValue", RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(33) .Put16(minInterval) .Put16(maxInterval); @@ -3510,7 +3510,7 @@ PacketBufferHandle encodeRelativeHumidityMeasurementClusterReadMinMeasuredValueA EndpointId destinationEndpoint) { COMMAND_HEADER("ReadRelativeHumidityMeasurementMinMeasuredValue", RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -3521,7 +3521,7 @@ PacketBufferHandle encodeRelativeHumidityMeasurementClusterReadMaxMeasuredValueA EndpointId destinationEndpoint) { COMMAND_HEADER("ReadRelativeHumidityMeasurementMaxMeasuredValue", RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -3532,7 +3532,7 @@ PacketBufferHandle encodeRelativeHumidityMeasurementClusterReadClusterRevisionAt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadRelativeHumidityMeasurementClusterRevision", RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3560,7 +3560,7 @@ PacketBufferHandle encodeRelativeHumidityMeasurementClusterReadClusterRevisionAt PacketBufferHandle encodeScenesClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverScenesAttributes", SCENES_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3570,7 +3570,7 @@ PacketBufferHandle encodeScenesClusterDiscoverAttributes(uint8_t seqNum, Endpoin PacketBufferHandle encodeScenesClusterReadSceneCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadScenesSceneCount", SCENES_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3580,7 +3580,7 @@ PacketBufferHandle encodeScenesClusterReadSceneCountAttribute(uint8_t seqNum, En PacketBufferHandle encodeScenesClusterReadCurrentSceneAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadScenesCurrentScene", SCENES_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -3590,7 +3590,7 @@ PacketBufferHandle encodeScenesClusterReadCurrentSceneAttribute(uint8_t seqNum, PacketBufferHandle encodeScenesClusterReadCurrentGroupAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadScenesCurrentGroup", SCENES_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -3600,7 +3600,7 @@ PacketBufferHandle encodeScenesClusterReadCurrentGroupAttribute(uint8_t seqNum, PacketBufferHandle encodeScenesClusterReadSceneValidAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadScenesSceneValid", SCENES_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -3610,7 +3610,7 @@ PacketBufferHandle encodeScenesClusterReadSceneValidAttribute(uint8_t seqNum, En PacketBufferHandle encodeScenesClusterReadNameSupportAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadScenesNameSupport", SCENES_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0004); COMMAND_FOOTER(); } @@ -3620,7 +3620,7 @@ PacketBufferHandle encodeScenesClusterReadNameSupportAttribute(uint8_t seqNum, E PacketBufferHandle encodeScenesClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadScenesClusterRevision", SCENES_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3638,7 +3638,7 @@ PacketBufferHandle encodeScenesClusterReadClusterRevisionAttribute(uint8_t seqNu PacketBufferHandle encodeSoftwareDiagnosticsClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverSoftwareDiagnosticsAttributes", SOFTWARE_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3649,7 +3649,7 @@ PacketBufferHandle encodeSoftwareDiagnosticsClusterReadCurrentHeapHighWatermarkA EndpointId destinationEndpoint) { COMMAND_HEADER("ReadSoftwareDiagnosticsCurrentHeapHighWatermark", SOFTWARE_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -3659,7 +3659,7 @@ PacketBufferHandle encodeSoftwareDiagnosticsClusterReadCurrentHeapHighWatermarkA PacketBufferHandle encodeSoftwareDiagnosticsClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadSoftwareDiagnosticsClusterRevision", SOFTWARE_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3677,7 +3677,7 @@ PacketBufferHandle encodeSoftwareDiagnosticsClusterReadClusterRevisionAttribute( PacketBufferHandle encodeSwitchClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverSwitchAttributes", SWITCH_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3687,7 +3687,7 @@ PacketBufferHandle encodeSwitchClusterDiscoverAttributes(uint8_t seqNum, Endpoin PacketBufferHandle encodeSwitchClusterReadNumberOfPositionsAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadSwitchNumberOfPositions", SWITCH_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3697,7 +3697,7 @@ PacketBufferHandle encodeSwitchClusterReadNumberOfPositionsAttribute(uint8_t seq PacketBufferHandle encodeSwitchClusterReadCurrentPositionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadSwitchCurrentPosition", SWITCH_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -3707,9 +3707,9 @@ PacketBufferHandle encodeSwitchClusterConfigureCurrentPositionAttribute(uint8_t COMMAND_HEADER("ReportSwitchCurrentPosition", SWITCH_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0001) + .Put32(0x0001) .Put8(32) .Put16(minInterval) .Put16(maxInterval); @@ -3723,7 +3723,7 @@ PacketBufferHandle encodeSwitchClusterConfigureCurrentPositionAttribute(uint8_t PacketBufferHandle encodeSwitchClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadSwitchClusterRevision", SWITCH_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3745,7 +3745,7 @@ PacketBufferHandle encodeSwitchClusterReadClusterRevisionAttribute(uint8_t seqNu PacketBufferHandle encodeTvChannelClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverTvChannelAttributes", TV_CHANNEL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3755,7 +3755,7 @@ PacketBufferHandle encodeTvChannelClusterDiscoverAttributes(uint8_t seqNum, Endp PacketBufferHandle encodeTvChannelClusterReadTvChannelListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTvChannelTvChannelList", TV_CHANNEL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3765,7 +3765,7 @@ PacketBufferHandle encodeTvChannelClusterReadTvChannelListAttribute(uint8_t seqN PacketBufferHandle encodeTvChannelClusterReadTvChannelLineupAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTvChannelTvChannelLineup", TV_CHANNEL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -3775,7 +3775,7 @@ PacketBufferHandle encodeTvChannelClusterReadTvChannelLineupAttribute(uint8_t se PacketBufferHandle encodeTvChannelClusterReadCurrentTvChannelAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTvChannelCurrentTvChannel", TV_CHANNEL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -3785,7 +3785,7 @@ PacketBufferHandle encodeTvChannelClusterReadCurrentTvChannelAttribute(uint8_t s PacketBufferHandle encodeTvChannelClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTvChannelClusterRevision", TV_CHANNEL_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3803,7 +3803,7 @@ PacketBufferHandle encodeTvChannelClusterReadClusterRevisionAttribute(uint8_t se PacketBufferHandle encodeTargetNavigatorClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverTargetNavigatorAttributes", TARGET_NAVIGATOR_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3813,7 +3813,7 @@ PacketBufferHandle encodeTargetNavigatorClusterDiscoverAttributes(uint8_t seqNum PacketBufferHandle encodeTargetNavigatorClusterReadTargetNavigatorListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTargetNavigatorTargetNavigatorList", TARGET_NAVIGATOR_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3823,7 +3823,7 @@ PacketBufferHandle encodeTargetNavigatorClusterReadTargetNavigatorListAttribute( PacketBufferHandle encodeTargetNavigatorClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTargetNavigatorClusterRevision", TARGET_NAVIGATOR_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3842,7 +3842,7 @@ PacketBufferHandle encodeTargetNavigatorClusterReadClusterRevisionAttribute(uint PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverTemperatureMeasurementAttributes", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3852,7 +3852,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t PacketBufferHandle encodeTemperatureMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3864,9 +3864,9 @@ PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttr COMMAND_HEADER("ReportTemperatureMeasurementMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -3880,7 +3880,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttr PacketBufferHandle encodeTemperatureMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementMinMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -3890,7 +3890,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterReadMinMeasuredValueAttrib PacketBufferHandle encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementMaxMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -3900,7 +3900,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttrib PacketBufferHandle encodeTemperatureMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTemperatureMeasurementClusterRevision", TEMP_MEASUREMENT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -3941,7 +3941,7 @@ PacketBufferHandle encodeTemperatureMeasurementClusterReadClusterRevisionAttribu PacketBufferHandle encodeTestClusterClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverTestClusterAttributes", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -3951,7 +3951,7 @@ PacketBufferHandle encodeTestClusterClusterDiscoverAttributes(uint8_t seqNum, En PacketBufferHandle encodeTestClusterClusterReadBooleanAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterBoolean", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -3960,8 +3960,8 @@ PacketBufferHandle encodeTestClusterClusterWriteBooleanAttribute(uint8_t seqNum, COMMAND_HEADER("WriteTestClusterBoolean", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0000) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0000) .Put8(16) .Put8(static_cast(boolean)); COMMAND_FOOTER(); @@ -3973,7 +3973,7 @@ PacketBufferHandle encodeTestClusterClusterWriteBooleanAttribute(uint8_t seqNum, PacketBufferHandle encodeTestClusterClusterReadBitmap8Attribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterBitmap8", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -3982,8 +3982,8 @@ PacketBufferHandle encodeTestClusterClusterWriteBitmap8Attribute(uint8_t seqNum, COMMAND_HEADER("WriteTestClusterBitmap8", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0001) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0001) .Put8(24) .Put8(static_cast(bitmap8)); COMMAND_FOOTER(); @@ -3995,7 +3995,7 @@ PacketBufferHandle encodeTestClusterClusterWriteBitmap8Attribute(uint8_t seqNum, PacketBufferHandle encodeTestClusterClusterReadBitmap16Attribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterBitmap16", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -4004,8 +4004,8 @@ PacketBufferHandle encodeTestClusterClusterWriteBitmap16Attribute(uint8_t seqNum COMMAND_HEADER("WriteTestClusterBitmap16", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0002) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0002) .Put8(25) .Put16(static_cast(bitmap16)); COMMAND_FOOTER(); @@ -4017,7 +4017,7 @@ PacketBufferHandle encodeTestClusterClusterWriteBitmap16Attribute(uint8_t seqNum PacketBufferHandle encodeTestClusterClusterReadBitmap32Attribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterBitmap32", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -4026,8 +4026,8 @@ PacketBufferHandle encodeTestClusterClusterWriteBitmap32Attribute(uint8_t seqNum COMMAND_HEADER("WriteTestClusterBitmap32", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0003) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0003) .Put8(27) .Put32(static_cast(bitmap32)); COMMAND_FOOTER(); @@ -4039,7 +4039,7 @@ PacketBufferHandle encodeTestClusterClusterWriteBitmap32Attribute(uint8_t seqNum PacketBufferHandle encodeTestClusterClusterReadBitmap64Attribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterBitmap64", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0004); COMMAND_FOOTER(); } @@ -4048,8 +4048,8 @@ PacketBufferHandle encodeTestClusterClusterWriteBitmap64Attribute(uint8_t seqNum COMMAND_HEADER("WriteTestClusterBitmap64", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0004) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0004) .Put8(31) .Put64(static_cast(bitmap64)); COMMAND_FOOTER(); @@ -4061,7 +4061,7 @@ PacketBufferHandle encodeTestClusterClusterWriteBitmap64Attribute(uint8_t seqNum PacketBufferHandle encodeTestClusterClusterReadInt8uAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterInt8u", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0005); COMMAND_FOOTER(); } @@ -4070,8 +4070,8 @@ PacketBufferHandle encodeTestClusterClusterWriteInt8uAttribute(uint8_t seqNum, E COMMAND_HEADER("WriteTestClusterInt8u", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0005) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0005) .Put8(32) .Put8(static_cast(int8u)); COMMAND_FOOTER(); @@ -4083,7 +4083,7 @@ PacketBufferHandle encodeTestClusterClusterWriteInt8uAttribute(uint8_t seqNum, E PacketBufferHandle encodeTestClusterClusterReadInt16uAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterInt16u", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0006); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0006); COMMAND_FOOTER(); } @@ -4092,8 +4092,8 @@ PacketBufferHandle encodeTestClusterClusterWriteInt16uAttribute(uint8_t seqNum, COMMAND_HEADER("WriteTestClusterInt16u", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0006) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0006) .Put8(33) .Put16(static_cast(int16u)); COMMAND_FOOTER(); @@ -4105,7 +4105,7 @@ PacketBufferHandle encodeTestClusterClusterWriteInt16uAttribute(uint8_t seqNum, PacketBufferHandle encodeTestClusterClusterReadInt32uAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterInt32u", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0008); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0008); COMMAND_FOOTER(); } @@ -4114,8 +4114,8 @@ PacketBufferHandle encodeTestClusterClusterWriteInt32uAttribute(uint8_t seqNum, COMMAND_HEADER("WriteTestClusterInt32u", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0008) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0008) .Put8(35) .Put32(static_cast(int32u)); COMMAND_FOOTER(); @@ -4127,7 +4127,7 @@ PacketBufferHandle encodeTestClusterClusterWriteInt32uAttribute(uint8_t seqNum, PacketBufferHandle encodeTestClusterClusterReadInt64uAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterInt64u", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000C); COMMAND_FOOTER(); } @@ -4136,8 +4136,8 @@ PacketBufferHandle encodeTestClusterClusterWriteInt64uAttribute(uint8_t seqNum, COMMAND_HEADER("WriteTestClusterInt64u", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x000C) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x000C) .Put8(39) .Put64(static_cast(int64u)); COMMAND_FOOTER(); @@ -4149,7 +4149,7 @@ PacketBufferHandle encodeTestClusterClusterWriteInt64uAttribute(uint8_t seqNum, PacketBufferHandle encodeTestClusterClusterReadInt8sAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterInt8s", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000D); COMMAND_FOOTER(); } @@ -4158,8 +4158,8 @@ PacketBufferHandle encodeTestClusterClusterWriteInt8sAttribute(uint8_t seqNum, E COMMAND_HEADER("WriteTestClusterInt8s", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x000D) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x000D) .Put8(40) .Put8(static_cast(int8s)); COMMAND_FOOTER(); @@ -4171,7 +4171,7 @@ PacketBufferHandle encodeTestClusterClusterWriteInt8sAttribute(uint8_t seqNum, E PacketBufferHandle encodeTestClusterClusterReadInt16sAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterInt16s", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000E); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000E); COMMAND_FOOTER(); } @@ -4180,8 +4180,8 @@ PacketBufferHandle encodeTestClusterClusterWriteInt16sAttribute(uint8_t seqNum, COMMAND_HEADER("WriteTestClusterInt16s", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x000E) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x000E) .Put8(41) .Put16(static_cast(int16s)); COMMAND_FOOTER(); @@ -4193,7 +4193,7 @@ PacketBufferHandle encodeTestClusterClusterWriteInt16sAttribute(uint8_t seqNum, PacketBufferHandle encodeTestClusterClusterReadInt32sAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterInt32s", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0010); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0010); COMMAND_FOOTER(); } @@ -4202,8 +4202,8 @@ PacketBufferHandle encodeTestClusterClusterWriteInt32sAttribute(uint8_t seqNum, COMMAND_HEADER("WriteTestClusterInt32s", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0010) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0010) .Put8(43) .Put32(static_cast(int32s)); COMMAND_FOOTER(); @@ -4215,7 +4215,7 @@ PacketBufferHandle encodeTestClusterClusterWriteInt32sAttribute(uint8_t seqNum, PacketBufferHandle encodeTestClusterClusterReadInt64sAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterInt64s", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0014); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0014); COMMAND_FOOTER(); } @@ -4224,8 +4224,8 @@ PacketBufferHandle encodeTestClusterClusterWriteInt64sAttribute(uint8_t seqNum, COMMAND_HEADER("WriteTestClusterInt64s", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0014) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0014) .Put8(47) .Put64(static_cast(int64s)); COMMAND_FOOTER(); @@ -4237,7 +4237,7 @@ PacketBufferHandle encodeTestClusterClusterWriteInt64sAttribute(uint8_t seqNum, PacketBufferHandle encodeTestClusterClusterReadEnum8Attribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterEnum8", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0015); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0015); COMMAND_FOOTER(); } @@ -4246,8 +4246,8 @@ PacketBufferHandle encodeTestClusterClusterWriteEnum8Attribute(uint8_t seqNum, E COMMAND_HEADER("WriteTestClusterEnum8", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0015) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0015) .Put8(48) .Put8(static_cast(enum8)); COMMAND_FOOTER(); @@ -4259,7 +4259,7 @@ PacketBufferHandle encodeTestClusterClusterWriteEnum8Attribute(uint8_t seqNum, E PacketBufferHandle encodeTestClusterClusterReadEnum16Attribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterEnum16", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0016); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0016); COMMAND_FOOTER(); } @@ -4268,8 +4268,8 @@ PacketBufferHandle encodeTestClusterClusterWriteEnum16Attribute(uint8_t seqNum, COMMAND_HEADER("WriteTestClusterEnum16", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0016) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0016) .Put8(49) .Put16(static_cast(enum16)); COMMAND_FOOTER(); @@ -4281,7 +4281,7 @@ PacketBufferHandle encodeTestClusterClusterWriteEnum16Attribute(uint8_t seqNum, PacketBufferHandle encodeTestClusterClusterReadOctetStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterOctetString", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0019); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0019); COMMAND_FOOTER(); } @@ -4298,8 +4298,8 @@ PacketBufferHandle encodeTestClusterClusterWriteOctetStringAttribute(uint8_t seq buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0019) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0019) .Put8(65) .Put(static_cast(octetStringStrLen)) .Put(octetString.data(), octetStringStrLen); @@ -4312,7 +4312,7 @@ PacketBufferHandle encodeTestClusterClusterWriteOctetStringAttribute(uint8_t seq PacketBufferHandle encodeTestClusterClusterReadListInt8uAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterListInt8u", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001A); COMMAND_FOOTER(); } @@ -4322,7 +4322,7 @@ PacketBufferHandle encodeTestClusterClusterReadListInt8uAttribute(uint8_t seqNum PacketBufferHandle encodeTestClusterClusterReadListOctetStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterListOctetString", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001B); COMMAND_FOOTER(); } @@ -4332,7 +4332,7 @@ PacketBufferHandle encodeTestClusterClusterReadListOctetStringAttribute(uint8_t PacketBufferHandle encodeTestClusterClusterReadListStructOctetStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterListStructOctetString", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001C); COMMAND_FOOTER(); } @@ -4342,7 +4342,7 @@ PacketBufferHandle encodeTestClusterClusterReadListStructOctetStringAttribute(ui PacketBufferHandle encodeTestClusterClusterReadLongOctetStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterLongOctetString", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001D); COMMAND_FOOTER(); } @@ -4359,8 +4359,8 @@ PacketBufferHandle encodeTestClusterClusterWriteLongOctetStringAttribute(uint8_t buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x001D) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x001D) .Put8(67) .Put16(static_cast(longOctetStringStrLen)) .Put(longOctetString.data(), longOctetStringStrLen); @@ -4373,7 +4373,7 @@ PacketBufferHandle encodeTestClusterClusterWriteLongOctetStringAttribute(uint8_t PacketBufferHandle encodeTestClusterClusterReadUnsupportedAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterUnsupported", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x00FF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x00FF); COMMAND_FOOTER(); } @@ -4383,8 +4383,8 @@ PacketBufferHandle encodeTestClusterClusterWriteUnsupportedAttribute(uint8_t seq COMMAND_HEADER("WriteTestClusterUnsupported", TEST_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x00FF) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x00FF) .Put8(16) .Put8(static_cast(unsupported)); COMMAND_FOOTER(); @@ -4396,7 +4396,7 @@ PacketBufferHandle encodeTestClusterClusterWriteUnsupportedAttribute(uint8_t seq PacketBufferHandle encodeTestClusterClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadTestClusterClusterRevision", TEST_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -4422,7 +4422,7 @@ PacketBufferHandle encodeTestClusterClusterReadClusterRevisionAttribute(uint8_t PacketBufferHandle encodeThermostatClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverThermostatAttributes", THERMOSTAT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -4432,7 +4432,7 @@ PacketBufferHandle encodeThermostatClusterDiscoverAttributes(uint8_t seqNum, End PacketBufferHandle encodeThermostatClusterReadLocalTemperatureAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThermostatLocalTemperature", THERMOSTAT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -4443,9 +4443,9 @@ PacketBufferHandle encodeThermostatClusterConfigureLocalTemperatureAttribute(uin COMMAND_HEADER("ReportThermostatLocalTemperature", THERMOSTAT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0000) + .Put32(0x0000) .Put8(41) .Put16(minInterval) .Put16(maxInterval); @@ -4459,7 +4459,7 @@ PacketBufferHandle encodeThermostatClusterConfigureLocalTemperatureAttribute(uin PacketBufferHandle encodeThermostatClusterReadOccupiedCoolingSetpointAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThermostatOccupiedCoolingSetpoint", THERMOSTAT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0011); COMMAND_FOOTER(); } @@ -4469,8 +4469,8 @@ PacketBufferHandle encodeThermostatClusterWriteOccupiedCoolingSetpointAttribute( COMMAND_HEADER("WriteThermostatOccupiedCoolingSetpoint", THERMOSTAT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0011) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0011) .Put8(41) .Put16(static_cast(occupiedCoolingSetpoint)); COMMAND_FOOTER(); @@ -4482,7 +4482,7 @@ PacketBufferHandle encodeThermostatClusterWriteOccupiedCoolingSetpointAttribute( PacketBufferHandle encodeThermostatClusterReadOccupiedHeatingSetpointAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThermostatOccupiedHeatingSetpoint", THERMOSTAT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0012); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0012); COMMAND_FOOTER(); } @@ -4492,8 +4492,8 @@ PacketBufferHandle encodeThermostatClusterWriteOccupiedHeatingSetpointAttribute( COMMAND_HEADER("WriteThermostatOccupiedHeatingSetpoint", THERMOSTAT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0012) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0012) .Put8(41) .Put16(static_cast(occupiedHeatingSetpoint)); COMMAND_FOOTER(); @@ -4505,7 +4505,7 @@ PacketBufferHandle encodeThermostatClusterWriteOccupiedHeatingSetpointAttribute( PacketBufferHandle encodeThermostatClusterReadControlSequenceOfOperationAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThermostatControlSequenceOfOperation", THERMOSTAT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001B); COMMAND_FOOTER(); } @@ -4515,8 +4515,8 @@ PacketBufferHandle encodeThermostatClusterWriteControlSequenceOfOperationAttribu COMMAND_HEADER("WriteThermostatControlSequenceOfOperation", THERMOSTAT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x001B) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x001B) .Put8(48) .Put8(static_cast(controlSequenceOfOperation)); COMMAND_FOOTER(); @@ -4528,7 +4528,7 @@ PacketBufferHandle encodeThermostatClusterWriteControlSequenceOfOperationAttribu PacketBufferHandle encodeThermostatClusterReadSystemModeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThermostatSystemMode", THERMOSTAT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001C); COMMAND_FOOTER(); } @@ -4538,8 +4538,8 @@ PacketBufferHandle encodeThermostatClusterWriteSystemModeAttribute(uint8_t seqNu COMMAND_HEADER("WriteThermostatSystemMode", THERMOSTAT_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x001C) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x001C) .Put8(48) .Put8(static_cast(systemMode)); COMMAND_FOOTER(); @@ -4551,7 +4551,7 @@ PacketBufferHandle encodeThermostatClusterWriteSystemModeAttribute(uint8_t seqNu PacketBufferHandle encodeThermostatClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThermostatClusterRevision", THERMOSTAT_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -4628,7 +4628,7 @@ PacketBufferHandle encodeThermostatClusterReadClusterRevisionAttribute(uint8_t s PacketBufferHandle encodeThreadNetworkDiagnosticsClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverThreadNetworkDiagnosticsAttributes", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -4638,7 +4638,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterDiscoverAttributes(uint8 PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadChannelAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsChannel", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -4648,7 +4648,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadChannelAttribute(uin PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRoutingRoleAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRoutingRole", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -4658,7 +4658,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRoutingRoleAttribute PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadNetworkNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsNetworkName", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -4668,7 +4668,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadNetworkNameAttribute PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadPanIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsPanId", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -4678,7 +4678,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadPanIdAttribute(uint8 PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadExtendedPanIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsExtendedPanId", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0004); COMMAND_FOOTER(); } @@ -4688,7 +4688,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadExtendedPanIdAttribu PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadMeshLocalPrefixAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsMeshLocalPrefix", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0005); COMMAND_FOOTER(); } @@ -4698,7 +4698,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadMeshLocalPrefixAttri PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadOverrunCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsOverrunCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0006); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0006); COMMAND_FOOTER(); } @@ -4709,7 +4709,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadNeighborTableListAtt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsNeighborTableList", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0007); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0007); COMMAND_FOOTER(); } @@ -4719,7 +4719,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadNeighborTableListAtt PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRouteTableListAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRouteTableList", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0008); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0008); COMMAND_FOOTER(); } @@ -4729,7 +4729,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRouteTableListAttrib PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadPartitionIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsPartitionId", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0009); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0009); COMMAND_FOOTER(); } @@ -4739,7 +4739,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadPartitionIdAttribute PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadWeightingAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsWeighting", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000A); COMMAND_FOOTER(); } @@ -4749,7 +4749,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadWeightingAttribute(u PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadDataVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsDataVersion", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000B); COMMAND_FOOTER(); } @@ -4760,7 +4760,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadStableDataVersionAtt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsStableDataVersion", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000C); COMMAND_FOOTER(); } @@ -4770,7 +4770,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadStableDataVersionAtt PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadLeaderRouterIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsLeaderRouterId", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000D); COMMAND_FOOTER(); } @@ -4781,7 +4781,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadDetachedRoleCountAtt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsDetachedRoleCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000E); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000E); COMMAND_FOOTER(); } @@ -4791,7 +4791,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadDetachedRoleCountAtt PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadChildRoleCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsChildRoleCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000F); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000F); COMMAND_FOOTER(); } @@ -4801,7 +4801,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadChildRoleCountAttrib PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRouterRoleCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRouterRoleCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0010); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0010); COMMAND_FOOTER(); } @@ -4811,7 +4811,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRouterRoleCountAttri PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadLeaderRoleCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsLeaderRoleCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0011); COMMAND_FOOTER(); } @@ -4822,7 +4822,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadAttachAttemptCountAt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsAttachAttemptCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0012); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0012); COMMAND_FOOTER(); } @@ -4833,7 +4833,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadPartitionIdChangeCou EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsPartitionIdChangeCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0013); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0013); COMMAND_FOOTER(); } @@ -4844,7 +4844,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadBetterPartitionAttachAttemptCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0014); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0014); COMMAND_FOOTER(); } @@ -4855,7 +4855,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadParentChangeCountAtt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsParentChangeCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0015); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0015); COMMAND_FOOTER(); } @@ -4865,7 +4865,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadParentChangeCountAtt PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxTotalCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxTotalCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0016); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0016); COMMAND_FOOTER(); } @@ -4875,7 +4875,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxTotalCountAttribut PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxUnicastCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxUnicastCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0017); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0017); COMMAND_FOOTER(); } @@ -4886,7 +4886,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxBroadcastCountAttr EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxBroadcastCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0018); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0018); COMMAND_FOOTER(); } @@ -4897,7 +4897,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxAckRequestedCountA EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxAckRequestedCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0019); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0019); COMMAND_FOOTER(); } @@ -4907,7 +4907,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxAckRequestedCountA PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxAckedCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxAckedCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001A); COMMAND_FOOTER(); } @@ -4918,7 +4918,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxNoAckRequestedCoun EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxNoAckRequestedCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001B); COMMAND_FOOTER(); } @@ -4928,7 +4928,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxNoAckRequestedCoun PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxDataCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxDataCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001C); COMMAND_FOOTER(); } @@ -4938,7 +4938,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxDataCountAttribute PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxDataPollCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxDataPollCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001D); COMMAND_FOOTER(); } @@ -4948,7 +4948,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxDataPollCountAttri PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxBeaconCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxBeaconCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001E); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001E); COMMAND_FOOTER(); } @@ -4959,7 +4959,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxBeaconRequestCount EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxBeaconRequestCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001F); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001F); COMMAND_FOOTER(); } @@ -4969,7 +4969,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxBeaconRequestCount PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxOtherCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxOtherCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0020); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0020); COMMAND_FOOTER(); } @@ -4979,7 +4979,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxOtherCountAttribut PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxRetryCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxRetryCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0021); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0021); COMMAND_FOOTER(); } @@ -4990,7 +4990,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxDirectMaxRetryExpi EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0022); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0022); COMMAND_FOOTER(); } @@ -5001,7 +5001,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxIndirectMaxRetryEx EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0023); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0023); COMMAND_FOOTER(); } @@ -5011,7 +5011,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxIndirectMaxRetryEx PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxErrCcaCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxErrCcaCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0024); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0024); COMMAND_FOOTER(); } @@ -5021,7 +5021,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxErrCcaCountAttribu PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxErrAbortCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxErrAbortCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0025); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0025); COMMAND_FOOTER(); } @@ -5032,7 +5032,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxErrBusyChannelCoun EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsTxErrBusyChannelCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0026); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0026); COMMAND_FOOTER(); } @@ -5042,7 +5042,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadTxErrBusyChannelCoun PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxTotalCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxTotalCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0027); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0027); COMMAND_FOOTER(); } @@ -5052,7 +5052,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxTotalCountAttribut PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxUnicastCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxUnicastCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0028); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0028); COMMAND_FOOTER(); } @@ -5063,7 +5063,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxBroadcastCountAttr EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxBroadcastCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0029); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0029); COMMAND_FOOTER(); } @@ -5073,7 +5073,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxBroadcastCountAttr PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxDataCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxDataCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x002A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x002A); COMMAND_FOOTER(); } @@ -5083,7 +5083,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxDataCountAttribute PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxDataPollCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxDataPollCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x002B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x002B); COMMAND_FOOTER(); } @@ -5093,7 +5093,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxDataPollCountAttri PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxBeaconCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxBeaconCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x002C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x002C); COMMAND_FOOTER(); } @@ -5104,7 +5104,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxBeaconRequestCount EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxBeaconRequestCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x002D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x002D); COMMAND_FOOTER(); } @@ -5114,7 +5114,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxBeaconRequestCount PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxOtherCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxOtherCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x002E); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x002E); COMMAND_FOOTER(); } @@ -5125,7 +5125,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxAddressFilteredCou EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxAddressFilteredCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x002F); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x002F); COMMAND_FOOTER(); } @@ -5136,7 +5136,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxDestAddrFilteredCo EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0030); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0030); COMMAND_FOOTER(); } @@ -5147,7 +5147,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxDuplicatedCountAtt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxDuplicatedCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0031); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0031); COMMAND_FOOTER(); } @@ -5158,7 +5158,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrNoFrameCountAtt EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxErrNoFrameCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0032); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0032); COMMAND_FOOTER(); } @@ -5169,7 +5169,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrUnknownNeighbor EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0033); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0033); COMMAND_FOOTER(); } @@ -5180,7 +5180,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrInvalidSrcAddrC EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0034); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0034); COMMAND_FOOTER(); } @@ -5190,7 +5190,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrInvalidSrcAddrC PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrSecCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxErrSecCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0035); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0035); COMMAND_FOOTER(); } @@ -5200,7 +5200,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrSecCountAttribu PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrFcsCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxErrFcsCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0036); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0036); COMMAND_FOOTER(); } @@ -5210,7 +5210,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrFcsCountAttribu PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrOtherCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsRxErrOtherCount", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0037); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0037); COMMAND_FOOTER(); } @@ -5220,7 +5220,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadRxErrOtherCountAttri PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadSecurityPolicyAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsSecurityPolicy", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x003B); COMMAND_FOOTER(); } @@ -5230,7 +5230,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadSecurityPolicyAttrib PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadChannelMaskAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsChannelMask", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x003C); COMMAND_FOOTER(); } @@ -5241,7 +5241,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadOperationalDatasetCo EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsOperationalDatasetComponents", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x003D); COMMAND_FOOTER(); } @@ -5252,7 +5252,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadActiveNetworkFaultsL EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsActiveNetworkFaultsList", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003E); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x003E); COMMAND_FOOTER(); } @@ -5262,7 +5262,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadActiveNetworkFaultsL PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadThreadNetworkDiagnosticsClusterRevision", THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -5279,7 +5279,7 @@ PacketBufferHandle encodeThreadNetworkDiagnosticsClusterReadClusterRevisionAttri PacketBufferHandle encodeWakeOnLanClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverWakeOnLanAttributes", WAKE_ON_LAN_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -5289,7 +5289,7 @@ PacketBufferHandle encodeWakeOnLanClusterDiscoverAttributes(uint8_t seqNum, Endp PacketBufferHandle encodeWakeOnLanClusterReadWakeOnLanMacAddressAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWakeOnLanWakeOnLanMacAddress", WAKE_ON_LAN_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -5299,7 +5299,7 @@ PacketBufferHandle encodeWakeOnLanClusterReadWakeOnLanMacAddressAttribute(uint8_ PacketBufferHandle encodeWakeOnLanClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWakeOnLanClusterRevision", WAKE_ON_LAN_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -5320,7 +5320,7 @@ PacketBufferHandle encodeWakeOnLanClusterReadClusterRevisionAttribute(uint8_t se PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverWiFiNetworkDiagnosticsAttributes", WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -5330,7 +5330,7 @@ PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterDiscoverAttributes(uint8_t PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadBssidAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWiFiNetworkDiagnosticsBssid", WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -5340,7 +5340,7 @@ PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadBssidAttribute(uint8_t PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadSecurityTypeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWiFiNetworkDiagnosticsSecurityType", WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0001); COMMAND_FOOTER(); } @@ -5350,7 +5350,7 @@ PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadSecurityTypeAttribute( PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadWiFiVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWiFiNetworkDiagnosticsWiFiVersion", WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0002); COMMAND_FOOTER(); } @@ -5360,7 +5360,7 @@ PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadWiFiVersionAttribute(u PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadChannelNumberAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWiFiNetworkDiagnosticsChannelNumber", WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -5370,7 +5370,7 @@ PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadChannelNumberAttribute PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadRssiAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWiFiNetworkDiagnosticsRssi", WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0004); COMMAND_FOOTER(); } @@ -5380,7 +5380,7 @@ PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadRssiAttribute(uint8_t PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWiFiNetworkDiagnosticsClusterRevision", WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } @@ -5421,7 +5421,7 @@ PacketBufferHandle encodeWiFiNetworkDiagnosticsClusterReadClusterRevisionAttribu PacketBufferHandle encodeWindowCoveringClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("DiscoverWindowCoveringAttributes", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put32(0x0000).Put8(0xFF); COMMAND_FOOTER(); } @@ -5431,7 +5431,7 @@ PacketBufferHandle encodeWindowCoveringClusterDiscoverAttributes(uint8_t seqNum, PacketBufferHandle encodeWindowCoveringClusterReadTypeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringType", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0000); COMMAND_FOOTER(); } @@ -5441,7 +5441,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadTypeAttribute(uint8_t seqNum, PacketBufferHandle encodeWindowCoveringClusterReadCurrentPositionLiftAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringCurrentPositionLift", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0003); COMMAND_FOOTER(); } @@ -5451,7 +5451,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadCurrentPositionLiftAttribute(u PacketBufferHandle encodeWindowCoveringClusterReadCurrentPositionTiltAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringCurrentPositionTilt", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0004); COMMAND_FOOTER(); } @@ -5461,7 +5461,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadCurrentPositionTiltAttribute(u PacketBufferHandle encodeWindowCoveringClusterReadConfigStatusAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringConfigStatus", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0007); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0007); COMMAND_FOOTER(); } @@ -5472,7 +5472,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadCurrentPositionLiftPercentageA EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringCurrentPositionLiftPercentage", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0008); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0008); COMMAND_FOOTER(); } @@ -5484,9 +5484,9 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureCurrentPositionLiftPercen COMMAND_HEADER("ReportWindowCoveringCurrentPositionLiftPercentage", WINDOW_COVERING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0008) + .Put32(0x0008) .Put8(32) .Put16(minInterval) .Put16(maxInterval); @@ -5501,7 +5501,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadCurrentPositionTiltPercentageA EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringCurrentPositionTiltPercentage", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0009); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0009); COMMAND_FOOTER(); } @@ -5513,9 +5513,9 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureCurrentPositionTiltPercen COMMAND_HEADER("ReportWindowCoveringCurrentPositionTiltPercentage", WINDOW_COVERING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x0009) + .Put32(0x0009) .Put8(32) .Put16(minInterval) .Put16(maxInterval); @@ -5529,7 +5529,7 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureCurrentPositionTiltPercen PacketBufferHandle encodeWindowCoveringClusterReadOperationalStatusAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringOperationalStatus", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000A); COMMAND_FOOTER(); } @@ -5539,9 +5539,9 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureOperationalStatusAttribut COMMAND_HEADER("ReportWindowCoveringOperationalStatus", WINDOW_COVERING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x000A) + .Put32(0x000A) .Put8(24) .Put16(minInterval) .Put16(maxInterval); @@ -5555,7 +5555,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadTargetPositionLiftPercent100th EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringTargetPositionLiftPercent100ths", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000B); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000B); COMMAND_FOOTER(); } @@ -5565,9 +5565,9 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureTargetPositionLiftPercent COMMAND_HEADER("ReportWindowCoveringTargetPositionLiftPercent100ths", WINDOW_COVERING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x000B) + .Put32(0x000B) .Put8(33) .Put16(minInterval) .Put16(maxInterval); @@ -5582,7 +5582,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadTargetPositionTiltPercent100th EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringTargetPositionTiltPercent100ths", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000C); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000C); COMMAND_FOOTER(); } @@ -5592,9 +5592,9 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureTargetPositionTiltPercent COMMAND_HEADER("ReportWindowCoveringTargetPositionTiltPercent100ths", WINDOW_COVERING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x000C) + .Put32(0x000C) .Put8(33) .Put16(minInterval) .Put16(maxInterval); @@ -5608,7 +5608,7 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureTargetPositionTiltPercent PacketBufferHandle encodeWindowCoveringClusterReadEndProductTypeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringEndProductType", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000D); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000D); COMMAND_FOOTER(); } @@ -5619,7 +5619,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadCurrentPositionLiftPercent100t EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringCurrentPositionLiftPercent100ths", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000E); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000E); COMMAND_FOOTER(); } @@ -5629,9 +5629,9 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureCurrentPositionLiftPercen COMMAND_HEADER("ReportWindowCoveringCurrentPositionLiftPercent100ths", WINDOW_COVERING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x000E) + .Put32(0x000E) .Put8(33) .Put16(minInterval) .Put16(maxInterval); @@ -5646,7 +5646,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadCurrentPositionTiltPercent100t EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringCurrentPositionTiltPercent100ths", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000F); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x000F); COMMAND_FOOTER(); } @@ -5656,9 +5656,9 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureCurrentPositionTiltPercen COMMAND_HEADER("ReportWindowCoveringCurrentPositionTiltPercent100ths", WINDOW_COVERING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x000F) + .Put32(0x000F) .Put8(33) .Put16(minInterval) .Put16(maxInterval); @@ -5672,7 +5672,7 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureCurrentPositionTiltPercen PacketBufferHandle encodeWindowCoveringClusterReadInstalledOpenLimitLiftAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringInstalledOpenLimitLift", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0010); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0010); COMMAND_FOOTER(); } @@ -5682,7 +5682,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadInstalledOpenLimitLiftAttribut PacketBufferHandle encodeWindowCoveringClusterReadInstalledClosedLimitLiftAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringInstalledClosedLimitLift", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0011); COMMAND_FOOTER(); } @@ -5692,7 +5692,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadInstalledClosedLimitLiftAttrib PacketBufferHandle encodeWindowCoveringClusterReadInstalledOpenLimitTiltAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringInstalledOpenLimitTilt", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0012); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0012); COMMAND_FOOTER(); } @@ -5702,7 +5702,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadInstalledOpenLimitTiltAttribut PacketBufferHandle encodeWindowCoveringClusterReadInstalledClosedLimitTiltAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringInstalledClosedLimitTilt", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0013); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0013); COMMAND_FOOTER(); } @@ -5712,7 +5712,7 @@ PacketBufferHandle encodeWindowCoveringClusterReadInstalledClosedLimitTiltAttrib PacketBufferHandle encodeWindowCoveringClusterReadModeAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringMode", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0017); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x0017); COMMAND_FOOTER(); } @@ -5721,8 +5721,8 @@ PacketBufferHandle encodeWindowCoveringClusterWriteModeAttribute(uint8_t seqNum, COMMAND_HEADER("WriteWindowCoveringMode", WINDOW_COVERING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) - .Put16(0x0017) + .Put32(ZCL_WRITE_ATTRIBUTES_COMMAND_ID) + .Put32(0x0017) .Put8(24) .Put8(static_cast(mode)); COMMAND_FOOTER(); @@ -5734,7 +5734,7 @@ PacketBufferHandle encodeWindowCoveringClusterWriteModeAttribute(uint8_t seqNum, PacketBufferHandle encodeWindowCoveringClusterReadSafetyStatusAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringSafetyStatus", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001A); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0x001A); COMMAND_FOOTER(); } @@ -5744,9 +5744,9 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureSafetyStatusAttribute(uin COMMAND_HEADER("ReportWindowCoveringSafetyStatus", WINDOW_COVERING_CLUSTER_ID); buf.Put8(kFrameControlGlobalCommand) .Put8(seqNum) - .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID) + .Put32(ZCL_CONFIGURE_REPORTING_COMMAND_ID) .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED) - .Put16(0x001A) + .Put32(0x001A) .Put8(25) .Put16(minInterval) .Put16(maxInterval); @@ -5759,6 +5759,6 @@ PacketBufferHandle encodeWindowCoveringClusterConfigureSafetyStatusAttribute(uin PacketBufferHandle encodeWindowCoveringClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint) { COMMAND_HEADER("ReadWindowCoveringClusterRevision", WINDOW_COVERING_CLUSTER_ID); - buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD); + buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put32(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put32(0xFFFD); COMMAND_FOOTER(); } diff --git a/src/controller/java/gen/CHIPClusters-JNI.cpp b/src/controller/java/gen/CHIPClusters-JNI.cpp index 2a726ceca91f83..82f6d4d55ab2f4 100644 --- a/src/controller/java/gen/CHIPClusters-JNI.cpp +++ b/src/controller/java/gen/CHIPClusters-JNI.cpp @@ -5615,7 +5615,7 @@ JNI_METHOD(jlong, BindingCluster, initWithDevice)(JNIEnv * env, jobject self, jl } JNI_METHOD(void, BindingCluster, bind) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jint clusterId) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId) { StackLockGuard lock(JniReferences::GetInstance().GetStackLock()); CHIP_ERROR err = CHIP_NO_ERROR; @@ -5661,7 +5661,7 @@ JNI_METHOD(void, BindingCluster, bind) } } JNI_METHOD(void, BindingCluster, unbind) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jint clusterId) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId) { StackLockGuard lock(JniReferences::GetInstance().GetStackLock()); CHIP_ERROR err = CHIP_NO_ERROR; @@ -10630,7 +10630,7 @@ JNI_METHOD(jlong, ScenesCluster, initWithDevice)(JNIEnv * env, jobject self, jlo JNI_METHOD(void, ScenesCluster, addScene) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime, jstring sceneName, - jint clusterId, jint length, jint value) + jlong clusterId, jint length, jint value) { StackLockGuard lock(JniReferences::GetInstance().GetStackLock()); CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/controller/java/gen/ChipClusters.java b/src/controller/java/gen/ChipClusters.java index 8e1452fb6dc8cd..7f195c1d13f847 100644 --- a/src/controller/java/gen/ChipClusters.java +++ b/src/controller/java/gen/ChipClusters.java @@ -208,12 +208,12 @@ public BindingCluster(long devicePtr, int endpointId) { public native long initWithDevice(long devicePtr, int endpointId); public void bind( - DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, int clusterId) { + DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) { bind(chipClusterPtr, callback, nodeId, groupId, endpointId, clusterId); } public void unbind( - DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, int clusterId) { + DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) { unbind(chipClusterPtr, callback, nodeId, groupId, endpointId, clusterId); } @@ -223,7 +223,7 @@ private native void bind( long nodeId, int groupId, int endpointId, - int clusterId); + long clusterId); private native void unbind( long chipClusterPtr, @@ -231,7 +231,7 @@ private native void unbind( long nodeId, int groupId, int endpointId, - int clusterId); + long clusterId); } public static class BridgedDeviceBasicCluster extends BaseChipCluster { @@ -2013,7 +2013,7 @@ public void addScene( int sceneId, int transitionTime, String sceneName, - int clusterId, + long clusterId, int length, int value) { addScene( @@ -2060,7 +2060,7 @@ private native void addScene( int sceneId, int transitionTime, String sceneName, - int clusterId, + long clusterId, int length, int value); diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index ca221829f40a51..893ec3462086a7 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -3702,10 +3702,10 @@ def InitLib(self, chipLib): self._chipLib.chip_ime_ReadAttribute_BinaryInputBasic_ClusterRevision.restype = ctypes.c_uint32 # Cluster Binding # Cluster Binding Command Bind - self._chipLib.chip_ime_AppendCommand_Binding_Bind.argtypes = [ctypes.c_void_p, ctypes.c_uint8, ctypes.c_uint16, ctypes.c_uint64, ctypes.c_uint16, ctypes.c_uint8, ctypes.c_uint16] + self._chipLib.chip_ime_AppendCommand_Binding_Bind.argtypes = [ctypes.c_void_p, ctypes.c_uint8, ctypes.c_uint16, ctypes.c_uint64, ctypes.c_uint16, ctypes.c_uint16, ctypes.c_uint32] self._chipLib.chip_ime_AppendCommand_Binding_Bind.restype = ctypes.c_uint32 # Cluster Binding Command Unbind - self._chipLib.chip_ime_AppendCommand_Binding_Unbind.argtypes = [ctypes.c_void_p, ctypes.c_uint8, ctypes.c_uint16, ctypes.c_uint64, ctypes.c_uint16, ctypes.c_uint8, ctypes.c_uint16] + self._chipLib.chip_ime_AppendCommand_Binding_Unbind.argtypes = [ctypes.c_void_p, ctypes.c_uint8, ctypes.c_uint16, ctypes.c_uint64, ctypes.c_uint16, ctypes.c_uint16, ctypes.c_uint32] self._chipLib.chip_ime_AppendCommand_Binding_Unbind.restype = ctypes.c_uint32 # Cluster Binding ReadAttribute ClusterRevision self._chipLib.chip_ime_ReadAttribute_Binding_ClusterRevision.argtypes = [ctypes.c_void_p, ctypes.c_uint8, ctypes.c_uint16] @@ -4542,7 +4542,7 @@ def InitLib(self, chipLib): self._chipLib.chip_ime_ReadAttribute_RelativeHumidityMeasurement_ClusterRevision.restype = ctypes.c_uint32 # Cluster Scenes # Cluster Scenes Command AddScene - self._chipLib.chip_ime_AppendCommand_Scenes_AddScene.argtypes = [ctypes.c_void_p, ctypes.c_uint8, ctypes.c_uint16, ctypes.c_uint16, ctypes.c_uint8, ctypes.c_uint16, ctypes.c_char_p, ctypes.c_uint32, ctypes.c_uint16, ctypes.c_uint8, ctypes.c_uint8] + self._chipLib.chip_ime_AppendCommand_Scenes_AddScene.argtypes = [ctypes.c_void_p, ctypes.c_uint8, ctypes.c_uint16, ctypes.c_uint16, ctypes.c_uint8, ctypes.c_uint16, ctypes.c_char_p, ctypes.c_uint32, ctypes.c_uint32, ctypes.c_uint8, ctypes.c_uint8] self._chipLib.chip_ime_AppendCommand_Scenes_AddScene.restype = ctypes.c_uint32 # Cluster Scenes Command GetSceneMembership self._chipLib.chip_ime_AppendCommand_Scenes_GetSceneMembership.argtypes = [ctypes.c_void_p, ctypes.c_uint8, ctypes.c_uint16, ctypes.c_uint16] diff --git a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h index 58d22671ebfe42..7af6ffc79acb76 100644 --- a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h +++ b/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h @@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN @interface CHIPCluster : NSObject - (nullable instancetype)initWithDevice:(CHIPDevice *)device - endpoint:(uint8_t)endpoint + endpoint:(uint16_t)endpoint queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER; - (instancetype)init NS_UNAVAILABLE; + (instancetype)new NS_UNAVAILABLE; @@ -185,13 +185,13 @@ NS_ASSUME_NONNULL_BEGIN - (void)bind:(uint64_t)nodeId groupId:(uint16_t)groupId - endpointId:(uint8_t)endpointId - clusterId:(uint16_t)clusterId + endpointId:(uint16_t)endpointId + clusterId:(uint32_t)clusterId responseHandler:(ResponseHandler)responseHandler; - (void)unbind:(uint64_t)nodeId groupId:(uint16_t)groupId - endpointId:(uint8_t)endpointId - clusterId:(uint16_t)clusterId + endpointId:(uint16_t)endpointId + clusterId:(uint32_t)clusterId responseHandler:(ResponseHandler)responseHandler; - (void)readAttributeClusterRevisionWithResponseHandler:(ResponseHandler)responseHandler; @@ -926,7 +926,7 @@ NS_ASSUME_NONNULL_BEGIN sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime sceneName:(NSString *)sceneName - clusterId:(uint16_t)clusterId + clusterId:(uint32_t)clusterId length:(uint8_t)length value:(uint8_t)value responseHandler:(ResponseHandler)responseHandler; diff --git a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm index 9e9470a362cb52..7618ceb45757c7 100644 --- a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm @@ -2859,7 +2859,7 @@ static void CallbackFn(void * context, uint16_t count, chip::ClusterId * entries if (callback && callback->mQueue) { id values[count]; for (uint16_t i = 0; i < count; i++) { - values[i] = [NSNumber numberWithUnsignedShort:entries[i]]; + values[i] = [NSNumber numberWithUnsignedLong:entries[i]]; } id array = [NSArray arrayWithObjects:values count:count]; @@ -2894,7 +2894,7 @@ static void CallbackFn(void * context, uint16_t count, chip::ClusterId * entries if (callback && callback->mQueue) { id values[count]; for (uint16_t i = 0; i < count; i++) { - values[i] = [NSNumber numberWithUnsignedShort:entries[i]]; + values[i] = [NSNumber numberWithUnsignedLong:entries[i]]; } id array = [NSArray arrayWithObjects:values count:count]; @@ -2929,7 +2929,7 @@ static void CallbackFn(void * context, uint16_t count, chip::EndpointId * entrie if (callback && callback->mQueue) { id values[count]; for (uint16_t i = 0; i < count; i++) { - values[i] = [NSNumber numberWithUnsignedChar:entries[i]]; + values[i] = [NSNumber numberWithUnsignedShort:entries[i]]; } id array = [NSArray arrayWithObjects:values count:count]; @@ -5353,8 +5353,8 @@ @implementation CHIPBinding - (void)bind:(uint64_t)nodeId groupId:(uint16_t)groupId - endpointId:(uint8_t)endpointId - clusterId:(uint16_t)clusterId + endpointId:(uint16_t)endpointId + clusterId:(uint32_t)clusterId responseHandler:(ResponseHandler)responseHandler { CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(responseHandler, [self callbackQueue]); @@ -5383,8 +5383,8 @@ - (void)bind:(uint64_t)nodeId } - (void)unbind:(uint64_t)nodeId groupId:(uint16_t)groupId - endpointId:(uint8_t)endpointId - clusterId:(uint16_t)clusterId + endpointId:(uint16_t)endpointId + clusterId:(uint32_t)clusterId responseHandler:(ResponseHandler)responseHandler { CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(responseHandler, [self callbackQueue]); @@ -13504,7 +13504,7 @@ - (void)addScene:(uint16_t)groupId sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime sceneName:(NSString *)sceneName - clusterId:(uint16_t)clusterId + clusterId:(uint32_t)clusterId length:(uint8_t)length value:(uint8_t)value responseHandler:(ResponseHandler)responseHandler diff --git a/src/darwin/Framework/CHIP/templates/CHIPClustersObjc.zapt b/src/darwin/Framework/CHIP/templates/CHIPClustersObjc.zapt index f79816bc8afbbf..f1e5f2e73650cd 100644 --- a/src/darwin/Framework/CHIP/templates/CHIPClustersObjc.zapt +++ b/src/darwin/Framework/CHIP/templates/CHIPClustersObjc.zapt @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPCluster : NSObject -- (nullable instancetype)initWithDevice:(CHIPDevice *)device endpoint:(uint8_t)endpoint queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER; +- (nullable instancetype)initWithDevice:(CHIPDevice *)device endpoint:(uint16_t)endpoint queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER; - (instancetype)init NS_UNAVAILABLE; + (instancetype)new NS_UNAVAILABLE; diff --git a/src/lib/core/CHIPCallback.h b/src/lib/core/CHIPCallback.h index 391fafdd43f56f..69d26481ca2f55 100644 --- a/src/lib/core/CHIPCallback.h +++ b/src/lib/core/CHIPCallback.h @@ -49,7 +49,7 @@ class Cancelable */ Cancelable * mNext; Cancelable * mPrev; - alignas(uint64_t) char mInfo[16]; + alignas(uint64_t) char mInfo[24]; /** * @brief when non-null, indicates the Callback is registered with