Merge branch 'bugfix/fix_boot_button_conflict_ethernet' into 'main'

Fix boot button conflict with Ethernet

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

Author: TempoTian

solutions/doorbell_demo/main/common.h

@@ -48,6 +48,11 @@ void query_webrtc(void);
  */
 int stop_webrtc(void);
 
+/**
+ * @brief  Send command to peer
+ */
+void send_cmd(char *cmd);
+
 #ifdef __cplusplus
 }
 #endif

solutions/doorbell_demo/main/main.c

@@ -67,6 +67,12 @@ static int leave_room(int argc, char **argv)
     return 0;
 }
 
+static int cmd_cli(int argc, char **argv)
+{
+    send_cmd(argc > 1 ? argv[1] : "ring");
+    return 0;
+}
+
 static int assert_cli(int argc, char **argv)
 {
     *(int *)0 = 0;
@@ -138,6 +144,11 @@ static int init_console()
             .help = "Leave from room\n",
             .func = leave_room,
         },
+        {
+            .command = "cmd",
+            .help = "Send command (ring etc)\n",
+            .func = cmd_cli,
+        },
         {
             .command = "i",
             .help = "Show system status\r\n",

solutions/doorbell_demo/main/settings.h

@@ -42,6 +42,10 @@ extern "C" {
 
 /**
  * @brief  GPIO for ring button
+ * 
+ * @note  When use ESP32P4-Fuction-Ev-Board, GPIO35(boot button) is connected RMII_TXD1
+ *        Which will cause socket error
+ *        User must replace it to a unused GPIO instead (like GPIO27)
  */
 #define DOOR_BELL_RING_BUTTON  35
 

solutions/doorbell_demo/main/webrtc.c

@@ -114,6 +114,18 @@ static int webrtc_event_handler(esp_webrtc_event_t *event, void *ctx)
     return 0;
 }
 
+void send_cmd(char *cmd)
+{
+    if (SAME_STR(cmd, "ring")) {
+        SEND_CMD(webrtc, DOOR_BELL_RING_CMD);
+        ESP_LOGI(TAG, "Ring button on state %d", door_bell_state);
+        if (door_bell_state < DOOR_BELL_STATE_CONNECTING) {
+            door_bell_state = DOOR_BELL_STATE_RINGING;
+            play_tone(DOOR_BELL_TONE_RING);
+        }
+    }
+}
+
 static void key_monitor_thread(void *arg)
 {
     gpio_config_t io_conf;
@@ -134,12 +146,7 @@ static void key_monitor_thread(void *arg)
         if (level != last_level) {
             last_level = level;
             if (level != init_level) {
-                SEND_CMD(webrtc, DOOR_BELL_RING_CMD);
-                ESP_LOGI(TAG, "Ring button on state %d", door_bell_state);
-                if (door_bell_state < DOOR_BELL_STATE_CONNECTING) {
-                    door_bell_state = DOOR_BELL_STATE_RINGING;
-                    play_tone(DOOR_BELL_TONE_RING);
-                }
+                send_cmd("ring");
             }
         }
     }

solutions/videocall_demo/main/settings.h

@@ -42,6 +42,10 @@ extern "C" {
 
 /**
  * @brief  GPIO for ring button
+ * 
+ * @note  When use ESP32P4-Fuction-Ev-Board, GPIO35(boot button) is connected RMII_TXD1
+ *        Which will cause socket error
+ *        User must replace it to a unused GPIO instead (like GPIO27)
  */
 #define VIDEO_CALL_RING_BUTTON  35