fixup! cpu/esp32: implement ESP32 SoftAP mode

jeandudey · jeandudey · commit a80331213eaa · 2020-06-30T13:03:25.000-05:00
diff --git a/cpu/esp_common/esp-wifi/esp_wifi_netdev.c b/cpu/esp_common/esp-wifi/esp_wifi_netdev.c
@@ -827,8 +827,10 @@ static wifi_config_t wifi_config_sta = {
  */
 static wifi_config_t wifi_config_ap = {
     .ap = {
+#ifdef ESP_WIFI_SSID
         .ssid = ESP_WIFI_SSID,
         .ssid_len = ARRAY_SIZE(ESP_WIFI_SSID) - 1,
+#endif
 #ifdef ESP_WIFI_PASS
         .password = ESP_WIFI_PASS,
         .authmode = WIFI_AUTH_WPA2_PSK,
@@ -914,6 +916,15 @@ void esp_wifi_setup (esp_wifi_netdev_t* dev)
     }
 
 #if defined(MCU_ESP8266) || defined(MODULE_ESP_WIFI_AP)
+#ifdef ESP_WIFI_AP_PREFIX
+    uint8_t mac[ETHERNET_ADDR_LEN];
+    esp_wifi_get_mac(ESP_MAC_WIFI_SOFTAP, mac);
+    sprintf((char*)wifi_config_ap.ap.ssid, "%s%02x%02x%02x%02x%02x%02x",
+            ESP_WIFI_AP_PREFIX,
+            mac[0], mac[1], mac[2],
+            mac[3], mac[4], mac[5]);
+    wifi_config_ap.ap.ssid_len = strlen((char*)wifi_config_ap.ap.ssid);
+#endif /* ESP_WIFI_AP_PREFIX */
     /* set the SoftAP configuration */
     result = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config_ap);
     if (result != ESP_OK) {
diff --git a/cpu/esp_common/esp-wifi/esp_wifi_params.h b/cpu/esp_common/esp-wifi/esp_wifi_params.h
@@ -44,10 +44,17 @@
 /**
  * @brief   SSID of the AP to be used.
  */
-#ifndef ESP_WIFI_SSID
+#if !defined(ESP_WIFI_SSID) && !defined(ESP_WIFI_AP_PREFIX)
 #define ESP_WIFI_SSID       "RIOT_AP"
 #endif
 
+/**
+ * @brief   Prefix to be used as part of the SSID (e.g.: RIOT_AP_aabbccddeeff)
+ */
+#if !defined(ESP_WIFI_SSID) && !defined(ESP_WIFI_AP_PREFIX)
+#define ESP_WIFI_AP_PREFIX "RIOT_AP_"
+#endif
+
 /**
  * @brief   Passphrase used for the AP as clear text (max. 64 chars).
  */
