c6 wifi power save mode test

Author: DejinChen

config/esp32/components/chip/CMakeLists.txt

@@ -434,7 +434,13 @@ if(CONFIG_BT_ENABLED)
     if((target_name STREQUAL "esp32h2") OR (target_name STREQUAL "esp32c2") OR (target_name STREQUAL "esp32c6"))
         idf_component_get_property(bt_dir bt COMPONENT_DIR)
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}>)
-        list(APPEND chip_libraries "${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/libble_app.a")
+        if (EXISTS ${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/libble_app.a)
+            list(APPEND chip_libraries "${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/libble_app.a")
+            message("c6 bt lib in chip_library: ${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/libble_app.a")
+        elseif(EXISTS ${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/${target_name}/libble_app.a)
+            list(APPEND chip_libraries "${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/${target_name}/libble_app.a")
+            message("c6/c61 bt lib in chip_library: ${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/${target_name}/libble_app.a")
+        endif()
     else()
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}> -lbtdm_app)
     endif()

src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp

@@ -48,6 +48,18 @@ using namespace ::chip::Inet;
 using namespace ::chip::System;
 using chip::DeviceLayer::Internal::ESP32Utils;
 
+#define DEFAULT_BEACON_TIMEOUT  CONFIG_EXAMPLE_WIFI_BEACON_TIMEOUT
+
+#if CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM
+#define DEFAULT_PS_MODE WIFI_PS_MIN_MODEM
+#elif CONFIG_EXAMPLE_POWER_SAVE_MAX_MODEM
+#define DEFAULT_PS_MODE WIFI_PS_MAX_MODEM
+#elif CONFIG_EXAMPLE_POWER_SAVE_NONE
+#define DEFAULT_PS_MODE WIFI_PS_NONE
+#else
+#define DEFAULT_PS_MODE WIFI_PS_NONE
+#endif /*CONFIG_POWER_SAVE_MODEM*/
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -640,6 +652,10 @@ void ConnectivityManagerImpl::DriveStationState()
                 now >= mLastStationConnectFailTime + mWiFiStationReconnectInterval)
             {
                 ChipLogProgress(DeviceLayer, "Attempting to connect WiFi station interface");
+                esp_wifi_set_inactive_time(WIFI_IF_STA, 24);
+                esp_wifi_set_ps(WIFI_PS_MAX_MODEM);
+
+                printf("esp_wifi_connect()\r\n");
                 esp_err_t err = esp_wifi_connect();
                 if (err != ESP_OK)
                 {

src/platform/ESP32/ESP32Utils.cpp

@@ -112,6 +112,7 @@ CHIP_ERROR ESP32Utils::StartWiFiLayer(void)
         ChipLogProgress(DeviceLayer, "Starting ESP WiFi layer");
 
         err = esp_wifi_start();
+        printf("esp_wifi_start\r\n");
         if (err != ESP_OK)
         {
             ChipLogError(DeviceLayer, "esp_wifi_start() failed: %s", esp_err_to_name(err));

src/platform/ESP32/NetworkCommissioningDriver.cpp

@@ -38,6 +38,19 @@ constexpr char kWiFiCredentialsKeyName[] = "wifi-pass";
 static uint8_t WiFiSSIDStr[DeviceLayer::Internal::kMaxWiFiSSIDLength];
 } // namespace
 
+#define DEFAULT_LISTEN_INTERVAL (20)
+// #define DEFAULT_BEACON_TIMEOUT  CONFIG_EXAMPLE_WIFI_BEACON_TIMEOUT
+
+// #if CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM
+// #define DEFAULT_PS_MODE WIFI_PS_MIN_MODEM
+// #elif CONFIG_EXAMPLE_POWER_SAVE_MAX_MODEM
+// #define DEFAULT_PS_MODE WIFI_PS_MAX_MODEM
+// #elif CONFIG_EXAMPLE_POWER_SAVE_NONE
+// #define DEFAULT_PS_MODE WIFI_PS_NONE
+// #else
+// #define DEFAULT_PS_MODE WIFI_PS_NONE
+// #endif /*CONFIG_POWER_SAVE_MODEM*/
+
 BitFlags<WiFiSecurityBitmap> ConvertSecurityType(wifi_auth_mode_t authMode)
 {
     BitFlags<WiFiSecurityBitmap> securityType;
@@ -224,8 +237,12 @@ CHIP_ERROR ESPWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen,
     memcpy(wifiConfig.sta.ssid, ssid, std::min(ssidLen, static_cast<uint8_t>(sizeof(wifiConfig.sta.ssid))));
     memcpy(wifiConfig.sta.password, key, std::min(keyLen, static_cast<uint8_t>(sizeof(wifiConfig.sta.password))));
 
+    wifiConfig.sta.listen_interval = 20;
     // Configure the ESP WiFi interface.
     esp_err_t err = esp_wifi_set_config(WIFI_IF_STA, &wifiConfig);
+    // esp_wifi_set_inactive_time(WIFI_IF_STA, DEFAULT_BEACON_TIMEOUT);
+    // esp_wifi_set_ps(DEFAULT_PS_MODE);
+
     if (err != ESP_OK)
     {
         ChipLogError(DeviceLayer, "esp_wifi_set_config() failed: %s", esp_err_to_name(err));