Merge branch 'feature/add_auto_connect_demo' into 'main'

Add auto enter room when Wifi connected

See merge request adf/esp-webrtc-solution!15

Author: TempoTian

components/esp_webrtc/impl/apprtc_signal/signal_default.c

@@ -648,10 +648,6 @@ static int wss_signal_send_msg(esp_peer_signaling_handle_t h, esp_peer_signaling
     cJSON_Delete(json);
     int ret = https_post(request_room, NULL, payload, NULL, NULL);
     free(payload);
-    if (msg->type == ESP_PEER_SIGNALING_MSG_SDP) {
-        snprintf(request_room, 128, "%s/r/%s", sg->client_info.base_url, sg->client_info.room_id);
-        ESP_LOGI(TAG, "Please use browser to connect in: %s", request_room);
-    }
     return ret;
 }
 

solutions/common/network.c

@@ -46,6 +46,65 @@ bool network_is_connected(void)
 
 #ifndef CONFIG_NETWORK_USE_ETHERNET
 
+static wifi_config_t wifi_config;
+
+#define PART_NAME     "wifi-set"
+#define WIFI_SSID_KEY "ssid"
+#define WIFI_PSW_KEY  "psw"
+
+static bool load_from_nvs(void)
+{
+    nvs_handle_t wifi_nvs = 0;
+    bool load_ok = false;
+    do {
+        esp_err_t ret = nvs_open(PART_NAME, NVS_READWRITE, &wifi_nvs);
+        if (ret != ESP_OK) {
+            ESP_LOGE(TAG, "Fail to open nvs ret %d", ret);
+            break;
+        }
+        size_t size = sizeof(wifi_config.sta.ssid);
+        ret = nvs_get_str(wifi_nvs, WIFI_SSID_KEY, (char*)(wifi_config.sta.ssid), &size);
+        if (ret != ESP_OK) {
+            break;
+        }
+        wifi_config.sta.ssid[size] = '\0';
+        size = sizeof(wifi_config.sta.password);
+        ret = nvs_get_str(wifi_nvs, WIFI_PSW_KEY, (char*)(wifi_config.sta.password), &size);
+        if (ret != ESP_OK) {
+            break;
+        }
+        wifi_config.sta.password[size] = '\0';
+        load_ok = true;
+    } while (0);
+    if (wifi_nvs) {
+        nvs_close(wifi_nvs);
+    }
+    return load_ok;
+}
+
+static void store_to_nvs(void)
+{
+    nvs_handle_t wifi_nvs = 0;
+    do {
+        esp_err_t ret = nvs_open(PART_NAME, NVS_READWRITE, &wifi_nvs);
+        if (ret != ESP_OK) {
+            ESP_LOGE(TAG, "Fail to open nvs ret %d", ret);
+            break;
+        }
+        ret = nvs_set_str(wifi_nvs, WIFI_SSID_KEY, (char*)(wifi_config.sta.ssid));
+        if (ret != ESP_OK) {
+            break;
+        }
+        ret = nvs_set_str(wifi_nvs, WIFI_PSW_KEY, (char*)(wifi_config.sta.password));
+        if (ret != ESP_OK) {
+            break;
+        }
+    } while (0);
+    if (wifi_nvs) {
+        nvs_close(wifi_nvs);
+    }
+}
+
 static void event_handler(void *arg, esp_event_base_t event_base,
                           int32_t event_id, void *event_data)
 {
@@ -59,6 +118,7 @@ static void event_handler(void *arg, esp_event_base_t event_base,
         ip_event_got_ip_t *event = (ip_event_got_ip_t *)event_data;
         ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
         network_set_connected(true);
+        store_to_nvs();
     }
 }
 
@@ -84,16 +144,16 @@ int network_init(const char *ssid, const char *password, network_connect_cb cb)
                                                         &event_handler,
                                                         NULL,
                                                         &instance_got_ip));
-    wifi_config_t wifi_config = {
-        .sta = {
-            .threshold.authmode = WIFI_AUTH_WPA2_PSK,
-        },
-    };
-    if (ssid) {
-        memcpy(wifi_config.sta.ssid, ssid, strlen(ssid) + 1);
-    }
-    if (password) {
-        memcpy(wifi_config.sta.password, password, strlen(password) + 1);
+    wifi_config.sta.threshold.authmode = WIFI_AUTH_WPA2_PSK;
+    if (load_from_nvs()) {
+        ESP_LOGI(TAG, "Force to use wifi config from nvs");
+    } else {
+        if (ssid) {
+            memcpy(wifi_config.sta.ssid, ssid, strlen(ssid) + 1);
+        }
+        if (password) {
+            memcpy(wifi_config.sta.password, password, strlen(password) + 1);
+        }
     }
     connect_cb = cb;
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
@@ -104,19 +164,22 @@ int network_init(const char *ssid, const char *password, network_connect_cb cb)
     return 0;
 }
 
+int network_get_mac(uint8_t mac[6])
+{
+    esp_wifi_get_mac(WIFI_IF_STA, mac);
+    return 0;
+}
+
 int network_connect_wifi(const char *ssid, const char *password)
 {
-    wifi_config_t wifi_config = {
-        .sta = {
-            .threshold.authmode = WIFI_AUTH_WPA2_PSK,
-        },
-    };
+    wifi_config.sta.threshold.authmode = WIFI_AUTH_WPA2_PSK;
     if (ssid) {
         memcpy(wifi_config.sta.ssid, ssid, strlen(ssid) + 1);
     }
     if (password) {
         memcpy(wifi_config.sta.password, password, strlen(password) + 1);
     }
+    network_connected = false;
     esp_wifi_disconnect();
     esp_wifi_stop();
     ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
@@ -125,7 +188,7 @@ int network_connect_wifi(const char *ssid, const char *password)
 }
 
 #else
-
+static esp_eth_handle_t *eth_handles = NULL;
 static void eth_event_handler(void *arg, esp_event_base_t event_base,
                               int32_t event_id, void *event_data)
 {
@@ -139,7 +202,6 @@ static void eth_event_handler(void *arg, esp_event_base_t event_base,
             ESP_LOGI(TAG, "Ethernet Link Up");
             ESP_LOGI(TAG, "Ethernet HW Addr %02x:%02x:%02x:%02x:%02x:%02x",
                      mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
-            network_set_connected(true);
             break;
         case ETHERNET_EVENT_DISCONNECTED:
             ESP_LOGI(TAG, "Ethernet Link Down");
@@ -169,13 +231,13 @@ static void got_ip_event_handler(void *arg, esp_event_base_t event_base,
     ESP_LOGI(TAG, "ETHMASK:" IPSTR, IP2STR(&ip_info->netmask));
     ESP_LOGI(TAG, "ETHGW:" IPSTR, IP2STR(&ip_info->gw));
     ESP_LOGI(TAG, "~~~~~~~~~~~");
+    network_set_connected(true);
 }
 
 int network_init(const char *ssid, const char *password, network_connect_cb cb)
 {
     // Initialize Ethernet driver
     uint8_t eth_port_cnt = 0;
-    esp_eth_handle_t *eth_handles;
     ESP_ERROR_CHECK(example_eth_init(&eth_handles, &eth_port_cnt));
 
     // Initialize TCP/IP network interface aka the esp-netif (should be called only once in application)
@@ -227,6 +289,14 @@ int network_init(const char *ssid, const char *password, network_connect_cb cb)
     return 0;
 }
 
+int network_get_mac(uint8_t mac[6])
+{
+    if (eth_handles) {
+        esp_eth_ioctl(eth_handles[0], ETH_CMD_G_MAC_ADDR, mac);
+    }
+    return 0;
+}
+
 int network_connect_wifi(const char *ssid, const char *password)
 {
     ESP_LOGE(TAG, "Using ethernet now not support wifi config");

solutions/common/network.h

@@ -33,6 +33,17 @@ typedef int (*network_connect_cb)(bool connected);
  */
 int network_init(const char *ssid, const char *password, network_connect_cb cb);
 
+/**
+ * @brief  Get current network mac
+ *
+ * @param[out]  mac  Network mac to store
+ *
+ * @return
+ *      - 0       On success
+ *      - Others  Fail to initialized
+ */
+int network_get_mac(uint8_t mac[6]);
+
 /**
  * @brief  Check network connected or not
  *

solutions/doorbell_demo/README.md

@@ -34,9 +34,17 @@ After the board boots up, it will attempt to connect to the configured Wi-Fi SSI
 wifi ssid psw
 ```
 
-Once the Wi-Fi is connected successfully, use the `join` command to join a random room. Make sure the room is empty before entering:
+Once connected to Wi-Fi, the board will automatically try to join a room generated from its MAC address. The room name will appear in the console:
 ```
-join mytestroom
+W (9801) Webrtc_Test: Please use browser to join in espxxxxxx on https://webrtc.espressif.cn/doorbell
+```
+User also can use `leave` command leave the room and use the `join` command to join other random room. Make sure the room is empty before entering:
+```
+join random_room_id
+```
+If you're the first to join, you’ll see:
+```
+Initials set to 1
 ```
 
 Then, use a Chrome/Edge browser to enter the same room at [DoorBellDemo](https://webrtc.espressif.cn/doorbell).
@@ -64,3 +72,8 @@ Then, use a Chrome/Edge browser to enter the same room at [DoorBellDemo](https:/
 - **`esp_webrtc_enable_peer_connection` API**: A new API is introduced to manually control the connection and disconnection of the peer connection.
 
 All other steps follow the typical call flow of `esp_webrtc`. For more details on the standard connection build flow, refer to the [Connection Build Flow](../../components/esp_webrtc/README.md#typical-call-sequence-of-esp_webrtc).
+
+### QA
+- If the board unexpectedly leaves the room, fail to re-enter same room.
+  Server will keep the room for 1-2 minutes before timing out. The user must wait for the timeout to expire before retrying.
+

solutions/doorbell_demo/main/CMakeLists.txt

@@ -1,3 +1,3 @@
 idf_component_register(SRCS "webrtc.c"  "main.c" "board.c" "media_sys.c"
-                       EMBED_TXTFILES "ring.aac" "open.aac"
+                       EMBED_TXTFILES "ring.aac" "open.aac" "join.aac"
                        INCLUDE_DIRS ".")

solutions/doorbell_demo/main/join.aac

@@ -189,6 +189,9 @@ static void thread_scheduler(const char *thread_name, media_lib_thread_cfg_t *th
         thread_cfg->priority = 18;
         thread_cfg->core_id = 1;
     }
+    if (strcmp(thread_name, "start") == 0) {
+        thread_cfg->stack_size = 6 * 1024;
+    }
     if (strcmp(thread_name, "venc") == 0) {
 #if CONFIG_IDF_TARGET_ESP32S3
         thread_cfg->stack_size = 20 * 1024;
@@ -203,9 +206,28 @@ static void thread_scheduler(const char *thread_name, media_lib_thread_cfg_t *th
 #endif
 }
 
+static char* gen_room_id_use_mac(void)
+{
+    static char room_mac[16];
+    uint8_t mac[6];
+    network_get_mac(mac);
+    snprintf(room_mac, sizeof(room_mac)-1, "esp_%02x%02x%02x", mac[3], mac[4], mac[5]);
+    return room_mac;
+}
+
 static int network_event_handler(bool connected)
 {
-    if (connected == false) {
+    if (connected) {
+        // Enter into Room directly
+        RUN_ASYNC(start, {
+            char *room = gen_room_id_use_mac();
+            snprintf(room_url, sizeof(room_url), "https://webrtc.espressif.cn/join/%s", room);
+            ESP_LOGI(TAG, "Start to join in room %s", room);
+            if (start_webrtc(room_url) == 0) {
+                ESP_LOGW(TAG, "Please use browser to join in %s on https://webrtc.espressif.cn/doorbell", room);
+            }
+        });
+    } else {
         stop_webrtc();
     }
     return 0;

solutions/doorbell_demo/main/main.c

@@ -47,7 +47,7 @@ extern "C" {
  *        When enable `NETWORK_USE_ETHERNET` will cause socket error
  *        User must replace it to a unused GPIO instead (like GPIO27)
  */
-#define DOOR_BELL_RING_BUTTON  27
+#define DOOR_BELL_RING_BUTTON  35
 
 #ifdef __cplusplus
 }

solutions/doorbell_demo/main/settings.h

@@ -38,6 +38,7 @@ typedef enum {
 typedef enum {
     DOOR_BELL_TONE_RING,
     DOOR_BELL_TONE_OPEN_DOOR,
+    DOOR_BELL_TONE_JOIN_SUCCESS,
 } door_bell_tone_type_t;
 
 typedef struct {
@@ -54,12 +55,15 @@ extern const uint8_t ring_music_start[] asm("_binary_ring_aac_start");
 extern const uint8_t ring_music_end[] asm("_binary_ring_aac_end");
 extern const uint8_t open_music_start[] asm("_binary_open_aac_start");
 extern const uint8_t open_music_end[] asm("_binary_open_aac_end");
+extern const uint8_t join_music_start[] asm("_binary_join_aac_start");
+extern const uint8_t join_music_end[] asm("_binary_join_aac_end");
 
 static int play_tone(door_bell_tone_type_t type)
 {
     door_bell_tone_data_t tone_data[] = {
         { ring_music_start, ring_music_end, 4000 },
         { open_music_start, open_music_end, 0 },
+        { join_music_start, join_music_end, 0 },
     };
     if (type >= sizeof(tone_data) / sizeof(tone_data[0])) {
         return 0;
@@ -225,6 +229,8 @@ int start_webrtc(char *url)
     ret = esp_webrtc_start(webrtc);
     if (ret != 0) {
         ESP_LOGE(TAG, "Fail to start webrtc");
+    } else {
+        play_tone(DOOR_BELL_TONE_JOIN_SUCCESS);
     }
     return ret;
 }