Uncomment basic cluster

examples/lighting-app/nrf5/main/gen/callback.h

@@ -3283,6 +3283,18 @@ EmberAfStatus emberAfOnOffClusterSetValueCallback(uint8_t endpoint, uint8_t comm
  */
 void emberAfPluginOnOffClusterServerPostInitCallback(uint8_t endpoint);
 
+/** @brief Basic Cluster Reset To Factory Defaults
+ *
+ * This function is called by the Basic server plugin when a request to
+ * reset to factory defaults is received. The plugin will reset attributes
+ * managed by the framework to their default values.
+ * The application should perform any other necessary reset-related operations
+ * in this callback, including resetting any externally-stored attributes.
+ *
+ * @param endpoint Endpoint that is being initialized  Ver.: always
+ */
+void emberAfPluginBasicResetToFactoryDefaultsCallback(uint8_t endpoint);
+
 /** @} END On/off Cluster Callbacks */
 
 /** @name On/off Switch Configuration Cluster Callbacks */

examples/lock-app/nrf5/main/gen/callback.h

@@ -3283,6 +3283,18 @@ EmberAfStatus emberAfOnOffClusterSetValueCallback(uint8_t endpoint, uint8_t comm
  */
 void emberAfPluginOnOffClusterServerPostInitCallback(uint8_t endpoint);
 
+/** @brief Basic Cluster Reset To Factory Defaults
+ *
+ * This function is called by the Basic server plugin when a request to
+ * reset to factory defaults is received. The plugin will reset attributes
+ * managed by the framework to their default values.
+ * The application should perform any other necessary reset-related operations
+ * in this callback, including resetting any externally-stored attributes.
+ *
+ * @param endpoint Endpoint that is being initialized  Ver.: always
+ */
+void emberAfPluginBasicResetToFactoryDefaultsCallback(uint8_t endpoint);
+
 /** @} END On/off Cluster Callbacks */
 
 /** @name On/off Switch Configuration Cluster Callbacks */

examples/lock-app/nrfconnect/main/gen/callback.h

@@ -3283,6 +3283,18 @@ EmberAfStatus emberAfOnOffClusterSetValueCallback(uint8_t endpoint, uint8_t comm
  */
 void emberAfPluginOnOffClusterServerPostInitCallback(uint8_t endpoint);
 
+/** @brief Basic Cluster Reset To Factory Defaults
+ *
+ * This function is called by the Basic server plugin when a request to
+ * reset to factory defaults is received. The plugin will reset attributes
+ * managed by the framework to their default values.
+ * The application should perform any other necessary reset-related operations
+ * in this callback, including resetting any externally-stored attributes.
+ *
+ * @param endpoint Endpoint that is being initialized  Ver.: always
+ */
+void emberAfPluginBasicResetToFactoryDefaultsCallback(uint8_t endpoint);
+
 /** @} END On/off Cluster Callbacks */
 
 /** @name On/off Switch Configuration Cluster Callbacks */

examples/wifi-echo/server/esp32/main/component.mk

@@ -33,7 +33,7 @@ COMPONENT_SRCDIRS :=                                                      \
   ../third_party/connectedhomeip/src/app/clusters/groups-server           \
   ../third_party/connectedhomeip/src/app/clusters/color-control-server    \
   ../third_party/connectedhomeip/src/app/clusters/scenes                 \
-#  ../third_party/connectedhomeip/src/app/clusters/basic                  \
+ ../third_party/connectedhomeip/src/app/clusters/basic                  \
 #  ../third_party/connectedhomeip/src/app/clusters/door-lock-server       \
 #  ../third_party/connectedhomeip/src/app/clusters/groups-client          \
 #  ../third_party/connectedhomeip/src/app/clusters/ias-zone-client        \

examples/wifi-echo/server/esp32/main/gen/callback-stub.c

@@ -98,6 +98,18 @@ bool emberAfPluginGroupsServerGroupNamesSupportedCallback(uint8_t endpoint)
  */
 void emberAfPluginGroupsServerSetGroupNameCallback(uint8_t endpoint, uint16_t groupId, uint8_t * groupName) {}
 
+/** @brief Basic Cluster Reset To Factory Defaults
+ *
+ * This function is called by the Basic server plugin when a request to
+ * reset to factory defaults is received. The plugin will reset attributes
+ * managed by the framework to their default values.
+ * The application should perform any other necessary reset-related operations
+ * in this callback, including resetting any externally-stored attributes.
+ *
+ * @param endpoint Endpoint that is being initialized  Ver.: always
+ */
+void emberAfPluginBasicResetToFactoryDefaultsCallback(uint8_t endpoint) {}
+
 /** @brief Add To Current App Tasks
  *
  * This function is only useful to sleepy end devices.  This function will note

examples/wifi-echo/server/esp32/main/gen/callback.h

@@ -3322,6 +3322,18 @@ EmberAfStatus emberAfOnOffClusterSetValueCallback(uint8_t endpoint, uint8_t comm
  */
 void emberAfPluginOnOffClusterServerPostInitCallback(uint8_t endpoint);
 
+/** @brief Basic Cluster Reset To Factory Defaults
+ *
+ * This function is called by the Basic server plugin when a request to
+ * reset to factory defaults is received. The plugin will reset attributes
+ * managed by the framework to their default values.
+ * The application should perform any other necessary reset-related operations
+ * in this callback, including resetting any externally-stored attributes.
+ *
+ * @param endpoint Endpoint that is being initialized  Ver.: always
+ */
+void emberAfPluginBasicResetToFactoryDefaultsCallback(uint8_t endpoint);
+
 /** @} END On/off Cluster Callbacks */
 
 /** @name On/off Switch Configuration Cluster Callbacks */

examples/wifi-echo/server/esp32/main/gen/clusters-callback-stubs.c

@@ -56,16 +56,6 @@ bool emberAfPluginIdentifyStopFeedbackCallback(uint8_t endpoint)
     return false;
 }
 
-/** @brief Basic Cluster Reset To Factory Defaults
- *
- *
- *
- */
-bool emberAfBasicClusterResetToFactoryDefaultsCallback(void)
-{
-    return false;
-}
-
 /** @brief Door Lock Cluster Clear All Pins
  *
  *

src/app/clusters/basic/basic.c

@@ -38,7 +38,7 @@
  *******************************************************************************
  ******************************************************************************/
 
-#include "../../include/af.h"
+#include "af.h"
 
 void emberAfResetAttributes(uint8_t endpoint);