Merge pull request #62 from qmsk/esp-idf-4.4.6

esp32: upgrade esp-idf 4.4.6
qmsk · Nov 19, 2023 · 5f730bd · 5f730bd
2 parents 7bcc4e7 + c4de848
commit 5f730bd
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   NODE_VERSION: 15.x
-  ESP_IDF_VERSION: v4.4
+  ESP_IDF_VERSION: v4.4.6
   ESP8266_RTOS_SDK_VERSION: v3.4
 
 jobs:

diff --git a/components/system/include/system_wifi.h b/components/system/include/system_wifi.h
@@ -7,3 +7,7 @@ const char *wifi_mode_str(wifi_mode_t mode);
 const char *wifi_auth_mode_str(wifi_auth_mode_t auth_mode);
 const char *wifi_cipher_type_str(wifi_cipher_type_t cipher_type);
 const char *wifi_err_reason_str(wifi_err_reason_t reason);
+
+#if !CONFIG_IDF_TARGET_ESP8266
+  const char *wifi_phy_mode_str(wifi_phy_mode_t phymode);
+#endif
diff --git a/components/system/wifi.c b/components/system/wifi.c
@@ -31,7 +31,7 @@ const char *wifi_auth_mode_str(wifi_auth_mode_t auth_mode) {
     case WIFI_AUTH_WPA2_WPA3_PSK:   return "WPA2/3-PSK";
 #if CONFIG_IDF_TARGET_ESP32
     case WIFI_AUTH_WAPI_PSK:        return "WPAI-PSK";
-#endif    
+#endif
     default:                        return "?";
   }
 }
@@ -101,3 +101,18 @@ const char *wifi_err_reason_str(wifi_err_reason_t reason) {
     default: return "?";
   }
 }
+
+#if !CONFIG_IDF_TARGET_ESP8266
+  const char *wifi_phy_mode_str(wifi_phy_mode_t phymode)
+  {
+    switch (phymode) {
+      case WIFI_PHY_MODE_LR:    return "LR";
+      case WIFI_PHY_MODE_11B:   return "11B";
+      case WIFI_PHY_MODE_11G:   return "11G";
+      case WIFI_PHY_MODE_HT20:  return "HT20";
+      case WIFI_PHY_MODE_HT40:  return "HT40";
+      case WIFI_PHY_MODE_HE20:  return "HE20";
+      default:                  return "?";
+    }
+  }
+#endif
diff --git a/main/wifi_cmd.c b/main/wifi_cmd.c
@@ -92,6 +92,16 @@ static int print_wifi_info_sta()
     );
   }
 
+#if !CONFIG_IDF_TARGET_ESP8266
+  wifi_phy_mode_t phymode = -1;
+
+  if ((err = esp_wifi_sta_get_negotiated_phymode(&phymode))) {
+    LOG_WARN("esp_wifi_sta_get_negotiated_phymode: %s", esp_err_to_name(err));
+  } else {
+    printf("\t\t%-20s: %s\n", "PHY Mode", wifi_phy_mode_str(phymode));
+  }
+#endif
+
   return 0;
 }
 

diff --git a/main/wifi_events.c b/main/wifi_events.c
@@ -57,10 +57,31 @@ static void on_sta_stop()
 
 static void on_sta_connected(wifi_event_sta_connected_t *event)
 {
-  LOG_INFO("ssid=%.32s bssid=%02x:%02x:%02x:%02x:%02x:%02x channel=%u authmode=%s",
+#if !CONFIG_IDF_TARGET_ESP8266
+  int rssi = 0;
+  wifi_phy_mode_t phymode = -1;
+  esp_err_t err;
+
+  if ((err = esp_wifi_sta_get_rssi(&rssi))) {
+
+  }
+
+  if ((err = esp_wifi_sta_get_negotiated_phymode(&phymode))) {
+
+  }
+#endif
+
+  LOG_INFO("ssid=%.32s bssid=%02x:%02x:%02x:%02x:%02x:%02x channel=%u rssi=%d phymode=%s authmode=%s",
     event->ssid,
     event->bssid[0], event->bssid[1], event->bssid[2], event->bssid[3], event->bssid[4], event->bssid[5],
     event->channel,
+#if CONFIG_IDF_TARGET_ESP8266
+    0,
+    "?",
+#else
+    rssi,
+    wifi_phy_mode_str(phymode),
+#endif
     wifi_auth_mode_str(event->authmode)
   );
 

diff --git a/projects/esp32/docker-compose.yml b/projects/esp32/docker-compose.yml
@@ -9,7 +9,8 @@ services:
     build:
       context: ../../sdk/esp-idf
       args:
-        ESP_IDF_VERSION: v4.4.4
+        # also update .github/workflows/build.yml `ESP_IDF_VERSION`
+        ESP_IDF_VERSION: v4.4.6
         BUILD_UID: ${BUILD_UID}
         BUILD_GID: ${BUILD_GID}
     command: idf.py --version