Merge branch 'master' into feature/fix-cluster-revisions

Author: lazarkov

examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h

@@ -50,7 +50,7 @@ class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::Supp
     };
 
     static storage_value_type coffeeOptions[];
-    static const EndpointSpanPair supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT];
+    static const EndpointSpanPair supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT];
 
 public:
     static const StaticSupportedModesManager instance;

examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h

@@ -49,7 +49,7 @@ class AppSupportedTemperatureLevelsDelegate : public SupportedTemperatureLevelsI
     static CharSpan temperatureLevelOptions[3];
 
 public:
-    static const EndpointPair supportedOptionsByEndpoints[EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT];
+    static const EndpointPair supportedOptionsByEndpoints[MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT];
 
     uint8_t Size() override;