Resolved merge conflicts

project-chip · Jun 8, 2022 · 2101c12 · 2101c12
1 parent 36ce661
commit 2101c12
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/examples/platform/esp32/common/CommonDeviceCallbacks.cpp b/examples/platform/esp32/common/CommonDeviceCallbacks.cpp
@@ -34,6 +34,7 @@
 #include <app/server/Dnssd.h>
 #include <app/util/util.h>
 #include <lib/support/CodeUtils.h>
+#include <platform/ESP32/ESP32Utils.h>
 #if CONFIG_ENABLE_OTA_REQUESTOR
 #include <ota/OTAHelper.h>
 #endif
@@ -58,6 +59,14 @@ void CommonDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, i
         OnSessionEstablished(event);
         break;
 
+    case DeviceEventType::kFailSafeTimerExpired: {
+        CHIP_ERROR error = chip::DeviceLayer::Internal::ESP32Utils::ClearWiFiStationProvision();
+        if (error != CHIP_NO_ERROR)
+        {
+            ChipLogError(DeviceLayer, "ClearWiFiStationProvision failed: %s", chip::ErrorStr(error));
+        }
+    }
+    break;
     case DeviceEventType::kCHIPoBLEConnectionEstablished:
         ESP_LOGI(TAG, "CHIPoBLE connection established");
         break;