From 3575448373c2737762d8894baadb976e36960238 Mon Sep 17 00:00:00 2001 From: Terrence Date: Wed, 6 Nov 2024 06:18:56 +0800 Subject: [PATCH] move all hardware init to boards --- main/CMakeLists.txt | 44 +--- main/application.cc | 219 ++++++++---------- main/application.h | 12 +- main/audio_codec.cc | 67 ++++++ main/{audio_device.h => audio_codec.h} | 32 ++- .../box_audio_codec.cc} | 152 +++++------- main/audio_codecs/box_audio_codec.h | 41 ++++ .../no_audio_codec.cc} | 112 ++------- main/audio_codecs/no_audio_codec.h | 25 ++ main/board.h | 13 +- .../compact_ml307_board.cc | 99 +++++++- main/boards/bread-compact-ml307/config.h | 4 +- .../bread-compact-wifi/compact_wifi_board.cc | 99 +++++++- main/boards/bread-compact-wifi/config.h | 4 +- main/boards/esp-box-3/config.h | 2 +- main/boards/esp-box-3/esp_box3_board.cc | 62 ++++- main/boards/kevin-box-0/config.h | 3 +- main/boards/kevin-box-0/kevin_box_board.cc | 123 +++++++++- main/boards/kevin-box-1/config.h | 3 +- main/boards/kevin-box-1/kevin_box_board.cc | 117 +++++++++- main/boards/lichuang-dev/config.h | 2 +- .../boards/lichuang-dev/lichuang_dev_board.cc | 84 ++++++- main/boards/ml307_board.cc | 43 ++-- main/boards/ml307_board.h | 4 +- main/boards/wifi_board.cc | 11 +- main/box_audio_device.h | 39 ---- main/display.cc | 147 ++---------- main/display.h | 23 +- main/display/no_display.cc | 9 + main/display/no_display.h | 16 ++ main/display/ssd1306_display.cc | 106 +++++++++ main/display/ssd1306_display.h | 24 ++ main/{builtin_led.cc => led.cc} | 61 +++-- main/{builtin_led.h => led.h} | 17 +- 34 files changed, 1150 insertions(+), 669 deletions(-) create mode 100644 main/audio_codec.cc rename main/{audio_device.h => audio_codec.h} (70%) rename main/{box_audio_device.cc => audio_codecs/box_audio_codec.cc} (69%) create mode 100644 main/audio_codecs/box_audio_codec.h rename main/{audio_device.cc => audio_codecs/no_audio_codec.cc} (63%) create mode 100644 main/audio_codecs/no_audio_codec.h delete mode 100644 main/box_audio_device.h create mode 100644 main/display/no_display.cc create mode 100644 main/display/no_display.h create mode 100644 main/display/ssd1306_display.cc create mode 100644 main/display/ssd1306_display.h rename main/{builtin_led.cc => led.cc} (80%) rename main/{builtin_led.h => led.h} (82%) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 112fa97d..7917587a 100755 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,11 +1,17 @@ -set(SOURCES "audio_device.cc" +set(SOURCES "audio_codec.cc" + "audio_codecs/no_audio_codec.cc" + "audio_codecs/box_audio_codec.cc" + "display.cc" + "display/ssd1306_display.cc" + "display/no_display.cc" + "board.cc" + "boards/ml307_board.cc" + "boards/wifi_board.cc" "system_info.cc" "system_reset.cc" "application.cc" "button.cc" - "builtin_led.cc" - "display.cc" - "board.cc" + "led.cc" "ota.cc" "main.cc" ) @@ -13,46 +19,20 @@ set(INCLUDE_DIRS ".") # 根据 BOARD_TYPE 配置添加对应的板级文件 if(CONFIG_BOARD_TYPE_BREAD_COMPACT_WIFI) - # add all files from boards/bread-compact-wifi set(BOARD_TYPE "bread-compact-wifi") - file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc) - list(APPEND SOURCES ${BOARD_SOURCES} "boards/wifi_board.cc") - list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}) elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_ML307) - # add all files from boards/bread-compact-ml307 set(BOARD_TYPE "bread-compact-ml307") - file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc) - list(APPEND SOURCES ${BOARD_SOURCES} "boards/ml307_board.cc") - list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}) elseif(CONFIG_BOARD_TYPE_ESP_BOX_3) - # add all files from boards/esp-box-3 set(BOARD_TYPE "esp-box-3") - file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc) - list(APPEND SOURCES ${BOARD_SOURCES} "boards/wifi_board.cc") - list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}) - list(APPEND SOURCES "box_audio_device.cc") elseif(CONFIG_BOARD_TYPE_KEVIN_BOX_0) - # add all files from boards/kevin-box-0 set(BOARD_TYPE "kevin-box-0") - file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc) - list(APPEND SOURCES ${BOARD_SOURCES} "boards/wifi_board.cc") - list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}) - list(APPEND SOURCES "box_audio_device.cc") elseif(CONFIG_BOARD_TYPE_KEVIN_BOX_1) - # add all files from boards/kevin-box-1 set(BOARD_TYPE "kevin-box-1") - file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc) - list(APPEND SOURCES ${BOARD_SOURCES} "boards/ml307_board.cc") - list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}) - list(APPEND SOURCES "box_audio_device.cc") elseif(CONFIG_BOARD_TYPE_LICHUANG_DEV) - # add all files from boards/lichuang-dev set(BOARD_TYPE "lichuang-dev") - file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc) - list(APPEND SOURCES ${BOARD_SOURCES} "boards/wifi_board.cc") - list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}) - list(APPEND SOURCES "box_audio_device.cc") endif() +file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc) +list(APPEND SOURCES ${BOARD_SOURCES}) if(CONFIG_USE_AFE_SR) list(APPEND SOURCES "audio_processor.cc" "wake_word_detect.cc") diff --git a/main/application.cc b/main/application.cc index ca0fca03..ee746c04 100644 --- a/main/application.cc +++ b/main/application.cc @@ -1,7 +1,7 @@ -#include "builtin_led.h" +#include "application.h" #include "system_info.h" #include "ml307_ssl_transport.h" -#include "application.h" +#include "audio_codec.h" #include #include @@ -19,24 +19,9 @@ extern const char p3_err_wificonfig_start[] asm("_binary_err_wificonfig_p3_start extern const char p3_err_wificonfig_end[] asm("_binary_err_wificonfig_p3_end"); -Application::Application() - : boot_button_((gpio_num_t)BOOT_BUTTON_GPIO), - volume_up_button_((gpio_num_t)VOLUME_UP_BUTTON_GPIO), - volume_down_button_((gpio_num_t)VOLUME_DOWN_BUTTON_GPIO), - display_(DISPLAY_SDA_PIN, DISPLAY_SCL_PIN) -{ +Application::Application() { event_group_ = xEventGroupCreate(); - opus_encoder_.Configure(16000, 1); - opus_decoder_ = opus_decoder_create(opus_decode_sample_rate_, 1, NULL); - if (opus_decode_sample_rate_ != AUDIO_OUTPUT_SAMPLE_RATE) { - output_resampler_.Configure(AUDIO_OUTPUT_SAMPLE_RATE, opus_decode_sample_rate_); - } - if (16000 != AUDIO_INPUT_SAMPLE_RATE) { - input_resampler_.Configure(AUDIO_INPUT_SAMPLE_RATE, 16000); - reference_resampler_.Configure(AUDIO_INPUT_SAMPLE_RATE, 16000); - } - ota_.SetCheckVersionUrl(CONFIG_OTA_VERSION_URL); ota_.SetHeader("Device-Id", SystemInfo::GetMacAddress().c_str()); } @@ -58,9 +43,6 @@ Application::~Application() { if (main_loop_task_stack_ != nullptr) { heap_caps_free(main_loop_task_stack_); } - if (audio_device_ != nullptr) { - delete audio_device_; - } vEventGroupDelete(event_group_); } @@ -75,10 +57,11 @@ void Application::CheckNewVersion() { vTaskDelay(100); } SetChatState(kChatStateUpgrading); - ota_.StartUpgrade([this](int progress, size_t speed) { + ota_.StartUpgrade([](int progress, size_t speed) { char buffer[64]; snprintf(buffer, sizeof(buffer), "Upgrading...\n %d%% %zuKB/s", progress, speed / 1024); - display_.SetText(buffer); + auto display = Board::GetInstance().GetDisplay(); + display->SetText(buffer); }); // If upgrade success, the device will reboot and never reach here ESP_LOGI(TAG, "Firmware upgrade failed..."); @@ -90,7 +73,8 @@ void Application::CheckNewVersion() { void Application::Alert(const std::string&& title, const std::string&& message) { ESP_LOGE(TAG, "Alert: %s, %s", title.c_str(), message.c_str()); - display_.ShowNotification(std::string(title + "\n" + message)); + auto display = Board::GetInstance().GetDisplay(); + display->ShowNotification(std::string(title + "\n" + message)); if (message == "PIN is not ready") { PlayLocalFile(p3_err_pin_start, p3_err_pin_end - p3_err_pin_start); @@ -104,7 +88,8 @@ void Application::Alert(const std::string&& title, const std::string&& message) void Application::PlayLocalFile(const char* data, size_t size) { ESP_LOGI(TAG, "PlayLocalFile: %zu bytes", size); SetDecodeSampleRate(16000); - audio_device_->EnableOutput(true); + auto codec = Board::GetInstance().GetAudioCodec(); + codec->EnableOutput(true); { std::lock_guard lock(mutex_); @@ -124,22 +109,58 @@ void Application::PlayLocalFile(const char* data, size_t size) { } } -void Application::Start() { - auto& builtin_led = BuiltinLed::GetInstance(); - builtin_led.SetBlue(); - builtin_led.StartContinuousBlink(100); +void Application::ToggleChatState() { + Schedule([this]() { + if (chat_state_ == kChatStateIdle) { + SetChatState(kChatStateConnecting); + StartWebSocketClient(); + if (ws_client_ && ws_client_->IsConnected()) { + opus_encoder_.ResetState(); +#ifdef CONFIG_USE_AFE_SR + audio_processor_.Start(); +#endif + SetChatState(kChatStateListening); + ESP_LOGI(TAG, "Communication started"); + } else { + SetChatState(kChatStateIdle); + } + } else if (chat_state_ == kChatStateSpeaking) { + AbortSpeaking(); + } else if (chat_state_ == kChatStateListening) { + if (ws_client_ && ws_client_->IsConnected()) { + ws_client_->Close(); + } + } + }); +} + +void Application::Start() { auto& board = Board::GetInstance(); board.Initialize(); - audio_device_ = board.GetAudioDevice(); - audio_device_->Initialize(); - audio_device_->EnableInput(true); - audio_device_->EnableOutput(true); - audio_device_->EnableOutput(false); - audio_device_->OnInputData([this](std::vector&& data) { - if (16000 != AUDIO_INPUT_SAMPLE_RATE) { - if (audio_device_->input_channels() == 2) { + auto builtin_led = board.GetBuiltinLed(); + builtin_led->SetBlue(); + builtin_led->StartContinuousBlink(100); + + auto display = board.GetDisplay(); + display->SetupUI(); + + auto codec = board.GetAudioCodec(); + opus_decode_sample_rate_ = codec->output_sample_rate(); + opus_decoder_ = opus_decoder_create(opus_decode_sample_rate_, 1, NULL); + opus_encoder_.Configure(codec->input_sample_rate(), 1); + if (codec->input_sample_rate() != 16000) { + input_resampler_.Configure(codec->input_sample_rate(), 16000); + reference_resampler_.Configure(codec->input_sample_rate(), 16000); + } + + codec->EnableInput(true); + codec->EnableOutput(true); + codec->EnableOutput(false); + codec->OnInputData([this, codec](std::vector&& data) { + if (codec->input_sample_rate() != 16000) { + if (codec->input_channels() == 2) { auto mic_channel = std::vector(data.size() / 2); auto reference_channel = std::vector(data.size() / 2); for (size_t i = 0, j = 0; i < mic_channel.size(); ++i, j += 2) { @@ -196,70 +217,8 @@ void Application::Start() { board.StartNetwork(); // Blink the LED to indicate the device is running - builtin_led.SetGreen(); - builtin_led.BlinkOnce(); - - boot_button_.OnClick([this]() { - Schedule([this]() { - if (chat_state_ == kChatStateIdle) { - SetChatState(kChatStateConnecting); - StartWebSocketClient(); - - if (ws_client_ && ws_client_->IsConnected()) { - opus_encoder_.ResetState(); -#ifdef CONFIG_USE_AFE_SR - audio_processor_.Start(); -#endif - SetChatState(kChatStateListening); - ESP_LOGI(TAG, "Communication started"); - } else { - SetChatState(kChatStateIdle); - } - } else if (chat_state_ == kChatStateSpeaking) { - AbortSpeaking(); - } else if (chat_state_ == kChatStateListening) { - if (ws_client_ && ws_client_->IsConnected()) { - ws_client_->Close(); - } - } - }); - }); - - volume_up_button_.OnClick([this]() { - Schedule([this]() { - auto volume = audio_device_->output_volume() + 10; - if (volume > 100) { - volume = 100; - } - audio_device_->SetOutputVolume(volume); - display_.ShowNotification("Volume\n" + std::to_string(volume)); - }); - }); - - volume_up_button_.OnLongPress([this]() { - Schedule([this]() { - audio_device_->SetOutputVolume(100); - display_.ShowNotification("Volume\n100"); - }); - }); - - volume_down_button_.OnClick([this]() { - Schedule([this]() { - auto volume = audio_device_->output_volume() - 10; - if (volume < 0) { - volume = 0; - } - audio_device_->SetOutputVolume(volume); - display_.ShowNotification("Volume\n" + std::to_string(volume)); - }); - }); - - volume_down_button_.OnLongPress([this]() { - Schedule([this]() { - audio_device_->SetOutputVolume(0); - display_.ShowNotification("Volume\n0"); - }); - }); + builtin_led->SetGreen(); + builtin_led->BlinkOnce(); const size_t main_loop_stack_size = 4096 * 2; main_loop_task_stack_ = (StackType_t*)heap_caps_malloc(main_loop_stack_size, MALLOC_CAP_SPIRAM); @@ -277,17 +236,17 @@ void Application::Start() { }, "check_new_version", 4096 * 2, this, 1, NULL); #ifdef CONFIG_USE_AFE_SR - wake_word_detect_.Initialize(audio_device_->input_channels(), audio_device_->input_reference()); + wake_word_detect_.Initialize(codec->input_channels(), codec->input_reference()); wake_word_detect_.OnVadStateChange([this](bool speaking) { Schedule([this, speaking]() { - auto& builtin_led = BuiltinLed::GetInstance(); + auto builtin_led = Board::GetInstance().GetBuiltinLed(); if (chat_state_ == kChatStateListening) { if (speaking) { - builtin_led.SetRed(32); + builtin_led->SetRed(32); } else { - builtin_led.SetRed(8); + builtin_led->SetRed(8); } - builtin_led.TurnOn(); + builtin_led->TurnOn(); } }); }); @@ -326,7 +285,7 @@ void Application::Start() { }); wake_word_detect_.StartDetection(); - audio_processor_.Initialize(audio_device_->input_channels(), audio_device_->input_reference()); + audio_processor_.Initialize(codec->input_channels(), codec->input_reference()); audio_processor_.OnOutput([this](std::vector&& data) { Schedule([this, data = std::move(data)]() { if (chat_state_ == kChatStateListening) { @@ -339,7 +298,7 @@ void Application::Start() { #endif chat_state_ = kChatStateIdle; - display_.UpdateDisplay(); + display->UpdateDisplay(); } void Application::Schedule(std::function callback) { @@ -397,31 +356,31 @@ void Application::SetChatState(ChatState state) { chat_state_ = state; ESP_LOGI(TAG, "STATE: %s", state_str[chat_state_]); - auto& builtin_led = BuiltinLed::GetInstance(); + auto builtin_led = Board::GetInstance().GetBuiltinLed(); switch (chat_state_) { case kChatStateUnknown: case kChatStateIdle: - builtin_led.TurnOff(); + builtin_led->TurnOff(); break; case kChatStateConnecting: - builtin_led.SetBlue(); - builtin_led.TurnOn(); + builtin_led->SetBlue(); + builtin_led->TurnOn(); break; case kChatStateListening: - builtin_led.SetRed(); - builtin_led.TurnOn(); + builtin_led->SetRed(); + builtin_led->TurnOn(); break; case kChatStateSpeaking: - builtin_led.SetGreen(); - builtin_led.TurnOn(); + builtin_led->SetGreen(); + builtin_led->TurnOn(); break; case kChatStateWakeWordDetected: - builtin_led.SetBlue(); - builtin_led.TurnOn(); + builtin_led->SetBlue(); + builtin_led->TurnOn(); break; case kChatStateUpgrading: - builtin_led.SetGreen(); - builtin_led.StartContinuousBlink(100); + builtin_led->SetGreen(); + builtin_led->StartContinuousBlink(100); break; } @@ -450,6 +409,7 @@ BinaryProtocol3* Application::AllocateBinaryProtocol3(const uint8_t* payload, si void Application::AudioEncodeTask() { ESP_LOGI(TAG, "Audio encode task started"); const int max_audio_play_queue_size_ = 2; // avoid decoding too fast + auto codec = Board::GetInstance().GetAudioCodec(); while (true) { std::unique_lock lock(mutex_); @@ -490,7 +450,7 @@ void Application::AudioEncodeTask() { continue; } - if (opus_decode_sample_rate_ != AUDIO_OUTPUT_SAMPLE_RATE) { + if (opus_decode_sample_rate_ != codec->output_sample_rate()) { int target_size = output_resampler_.GetOutputSamples(frame_size); std::vector resampled(target_size); output_resampler_.Process(packet->pcm.data(), frame_size, resampled.data()); @@ -514,7 +474,8 @@ void Application::HandleAudioPacket(AudioPacket* packet) { } // This will block until the audio device has finished playing the audio - audio_device_->OutputData(packet->pcm); + auto codec = Board::GetInstance().GetAudioCodec(); + codec->OutputData(packet->pcm); break; } case kAudioPacketTypeStart: @@ -574,9 +535,11 @@ void Application::SetDecodeSampleRate(int sample_rate) { opus_decoder_destroy(opus_decoder_); opus_decode_sample_rate_ = sample_rate; opus_decoder_ = opus_decoder_create(opus_decode_sample_rate_, 1, NULL); - if (opus_decode_sample_rate_ != AUDIO_OUTPUT_SAMPLE_RATE) { - ESP_LOGI(TAG, "Resampling audio from %d to %d", opus_decode_sample_rate_, AUDIO_OUTPUT_SAMPLE_RATE); - output_resampler_.Configure(opus_decode_sample_rate_, AUDIO_OUTPUT_SAMPLE_RATE); + + auto codec = Board::GetInstance().GetAudioCodec(); + if (opus_decode_sample_rate_ != codec->output_sample_rate()) { + ESP_LOGI(TAG, "Resampling audio from %d to %d", opus_decode_sample_rate_, codec->output_sample_rate()); + output_resampler_.Configure(opus_decode_sample_rate_, codec->output_sample_rate()); } } @@ -683,7 +646,8 @@ void Application::StartWebSocketClient() { ws_client_->OnDisconnected([this]() { ESP_LOGI(TAG, "Websocket disconnected"); Schedule([this]() { - audio_device_->EnableOutput(false); + auto codec = Board::GetInstance().GetAudioCodec(); + codec->EnableOutput(false); #ifdef CONFIG_USE_AFE_SR audio_processor_.Stop(); #endif @@ -699,5 +663,6 @@ void Application::StartWebSocketClient() { } // 建立语音通道后打开音频输出，避免待机时喇叭底噪 - audio_device_->EnableOutput(true); + auto codec = Board::GetInstance().GetAudioCodec(); + codec->EnableOutput(true); } diff --git a/main/application.h b/main/application.h index 9ea7bdbe..f3abaf74 100644 --- a/main/application.h +++ b/main/application.h @@ -13,7 +13,6 @@ #include "opus_resampler.h" #include -#include "audio_device.h" #include "display.h" #include "board.h" #include "ota.h" @@ -23,8 +22,6 @@ #include "audio_processor.h" #endif -#include "button.h" - #define DETECTION_RUNNING 1 #define COMMUNICATION_RUNNING 2 @@ -73,11 +70,11 @@ public: void Start(); ChatState GetChatState() const { return chat_state_; } - Display& GetDisplay() { return display_; } void Schedule(std::function callback); void SetChatState(ChatState state); void Alert(const std::string&& title, const std::string&& message); void AbortSpeaking(); + void ToggleChatState(); // 删除拷贝构造函数和赋值运算符 Application(const Application&) = delete; Application& operator=(const Application&) = delete; @@ -86,11 +83,6 @@ private: Application(); ~Application(); - Button boot_button_; - Button volume_up_button_; - Button volume_down_button_; - AudioDevice* audio_device_ = nullptr; - Display display_; #ifdef CONFIG_USE_AFE_SR WakeWordDetect wake_word_detect_; AudioProcessor audio_processor_; @@ -118,7 +110,7 @@ private: OpusDecoder* opus_decoder_ = nullptr; int opus_duration_ms_ = 60; - int opus_decode_sample_rate_ = AUDIO_OUTPUT_SAMPLE_RATE; + int opus_decode_sample_rate_ = -1; OpusResampler input_resampler_; OpusResampler reference_resampler_; OpusResampler output_resampler_; diff --git a/main/audio_codec.cc b/main/audio_codec.cc new file mode 100644 index 00000000..0d087784 --- /dev/null +++ b/main/audio_codec.cc @@ -0,0 +1,67 @@ +#include "audio_codec.h" +#include "board.h" + +#include +#include + +#define TAG "AudioCodec" + +AudioCodec::AudioCodec() { +} + +AudioCodec::~AudioCodec() { + if (audio_input_task_ != nullptr) { + vTaskDelete(audio_input_task_); + } +} + +void AudioCodec::OnInputData(std::function&& data)> callback) { + on_input_data_ = callback; + + // 创建音频输入任务 + if (audio_input_task_ == nullptr) { + xTaskCreate([](void* arg) { + auto audio_device = (AudioCodec*)arg; + audio_device->InputTask(); + }, "audio_input", 4096 * 2, this, 3, &audio_input_task_); + } +} + +void AudioCodec::OutputData(std::vector& data) { + Write(data.data(), data.size()); +} + +void AudioCodec::InputTask() { + int duration = 30; + int input_frame_size = input_sample_rate_ / 1000 * duration * input_channels_; + while (true) { + std::vector input_data(input_frame_size); + int samples = Read(input_data.data(), input_data.size()); + if (samples > 0) { + if (on_input_data_) { + on_input_data_(std::move(input_data)); + } + } + } +} + +void AudioCodec::SetOutputVolume(int volume) { + output_volume_ = volume; + ESP_LOGI(TAG, "Set output volume to %d", output_volume_); +} + +void AudioCodec::EnableInput(bool enable) { + if (enable == input_enabled_) { + return; + } + input_enabled_ = enable; + ESP_LOGI(TAG, "Set input enable to %s", enable ? "true" : "false"); +} + +void AudioCodec::EnableOutput(bool enable) { + if (enable == output_enabled_) { + return; + } + output_enabled_ = enable; + ESP_LOGI(TAG, "Set output enable to %s", enable ? "true" : "false"); +} diff --git a/main/audio_device.h b/main/audio_codec.h similarity index 70% rename from main/audio_device.h rename to main/audio_codec.h index 3a4e8b12..5f5f07b3 100644 --- a/main/audio_device.h +++ b/main/audio_codec.h @@ -1,8 +1,8 @@ -#ifndef _AUDIO_DEVICE_H -#define _AUDIO_DEVICE_H +#ifndef _AUDIO_CODEC_H +#define _AUDIO_CODEC_H #include -#include +#include #include #include @@ -10,18 +10,18 @@ #include "board.h" -class AudioDevice { +class AudioCodec { public: - AudioDevice(); - virtual ~AudioDevice(); - virtual void Initialize(); - - void OnInputData(std::function&& data)> callback); - void OutputData(std::vector& data); + AudioCodec(); + virtual ~AudioCodec(); + virtual void SetOutputVolume(int volume); virtual void EnableInput(bool enable); virtual void EnableOutput(bool enable); + void OnInputData(std::function&& data)> callback); + void OutputData(std::vector& data); + inline bool duplex() const { return duplex_; } inline bool input_reference() const { return input_reference_; } inline int input_sample_rate() const { return input_sample_rate_; } @@ -35,7 +35,6 @@ private: std::function&& data)> on_input_data_; void InputTask(); - void CreateSimplexChannels(); protected: bool duplex_ = false; @@ -46,13 +45,10 @@ protected: int output_sample_rate_ = 0; int input_channels_ = 1; int output_channels_ = 1; - int output_volume_ = AUDIO_DEFAULT_OUTPUT_VOLUME; - i2s_chan_handle_t tx_handle_ = nullptr; - i2s_chan_handle_t rx_handle_ = nullptr; + int output_volume_ = 70; - virtual void CreateDuplexChannels(); - virtual int Read(int16_t* dest, int samples); - virtual int Write(const int16_t* data, int samples); + virtual int Read(int16_t* dest, int samples) = 0; + virtual int Write(const int16_t* data, int samples) = 0; }; -#endif // _AUDIO_DEVICE_H +#endif // _AUDIO_CODEC_H diff --git a/main/box_audio_device.cc b/main/audio_codecs/box_audio_codec.cc similarity index 69% rename from main/box_audio_device.cc rename to main/audio_codecs/box_audio_codec.cc index 4d08fc67..4e26f835 100644 --- a/main/box_audio_device.cc +++ b/main/audio_codecs/box_audio_codec.cc @@ -1,73 +1,19 @@ -#include "box_audio_device.h" -#include "board.h" +#include "box_audio_codec.h" #include -#include +#include -static const char* TAG = "BoxAudioDevice"; +static const char TAG[] = "BoxAudioCodec"; -BoxAudioDevice::BoxAudioDevice() { -} - -BoxAudioDevice::~BoxAudioDevice() { - ESP_ERROR_CHECK(esp_codec_dev_close(output_dev_)); - esp_codec_dev_delete(output_dev_); - ESP_ERROR_CHECK(esp_codec_dev_close(input_dev_)); - esp_codec_dev_delete(input_dev_); - - audio_codec_delete_codec_if(in_codec_if_); - audio_codec_delete_ctrl_if(in_ctrl_if_); - audio_codec_delete_codec_if(out_codec_if_); - audio_codec_delete_ctrl_if(out_ctrl_if_); - audio_codec_delete_gpio_if(gpio_if_); - audio_codec_delete_data_if(data_if_); - - ESP_ERROR_CHECK(i2c_del_master_bus(i2c_master_handle_)); -} - -void BoxAudioDevice::Initialize() { +BoxAudioCodec::BoxAudioCodec(void* i2c_master_handle, int input_sample_rate, int output_sample_rate, gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din, + gpio_num_t pa_pin, uint8_t es8311_addr, uint8_t es7210_addr, bool input_reference) { duplex_ = true; // 是否双工 - input_reference_ = AUDIO_INPUT_REFERENCE; // 是否使用参考输入，实现回声消除 + input_reference_ = input_reference; // 是否使用参考输入，实现回声消除 input_channels_ = input_reference_ ? 2 : 1; // 输入通道数 + input_sample_rate_ = input_sample_rate; + output_sample_rate_ = output_sample_rate; - // Initialize I2C peripheral - i2c_master_bus_config_t i2c_bus_cfg = { - .i2c_port = I2C_NUM_1, - .sda_io_num = (gpio_num_t)AUDIO_CODEC_I2C_SDA_PIN, - .scl_io_num = (gpio_num_t)AUDIO_CODEC_I2C_SCL_PIN, - .clk_source = I2C_CLK_SRC_DEFAULT, - .glitch_ignore_cnt = 7, - .intr_priority = 0, - .trans_queue_depth = 0, - .flags = { - .enable_internal_pullup = 0, - }, - }; - ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_master_handle_)); - - CreateDuplexChannels(); - -#ifdef AUDIO_CODEC_USE_PCA9557 - // Initialize PCA9557 - i2c_device_config_t pca9557_cfg = { - .dev_addr_length = I2C_ADDR_BIT_LEN_7, - .device_address = 0x19, - .scl_speed_hz = 400000, - .scl_wait_us = 0, - .flags = { - .disable_ack_check = 0, - }, - }; - i2c_master_dev_handle_t pca9557_handle; - ESP_ERROR_CHECK(i2c_master_bus_add_device(i2c_master_handle_, &pca9557_cfg, &pca9557_handle)); - assert(pca9557_handle != NULL); - auto pca9557_set_register = [](i2c_master_dev_handle_t pca9557_handle, uint8_t data_addr, uint8_t data) { - uint8_t data_[2] = {data_addr, data}; - ESP_ERROR_CHECK(i2c_master_transmit(pca9557_handle, data_, 2, 50)); - }; - pca9557_set_register(pca9557_handle, 0x03, 0xfd); - pca9557_set_register(pca9557_handle, 0x01, 0x02); -#endif + CreateDuplexChannels(mclk, bclk, ws, dout, din); // Do initialize of related interface: data_if, ctrl_if and gpio_if audio_codec_i2s_cfg_t i2s_cfg = { @@ -81,8 +27,8 @@ void BoxAudioDevice::Initialize() { // Output audio_codec_i2c_cfg_t i2c_cfg = { .port = I2C_NUM_1, - .addr = AUDIO_CODEC_ES8311_ADDR, - .bus_handle = i2c_master_handle_, + .addr = es8311_addr, + .bus_handle = i2c_master_handle, }; out_ctrl_if_ = audio_codec_new_i2c_ctrl(&i2c_cfg); assert(out_ctrl_if_ != NULL); @@ -94,7 +40,7 @@ void BoxAudioDevice::Initialize() { es8311_cfg.ctrl_if = out_ctrl_if_; es8311_cfg.gpio_if = gpio_if_; es8311_cfg.codec_mode = ESP_CODEC_DEV_WORK_MODE_DAC; - es8311_cfg.pa_pin = AUDIO_CODEC_PA_PIN; + es8311_cfg.pa_pin = pa_pin; es8311_cfg.use_mclk = true; es8311_cfg.hw_gain.pa_voltage = 5.0; es8311_cfg.hw_gain.codec_dac_voltage = 3.3; @@ -110,7 +56,7 @@ void BoxAudioDevice::Initialize() { assert(output_dev_ != NULL); // Input - i2c_cfg.addr = AUDIO_CODEC_ES7210_ADDR; + i2c_cfg.addr = es7210_addr; in_ctrl_if_ = audio_codec_new_i2c_ctrl(&i2c_cfg); assert(in_ctrl_if_ != NULL); @@ -128,7 +74,21 @@ void BoxAudioDevice::Initialize() { ESP_LOGI(TAG, "BoxAudioDevice initialized"); } -void BoxAudioDevice::CreateDuplexChannels() { +BoxAudioCodec::~BoxAudioCodec() { + ESP_ERROR_CHECK(esp_codec_dev_close(output_dev_)); + esp_codec_dev_delete(output_dev_); + ESP_ERROR_CHECK(esp_codec_dev_close(input_dev_)); + esp_codec_dev_delete(input_dev_); + + audio_codec_delete_codec_if(in_codec_if_); + audio_codec_delete_ctrl_if(in_ctrl_if_); + audio_codec_delete_codec_if(out_codec_if_); + audio_codec_delete_ctrl_if(out_ctrl_if_); + audio_codec_delete_gpio_if(gpio_if_); + audio_codec_delete_data_if(data_if_); +} + +void BoxAudioCodec::CreateDuplexChannels(gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din) { assert(input_sample_rate_ == output_sample_rate_); i2s_chan_config_t chan_cfg = { @@ -162,10 +122,10 @@ void BoxAudioDevice::CreateDuplexChannels() { .bit_order_lsb = false }, .gpio_cfg = { - .mclk = (gpio_num_t)AUDIO_I2S_GPIO_MCLK, - .bclk = (gpio_num_t)AUDIO_I2S_GPIO_BCLK, - .ws = (gpio_num_t)AUDIO_I2S_GPIO_LRCK, - .dout = (gpio_num_t)AUDIO_I2S_GPIO_DOUT, + .mclk = mclk, + .bclk = bclk, + .ws = ws, + .dout = dout, .din = I2S_GPIO_UNUSED, .invert_flags = { .mclk_inv = false, @@ -198,11 +158,11 @@ void BoxAudioDevice::CreateDuplexChannels() { .total_slot = I2S_TDM_AUTO_SLOT_NUM }, .gpio_cfg = { - .mclk = (gpio_num_t)AUDIO_I2S_GPIO_MCLK, - .bclk = (gpio_num_t)AUDIO_I2S_GPIO_BCLK, - .ws = (gpio_num_t)AUDIO_I2S_GPIO_LRCK, + .mclk = mclk, + .bclk = bclk, + .ws = ws, .dout = I2S_GPIO_UNUSED, - .din = (gpio_num_t)AUDIO_I2S_GPIO_DIN, + .din = din, .invert_flags = { .mclk_inv = false, .bclk_inv = false, @@ -218,26 +178,12 @@ void BoxAudioDevice::CreateDuplexChannels() { ESP_LOGI(TAG, "Duplex channels created"); } -int BoxAudioDevice::Read(int16_t *buffer, int samples) { - if (input_enabled_) { - ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)buffer, samples * sizeof(int16_t))); - } - return samples; -} - -int BoxAudioDevice::Write(const int16_t *buffer, int samples) { - if (output_enabled_) { - ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)buffer, samples * sizeof(int16_t))); - } - return samples; -} - -void BoxAudioDevice::SetOutputVolume(int volume) { +void BoxAudioCodec::SetOutputVolume(int volume) { ESP_ERROR_CHECK(esp_codec_dev_set_out_vol(output_dev_, volume)); - AudioDevice::SetOutputVolume(volume); + AudioCodec::SetOutputVolume(volume); } -void BoxAudioDevice::EnableInput(bool enable) { +void BoxAudioCodec::EnableInput(bool enable) { if (enable == input_enabled_) { return; } @@ -257,10 +203,10 @@ void BoxAudioDevice::EnableInput(bool enable) { } else { ESP_ERROR_CHECK(esp_codec_dev_close(input_dev_)); } - AudioDevice::EnableInput(enable); + AudioCodec::EnableInput(enable); } -void BoxAudioDevice::EnableOutput(bool enable) { +void BoxAudioCodec::EnableOutput(bool enable) { if (enable == output_enabled_) { return; } @@ -278,5 +224,19 @@ void BoxAudioDevice::EnableOutput(bool enable) { } else { ESP_ERROR_CHECK(esp_codec_dev_close(output_dev_)); } - AudioDevice::EnableOutput(enable); + AudioCodec::EnableOutput(enable); } + +int BoxAudioCodec::Read(int16_t* dest, int samples) { + if (input_enabled_) { + ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)dest, samples * sizeof(int16_t))); + } + return samples; +} + +int BoxAudioCodec::Write(const int16_t* data, int samples) { + if (output_enabled_) { + ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t))); + } + return samples; +} \ No newline at end of file diff --git a/main/audio_codecs/box_audio_codec.h b/main/audio_codecs/box_audio_codec.h new file mode 100644 index 00000000..173dac52 --- /dev/null +++ b/main/audio_codecs/box_audio_codec.h @@ -0,0 +1,41 @@ +#ifndef _BOX_AUDIO_CODEC_H +#define _BOX_AUDIO_CODEC_H + +#include "audio_codec.h" + +#include +#include +#include +#include + +class BoxAudioCodec : public AudioCodec { +private: + i2s_chan_handle_t tx_handle_ = nullptr; + i2s_chan_handle_t rx_handle_ = nullptr; + + const audio_codec_data_if_t* data_if_ = nullptr; + const audio_codec_ctrl_if_t* out_ctrl_if_ = nullptr; + const audio_codec_if_t* out_codec_if_ = nullptr; + const audio_codec_ctrl_if_t* in_ctrl_if_ = nullptr; + const audio_codec_if_t* in_codec_if_ = nullptr; + const audio_codec_gpio_if_t* gpio_if_ = nullptr; + + esp_codec_dev_handle_t output_dev_ = nullptr; + esp_codec_dev_handle_t input_dev_ = nullptr; + + void CreateDuplexChannels(gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din); + + virtual int Read(int16_t* dest, int samples) override; + virtual int Write(const int16_t* data, int samples) override; + +public: + BoxAudioCodec(void* i2c_master_handle, int input_sample_rate, int output_sample_rate, gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din, + gpio_num_t pa_pin, uint8_t es8311_addr, uint8_t es7210_addr, bool input_reference); + virtual ~BoxAudioCodec(); + + virtual void SetOutputVolume(int volume) override; + virtual void EnableInput(bool enable) override; + virtual void EnableOutput(bool enable) override; +}; + +#endif // _BOX_AUDIO_CODEC_H diff --git a/main/audio_device.cc b/main/audio_codecs/no_audio_codec.cc similarity index 63% rename from main/audio_device.cc rename to main/audio_codecs/no_audio_codec.cc index 4dfb9025..bacb0457 100644 --- a/main/audio_device.cc +++ b/main/audio_codecs/no_audio_codec.cc @@ -1,21 +1,11 @@ -#include "audio_device.h" -#include "board.h" +#include "no_audio_codec.h" #include -#include #include -#define TAG "AudioDevice" +#define TAG "NoAudioCodec" -AudioDevice::AudioDevice() - : input_sample_rate_(AUDIO_INPUT_SAMPLE_RATE), - output_sample_rate_(AUDIO_OUTPUT_SAMPLE_RATE) { -} - -AudioDevice::~AudioDevice() { - if (audio_input_task_ != nullptr) { - vTaskDelete(audio_input_task_); - } +NoAudioCodec::~NoAudioCodec() { if (rx_handle_ != nullptr) { ESP_ERROR_CHECK(i2s_channel_disable(rx_handle_)); } @@ -24,17 +14,11 @@ AudioDevice::~AudioDevice() { } } -void AudioDevice::Initialize() { -#ifdef AUDIO_I2S_METHOD_SIMPLEX - CreateSimplexChannels(); -#else - CreateDuplexChannels(); -#endif -} -void AudioDevice::CreateDuplexChannels() { -#ifndef AUDIO_I2S_METHOD_SIMPLEX +NoAudioCodec::NoAudioCodec(int input_sample_rate, int output_sample_rate, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din) { duplex_ = true; + input_sample_rate_ = input_sample_rate; + output_sample_rate_ = output_sample_rate; i2s_chan_config_t chan_cfg = { .id = I2S_NUM_0, @@ -68,10 +52,10 @@ void AudioDevice::CreateDuplexChannels() { }, .gpio_cfg = { .mclk = I2S_GPIO_UNUSED, - .bclk = (gpio_num_t)AUDIO_I2S_GPIO_BCLK, - .ws = (gpio_num_t)AUDIO_I2S_GPIO_LRCK, - .dout = (gpio_num_t)AUDIO_I2S_GPIO_DOUT, - .din = (gpio_num_t)AUDIO_I2S_GPIO_DIN, + .bclk = bclk, + .ws = ws, + .dout = dout, + .din = din, .invert_flags = { .mclk_inv = false, .bclk_inv = false, @@ -84,11 +68,13 @@ void AudioDevice::CreateDuplexChannels() { ESP_ERROR_CHECK(i2s_channel_enable(tx_handle_)); ESP_ERROR_CHECK(i2s_channel_enable(rx_handle_)); ESP_LOGI(TAG, "Duplex channels created"); -#endif } -void AudioDevice::CreateSimplexChannels() { -#ifdef AUDIO_I2S_METHOD_SIMPLEX +NoAudioCodec::NoAudioCodec(int input_sample_rate, int output_sample_rate, gpio_num_t spk_bclk, gpio_num_t spk_ws, gpio_num_t spk_dout, gpio_num_t mic_sck, gpio_num_t mic_ws, gpio_num_t mic_din) { + duplex_ = false; + input_sample_rate_ = input_sample_rate; + output_sample_rate_ = output_sample_rate; + // Create a new channel for speaker i2s_chan_config_t chan_cfg = { .id = I2S_NUM_0, @@ -122,9 +108,9 @@ void AudioDevice::CreateSimplexChannels() { }, .gpio_cfg = { .mclk = I2S_GPIO_UNUSED, - .bclk = (gpio_num_t)AUDIO_I2S_SPK_GPIO_BCLK, - .ws = (gpio_num_t)AUDIO_I2S_SPK_GPIO_LRCK, - .dout = (gpio_num_t)AUDIO_I2S_SPK_GPIO_DOUT, + .bclk = spk_bclk, + .ws = spk_ws, + .dout = spk_dout, .din = I2S_GPIO_UNUSED, .invert_flags = { .mclk_inv = false, @@ -139,19 +125,18 @@ void AudioDevice::CreateSimplexChannels() { chan_cfg.id = I2S_NUM_1; ESP_ERROR_CHECK(i2s_new_channel(&chan_cfg, nullptr, &rx_handle_)); std_cfg.clk_cfg.sample_rate_hz = (uint32_t)input_sample_rate_; - std_cfg.gpio_cfg.bclk = (gpio_num_t)AUDIO_I2S_MIC_GPIO_SCK; - std_cfg.gpio_cfg.ws = (gpio_num_t)AUDIO_I2S_MIC_GPIO_WS; + std_cfg.gpio_cfg.bclk = mic_sck; + std_cfg.gpio_cfg.ws = mic_ws; std_cfg.gpio_cfg.dout = I2S_GPIO_UNUSED; - std_cfg.gpio_cfg.din = (gpio_num_t)AUDIO_I2S_MIC_GPIO_DIN; + std_cfg.gpio_cfg.din = mic_din; ESP_ERROR_CHECK(i2s_channel_init_std_mode(rx_handle_, &std_cfg)); ESP_ERROR_CHECK(i2s_channel_enable(tx_handle_)); ESP_ERROR_CHECK(i2s_channel_enable(rx_handle_)); ESP_LOGI(TAG, "Simplex channels created"); -#endif } -int AudioDevice::Write(const int16_t* data, int samples) { +int NoAudioCodec::Write(const int16_t* data, int samples) { int32_t buffer[samples]; // output_volume_: 0-100 @@ -173,7 +158,7 @@ int AudioDevice::Write(const int16_t* data, int samples) { return bytes_written / sizeof(int32_t); } -int AudioDevice::Read(int16_t* dest, int samples) { +int NoAudioCodec::Read(int16_t* dest, int samples) { size_t bytes_read; int32_t bit32_buffer[samples]; @@ -189,54 +174,3 @@ int AudioDevice::Read(int16_t* dest, int samples) { } return samples; } - -void AudioDevice::OnInputData(std::function&& data)> callback) { - on_input_data_ = callback; - - // 创建音频输入任务 - if (audio_input_task_ == nullptr) { - xTaskCreate([](void* arg) { - auto audio_device = (AudioDevice*)arg; - audio_device->InputTask(); - }, "audio_input", 4096 * 2, this, 3, &audio_input_task_); - } -} - -void AudioDevice::OutputData(std::vector& data) { - Write(data.data(), data.size()); -} - -void AudioDevice::InputTask() { - int duration = 30; - int input_frame_size = input_sample_rate_ / 1000 * duration * input_channels_; - while (true) { - std::vector input_data(input_frame_size); - int samples = Read(input_data.data(), input_data.size()); - if (samples > 0) { - if (on_input_data_) { - on_input_data_(std::move(input_data)); - } - } - } -} - -void AudioDevice::SetOutputVolume(int volume) { - output_volume_ = volume; - ESP_LOGI(TAG, "Set output volume to %d", output_volume_); -} - -void AudioDevice::EnableInput(bool enable) { - if (enable == input_enabled_) { - return; - } - input_enabled_ = enable; - ESP_LOGI(TAG, "Set input enable to %s", enable ? "true" : "false"); -} - -void AudioDevice::EnableOutput(bool enable) { - if (enable == output_enabled_) { - return; - } - output_enabled_ = enable; - ESP_LOGI(TAG, "Set output enable to %s", enable ? "true" : "false"); -} diff --git a/main/audio_codecs/no_audio_codec.h b/main/audio_codecs/no_audio_codec.h new file mode 100644 index 00000000..fa69267a --- /dev/null +++ b/main/audio_codecs/no_audio_codec.h @@ -0,0 +1,25 @@ +#ifndef _NO_AUDIO_CODEC_H +#define _NO_AUDIO_CODEC_H + +#include "audio_codec.h" + +#include +#include + +class NoAudioCodec : public AudioCodec { +private: + i2s_chan_handle_t tx_handle_ = nullptr; + i2s_chan_handle_t rx_handle_ = nullptr; + + virtual int Write(const int16_t* data, int samples) override; + virtual int Read(int16_t* dest, int samples) override; + +public: + // Duplex + NoAudioCodec(int input_sample_rate, int output_sample_rate, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din); + // Simplex + NoAudioCodec(int input_sample_rate, int output_sample_rate, gpio_num_t spk_bclk, gpio_num_t spk_ws, gpio_num_t spk_dout, gpio_num_t mic_sck, gpio_num_t mic_ws, gpio_num_t mic_din); + virtual ~NoAudioCodec(); +}; + +#endif // _NO_AUDIO_CODEC_H diff --git a/main/board.h b/main/board.h index e570a604..67110465 100644 --- a/main/board.h +++ b/main/board.h @@ -1,16 +1,15 @@ #ifndef BOARD_H #define BOARD_H -#include "config.h" - #include #include #include -void* create_board(); -class AudioDevice; -class Display; +#include "led.h" +void* create_board(); +class AudioCodec; +class Display; class Board { private: Board(const Board&) = delete; // 禁用拷贝构造函数 @@ -32,7 +31,9 @@ public: virtual void Initialize() = 0; virtual void StartNetwork() = 0; virtual ~Board() = default; - virtual AudioDevice* GetAudioDevice() = 0; + virtual Led* GetBuiltinLed() = 0; + virtual AudioCodec* GetAudioCodec() = 0; + virtual Display* GetDisplay() = 0; virtual Http* CreateHttp() = 0; virtual WebSocket* CreateWebSocket() = 0; virtual bool GetNetworkState(std::string& network_name, int& signal_quality, std::string& signal_quality_text) = 0; diff --git a/main/boards/bread-compact-ml307/compact_ml307_board.cc b/main/boards/bread-compact-ml307/compact_ml307_board.cc index 756cbab6..a66b082b 100644 --- a/main/boards/bread-compact-ml307/compact_ml307_board.cc +++ b/main/boards/bread-compact-ml307/compact_ml307_board.cc @@ -1,24 +1,115 @@ #include "boards/ml307_board.h" +#include "audio_codecs/no_audio_codec.h" +#include "display/ssd1306_display.h" #include "system_reset.h" -#include "audio_device.h" +#include "application.h" +#include "button.h" +#include "led.h" +#include "config.h" #include +#include #define TAG "CompactMl307Board" class CompactMl307Board : public Ml307Board { +private: + i2c_master_bus_handle_t display_i2c_bus_; + Button boot_button_; + Button volume_up_button_; + Button volume_down_button_; + + void InitializeDisplayI2c() { + i2c_master_bus_config_t bus_config = { + .i2c_port = I2C_NUM_0, + .sda_io_num = DISPLAY_SDA_PIN, + .scl_io_num = DISPLAY_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .glitch_ignore_cnt = 7, + .intr_priority = 0, + .trans_queue_depth = 0, + .flags = { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&bus_config, &display_i2c_bus_)); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + Application::GetInstance().ToggleChatState(); + }); + + volume_up_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() + 10; + if (volume > 100) { + volume = 100; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("Volume\n" + std::to_string(volume)); + }); + + volume_up_button_.OnLongPress([this]() { + auto codec = GetAudioCodec(); + codec->SetOutputVolume(100); + GetDisplay()->ShowNotification("Volume\n100"); + }); + + volume_down_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() - 10; + if (volume < 0) { + volume = 0; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("Volume\n" + std::to_string(volume)); + }); + + volume_down_button_.OnLongPress([this]() { + auto codec = GetAudioCodec(); + codec->SetOutputVolume(0); + GetDisplay()->ShowNotification("Volume\n0"); + }); + } + public: + CompactMl307Board() : Ml307Board(ML307_TX_PIN, ML307_RX_PIN, 4096), + boot_button_(BOOT_BUTTON_GPIO), + volume_up_button_(VOLUME_UP_BUTTON_GPIO), + volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { + } + virtual void Initialize() override { ESP_LOGI(TAG, "Initializing CompactMl307Board"); // Check if the reset button is pressed SystemReset::GetInstance().CheckButtons(); + InitializeDisplayI2c(); + InitializeButtons(); + Ml307Board::Initialize(); } - virtual AudioDevice* GetAudioDevice() override { - static AudioDevice audio_device; - return &audio_device; + virtual Led* GetBuiltinLed() override { + static Led led(BUILTIN_LED_GPIO); + return &led; + } + + virtual AudioCodec* GetAudioCodec() override { +#ifdef AUDIO_I2S_METHOD_SIMPLEX + static NoAudioCodec audio_codec(AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_SPK_GPIO_BCLK, AUDIO_I2S_SPK_GPIO_LRCK, AUDIO_I2S_SPK_GPIO_DOUT, AUDIO_I2S_MIC_GPIO_SCK, AUDIO_I2S_MIC_GPIO_WS, AUDIO_I2S_MIC_GPIO_DIN); +#else + static NoAudioCodec audio_codec(AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_GPIO_BCLK, AUDIO_I2S_GPIO_WS, AUDIO_I2S_GPIO_DOUT, AUDIO_I2S_GPIO_DIN); +#endif + return &audio_codec; + } + + virtual Display* GetDisplay() override { + static Ssd1306Display display(display_i2c_bus_, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y); + return &display; } }; diff --git a/main/boards/bread-compact-ml307/config.h b/main/boards/bread-compact-ml307/config.h index 383fc0cf..1a22e32b 100644 --- a/main/boards/bread-compact-ml307/config.h +++ b/main/boards/bread-compact-ml307/config.h @@ -5,8 +5,8 @@ #define AUDIO_INPUT_SAMPLE_RATE 16000 #define AUDIO_OUTPUT_SAMPLE_RATE 24000 -#define AUDIO_DEFAULT_OUTPUT_VOLUME 70 +// 如果使用 Duplex I2S 模式，请注释下面一行 #define AUDIO_I2S_METHOD_SIMPLEX #ifdef AUDIO_I2S_METHOD_SIMPLEX @@ -20,7 +20,7 @@ #else -#define AUDIO_I2S_GPIO_LRCK GPIO_NUM_4 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_4 #define AUDIO_I2S_GPIO_BCLK GPIO_NUM_5 #define AUDIO_I2S_GPIO_DIN GPIO_NUM_6 #define AUDIO_I2S_GPIO_DOUT GPIO_NUM_7 diff --git a/main/boards/bread-compact-wifi/compact_wifi_board.cc b/main/boards/bread-compact-wifi/compact_wifi_board.cc index b5620ff6..7d5d60a2 100644 --- a/main/boards/bread-compact-wifi/compact_wifi_board.cc +++ b/main/boards/bread-compact-wifi/compact_wifi_board.cc @@ -1,24 +1,115 @@ #include "boards/wifi_board.h" +#include "audio_codecs/no_audio_codec.h" +#include "display/ssd1306_display.h" #include "system_reset.h" -#include "audio_device.h" +#include "application.h" +#include "button.h" +#include "led.h" +#include "config.h" #include +#include #define TAG "CompactWifiBoard" class CompactWifiBoard : public WifiBoard { +private: + i2c_master_bus_handle_t display_i2c_bus_; + Button boot_button_; + Button volume_up_button_; + Button volume_down_button_; + + void InitializeDisplayI2c() { + i2c_master_bus_config_t bus_config = { + .i2c_port = I2C_NUM_0, + .sda_io_num = DISPLAY_SDA_PIN, + .scl_io_num = DISPLAY_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .glitch_ignore_cnt = 7, + .intr_priority = 0, + .trans_queue_depth = 0, + .flags = { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&bus_config, &display_i2c_bus_)); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + Application::GetInstance().ToggleChatState(); + }); + + volume_up_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() + 10; + if (volume > 100) { + volume = 100; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("Volume\n" + std::to_string(volume)); + }); + + volume_up_button_.OnLongPress([this]() { + auto codec = GetAudioCodec(); + codec->SetOutputVolume(100); + GetDisplay()->ShowNotification("Volume\n100"); + }); + + volume_down_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() - 10; + if (volume < 0) { + volume = 0; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("Volume\n" + std::to_string(volume)); + }); + + volume_down_button_.OnLongPress([this]() { + auto codec = GetAudioCodec(); + codec->SetOutputVolume(0); + GetDisplay()->ShowNotification("Volume\n0"); + }); + } + public: + CompactWifiBoard() : + boot_button_(BOOT_BUTTON_GPIO), + volume_up_button_(VOLUME_UP_BUTTON_GPIO), + volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { + } + virtual void Initialize() override { ESP_LOGI(TAG, "Initializing CompactWifiBoard"); // Check if the reset button is pressed SystemReset::GetInstance().CheckButtons(); + InitializeDisplayI2c(); + InitializeButtons(); + WifiBoard::Initialize(); } - virtual AudioDevice* GetAudioDevice() override { - static AudioDevice audio_device; - return &audio_device; + virtual Led* GetBuiltinLed() override { + static Led led(BUILTIN_LED_GPIO); + return &led; + } + + virtual AudioCodec* GetAudioCodec() override { +#ifdef AUDIO_I2S_METHOD_SIMPLEX + static NoAudioCodec audio_codec(AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_SPK_GPIO_BCLK, AUDIO_I2S_SPK_GPIO_LRCK, AUDIO_I2S_SPK_GPIO_DOUT, AUDIO_I2S_MIC_GPIO_SCK, AUDIO_I2S_MIC_GPIO_WS, AUDIO_I2S_MIC_GPIO_DIN); +#else + static NoAudioCodec audio_codec(AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_GPIO_BCLK, AUDIO_I2S_GPIO_WS, AUDIO_I2S_GPIO_DOUT, AUDIO_I2S_GPIO_DIN); +#endif + return &audio_codec; + } + + virtual Display* GetDisplay() override { + static Ssd1306Display display(display_i2c_bus_, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y); + return &display; } }; diff --git a/main/boards/bread-compact-wifi/config.h b/main/boards/bread-compact-wifi/config.h index e893813f..81d9a27a 100644 --- a/main/boards/bread-compact-wifi/config.h +++ b/main/boards/bread-compact-wifi/config.h @@ -5,8 +5,8 @@ #define AUDIO_INPUT_SAMPLE_RATE 16000 #define AUDIO_OUTPUT_SAMPLE_RATE 24000 -#define AUDIO_DEFAULT_OUTPUT_VOLUME 70 +// 如果使用 Duplex I2S 模式，请注释下面一行 #define AUDIO_I2S_METHOD_SIMPLEX #ifdef AUDIO_I2S_METHOD_SIMPLEX @@ -20,7 +20,7 @@ #else -#define AUDIO_I2S_GPIO_LRCK GPIO_NUM_4 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_4 #define AUDIO_I2S_GPIO_BCLK GPIO_NUM_5 #define AUDIO_I2S_GPIO_DIN GPIO_NUM_6 #define AUDIO_I2S_GPIO_DOUT GPIO_NUM_7 diff --git a/main/boards/esp-box-3/config.h b/main/boards/esp-box-3/config.h index aeea3536..a7656cde 100644 --- a/main/boards/esp-box-3/config.h +++ b/main/boards/esp-box-3/config.h @@ -10,7 +10,7 @@ #define AUDIO_INPUT_REFERENCE true #define AUDIO_I2S_GPIO_MCLK GPIO_NUM_2 -#define AUDIO_I2S_GPIO_LRCK GPIO_NUM_45 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_45 #define AUDIO_I2S_GPIO_BCLK GPIO_NUM_17 #define AUDIO_I2S_GPIO_DIN GPIO_NUM_16 #define AUDIO_I2S_GPIO_DOUT GPIO_NUM_15 diff --git a/main/boards/esp-box-3/esp_box3_board.cc b/main/boards/esp-box-3/esp_box3_board.cc index 3604bacb..6f67d15a 100644 --- a/main/boards/esp-box-3/esp_box3_board.cc +++ b/main/boards/esp-box-3/esp_box3_board.cc @@ -1,20 +1,74 @@ #include "boards/wifi_board.h" -#include "box_audio_device.h" +#include "audio_codecs/box_audio_codec.h" +#include "display/no_display.h" +#include "application.h" +#include "button.h" +#include "led.h" +#include "config.h" #include +#include #define TAG "EspBox3Board" class EspBox3Board : public WifiBoard { +private: + i2c_master_bus_handle_t i2c_bus_; + Button boot_button_; + + void InitializeI2c() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = I2C_NUM_1, + .sda_io_num = AUDIO_CODEC_I2C_SDA_PIN, + .scl_io_num = AUDIO_CODEC_I2C_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .glitch_ignore_cnt = 7, + .intr_priority = 0, + .trans_queue_depth = 0, + .flags = { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_bus_)); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + Application::GetInstance().ToggleChatState(); + }); + } + public: + EspBox3Board() : boot_button_(BOOT_BUTTON_GPIO) { + } + virtual void Initialize() override { ESP_LOGI(TAG, "Initializing EspBox3Board"); + InitializeI2c(); + InitializeButtons(); WifiBoard::Initialize(); } - virtual AudioDevice* GetAudioDevice() override { - static BoxAudioDevice audio_device; - return &audio_device; + virtual Led* GetBuiltinLed() override { + static Led led(GPIO_NUM_NC); + return &led; + } + + virtual AudioCodec* GetAudioCodec() override { + static BoxAudioCodec* audio_codec = nullptr; + if (audio_codec == nullptr) { + audio_codec = new BoxAudioCodec(i2c_bus_, AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_GPIO_MCLK, AUDIO_I2S_GPIO_BCLK, AUDIO_I2S_GPIO_WS, AUDIO_I2S_GPIO_DOUT, AUDIO_I2S_GPIO_DIN, + AUDIO_CODEC_PA_PIN, AUDIO_CODEC_ES8311_ADDR, AUDIO_CODEC_ES7210_ADDR, AUDIO_INPUT_REFERENCE); + audio_codec->SetOutputVolume(AUDIO_DEFAULT_OUTPUT_VOLUME); + } + return audio_codec; + } + + virtual Display* GetDisplay() override { + static NoDisplay display; + return &display; } }; diff --git a/main/boards/kevin-box-0/config.h b/main/boards/kevin-box-0/config.h index 15819abe..613dc6d3 100644 --- a/main/boards/kevin-box-0/config.h +++ b/main/boards/kevin-box-0/config.h @@ -5,12 +5,11 @@ #define AUDIO_INPUT_SAMPLE_RATE 24000 #define AUDIO_OUTPUT_SAMPLE_RATE 24000 -#define AUDIO_DEFAULT_OUTPUT_VOLUME 70 #define AUDIO_INPUT_REFERENCE true #define AUDIO_I2S_GPIO_MCLK GPIO_NUM_0 -#define AUDIO_I2S_GPIO_LRCK GPIO_NUM_47 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_47 #define AUDIO_I2S_GPIO_BCLK GPIO_NUM_48 #define AUDIO_I2S_GPIO_DIN GPIO_NUM_45 #define AUDIO_I2S_GPIO_DOUT GPIO_NUM_21 diff --git a/main/boards/kevin-box-0/kevin_box_board.cc b/main/boards/kevin-box-0/kevin_box_board.cc index 192df605..a57952af 100644 --- a/main/boards/kevin-box-0/kevin_box_board.cc +++ b/main/boards/kevin-box-0/kevin_box_board.cc @@ -1,9 +1,15 @@ #include "boards/ml307_board.h" -#include "box_audio_device.h" +#include "audio_codecs/box_audio_codec.h" +#include "display/ssd1306_display.h" +#include "application.h" +#include "button.h" +#include "led.h" +#include "config.h" #include #include #include +#include #include #include #include @@ -14,6 +20,11 @@ class KevinBoxBoard : public Ml307Board { private: adc_oneshot_unit_handle_t adc1_handle_; adc_cali_handle_t adc1_cali_handle_; + i2c_master_bus_handle_t display_i2c_bus_; + i2c_master_bus_handle_t codec_i2c_bus_; + Button boot_button_; + Button volume_up_button_; + Button volume_down_button_; void MountStorage() { // Mount the storage partition @@ -39,7 +50,7 @@ private: gpio_set_level(GPIO_NUM_15, 1); } - virtual void InitializeADC() { + void InitializeADC() { adc_oneshot_unit_init_cfg_t init_config1 = {}; init_config1.unit_id = ADC_UNIT_1; ESP_ERROR_CHECK(adc_oneshot_new_unit(&init_config1, &adc1_handle_)); @@ -59,27 +70,121 @@ private: }; ESP_ERROR_CHECK(adc_cali_create_scheme_curve_fitting(&cali_config, &adc1_cali_handle_)); } + + void InitializeDisplayI2c() { + i2c_master_bus_config_t bus_config = { + .i2c_port = I2C_NUM_0, + .sda_io_num = DISPLAY_SDA_PIN, + .scl_io_num = DISPLAY_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .glitch_ignore_cnt = 7, + .intr_priority = 0, + .trans_queue_depth = 0, + .flags = { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&bus_config, &display_i2c_bus_)); + } + + void InitializeCodecI2c() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = I2C_NUM_1, + .sda_io_num = AUDIO_CODEC_I2C_SDA_PIN, + .scl_io_num = AUDIO_CODEC_I2C_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .glitch_ignore_cnt = 7, + .intr_priority = 0, + .trans_queue_depth = 0, + .flags = { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &codec_i2c_bus_)); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + Application::GetInstance().ToggleChatState(); + }); + + volume_up_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() + 10; + if (volume > 100) { + volume = 100; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("Volume\n" + std::to_string(volume)); + }); + + volume_up_button_.OnLongPress([this]() { + auto codec = GetAudioCodec(); + codec->SetOutputVolume(100); + GetDisplay()->ShowNotification("Volume\n100"); + }); + + volume_down_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() - 10; + if (volume < 0) { + volume = 0; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("Volume\n" + std::to_string(volume)); + }); + + volume_down_button_.OnLongPress([this]() { + auto codec = GetAudioCodec(); + codec->SetOutputVolume(0); + GetDisplay()->ShowNotification("Volume\n0"); + }); + } + public: + KevinBoxBoard() : Ml307Board(ML307_TX_PIN, ML307_RX_PIN, 4096), + boot_button_(BOOT_BUTTON_GPIO), + volume_up_button_(VOLUME_UP_BUTTON_GPIO), + volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { + } + virtual void Initialize() override { ESP_LOGI(TAG, "Initializing KevinBoxBoard"); + InitializeDisplayI2c(); + InitializeCodecI2c(); InitializeADC(); MountStorage(); Enable4GModule(); + + InitializeButtons(); + Ml307Board::Initialize(); } - virtual AudioDevice* GetAudioDevice() override { - static BoxAudioDevice audio_device; - return &audio_device; + virtual Led* GetBuiltinLed() override { + static Led led(BUILTIN_LED_GPIO); + return &led; + } + + virtual AudioCodec* GetAudioCodec() override { + static BoxAudioCodec audio_codec(codec_i2c_bus_, AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_GPIO_MCLK, AUDIO_I2S_GPIO_BCLK, AUDIO_I2S_GPIO_WS, AUDIO_I2S_GPIO_DOUT, AUDIO_I2S_GPIO_DIN, + AUDIO_CODEC_PA_PIN, AUDIO_CODEC_ES8311_ADDR, AUDIO_CODEC_ES7210_ADDR, AUDIO_INPUT_REFERENCE); + return &audio_codec; + } + + virtual Display* GetDisplay() override { + static Ssd1306Display display(display_i2c_bus_, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y); + return &display; } virtual bool GetBatteryVoltage(int &voltage, bool& charging) override { - int adc_reading; - ESP_ERROR_CHECK(adc_oneshot_read(adc1_handle_, ADC_CHANNEL_0, &adc_reading)); - ESP_ERROR_CHECK(adc_cali_raw_to_voltage(adc1_cali_handle_, adc_reading, &voltage)); + ESP_ERROR_CHECK(adc_oneshot_get_calibrated_result(adc1_handle_, adc1_cali_handle_, ADC_CHANNEL_0, &voltage)); charging = false; + ESP_LOGI(TAG, "Battery voltage: %d, Charging: %d", voltage, charging); return true; } }; -DECLARE_BOARD(KevinBoxBoard); +DECLARE_BOARD(KevinBoxBoard); \ No newline at end of file diff --git a/main/boards/kevin-box-1/config.h b/main/boards/kevin-box-1/config.h index 58ce7eba..8bd55ad2 100644 --- a/main/boards/kevin-box-1/config.h +++ b/main/boards/kevin-box-1/config.h @@ -5,12 +5,11 @@ #define AUDIO_INPUT_SAMPLE_RATE 24000 #define AUDIO_OUTPUT_SAMPLE_RATE 24000 -#define AUDIO_DEFAULT_OUTPUT_VOLUME 70 #define AUDIO_INPUT_REFERENCE true #define AUDIO_I2S_GPIO_MCLK GPIO_NUM_42 -#define AUDIO_I2S_GPIO_LRCK GPIO_NUM_47 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_47 #define AUDIO_I2S_GPIO_BCLK GPIO_NUM_48 #define AUDIO_I2S_GPIO_DIN GPIO_NUM_45 #define AUDIO_I2S_GPIO_DOUT GPIO_NUM_21 diff --git a/main/boards/kevin-box-1/kevin_box_board.cc b/main/boards/kevin-box-1/kevin_box_board.cc index d29d08ad..d8629f5b 100644 --- a/main/boards/kevin-box-1/kevin_box_board.cc +++ b/main/boards/kevin-box-1/kevin_box_board.cc @@ -1,9 +1,15 @@ #include "boards/ml307_board.h" -#include "box_audio_device.h" +#include "audio_codecs/box_audio_codec.h" +#include "display/ssd1306_display.h" +#include "application.h" +#include "button.h" +#include "led.h" +#include "config.h" #include #include #include +#include #include #include #include @@ -14,6 +20,11 @@ class KevinBoxBoard : public Ml307Board { private: adc_oneshot_unit_handle_t adc1_handle_; adc_cali_handle_t adc1_cali_handle_; + i2c_master_bus_handle_t display_i2c_bus_; + i2c_master_bus_handle_t codec_i2c_bus_; + Button boot_button_; + Button volume_up_button_; + Button volume_down_button_; void MountStorage() { // Mount the storage partition @@ -40,7 +51,7 @@ private: gpio_set_level(GPIO_NUM_18, 1); } - virtual void InitializeADC() { + void InitializeADC() { adc_oneshot_unit_init_cfg_t init_config1 = {}; init_config1.unit_id = ADC_UNIT_1; ESP_ERROR_CHECK(adc_oneshot_new_unit(&init_config1, &adc1_handle_)); @@ -60,9 +71,89 @@ private: }; ESP_ERROR_CHECK(adc_cali_create_scheme_curve_fitting(&cali_config, &adc1_cali_handle_)); } + + void InitializeDisplayI2c() { + i2c_master_bus_config_t bus_config = { + .i2c_port = I2C_NUM_0, + .sda_io_num = DISPLAY_SDA_PIN, + .scl_io_num = DISPLAY_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .glitch_ignore_cnt = 7, + .intr_priority = 0, + .trans_queue_depth = 0, + .flags = { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&bus_config, &display_i2c_bus_)); + } + + void InitializeCodecI2c() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = I2C_NUM_1, + .sda_io_num = AUDIO_CODEC_I2C_SDA_PIN, + .scl_io_num = AUDIO_CODEC_I2C_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .glitch_ignore_cnt = 7, + .intr_priority = 0, + .trans_queue_depth = 0, + .flags = { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &codec_i2c_bus_)); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + Application::GetInstance().ToggleChatState(); + }); + + volume_up_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() + 10; + if (volume > 100) { + volume = 100; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("Volume\n" + std::to_string(volume)); + }); + + volume_up_button_.OnLongPress([this]() { + auto codec = GetAudioCodec(); + codec->SetOutputVolume(100); + GetDisplay()->ShowNotification("Volume\n100"); + }); + + volume_down_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() - 10; + if (volume < 0) { + volume = 0; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("Volume\n" + std::to_string(volume)); + }); + + volume_down_button_.OnLongPress([this]() { + auto codec = GetAudioCodec(); + codec->SetOutputVolume(0); + GetDisplay()->ShowNotification("Volume\n0"); + }); + } + public: + KevinBoxBoard() : Ml307Board(ML307_TX_PIN, ML307_RX_PIN, 4096), + boot_button_(BOOT_BUTTON_GPIO), + volume_up_button_(VOLUME_UP_BUTTON_GPIO), + volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { + } + virtual void Initialize() override { ESP_LOGI(TAG, "Initializing KevinBoxBoard"); + InitializeDisplayI2c(); + InitializeCodecI2c(); InitializeADC(); MountStorage(); Enable4GModule(); @@ -76,12 +167,26 @@ public: }; gpio_config(&charging_io); + InitializeButtons(); + Ml307Board::Initialize(); } - virtual AudioDevice* GetAudioDevice() override { - static BoxAudioDevice audio_device; - return &audio_device; + virtual Led* GetBuiltinLed() override { + static Led led(BUILTIN_LED_GPIO); + return &led; + } + + virtual AudioCodec* GetAudioCodec() override { + static BoxAudioCodec audio_codec(codec_i2c_bus_, AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_GPIO_MCLK, AUDIO_I2S_GPIO_BCLK, AUDIO_I2S_GPIO_WS, AUDIO_I2S_GPIO_DOUT, AUDIO_I2S_GPIO_DIN, + AUDIO_CODEC_PA_PIN, AUDIO_CODEC_ES8311_ADDR, AUDIO_CODEC_ES7210_ADDR, AUDIO_INPUT_REFERENCE); + return &audio_codec; + } + + virtual Display* GetDisplay() override { + static Ssd1306Display display(display_i2c_bus_, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y); + return &display; } virtual bool GetBatteryVoltage(int &voltage, bool& charging) override { @@ -92,4 +197,4 @@ public: } }; -DECLARE_BOARD(KevinBoxBoard); +DECLARE_BOARD(KevinBoxBoard); \ No newline at end of file diff --git a/main/boards/lichuang-dev/config.h b/main/boards/lichuang-dev/config.h index c9f21cc2..7896ac2f 100644 --- a/main/boards/lichuang-dev/config.h +++ b/main/boards/lichuang-dev/config.h @@ -10,7 +10,7 @@ #define AUDIO_INPUT_REFERENCE true #define AUDIO_I2S_GPIO_MCLK GPIO_NUM_38 -#define AUDIO_I2S_GPIO_LRCK GPIO_NUM_13 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_13 #define AUDIO_I2S_GPIO_BCLK GPIO_NUM_14 #define AUDIO_I2S_GPIO_DIN GPIO_NUM_12 #define AUDIO_I2S_GPIO_DOUT GPIO_NUM_45 diff --git a/main/boards/lichuang-dev/lichuang_dev_board.cc b/main/boards/lichuang-dev/lichuang_dev_board.cc index 78de9448..30321100 100644 --- a/main/boards/lichuang-dev/lichuang_dev_board.cc +++ b/main/boards/lichuang-dev/lichuang_dev_board.cc @@ -1,20 +1,96 @@ #include "boards/wifi_board.h" -#include "box_audio_device.h" +#include "audio_codecs/box_audio_codec.h" +#include "display/no_display.h" +#include "application.h" +#include "button.h" +#include "led.h" +#include "config.h" #include +#include #define TAG "LichuangDevBoard" class LichuangDevBoard : public WifiBoard { +private: + i2c_master_bus_handle_t i2c_bus_; + Button boot_button_; + + void InitializeI2c() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = I2C_NUM_1, + .sda_io_num = AUDIO_CODEC_I2C_SDA_PIN, + .scl_io_num = AUDIO_CODEC_I2C_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .glitch_ignore_cnt = 7, + .intr_priority = 0, + .trans_queue_depth = 0, + .flags = { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_bus_)); + } + + void InitializePca9557() { + i2c_device_config_t pca9557_cfg = { + .dev_addr_length = I2C_ADDR_BIT_LEN_7, + .device_address = 0x19, + .scl_speed_hz = 400000, + .scl_wait_us = 0, + .flags = { + .disable_ack_check = 0, + }, + }; + i2c_master_dev_handle_t pca9557_handle; + ESP_ERROR_CHECK(i2c_master_bus_add_device(i2c_bus_, &pca9557_cfg, &pca9557_handle)); + assert(pca9557_handle != NULL); + auto pca9557_set_register = [](i2c_master_dev_handle_t pca9557_handle, uint8_t data_addr, uint8_t data) { + uint8_t data_[2] = {data_addr, data}; + ESP_ERROR_CHECK(i2c_master_transmit(pca9557_handle, data_, 2, 50)); + }; + pca9557_set_register(pca9557_handle, 0x03, 0xfd); + pca9557_set_register(pca9557_handle, 0x01, 0x02); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + Application::GetInstance().ToggleChatState(); + }); + } + public: + LichuangDevBoard() : boot_button_(BOOT_BUTTON_GPIO) { + } + virtual void Initialize() override { ESP_LOGI(TAG, "Initializing LichuangDevBoard"); + InitializeI2c(); + InitializePca9557(); + InitializeButtons(); WifiBoard::Initialize(); } - virtual AudioDevice* GetAudioDevice() override { - static BoxAudioDevice audio_device; - return &audio_device; + virtual Led* GetBuiltinLed() override { + static Led led(GPIO_NUM_NC); + return &led; + } + + virtual AudioCodec* GetAudioCodec() override { + static BoxAudioCodec* audio_codec = nullptr; + if (audio_codec == nullptr) { + audio_codec = new BoxAudioCodec(i2c_bus_, AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_GPIO_MCLK, AUDIO_I2S_GPIO_BCLK, AUDIO_I2S_GPIO_WS, AUDIO_I2S_GPIO_DOUT, AUDIO_I2S_GPIO_DIN, + AUDIO_CODEC_PA_PIN, AUDIO_CODEC_ES8311_ADDR, AUDIO_CODEC_ES7210_ADDR, AUDIO_INPUT_REFERENCE); + audio_codec->SetOutputVolume(AUDIO_DEFAULT_OUTPUT_VOLUME); + } + return audio_codec; + } + + virtual Display* GetDisplay() override { + static NoDisplay display; + return &display; } }; diff --git a/main/boards/ml307_board.cc b/main/boards/ml307_board.cc index 48c4bbd1..cd18bc5c 100644 --- a/main/boards/ml307_board.cc +++ b/main/boards/ml307_board.cc @@ -27,13 +27,32 @@ static std::string csq_to_string(int csq) { } -Ml307Board::Ml307Board() : modem_(ML307_TX_PIN, ML307_RX_PIN, 4096) { +Ml307Board::Ml307Board(gpio_num_t tx_pin, gpio_num_t rx_pin, size_t rx_buffer_size) : modem_(tx_pin, rx_pin, rx_buffer_size) { } void Ml307Board::StartNetwork() { + auto display = Board::GetInstance().GetDisplay(); + display->SetText(std::string("Starting modem")); + modem_.SetDebug(false); + modem_.SetBaudRate(921600); + auto& application = Application::GetInstance(); - auto& display = application.GetDisplay(); - display.SetText(std::string("Wait for network\n")); + // If low power, the material ready event will be triggered by the modem because of a reset + modem_.OnMaterialReady([this, &application]() { + ESP_LOGI(TAG, "ML307 material ready"); + application.Schedule([this, &application]() { + application.SetChatState(kChatStateIdle); + WaitForNetworkReady(); + }); + }); + + WaitForNetworkReady(); +} + +void Ml307Board::WaitForNetworkReady() { + auto& application = Application::GetInstance(); + auto display = Board::GetInstance().GetDisplay(); + display->SetText(std::string("Wait for network\n")); int result = modem_.WaitForNetworkReady(); if (result == -1) { application.Alert("Error", "PIN is not ready"); @@ -52,26 +71,8 @@ void Ml307Board::StartNetwork() { ESP_LOGI(TAG, "ML307 ICCID: %s", iccid.c_str()); } -void Ml307Board::StartModem() { - auto& display = Application::GetInstance().GetDisplay(); - display.SetText(std::string("Starting modem")); - modem_.SetDebug(false); - modem_.SetBaudRate(921600); - - auto& application = Application::GetInstance(); - // If low power, the material ready event will be triggered by the modem because of a reset - modem_.OnMaterialReady([this, &application]() { - ESP_LOGI(TAG, "ML307 material ready"); - application.Schedule([this, &application]() { - application.SetChatState(kChatStateIdle); - StartNetwork(); - }); - }); -} - void Ml307Board::Initialize() { ESP_LOGI(TAG, "Initializing Ml307Board"); - StartModem(); } Http* Ml307Board::CreateHttp() { diff --git a/main/boards/ml307_board.h b/main/boards/ml307_board.h index 8ccf9d5a..32d97b93 100644 --- a/main/boards/ml307_board.h +++ b/main/boards/ml307_board.h @@ -9,10 +9,10 @@ protected: Ml307AtModem modem_; virtual std::string GetBoardJson() override; - void StartModem(); + void WaitForNetworkReady(); public: - Ml307Board(); + Ml307Board(gpio_num_t tx_pin, gpio_num_t rx_pin, size_t rx_buffer_size = 4096); virtual void Initialize() override; virtual void StartNetwork() override; virtual Http* CreateHttp() override; diff --git a/main/boards/wifi_board.cc b/main/boards/wifi_board.cc index 3fc405e7..b26903ea 100644 --- a/main/boards/wifi_board.cc +++ b/main/boards/wifi_board.cc @@ -1,7 +1,6 @@ #include "wifi_board.h" #include "application.h" #include "system_info.h" -#include "builtin_led.h" #include #include @@ -32,17 +31,17 @@ static std::string rssi_to_string(int rssi) { void WifiBoard::StartNetwork() { auto& application = Application::GetInstance(); - auto& display = application.GetDisplay(); - auto& builtin_led = BuiltinLed::GetInstance(); + auto display = Board::GetInstance().GetDisplay(); + auto builtin_led = Board::GetInstance().GetBuiltinLed(); // Try to connect to WiFi, if failed, launch the WiFi configuration AP auto& wifi_station = WifiStation::GetInstance(); - display.SetText(std::string("Connect to WiFi\n") + wifi_station.GetSsid()); + display->SetText(std::string("Connect to WiFi\n") + wifi_station.GetSsid()); wifi_station.Start(); if (!wifi_station.IsConnected()) { application.Alert("Info", "Configuring WiFi"); - builtin_led.SetBlue(); - builtin_led.Blink(1000, 500); + builtin_led->SetBlue(); + builtin_led->Blink(1000, 500); auto& wifi_ap = WifiConfigurationAp::GetInstance(); wifi_ap.SetSsidPrefix("Xiaozhi"); wifi_ap.Start(); diff --git a/main/box_audio_device.h b/main/box_audio_device.h deleted file mode 100644 index f24ebd4a..00000000 --- a/main/box_audio_device.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef _BOX_AUDIO_DEVICE_H -#define _BOX_AUDIO_DEVICE_H - -#include "audio_device.h" - -#include -#include -#include -#include - - -class BoxAudioDevice : public AudioDevice { -public: - BoxAudioDevice(); - virtual ~BoxAudioDevice(); - virtual void Initialize() override; - virtual void SetOutputVolume(int volume) override; - virtual void EnableInput(bool enable) override; - virtual void EnableOutput(bool enable) override; - -private: - i2c_master_bus_handle_t i2c_master_handle_ = nullptr; - - const audio_codec_data_if_t* data_if_ = nullptr; - const audio_codec_ctrl_if_t* out_ctrl_if_ = nullptr; - const audio_codec_if_t* out_codec_if_ = nullptr; - const audio_codec_ctrl_if_t* in_ctrl_if_ = nullptr; - const audio_codec_if_t* in_codec_if_ = nullptr; - const audio_codec_gpio_if_t* gpio_if_ = nullptr; - - esp_codec_dev_handle_t output_dev_ = nullptr; - esp_codec_dev_handle_t input_dev_ = nullptr; - - void CreateDuplexChannels() override; - int Read(int16_t* dest, int samples) override; - int Write(const int16_t* data, int samples) override; -}; - -#endif // _BOX_AUDIO_DEVICE_H diff --git a/main/display.cc b/main/display.cc index 1ab229ad..51a1a72d 100644 --- a/main/display.cc +++ b/main/display.cc @@ -1,8 +1,5 @@ #include #include -#include -#include -#include #include #include @@ -12,115 +9,26 @@ #define TAG "Display" -Display::Display(int sda_pin, int scl_pin) : sda_pin_(sda_pin), scl_pin_(scl_pin) { - if (sda_pin_ == GPIO_NUM_NC || scl_pin_ == GPIO_NUM_NC) { - ESP_LOGI(TAG, "Display not connected"); +void Display::SetupUI() { + if (disp_ == nullptr) { return; } - i2c_master_bus_config_t bus_config = { - .i2c_port = I2C_NUM_0, - .sda_io_num = (gpio_num_t)sda_pin_, - .scl_io_num = (gpio_num_t)scl_pin_, - .clk_source = I2C_CLK_SRC_DEFAULT, - .glitch_ignore_cnt = 7, - .intr_priority = 0, - .trans_queue_depth = 0, - .flags = { - .enable_internal_pullup = 0, - }, - }; + ESP_LOGI(TAG, "Setting up UI"); + Lock(); + label_ = lv_label_create(lv_disp_get_scr_act(disp_)); + // lv_obj_set_style_text_font(label_, font_, 0); + lv_label_set_text(label_, "Initializing..."); + lv_obj_set_width(label_, disp_->driver->hor_res); + lv_obj_set_height(label_, disp_->driver->ver_res); - ESP_ERROR_CHECK(i2c_new_master_bus(&bus_config, &i2c_bus_)); - - // SSD1306 config - esp_lcd_panel_io_i2c_config_t io_config = { - .dev_addr = 0x3C, - .on_color_trans_done = nullptr, - .user_ctx = nullptr, - .control_phase_bytes = 1, - .dc_bit_offset = 6, - .lcd_cmd_bits = 8, - .lcd_param_bits = 8, - .flags = { - .dc_low_on_data = 0, - .disable_control_phase = 0, - }, - .scl_speed_hz = 100 * 1000, - }; - - ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c_v2(i2c_bus_, &io_config, &panel_io_)); - - ESP_LOGI(TAG, "Install SSD1306 driver"); - esp_lcd_panel_dev_config_t panel_config = {}; - panel_config.reset_gpio_num = -1; - panel_config.bits_per_pixel = 1; - - esp_lcd_panel_ssd1306_config_t ssd1306_config = { - .height = DISPLAY_HEIGHT - }; - panel_config.vendor_config = &ssd1306_config; - - ESP_ERROR_CHECK(esp_lcd_new_panel_ssd1306(panel_io_, &panel_config, &panel_)); - ESP_LOGI(TAG, "SSD1306 driver installed"); - - // Reset the display - ESP_ERROR_CHECK(esp_lcd_panel_reset(panel_)); - if (esp_lcd_panel_init(panel_) != ESP_OK) { - ESP_LOGE(TAG, "Failed to initialize display"); - return; - } - - ESP_LOGI(TAG, "Initialize LVGL"); - lvgl_port_cfg_t port_cfg = ESP_LVGL_PORT_INIT_CONFIG(); - lvgl_port_init(&port_cfg); - - // Set the display to on - ESP_LOGI(TAG, "Turning display on"); - ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_, true)); - - ESP_LOGI(TAG, "Adding LCD screen"); - const lvgl_port_display_cfg_t display_cfg = { - .io_handle = panel_io_, - .panel_handle = panel_, - .control_handle = nullptr, - .buffer_size = DISPLAY_WIDTH * DISPLAY_HEIGHT, - .double_buffer = false, - .trans_size = 0, - .hres = DISPLAY_WIDTH, - .vres = DISPLAY_HEIGHT, - .monochrome = true, - .rotation = { - .swap_xy = false, - .mirror_x = DISPLAY_MIRROR_X, - .mirror_y = DISPLAY_MIRROR_Y, - }, - .flags = { - .buff_dma = 1, - .buff_spiram = 0, - .sw_rotate = 0, - .full_refresh = 0, - .direct_mode = 0, - }, - }; - disp_ = lvgl_port_add_disp(&display_cfg);; - - ESP_LOGI(TAG, "Display Loading..."); - if (lvgl_port_lock(0)) { - label_ = lv_label_create(lv_disp_get_scr_act(disp_)); - // lv_obj_set_style_text_font(label_, font_, 0); - lv_label_set_text(label_, "Initializing..."); - lv_obj_set_width(label_, disp_->driver->hor_res); - lv_obj_set_height(label_, disp_->driver->ver_res); - - notification_ = lv_label_create(lv_disp_get_scr_act(disp_)); - // lv_obj_set_style_text_font(notification_, font_, 0); - lv_label_set_text(notification_, "Notification\nTest"); - lv_obj_set_width(notification_, disp_->driver->hor_res); - lv_obj_set_height(notification_, disp_->driver->ver_res); - lv_obj_set_style_opa(notification_, LV_OPA_MIN, 0); - lvgl_port_unlock(); - } + notification_ = lv_label_create(lv_disp_get_scr_act(disp_)); + // lv_obj_set_style_text_font(notification_, font_, 0); + lv_label_set_text(notification_, "Notification\nTest"); + lv_obj_set_width(notification_, disp_->driver->hor_res); + lv_obj_set_height(notification_, disp_->driver->ver_res); + lv_obj_set_style_opa(notification_, LV_OPA_MIN, 0); + Unlock(); // Create a timer to update the display every 10 seconds esp_timer_create_args_t update_display_timer_args = { @@ -146,43 +54,32 @@ Display::~Display() { esp_timer_stop(update_display_timer_); esp_timer_delete(update_display_timer_); } - - lvgl_port_lock(0); if (label_ != nullptr) { lv_obj_del(label_); lv_obj_del(notification_); } - lvgl_port_unlock(); - if (font_ != nullptr) { lv_font_free(font_); } - - if (disp_ != nullptr) { - lvgl_port_deinit(); - esp_lcd_panel_del(panel_); - esp_lcd_panel_io_del(panel_io_); - i2c_master_bus_reset(i2c_bus_); - } } void Display::SetText(const std::string &text) { if (label_ != nullptr) { text_ = text; - lvgl_port_lock(0); + Lock(); // Change the text of the label lv_label_set_text(label_, text_.c_str()); - lvgl_port_unlock(); + Unlock(); } } void Display::ShowNotification(const std::string &text) { if (notification_ != nullptr) { - lvgl_port_lock(0); + Lock(); lv_label_set_text(notification_, text.c_str()); lv_obj_set_style_opa(notification_, LV_OPA_MAX, 0); lv_obj_set_style_opa(label_, LV_OPA_MIN, 0); - lvgl_port_unlock(); + Unlock(); if (notification_timer_ != nullptr) { esp_timer_stop(notification_timer_); @@ -192,10 +89,10 @@ void Display::ShowNotification(const std::string &text) { esp_timer_create_args_t timer_args = { .callback = [](void *arg) { Display *display = static_cast(arg); - lvgl_port_lock(0); + display->Lock(); lv_obj_set_style_opa(display->notification_, LV_OPA_MIN, 0); lv_obj_set_style_opa(display->label_, LV_OPA_MAX, 0); - lvgl_port_unlock(); + display->Unlock(); }, .arg = this, .dispatch_method = ESP_TIMER_TASK, diff --git a/main/display.h b/main/display.h index fdd280d3..17d3bbcc 100644 --- a/main/display.h +++ b/main/display.h @@ -1,9 +1,6 @@ #ifndef DISPLAY_H #define DISPLAY_H -#include -#include -#include #include #include @@ -11,22 +8,18 @@ class Display { public: - Display(int sda_pin, int scl_pin); - ~Display(); + virtual ~Display(); + void SetupUI(); void SetText(const std::string &text); void ShowNotification(const std::string &text); void UpdateDisplay(); -private: - int sda_pin_; - int scl_pin_; + int width() const { return width_; } + int height() const { return height_; } - i2c_master_bus_handle_t i2c_bus_ = nullptr; - - esp_lcd_panel_io_handle_t panel_io_ = nullptr; - esp_lcd_panel_handle_t panel_ = nullptr; +protected: lv_disp_t *disp_ = nullptr; lv_font_t *font_ = nullptr; lv_obj_t *label_ = nullptr; @@ -34,7 +27,13 @@ private: esp_timer_handle_t notification_timer_ = nullptr; esp_timer_handle_t update_display_timer_ = nullptr; + int width_ = 0; + int height_ = 0; + std::string text_; + + virtual void Lock() = 0; + virtual void Unlock() = 0; }; #endif diff --git a/main/display/no_display.cc b/main/display/no_display.cc new file mode 100644 index 00000000..8acf9a08 --- /dev/null +++ b/main/display/no_display.cc @@ -0,0 +1,9 @@ +#include "no_display.h" + +NoDisplay::NoDisplay() {} + +NoDisplay::~NoDisplay() {} + +void NoDisplay::Lock() {} + +void NoDisplay::Unlock() {} diff --git a/main/display/no_display.h b/main/display/no_display.h new file mode 100644 index 00000000..6449e6c1 --- /dev/null +++ b/main/display/no_display.h @@ -0,0 +1,16 @@ +#ifndef _NO_DISPLAY_H_ +#define _NO_DISPLAY_H_ + +#include "display.h" + +class NoDisplay : public Display { +private: + virtual void Lock() override; + virtual void Unlock() override; + +public: + NoDisplay(); + ~NoDisplay(); +}; + +#endif diff --git a/main/display/ssd1306_display.cc b/main/display/ssd1306_display.cc new file mode 100644 index 00000000..5631b3fa --- /dev/null +++ b/main/display/ssd1306_display.cc @@ -0,0 +1,106 @@ +#include "ssd1306_display.h" + +#include +#include +#include +#include +#include + +#define TAG "Ssd1306Display" + +Ssd1306Display::Ssd1306Display(void* i2c_master_handle, int width, int height, bool mirror_x, bool mirror_y) + : mirror_x_(mirror_x), mirror_y_(mirror_y) { + width_ = width; + height_ = height; + + ESP_LOGI(TAG, "Initialize LVGL"); + lvgl_port_cfg_t port_cfg = ESP_LVGL_PORT_INIT_CONFIG(); + lvgl_port_init(&port_cfg); + + // SSD1306 config + esp_lcd_panel_io_i2c_config_t io_config = { + .dev_addr = 0x3C, + .on_color_trans_done = nullptr, + .user_ctx = nullptr, + .control_phase_bytes = 1, + .dc_bit_offset = 6, + .lcd_cmd_bits = 8, + .lcd_param_bits = 8, + .flags = { + .dc_low_on_data = 0, + .disable_control_phase = 0, + }, + .scl_speed_hz = 400 * 1000, + }; + + ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c_v2((i2c_master_bus_t*)i2c_master_handle, &io_config, &panel_io_)); + + ESP_LOGI(TAG, "Install SSD1306 driver"); + esp_lcd_panel_dev_config_t panel_config = {}; + panel_config.reset_gpio_num = -1; + panel_config.bits_per_pixel = 1; + + esp_lcd_panel_ssd1306_config_t ssd1306_config = { + .height = static_cast(height_), + }; + panel_config.vendor_config = &ssd1306_config; + + ESP_ERROR_CHECK(esp_lcd_new_panel_ssd1306(panel_io_, &panel_config, &panel_)); + ESP_LOGI(TAG, "SSD1306 driver installed"); + + // Reset the display + ESP_ERROR_CHECK(esp_lcd_panel_reset(panel_)); + if (esp_lcd_panel_init(panel_) != ESP_OK) { + ESP_LOGE(TAG, "Failed to initialize display"); + return; + } + + // Set the display to on + ESP_LOGI(TAG, "Turning display on"); + ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_, true)); + + ESP_LOGI(TAG, "Adding LCD screen"); + const lvgl_port_display_cfg_t display_cfg = { + .io_handle = panel_io_, + .panel_handle = panel_, + .control_handle = nullptr, + .buffer_size = static_cast(width_ * height_), + .double_buffer = false, + .trans_size = 0, + .hres = static_cast(width_), + .vres = static_cast(height_), + .monochrome = true, + .rotation = { + .swap_xy = false, + .mirror_x = mirror_x_, + .mirror_y = mirror_y_, + }, + .flags = { + .buff_dma = 1, + .buff_spiram = 0, + .sw_rotate = 0, + .full_refresh = 0, + .direct_mode = 0, + }, + }; + + disp_ = lvgl_port_add_disp(&display_cfg); +} + +Ssd1306Display::~Ssd1306Display() { + if (panel_ != nullptr) { + esp_lcd_panel_del(panel_); + } + if (panel_io_ != nullptr) { + esp_lcd_panel_io_del(panel_io_); + } + lvgl_port_deinit(); +} + +void Ssd1306Display::Lock() { + lvgl_port_lock(0); +} + +void Ssd1306Display::Unlock() { + lvgl_port_unlock(); +} diff --git a/main/display/ssd1306_display.h b/main/display/ssd1306_display.h new file mode 100644 index 00000000..89f5cbf1 --- /dev/null +++ b/main/display/ssd1306_display.h @@ -0,0 +1,24 @@ +#ifndef SSD1306_DISPLAY_H +#define SSD1306_DISPLAY_H + +#include "display.h" + +#include +#include + +class Ssd1306Display : public Display { +private: + esp_lcd_panel_io_handle_t panel_io_ = nullptr; + esp_lcd_panel_handle_t panel_ = nullptr; + bool mirror_x_ = false; + bool mirror_y_ = false; + + virtual void Lock() override; + virtual void Unlock() override; + +public: + Ssd1306Display(void* i2c_master_handle, int width, int height, bool mirror_x = false, bool mirror_y = false); + ~Ssd1306Display(); +}; + +#endif // SSD1306_DISPLAY_H diff --git a/main/builtin_led.cc b/main/led.cc similarity index 80% rename from main/builtin_led.cc rename to main/led.cc index b4bb7078..f0f4d129 100644 --- a/main/builtin_led.cc +++ b/main/led.cc @@ -1,25 +1,37 @@ -#include "builtin_led.h" +#include "led.h" #include "board.h" #include #include -#define TAG "builtin_led" +#define TAG "Led" -BuiltinLed::BuiltinLed() { +Led::Led(gpio_num_t gpio) { mutex_ = xSemaphoreCreateMutex(); blink_event_group_ = xEventGroupCreate(); xEventGroupSetBits(blink_event_group_, BLINK_TASK_STOPPED_BIT); - if (BUILTIN_LED_GPIO == GPIO_NUM_NC) { + if (gpio == GPIO_NUM_NC) { ESP_LOGI(TAG, "Builtin LED not connected"); return; } - Initialize(); + + led_strip_config_t strip_config = {}; + strip_config.strip_gpio_num = gpio; + strip_config.max_leds = 1; + strip_config.led_pixel_format = LED_PIXEL_FORMAT_GRB; + strip_config.led_model = LED_MODEL_WS2812; + + led_strip_rmt_config_t rmt_config = {}; + rmt_config.resolution_hz = 10 * 1000 * 1000; // 10MHz + + ESP_ERROR_CHECK(led_strip_new_rmt_device(&strip_config, &rmt_config, &led_strip_)); + led_strip_clear(led_strip_); + SetGrey(); } -BuiltinLed::~BuiltinLed() { +Led::~Led() { StopBlinkInternal(); if (led_strip_ != nullptr) { led_strip_del(led_strip_); @@ -32,32 +44,13 @@ BuiltinLed::~BuiltinLed() { } } -BuiltinLed& BuiltinLed::GetInstance() { - static BuiltinLed instance; - return instance; -} - -void BuiltinLed::Initialize() { - led_strip_config_t strip_config = {}; - strip_config.strip_gpio_num = BUILTIN_LED_GPIO; - strip_config.max_leds = 1; - strip_config.led_pixel_format = LED_PIXEL_FORMAT_GRB; - strip_config.led_model = LED_MODEL_WS2812; - - led_strip_rmt_config_t rmt_config = {}; - rmt_config.resolution_hz = 10 * 1000 * 1000; // 10MHz - - ESP_ERROR_CHECK(led_strip_new_rmt_device(&strip_config, &rmt_config, &led_strip_)); - led_strip_clear(led_strip_); -} - -void BuiltinLed::SetColor(uint8_t r, uint8_t g, uint8_t b) { +void Led::SetColor(uint8_t r, uint8_t g, uint8_t b) { r_ = r; g_ = g; b_ = b; } -void BuiltinLed::TurnOn() { +void Led::TurnOn() { if (led_strip_ == nullptr) { return; } @@ -68,7 +61,7 @@ void BuiltinLed::TurnOn() { xSemaphoreGive(mutex_); } -void BuiltinLed::TurnOff() { +void Led::TurnOff() { if (led_strip_ == nullptr) { return; } @@ -78,19 +71,19 @@ void BuiltinLed::TurnOff() { xSemaphoreGive(mutex_); } -void BuiltinLed::BlinkOnce() { +void Led::BlinkOnce() { Blink(1, 100); } -void BuiltinLed::Blink(int times, int interval_ms) { +void Led::Blink(int times, int interval_ms) { StartBlinkTask(times, interval_ms); } -void BuiltinLed::StartContinuousBlink(int interval_ms) { +void Led::StartContinuousBlink(int interval_ms) { StartBlinkTask(BLINK_INFINITE, interval_ms); } -void BuiltinLed::StartBlinkTask(int times, int interval_ms) { +void Led::StartBlinkTask(int times, int interval_ms) { if (led_strip_ == nullptr) { return; } @@ -105,7 +98,7 @@ void BuiltinLed::StartBlinkTask(int times, int interval_ms) { xEventGroupSetBits(blink_event_group_, BLINK_TASK_RUNNING_BIT); xTaskCreate([](void* obj) { - auto this_ = static_cast(obj); + auto this_ = static_cast(obj); int count = 0; while (this_->should_blink_ && (this_->blink_times_ == BLINK_INFINITE || count < this_->blink_times_)) { xSemaphoreTake(this_->mutex_, portMAX_DELAY); @@ -132,7 +125,7 @@ void BuiltinLed::StartBlinkTask(int times, int interval_ms) { xSemaphoreGive(mutex_); } -void BuiltinLed::StopBlinkInternal() { +void Led::StopBlinkInternal() { should_blink_ = false; xEventGroupWaitBits(blink_event_group_, BLINK_TASK_STOPPED_BIT, pdFALSE, pdTRUE, portMAX_DELAY); } diff --git a/main/builtin_led.h b/main/led.h similarity index 82% rename from main/builtin_led.h rename to main/led.h index a22daa0e..f42adf61 100644 --- a/main/builtin_led.h +++ b/main/led.h @@ -1,5 +1,5 @@ -#ifndef _BUILTIN_LED_H_ -#define _BUILTIN_LED_H_ +#ifndef _LED_H_ +#define _LED_H_ #include #include @@ -13,9 +13,10 @@ #define DEFAULT_BRIGHTNESS 16 -class BuiltinLed { +class Led { public: - static BuiltinLed& GetInstance(); + Led(gpio_num_t gpio); + ~Led(); void BlinkOnce(); void Blink(int times, int interval_ms); @@ -30,11 +31,6 @@ public: void SetBlue(uint8_t brightness = DEFAULT_BRIGHTNESS) { SetColor(0, 0, brightness); } private: - BuiltinLed(); - ~BuiltinLed(); - BuiltinLed(const BuiltinLed&) = delete; - BuiltinLed& operator=(const BuiltinLed&) = delete; - SemaphoreHandle_t mutex_; EventGroupHandle_t blink_event_group_; TaskHandle_t blink_task_ = nullptr; @@ -44,9 +40,8 @@ private: int blink_interval_ms_ = 0; std::atomic should_blink_{false}; - void Initialize(); void StartBlinkTask(int times, int interval_ms); void StopBlinkInternal(); }; -#endif // _BUILTIN_LED_H_ +#endif // _LED_H_