Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git stauts git: 'stauts' is not a git command. See 'git --help'. The most similar command is status Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git status On branch master Your branch is up to date with 'origin/master'. Changes to be committed: (use "git restore --staged ..." to unstage) modified: components/audio_board/CMakeLists.txt modified: components/audio_board/Kconfig.projbuild new file: components/audio_board/esp32_s3_korvo2_v3_21/board.c new file: components/audio_board/esp32_s3_korvo2_v3_21/board.h new file: components/audio_board/esp32_s3_korvo2_v3_21/board_def.h new file: components/audio_board/esp32_s3_korvo2_v3_21/board_pins_config.c Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: components/audio_board/CMakeLists.txt modified: components/audio_board/Kconfig.projbuild modified: components/audio_board/esp32_s3_korvo2_v3_21/board.c modified: components/audio_board/esp32_s3_korvo2_v3_21/board_def.h modified: components/audio_pipeline/audio_element.c Untracked files: (use "git add ..." to include in what will be committed) components/audio_board/esp32_s3_box_3_21/ Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git diff components/audio_board/CMakeLists.txt diff --git a/components/audio_board/CMakeLists.txt b/components/audio_board/CMakeLists.txt index ef061758..8717a17a 100644 --- a/components/audio_board/CMakeLists.txt +++ b/components/audio_board/CMakeLists.txt @@ -124,6 +124,15 @@ set(COMPONENT_SRCS ) endif() +if (CONFIG_ESP32_S3_BOX_3_21_BOARD) +message(STATUS "Current board name is " CONFIG_ESP32_S3_BOX_3_21_BOARD) +list(APPEND COMPONENT_ADD_INCLUDEDIRS ./esp32_s3_box_3_21) +set(COMPONENT_SRCS +./esp32_s3_box_3_21/board.c +./esp32_s3_box_3_21/board_pins_config.c +) +endif() + if (CONFIG_ESP32_C3_LYRA_V2_BOARD) message(STATUS "Current board name is " CONFIG_ESP32_C3_LYRA_V2_BOARD) list(APPEND COMPONENT_ADD_INCLUDEDIRS ./esp32_c3_lyra) Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git add components/audio_board/CMakeLists.txt Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git add components/audio_board/Kconfig.projbuild Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git add components/audio_board/esp32_s3_box_3_21/ Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git status On branch master Your branch is up to date with 'origin/master'. Changes to be committed: (use "git restore --staged ..." to unstage) modified: components/audio_board/CMakeLists.txt modified: components/audio_board/Kconfig.projbuild new file: components/audio_board/esp32_s3_box_3_21/board.c new file: components/audio_board/esp32_s3_box_3_21/board.h new file: components/audio_board/esp32_s3_box_3_21/board_def.h new file: components/audio_board/esp32_s3_box_3_21/board_pins_config.c new file: components/audio_board/esp32_s3_korvo2_v3_21/board.c new file: components/audio_board/esp32_s3_korvo2_v3_21/board.h new file: components/audio_board/esp32_s3_korvo2_v3_21/board_def.h new file: components/audio_board/esp32_s3_korvo2_v3_21/board_pins_config.c Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: components/audio_board/esp32_s3_korvo2_v3_21/board.c modified: components/audio_board/esp32_s3_korvo2_v3_21/board_def.h modified: components/audio_pipeline/audio_element.c Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git diff components/audio_pipeline/audio_element.c diff --git a/components/audio_pipeline/audio_element.c b/components/audio_pipeline/audio_element.c index 39b24468..66e7ee2f 100644 --- a/components/audio_pipeline/audio_element.c +++ b/components/audio_pipeline/audio_element.c @@ -1302,7 +1302,7 @@ int audio_element_multi_input(audio_element_handle_t el, char *buffer, int wante { int ret = ESP_OK; if (index >= el->multi_in.max_rb_num) { - ESP_LOGE(TAG, "The index of ringbuffer is gather than and equal to ringbuffer maximum (%d). line %d", el->multi_in.max_rb_num, __LINE__); + ESP_LOGE(TAG, "The index of ringbuffer is greater than and equal to ringbuffer maximum (%d). line %d", el->multi_in.max_rb_num, __LINE__); return ESP_ERR_INVALID_SIZE; } if (el->multi_in.rb[index]) { Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git add components/audio_board/esp32_s3_korvo2_v3_21/board.c Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git add components/audio_board/esp32_s3_korvo2_v3_21/board_def.h Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git status On branch master Your branch is up to date with 'origin/master'. Changes to be committed: (use "git restore --staged ..." to unstage) modified: components/audio_board/CMakeLists.txt modified: components/audio_board/Kconfig.projbuild new file: components/audio_board/esp32_s3_box_3_21/board.c new file: components/audio_board/esp32_s3_box_3_21/board.h new file: components/audio_board/esp32_s3_box_3_21/board_def.h new file: components/audio_board/esp32_s3_box_3_21/board_pins_config.c new file: components/audio_board/esp32_s3_korvo2_v3_21/board.c new file: components/audio_board/esp32_s3_korvo2_v3_21/board.h new file: components/audio_board/esp32_s3_korvo2_v3_21/board_def.h new file: components/audio_board/esp32_s3_korvo2_v3_21/board_pins_config.c Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: components/audio_pipeline/audio_element.c Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git commit Aborting commit due to empty commit message. Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git pull remote: Enumerating objects: 483, done. remote: Counting objects: 100% (483/483), done. remote: Compressing objects: 100% (113/113), done. remote: Total 319 (delta 200), reused 304 (delta 193), pack-reused 0 (from 0) Receiving objects: 100% (319/319), 204.74 KiB | 1.68 MiB/s, done. Resolving deltas: 100% (200/200), completed with 125 local objects. From https://gitee.com/EspressifSystems/esp-adf fe4139c9..a5545574 master -> origin/master error: Your local changes to the following files would be overwritten by merge: components/audio_board/CMakeLists.txt components/audio_board/Kconfig.projbuild Please commit your changes or stash them before you merge. Aborting Updating fe4139c9..a5545574 Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git status On branch master Your branch is behind 'origin/master' by 10 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes to be committed: (use "git restore --staged ..." to unstage) modified: components/audio_board/CMakeLists.txt modified: components/audio_board/Kconfig.projbuild new file: components/audio_board/esp32_s3_box_3_21/board.c new file: components/audio_board/esp32_s3_box_3_21/board.h new file: components/audio_board/esp32_s3_box_3_21/board_def.h new file: components/audio_board/esp32_s3_box_3_21/board_pins_config.c new file: components/audio_board/esp32_s3_korvo2_v3_21/board.c new file: components/audio_board/esp32_s3_korvo2_v3_21/board.h new file: components/audio_board/esp32_s3_korvo2_v3_21/board_def.h new file: components/audio_board/esp32_s3_korvo2_v3_21/board_pins_config.c Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: components/audio_pipeline/audio_element.c Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git commit [master 0d2a3b51] 新增了自己的板子 10 files changed, 1369 insertions(+) create mode 100644 components/audio_board/esp32_s3_box_3_21/board.c create mode 100644 components/audio_board/esp32_s3_box_3_21/board.h create mode 100644 components/audio_board/esp32_s3_box_3_21/board_def.h create mode 100644 components/audio_board/esp32_s3_box_3_21/board_pins_config.c create mode 100644 components/audio_board/esp32_s3_korvo2_v3_21/board.c create mode 100644 components/audio_board/esp32_s3_korvo2_v3_21/board.h create mode 100644 components/audio_board/esp32_s3_korvo2_v3_21/board_def.h create mode 100644 components/audio_board/esp32_s3_korvo2_v3_21/board_pins_config.c Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git pull Auto-merging components/audio_board/CMakeLists.txt CONFLICT (content): Merge conflict in components/audio_board/CMakeLists.txt Auto-merging components/audio_board/Kconfig.projbuild CONFLICT (content): Merge conflict in components/audio_board/Kconfig.projbuild Automatic merge failed; fix conflicts and then commit the result. Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master|MERGING) $ git status On branch master Your branch and 'origin/master' have diverged, and have 1 and 10 different commits each, respectively. (use "git pull" if you want to integrate the remote branch with yours) You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge) Changes to be committed: modified: .github/workflows/upload_component.yml modified: .gitignore modified: .gitlab-ci.yml modified: .gitlab/ci/build-examples-v5-x.yml modified: .gitlab/ci/build-ut.yml modified: .gitlab/ci/rules.yml modified: .gitlab/ci/target-examples-test-v5-x.yml modified: .gitlab/ci/target-ut-test.yml new file: components/audio_board/m5stack_atoms3r/board.c new file: components/audio_board/m5stack_atoms3r/board.h new file: components/audio_board/m5stack_atoms3r/board_def.h new file: components/audio_board/m5stack_atoms3r/board_pins_config.c modified: components/audio_hal/driver/es7210/es7210.c modified: components/audio_hal/driver/es7243/es7243.c modified: components/audio_hal/driver/es7243e/es7243e.c modified: components/audio_hal/driver/es8311/es8311.c modified: components/audio_sal/audio_url.c modified: components/coredump_upload_service/coredump_upload_service.c modified: components/coredump_upload_service/include/coredump_upload_service.h modified: components/display_service/led_bar/led_bar_is31x.c modified: components/display_service/led_indicator/led_indicator.c new file: components/esp_coze/CHANGELOG.md new file: components/esp_coze/CMakeLists.txt new file: components/esp_coze/LICENSE new file: components/esp_coze/README.md new file: components/esp_coze/idf_component.yml new file: components/esp_coze/include/esp_coze_chat.h new file: components/esp_coze/include/http_client_request.h new file: components/esp_coze/libs/esp32/libcoze_websocket.a new file: components/esp_coze/libs/esp32c3/libcoze_websocket.a new file: components/esp_coze/libs/esp32c6/libcoze_websocket.a new file: components/esp_coze/libs/esp32p4/libcoze_websocket.a new file: components/esp_coze/libs/esp32s2/libcoze_websocket.a new file: components/esp_coze/libs/esp32s3/libcoze_websocket.a new file: components/esp_coze/test_apps/CMakeLists.txt new file: components/esp_coze/test_apps/main/CMakeLists.txt new file: components/esp_coze/test_apps/main/esp_coze_test.c new file: components/esp_coze/test_apps/main/idf_component.yml new file: components/esp_coze/test_apps/main/nihao.pcm new file: components/esp_coze/test_apps/main/test_app_main.c new file: components/esp_coze/test_apps/sdkconfig.defaults new file: components/esp_coze/test_apps/sdkconfig.defaults.esp32s3 modified: components/esp_dispatcher/include/periph_service.h modified: components/esp_peripherals/lib/IS31FL3216/IS31FL3216.c modified: components/esp_peripherals/lib/adc_button/adc_button.c modified: components/esp_peripherals/lib/tca9554/tca9554.c modified: components/wifi_service/smart_config/smart_config.c modified: conftest.py modified: docs/_static/api-reference.png modified: docs/_static/design-guide.png modified: docs/_static/get-started.png new file: docs/_static/knowledge-center.png modified: docs/en/index.rst new file: docs/en/knowledge-center/application-notes/index.rst new file: docs/en/knowledge-center/index.rst new file: docs/en/knowledge-center/insight-star-map/esp-fourcc-introduction.rst new file: docs/en/knowledge-center/insight-star-map/index.rst modified: docs/zh_CN/index.rst new file: docs/zh_CN/knowledge-center/application-notes/index.rst new file: docs/zh_CN/knowledge-center/index.rst new file: docs/zh_CN/knowledge-center/insight-star-map/esp-fourcc-introduction.rst new file: docs/zh_CN/knowledge-center/insight-star-map/index.rst modified: examples/advanced_examples/aec/sdkconfig.defaults.esp32p4 modified: examples/advanced_examples/aec/sdkconfig.defaults.esp32s3 modified: examples/advanced_examples/algorithm/sdkconfig.defaults modified: examples/advanced_examples/algorithm/sdkconfig.defaults.esp32 modified: examples/advanced_examples/algorithm/sdkconfig.defaults.esp32p4 modified: examples/advanced_examples/algorithm/sdkconfig.defaults.esp32s3 modified: examples/advanced_examples/audio_mixer_tone/main/idf_component.yml modified: examples/advanced_examples/downmix_pipeline/main/idf_component.yml modified: examples/advanced_examples/downmix_pipeline/sdkconfig.defaults modified: examples/advanced_examples/downmix_pipeline/sdkconfig.defaults.esp32 modified: examples/advanced_examples/downmix_pipeline/sdkconfig.defaults.esp32s3 modified: examples/advanced_examples/flexible_pipeline/pytest_flexible_pipeline.py modified: examples/advanced_examples/nvs_dispatcher/main/idf_component.yml modified: examples/advanced_examples/nvs_dispatcher/sdkconfig.defaults modified: examples/advanced_examples/nvs_dispatcher/sdkconfig.defaults.esp32 modified: examples/advanced_examples/nvs_dispatcher/sdkconfig.defaults.esp32s2 modified: examples/advanced_examples/nvs_dispatcher/sdkconfig.defaults.esp32s3 modified: examples/advanced_examples/wifi_bt_ble_coex/sdkconfig.defaults new file: examples/ai_agent/coze_ws_app/CHANGELOG.md new file: examples/ai_agent/coze_ws_app/CMakeLists.txt new file: examples/ai_agent/coze_ws_app/LICENSE new file: examples/ai_agent/coze_ws_app/README.md new file: examples/ai_agent/coze_ws_app/README_CN.md new file: examples/ai_agent/coze_ws_app/components/common/CMakeLists.txt new file: examples/ai_agent/coze_ws_app/components/common/Kconfig.in new file: examples/ai_agent/coze_ws_app/components/common/esp_gmf_gpio_config.h new file: examples/ai_agent/coze_ws_app/components/common/esp_gmf_setup_peripheral.c new file: examples/ai_agent/coze_ws_app/components/common/esp_gmf_setup_peripheral.h new file: examples/ai_agent/coze_ws_app/components/common/esp_gmf_setup_pool.c new file: examples/ai_agent/coze_ws_app/components/common/esp_gmf_setup_pool.h new file: examples/ai_agent/coze_ws_app/components/common/idf_component.yml new file: examples/ai_agent/coze_ws_app/idf_component.yml new file: examples/ai_agent/coze_ws_app/main/CMakeLists.txt new file: examples/ai_agent/coze_ws_app/main/Kconfig.projbuild new file: examples/ai_agent/coze_ws_app/main/audio_processor.c new file: examples/ai_agent/coze_ws_app/main/audio_processor.h new file: examples/ai_agent/coze_ws_app/main/coze_chat_app.c new file: examples/ai_agent/coze_ws_app/main/coze_chat_app.h new file: examples/ai_agent/coze_ws_app/main/idf_component.yml new file: examples/ai_agent/coze_ws_app/main/main.c new file: examples/ai_agent/coze_ws_app/partitions.csv new file: examples/ai_agent/coze_ws_app/sdkconfig.defaults new file: examples/ai_agent/coze_ws_app/sdkconfig.defaults.esp32c6 new file: examples/ai_agent/coze_ws_app/sdkconfig.defaults.esp32s2 new file: examples/ai_agent/coze_ws_app/sdkconfig.defaults.esp32s3 new file: examples/ai_agent/coze_ws_app/spiffs/dingding.wav modified: examples/ai_agent/volc_rtc/sdkconfig.defaults.esp32 modified: examples/ai_agent/volc_rtc/sdkconfig.defaults.esp32s3 modified: examples/audio_processing/pipeline_alc/main/idf_component.yml modified: examples/audio_processing/pipeline_alc/pytest_pipeline_alc.py modified: examples/audio_processing/pipeline_equalizer/main/idf_component.yml modified: examples/audio_processing/pipeline_equalizer/pytest_pipeline_equalizer.py modified: examples/audio_processing/pipeline_passthru/main/idf_component.yml modified: examples/cli/main/idf_component.yml modified: examples/cli/pytest_cli.py modified: examples/cli/sdkconfig.defaults modified: examples/cli/sdkconfig.defaults.esp32p4 modified: examples/cloud_services/google_translate_device/main/idf_component.yml modified: examples/cloud_services/google_translate_device/sdkconfig.defaults.esp32p4 modified: examples/cloud_services/pipeline_aws_polly_mp3/main/idf_component.yml modified: examples/cloud_services/pipeline_aws_polly_mp3/sdkconfig.defaults.esp32p4 modified: examples/cloud_services/pipeline_baidu_speech_mp3/main/idf_component.yml modified: examples/cloud_services/pipeline_baidu_speech_mp3/sdkconfig.defaults.esp32p4 modified: examples/dueros/main/idf_component.yml modified: examples/dueros/sdkconfig.defaults modified: examples/dueros/sdkconfig.defaults.esp32 modified: examples/dueros/sdkconfig.defaults.esp32p4 modified: examples/dueros/sdkconfig.defaults.esp32s3 modified: examples/get-started/pipeline_tcp_client/main/idf_component.yml modified: examples/get-started/pipeline_tcp_client/sdkconfig.defaults.esp32p4 modified: examples/get-started/play_mp3_control/main/idf_component.yml modified: examples/get-started/play_mp3_control/pytest_play_mp3_control.py modified: examples/korvo_du1906/sdkconfig.defaults modified: examples/ota/main/idf_component.yml modified: examples/ota/sdkconfig.defaults modified: examples/ota/sdkconfig.defaults.esp32p4 modified: examples/player/pipeline_embed_flash_tone/main/idf_component.yml modified: examples/player/pipeline_embed_flash_tone/pytest_pipeline_embed_flash_tone.py modified: examples/player/pipeline_flash_tone/main/idf_component.yml modified: examples/player/pipeline_http_mp3/main/idf_component.yml modified: examples/player/pipeline_http_mp3/pytest_pipeline_http_mp3.py modified: examples/player/pipeline_http_mp3/sdkconfig.defaults.esp32p4 modified: examples/player/pipeline_http_select_decoder/main/idf_component.yml modified: examples/player/pipeline_http_select_decoder/pytest_pipeline_http_select_decoder.py modified: examples/player/pipeline_http_select_decoder/sdkconfig.ci modified: examples/player/pipeline_http_select_decoder/sdkconfig.defaults modified: examples/player/pipeline_http_select_decoder/sdkconfig.defaults.esp32 modified: examples/player/pipeline_http_select_decoder/sdkconfig.defaults.esp32p4 modified: examples/player/pipeline_http_select_decoder/sdkconfig.defaults.esp32s2 modified: examples/player/pipeline_http_select_decoder/sdkconfig.defaults.esp32s3 modified: examples/player/pipeline_living_stream/main/idf_component.yml modified: examples/player/pipeline_living_stream/pytest_pipeline_living_stream.py modified: examples/player/pipeline_living_stream/sdkconfig.defaults.esp32p4 modified: examples/player/pipeline_loop_playback_without_gap/main/idf_component.yml modified: examples/player/pipeline_loop_playback_without_gap/pytest_pipeline_loop_playback_without_gap.py modified: examples/player/pipeline_play_sdcard_music/main/idf_component.yml modified: examples/player/pipeline_play_sdcard_music/pytest_pipeline_play_sdcard_music.py modified: examples/player/pipeline_spiffs_mp3/main/idf_component.yml modified: examples/player/pipeline_tts_stream/main/idf_component.yml modified: examples/protocols/esp-rtc/sdkconfig.defaults modified: examples/protocols/esp-rtsp/sdkconfig.defaults modified: examples/protocols/rtmp/sdkconfig.defaults modified: examples/protocols/voip/sdkconfig.defaults modified: examples/recorder/element_cb_sdcard_amr/main/idf_component.yml modified: examples/recorder/element_cb_sdcard_amr/pytest_element_cb_sdcard_amr.py modified: examples/recorder/element_cb_sdcard_amr/sdkconfig.defaults modified: examples/recorder/element_cb_sdcard_amr/sdkconfig.defaults.esp32 modified: examples/recorder/element_cb_sdcard_amr/sdkconfig.defaults.esp32s3 modified: examples/recorder/element_wav_amr_sdcard/main/idf_component.yml modified: examples/recorder/element_wav_amr_sdcard/pytest_element_wav_amr_sdcard.py modified: examples/recorder/element_wav_amr_sdcard/sdkconfig.defaults modified: examples/recorder/element_wav_amr_sdcard/sdkconfig.defaults.esp32 modified: examples/recorder/element_wav_amr_sdcard/sdkconfig.defaults.esp32s3 modified: examples/recorder/pipeline_recording_to_sdcard/main/idf_component.yml modified: examples/recorder/pipeline_recording_to_sdcard/pytest_recording_to_sdcard.py modified: examples/recorder/pipeline_recording_to_sdcard/sdkconfig.defaults modified: examples/recorder/pipeline_recording_to_sdcard/sdkconfig.defaults.esp32 modified: examples/recorder/pipeline_recording_to_sdcard/sdkconfig.defaults.esp32s3 modified: examples/recorder/pipeline_wav_amr_sdcard/main/idf_component.yml modified: examples/recorder/pipeline_wav_amr_sdcard/pytest_pipeline_wav_amr_sdcard.py modified: examples/speech_recognition/wwe/main/idf_component.yml modified: examples/speech_recognition/wwe/sdkconfig.defaults.esp32 modified: examples/speech_recognition/wwe/sdkconfig.defaults.esp32p4 modified: examples/speech_recognition/wwe/sdkconfig.defaults.esp32s3 modified: examples/system/coredump/main/coredump_example.c modified: examples/system/coredump/main/idf_component.yml modified: examples/system/coredump/sdkconfig.defaults.esp32p4 modified: examples/system/power_save/pytest_power_save.py modified: tools/ci/apps.yaml modified: tools/ci/apps_filter.py new file: tools/ci/audio_board_idf.json modified: tools/ci/build_apps.py modified: tools/ci/check_apps_json_and_sdkcfg.sh modified: tools/ci/utils.sh Unmerged paths: (use "git add ..." to mark resolution) both modified: components/audio_board/CMakeLists.txt both modified: components/audio_board/Kconfig.projbuild Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: components/audio_pipeline/audio_element.c Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master|MERGING) $ git restore components/audio_pipeline/audio_element.c Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master|MERGING) $ git add components/audio_board/CMakeLists.txt Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master|MERGING) $ git add components/audio_board/Kconfig.projbuild Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master|MERGING) $ git commit [master 78c97598] Merge branch 'master' of https://gitee.com/EspressifSystems/esp-adf Administrator@PC-202312022041 MINGW64 /d/IDF/v5.4.1/esp-adf (master) $ git pull Already up to date.