From ad0c5312f87287839bc80551173c0c77fa1f40ec Mon Sep 17 00:00:00 2001 From: Terrence Date: Sun, 9 Mar 2025 00:52:28 +0800 Subject: [PATCH] Bump to 1.4.6 --- CMakeLists.txt | 2 +- main/CMakeLists.txt | 2 -- .../esp-box-lite}/box_audio_codec_lite.cc | 0 .../esp-box-lite}/box_audio_codec_lite.h | 0 main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) rename main/{audio_codecs => boards/esp-box-lite}/box_audio_codec_lite.cc (100%) rename main/{audio_codecs => boards/esp-box-lite}/box_audio_codec_lite.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 698ddfc6..8663d99b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(PROJECT_VER "1.4.5") +set(PROJECT_VER "1.4.6") # Add this line to disable the specific warning add_compile_options(-Wno-missing-field-initializers) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index bebf4b8a..c164d544 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,7 +1,6 @@ set(SOURCES "audio_codecs/audio_codec.cc" "audio_codecs/no_audio_codec.cc" "audio_codecs/box_audio_codec.cc" - "audio_codecs/box_audio_codec_lite.cc" "audio_codecs/es8311_audio_codec.cc" "audio_codecs/es8388_audio_codec.cc" "led/single_led.cc" @@ -161,7 +160,6 @@ file(GLOB COMMON_SOUNDS ${CMAKE_CURRENT_SOURCE_DIR}/assets/common/*.p3) # 如果目标芯片是 ESP32,则排除特定文件 if(CONFIG_IDF_TARGET_ESP32) list(REMOVE_ITEM SOURCES "audio_codecs/box_audio_codec.cc" - "audio_codecs/box_audio_codec_lite.cc" "audio_codecs/es8388_audio_codec.cc" "led/gpio_led.cc" ) diff --git a/main/audio_codecs/box_audio_codec_lite.cc b/main/boards/esp-box-lite/box_audio_codec_lite.cc similarity index 100% rename from main/audio_codecs/box_audio_codec_lite.cc rename to main/boards/esp-box-lite/box_audio_codec_lite.cc diff --git a/main/audio_codecs/box_audio_codec_lite.h b/main/boards/esp-box-lite/box_audio_codec_lite.h similarity index 100% rename from main/audio_codecs/box_audio_codec_lite.h rename to main/boards/esp-box-lite/box_audio_codec_lite.h diff --git a/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc b/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc index 7fad91b9..c5ddf22a 100644 --- a/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc +++ b/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc @@ -1,7 +1,6 @@ #include "wifi_board.h" #include "audio_codecs/es8311_audio_codec.h" #include "display/lcd_display.h" -#include "display/no_display.h" #include "application.h" #include "button.h" #include "config.h"