From 4e023c926eb3f665b755429133d248a0325604de Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 10 Oct 2022 11:34:16 -0400 Subject: [PATCH] Remove some 1.0-only backwards-compat hacks from chip-tool. These were just there to avoid changing some command lines from SVE2 to 1.0, but at this point those should be updated as needed. Fixes https://github.com/project-chip/connectedhomeip/issues/22507 Fixes https://github.com/project-chip/connectedhomeip/issues/22341 --- examples/chip-tool/templates/commands.zapt | 16 ---------------- .../chip-tool/zap-generated/cluster/Commands.h | 4 ---- 2 files changed, 20 deletions(-) diff --git a/examples/chip-tool/templates/commands.zapt b/examples/chip-tool/templates/commands.zapt index 8c075485a02ef1..b56772d44a5ad5 100644 --- a/examples/chip-tool/templates/commands.zapt +++ b/examples/chip-tool/templates/commands.zapt @@ -90,14 +90,6 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands, CredentialIss make_unique(Id, credsIssuerConfig), // {{#zcl_attributes_server}} make_unique(Id, "{{cleanse_label_as_kebab_case (asUpperCamelCase name)}}", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // - {{! TODO: Remove after 1.0. See https://github.com/project-chip/connectedhomeip/issues/22341 }} - {{#if (isStrEqual (asUpperCamelCase name) "ColorTemperatureMireds")}} - make_unique(Id, "color-temperature", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // - {{/if}} - {{! TODO: Remove after 1.0. See https://github.com/project-chip/connectedhomeip/issues/22507 }} - {{#if (isStrEqual (asUpperCamelCase name) "DeviceTypeList")}} - make_unique(Id, "device-list", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // - {{/if}} {{/zcl_attributes_server}} make_unique>(Id, credsIssuerConfig), // {{#zcl_attributes_server}} @@ -115,14 +107,6 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands, CredentialIss {{#zcl_attributes_server}} {{#if isReportable}} make_unique(Id, "{{cleanse_label_as_kebab_case (asUpperCamelCase name)}}", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // - {{! TODO: Remove after 1.0. See https://github.com/project-chip/connectedhomeip/issues/22341 }} - {{#if (isStrEqual (asUpperCamelCase name) "ColorTemperatureMireds")}} - make_unique(Id, "color-temperature", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // - {{/if}} - {{! TODO: Remove after 1.0. See https://github.com/project-chip/connectedhomeip/issues/22507 }} - {{#if (isStrEqual (asUpperCamelCase name) "DeviceTypeList")}} - make_unique(Id, "device-list", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // - {{/if}} {{/if}} {{/zcl_attributes_server}} // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 40b1760e02ba07..78b66ba4b6d5eb 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -8675,7 +8675,6 @@ void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * c // make_unique(Id, credsIssuerConfig), // make_unique(Id, "device-type-list", Attributes::DeviceTypeList::Id, credsIssuerConfig), // - make_unique(Id, "device-list", Attributes::DeviceTypeList::Id, credsIssuerConfig), // make_unique(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig), // make_unique(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig), // make_unique(Id, "parts-list", Attributes::PartsList::Id, credsIssuerConfig), // @@ -8687,7 +8686,6 @@ void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * c make_unique>(Id, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "device-type-list", Attributes::DeviceTypeList::Id, credsIssuerConfig), // - make_unique(Id, "device-list", Attributes::DeviceTypeList::Id, credsIssuerConfig), // make_unique(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig), // make_unique(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig), // make_unique(Id, "parts-list", Attributes::PartsList::Id, credsIssuerConfig), // @@ -11423,7 +11421,6 @@ void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * make_unique(Id, "drift-compensation", Attributes::DriftCompensation::Id, credsIssuerConfig), // make_unique(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig), // make_unique(Id, "color-temperature-mireds", Attributes::ColorTemperatureMireds::Id, credsIssuerConfig), // - make_unique(Id, "color-temperature", Attributes::ColorTemperatureMireds::Id, credsIssuerConfig), // make_unique(Id, "color-mode", Attributes::ColorMode::Id, credsIssuerConfig), // make_unique(Id, "options", Attributes::Options::Id, credsIssuerConfig), // make_unique(Id, "number-of-primaries", Attributes::NumberOfPrimaries::Id, credsIssuerConfig), // @@ -11516,7 +11513,6 @@ void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * make_unique(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig), // make_unique(Id, "color-temperature-mireds", Attributes::ColorTemperatureMireds::Id, credsIssuerConfig), // - make_unique(Id, "color-temperature", Attributes::ColorTemperatureMireds::Id, credsIssuerConfig), // make_unique(Id, "color-mode", Attributes::ColorMode::Id, credsIssuerConfig), // make_unique(Id, "options", Attributes::Options::Id, credsIssuerConfig), // make_unique(Id, "number-of-primaries", Attributes::NumberOfPrimaries::Id, credsIssuerConfig), //