[ESP32] Set the country code in esp_phy layer (#27365)

* [ESP32] Set the country code in esp_phy layer * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Oct 18, 2023 · 3263715 · 3263715
1 parent 0f86c37
commit 3263715
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/platform/ESP32/ConfigurationManagerImpl.cpp b/src/platform/ESP32/ConfigurationManagerImpl.cpp
@@ -32,6 +32,7 @@
 #include <platform/internal/GenericConfigurationManagerImpl.ipp>
 
 #include "esp_ota_ops.h"
+#include "esp_phy_init.h"
 #include "esp_wifi.h"
 #include "nvs.h"
 #include "nvs_flash.h"
@@ -236,6 +237,17 @@ CHIP_ERROR ConfigurationManagerImpl::GetLocationCapability(uint8_t & location)
 #endif
 }
 
+CHIP_ERROR ConfigurationManagerImpl::StoreCountryCode(const char * code, size_t codeLen)
+{
+    // As per spec, codeLen has to be 2
+    VerifyOrReturnError((code != nullptr) && (codeLen == 2), CHIP_ERROR_INVALID_ARGUMENT);
+    // Write CountryCode to esp_phy layer
+    ReturnErrorOnFailure(MapConfigError(esp_phy_update_country_info(code)));
+    // As we do not have API to read country code from esp_phy layer, we are writing to NVS and when client reads the
+    // CountryCode then we read from NVS
+    return GenericConfigurationManagerImpl<ESP32Config>::StoreCountryCode(code, codeLen);
+}
+
 CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
 {
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI

diff --git a/src/platform/ESP32/ConfigurationManagerImpl.h b/src/platform/ESP32/ConfigurationManagerImpl.h
@@ -58,6 +58,10 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
     CHIP_ERROR GetLocationCapability(uint8_t & location) override;
     static ConfigurationManagerImpl & GetDefaultInstance();
 
+    // Set the country code to esp_phy layer and also store it to NVS
+    // GenericConfigurationManagerImpl::GetCountryCode() API already reads from the NVS so its not implemented here
+    CHIP_ERROR StoreCountryCode(const char * code, size_t codeLen) override;
+
 private:
     // ===== Members that implement the ConfigurationManager public interface.