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 project-chip#22507 Fixes project-chip#22341
bzbarsky-apple · Oct 10, 2022 · 4e023c9 · 4e023c9
1 parent 119cdf5
commit 4e023c9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git 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<ReadAttribute>(Id, credsIssuerConfig), //
         {{#zcl_attributes_server}}
         make_unique<ReadAttribute>(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<ReadAttribute>(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<ReadAttribute>(Id, "device-list", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), //
-        {{/if}}
         {{/zcl_attributes_server}}
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig), //
         {{#zcl_attributes_server}}
@@ -115,14 +107,6 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands, CredentialIss
         {{#zcl_attributes_server}}
         {{#if isReportable}}
         make_unique<SubscribeAttribute>(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<SubscribeAttribute>(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<SubscribeAttribute>(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