From b6489a34568065768e670b9e562f9d6bf97fbe74 Mon Sep 17 00:00:00 2001 From: Terrence Date: Wed, 7 May 2025 17:11:26 +0800 Subject: [PATCH] Double click BOOT to switch 4G/Wi-Fi --- main/CMakeLists.txt | 2 - main/Kconfig.projbuild | 2 - main/assets/en-US/language.json | 2 + main/assets/ja-JP/language.json | 2 + main/assets/zh-CN/language.json | 2 + main/assets/zh-TW/language.json | 2 + .../compact_ml307_board.cc | 24 +- main/boards/common/dual_network_board.cc | 10 +- main/boards/common/dual_network_board.h | 2 +- main/boards/kevin-box-2/kevin_box_board.cc | 31 ++- .../xingzhi-cube-0.96oled-ml307.cc | 24 +- .../boards/xingzhi-cube-1.54tft-dual/config.h | 40 --- .../xingzhi-cube-1.54tft-dual/config.json | 15 -- .../xingzhi_cube_1_54tft_dual_board.cc | 243 ------------------ .../xingzhi-cube-1.54tft-ml307.cc | 22 +- 15 files changed, 98 insertions(+), 325 deletions(-) delete mode 100644 main/boards/xingzhi-cube-1.54tft-dual/config.h delete mode 100644 main/boards/xingzhi-cube-1.54tft-dual/config.json delete mode 100644 main/boards/xingzhi-cube-1.54tft-dual/xingzhi_cube_1_54tft_dual_board.cc diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index f0c55b11..8fe25ebb 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -145,8 +145,6 @@ elseif(CONFIG_BOARD_TYPE_XINGZHI_Cube_1_54TFT_WIFI) set(BOARD_TYPE "xingzhi-cube-1.54tft-wifi") elseif(CONFIG_BOARD_TYPE_XINGZHI_Cube_1_54TFT_ML307) set(BOARD_TYPE "xingzhi-cube-1.54tft-ml307") -elseif(CONFIG_BOARD_TYPE_XINGZHI_Cube_1_54TFT_DUAL) - set(BOARD_TYPE "xingzhi-cube-1.54tft-dual") elseif(CONFIG_BOARD_TYPE_SENSECAP_WATCHER) set(BOARD_TYPE "sensecap-watcher") elseif(CONFIG_BOARD_TYPE_DOIT_S3_AIBOX) diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 46e0f86a..96567005 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -140,8 +140,6 @@ choice BOARD_TYPE bool "无名科技星智1.54(WIFI)" config BOARD_TYPE_XINGZHI_Cube_1_54TFT_ML307 bool "无名科技星智1.54(ML307)" - config BOARD_TYPE_XINGZHI_Cube_1_54TFT_DUAL - bool "无名科技星智1.54(DUAL)" config BOARD_TYPE_SENSECAP_WATCHER bool "SenseCAP Watcher" config BOARD_TYPE_DOIT_S3_AIBOX diff --git a/main/assets/en-US/language.json b/main/assets/en-US/language.json index eef77c69..3af0d09d 100644 --- a/main/assets/en-US/language.json +++ b/main/assets/en-US/language.json @@ -15,6 +15,8 @@ "REGISTERING_NETWORK": "Waiting for network...", "CHECKING_NEW_VERSION": "Checking for new version...", "CHECK_NEW_VERSION_FAILED": "Check for new version failed, will retry in %d seconds: %s", + "SWITCH_TO_WIFI_NETWORK": "Switching to Wi-Fi...", + "SWITCH_TO_4G_NETWORK": "Switching to 4G...", "STANDBY": "Standby", "CONNECT_TO": "Connect to ", diff --git a/main/assets/ja-JP/language.json b/main/assets/ja-JP/language.json index e333cd99..fb05904b 100644 --- a/main/assets/ja-JP/language.json +++ b/main/assets/ja-JP/language.json @@ -15,6 +15,8 @@ "REGISTERING_NETWORK": "ネットワーク接続待機中...", "CHECKING_NEW_VERSION": "新しいバージョンを確認中...", "CHECK_NEW_VERSION_FAILED": "更新確認に失敗しました。%d 秒後に再試行します: %s", + "SWITCH_TO_WIFI_NETWORK": "Wi-Fiに切り替え中...", + "SWITCH_TO_4G_NETWORK": "4Gに切り替え中...", "STANDBY": "待機中", "CONNECT_TO": "接続先 ", diff --git a/main/assets/zh-CN/language.json b/main/assets/zh-CN/language.json index 7e929e73..9eb47b95 100644 --- a/main/assets/zh-CN/language.json +++ b/main/assets/zh-CN/language.json @@ -15,6 +15,8 @@ "REGISTERING_NETWORK":"等待网络...", "CHECKING_NEW_VERSION":"检查新版本...", "CHECK_NEW_VERSION_FAILED":"检查新版本失败，将在 %d 秒后重试：%s", + "SWITCH_TO_WIFI_NETWORK":"切换到 Wi-Fi...", + "SWITCH_TO_4G_NETWORK":"切换到 4G...", "STANDBY":"待命", "CONNECT_TO":"连接 ", diff --git a/main/assets/zh-TW/language.json b/main/assets/zh-TW/language.json index 7aef168b..d61cfc79 100644 --- a/main/assets/zh-TW/language.json +++ b/main/assets/zh-TW/language.json @@ -15,6 +15,8 @@ "REGISTERING_NETWORK": "等待網絡...", "CHECKING_NEW_VERSION": "檢查新版本...", "CHECK_NEW_VERSION_FAILED": "檢查新版本失敗，將在 %d 秒後重試：%s", + "SWITCH_TO_WIFI_NETWORK": "切換到 Wi-Fi...", + "SWITCH_TO_4G_NETWORK": "切換到 4G...", "STANDBY": "待命", "CONNECT_TO": "連接 ", diff --git a/main/boards/bread-compact-ml307/compact_ml307_board.cc b/main/boards/bread-compact-ml307/compact_ml307_board.cc index c197dbea..f42d265e 100644 --- a/main/boards/bread-compact-ml307/compact_ml307_board.cc +++ b/main/boards/bread-compact-ml307/compact_ml307_board.cc @@ -1,4 +1,4 @@ -#include "ml307_board.h" +#include "dual_network_board.h" #include "audio_codecs/no_audio_codec.h" #include "display/oled_display.h" #include "system_reset.h" @@ -13,13 +13,14 @@ #include #include #include +#include #define TAG "CompactMl307Board" LV_FONT_DECLARE(font_puhui_14_1); LV_FONT_DECLARE(font_awesome_14_1); -class CompactMl307Board : public Ml307Board { +class CompactMl307Board : public DualNetworkBoard { private: i2c_master_bus_handle_t display_i2c_bus_; esp_lcd_panel_io_handle_t panel_io_ = nullptr; @@ -96,8 +97,23 @@ private: void InitializeButtons() { boot_button_.OnClick([this]() { - Application::GetInstance().ToggleChatState(); + auto& app = Application::GetInstance(); + if (GetNetworkType() == NetworkType::WIFI) { + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + // cast to WifiBoard + auto& wifi_board = static_cast(GetCurrentBoard()); + wifi_board.ResetWifiConfiguration(); + } + } + app.ToggleChatState(); }); + boot_button_.OnDoubleClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting || app.GetDeviceState() == kDeviceStateWifiConfiguring) { + SwitchNetworkType(); + } + }); + touch_button_.OnPressDown([this]() { Application::GetInstance().StartListening(); }); @@ -144,7 +160,7 @@ private: } public: - CompactMl307Board() : Ml307Board(ML307_TX_PIN, ML307_RX_PIN, 4096), + CompactMl307Board() : DualNetworkBoard(ML307_TX_PIN, ML307_RX_PIN, 4096), boot_button_(BOOT_BUTTON_GPIO), touch_button_(TOUCH_BUTTON_GPIO), volume_up_button_(VOLUME_UP_BUTTON_GPIO), diff --git a/main/boards/common/dual_network_board.cc b/main/boards/common/dual_network_board.cc index 9b9e3f9c..81f2d98f 100644 --- a/main/boards/common/dual_network_board.cc +++ b/main/boards/common/dual_network_board.cc @@ -42,14 +42,18 @@ void DualNetworkBoard::InitializeCurrentBoard() { } } -void DualNetworkBoard::SwitchNetType() { +void DualNetworkBoard::SwitchNetworkType() { + auto display = GetDisplay(); if (network_type_ == NetworkType::WIFI) { - ESP_LOGI(TAG, "Switch to ML307 mode"); SaveNetworkTypeToSettings(NetworkType::ML307); + display->ShowNotification(Lang::Strings::SWITCH_TO_4G_NETWORK); } else { - ESP_LOGI(TAG, "Switch to WiFi mode"); SaveNetworkTypeToSettings(NetworkType::WIFI); + display->ShowNotification(Lang::Strings::SWITCH_TO_WIFI_NETWORK); } + vTaskDelay(pdMS_TO_TICKS(1000)); + auto& app = Application::GetInstance(); + app.Reboot(); } diff --git a/main/boards/common/dual_network_board.h b/main/boards/common/dual_network_board.h index 947e2ea3..df009c1c 100644 --- a/main/boards/common/dual_network_board.h +++ b/main/boards/common/dual_network_board.h @@ -38,7 +38,7 @@ public: virtual ~DualNetworkBoard() = default; // 切换网络类型 - void SwitchNetType(); + void SwitchNetworkType(); // 获取当前网络类型 NetworkType GetNetworkType() const { return network_type_; } diff --git a/main/boards/kevin-box-2/kevin_box_board.cc b/main/boards/kevin-box-2/kevin_box_board.cc index cc72d7dd..899163f6 100644 --- a/main/boards/kevin-box-2/kevin_box_board.cc +++ b/main/boards/kevin-box-2/kevin_box_board.cc @@ -1,4 +1,4 @@ -#include "ml307_board.h" +#include "dual_network_board.h" #include "audio_codecs/box_audio_codec.h" #include "display/oled_display.h" #include "application.h" @@ -10,6 +10,7 @@ #include "axp2101.h" #include "assets/lang_config.h" +#include #include #include #include @@ -50,8 +51,8 @@ public: } }; - -class KevinBoxBoard : public Ml307Board { + +class KevinBoxBoard : public DualNetworkBoard { private: i2c_master_bus_handle_t display_i2c_bus_; i2c_master_bus_handle_t codec_i2c_bus_; @@ -169,10 +170,28 @@ private: void InitializeButtons() { boot_button_.OnPressDown([this]() { power_save_timer_->WakeUp(); - Application::GetInstance().StartListening(); + auto& app = Application::GetInstance(); + app.StartListening(); }); boot_button_.OnPressUp([this]() { - Application::GetInstance().StopListening(); + auto& app = Application::GetInstance(); + app.StopListening(); + }); + boot_button_.OnClick([this]() { + auto& app = Application::GetInstance(); + if (GetNetworkType() == NetworkType::WIFI) { + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + // cast to WifiBoard + auto& wifi_board = static_cast(GetCurrentBoard()); + wifi_board.ResetWifiConfiguration(); + } + } + }); + boot_button_.OnDoubleClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting || app.GetDeviceState() == kDeviceStateWifiConfiguring) { + SwitchNetworkType(); + } }); volume_up_button_.OnClick([this]() { @@ -218,7 +237,7 @@ private: } public: - KevinBoxBoard() : Ml307Board(ML307_TX_PIN, ML307_RX_PIN, 4096), + KevinBoxBoard() : DualNetworkBoard(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) { diff --git a/main/boards/xingzhi-cube-0.96oled-ml307/xingzhi-cube-0.96oled-ml307.cc b/main/boards/xingzhi-cube-0.96oled-ml307/xingzhi-cube-0.96oled-ml307.cc index 78ed10e0..6acc14ee 100644 --- a/main/boards/xingzhi-cube-0.96oled-ml307/xingzhi-cube-0.96oled-ml307.cc +++ b/main/boards/xingzhi-cube-0.96oled-ml307/xingzhi-cube-0.96oled-ml307.cc @@ -1,14 +1,14 @@ -#include "ml307_board.h" +#include "dual_network_board.h" #include "audio_codecs/no_audio_codec.h" #include "display/oled_display.h" #include "system_reset.h" #include "application.h" #include "button.h" #include "config.h" +#include "power_save_timer.h" #include "iot/thing_manager.h" #include "led/single_led.h" #include "assets/lang_config.h" -#include "power_save_timer.h" #include "../xingzhi-cube-1.54tft-wifi/power_manager.h" #include @@ -17,6 +17,7 @@ #include #include #include +#include #define TAG "XINGZHI_CUBE_0_96OLED_ML307" @@ -24,7 +25,7 @@ LV_FONT_DECLARE(font_puhui_14_1); LV_FONT_DECLARE(font_awesome_14_1); -class XINGZHI_CUBE_0_96OLED_ML307 : public Ml307Board { +class XINGZHI_CUBE_0_96OLED_ML307 : public DualNetworkBoard { private: i2c_master_bus_handle_t display_i2c_bus_; Button boot_button_; @@ -143,8 +144,21 @@ private: boot_button_.OnClick([this]() { power_save_timer_->WakeUp(); auto& app = Application::GetInstance(); + if (GetNetworkType() == NetworkType::WIFI) { + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + // cast to WifiBoard + auto& wifi_board = static_cast(GetCurrentBoard()); + wifi_board.ResetWifiConfiguration(); + } + } app.ToggleChatState(); }); + boot_button_.OnDoubleClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting || app.GetDeviceState() == kDeviceStateWifiConfiguring) { + SwitchNetworkType(); + } + }); volume_up_button_.OnClick([this]() { power_save_timer_->WakeUp(); @@ -188,7 +202,7 @@ private: } public: - XINGZHI_CUBE_0_96OLED_ML307() : Ml307Board(ML307_TX_PIN, ML307_RX_PIN, 4096), + XINGZHI_CUBE_0_96OLED_ML307() : DualNetworkBoard(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) { @@ -231,7 +245,7 @@ public: if (!enabled) { power_save_timer_->WakeUp(); } - Ml307Board::SetPowerSaveMode(enabled); + DualNetworkBoard::SetPowerSaveMode(enabled); } }; diff --git a/main/boards/xingzhi-cube-1.54tft-dual/config.h b/main/boards/xingzhi-cube-1.54tft-dual/config.h deleted file mode 100644 index 9167578a..00000000 --- a/main/boards/xingzhi-cube-1.54tft-dual/config.h +++ /dev/null @@ -1,40 +0,0 @@ - -#ifndef _BOARD_CONFIG_H_ -#define _BOARD_CONFIG_H_ - -#include - -#define AUDIO_INPUT_SAMPLE_RATE 16000 -#define AUDIO_OUTPUT_SAMPLE_RATE 24000 - -#define AUDIO_I2S_MIC_GPIO_WS GPIO_NUM_4 -#define AUDIO_I2S_MIC_GPIO_SCK GPIO_NUM_5 -#define AUDIO_I2S_MIC_GPIO_DIN GPIO_NUM_6 -#define AUDIO_I2S_SPK_GPIO_DOUT GPIO_NUM_7 -#define AUDIO_I2S_SPK_GPIO_BCLK GPIO_NUM_15 -#define AUDIO_I2S_SPK_GPIO_LRCK GPIO_NUM_16 - -#define BOOT_BUTTON_GPIO GPIO_NUM_0 -#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_40 -#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_39 - -#define DISPLAY_SDA GPIO_NUM_10 -#define DISPLAY_SCL GPIO_NUM_9 -#define DISPLAY_DC GPIO_NUM_8 -#define DISPLAY_CS GPIO_NUM_14 -#define DISPLAY_RES GPIO_NUM_18 -#define DISPLAY_WIDTH 240 -#define DISPLAY_HEIGHT 240 -#define DISPLAY_SWAP_XY false -#define DISPLAY_MIRROR_X false -#define DISPLAY_MIRROR_Y false -#define BACKLIGHT_INVERT false -#define DISPLAY_OFFSET_X 0 -#define DISPLAY_OFFSET_Y 0 -#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_13 -#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false - -#define ML307_RX_PIN GPIO_NUM_11 -#define ML307_TX_PIN GPIO_NUM_12 - -#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/xingzhi-cube-1.54tft-dual/config.json b/main/boards/xingzhi-cube-1.54tft-dual/config.json deleted file mode 100644 index 4822e606..00000000 --- a/main/boards/xingzhi-cube-1.54tft-dual/config.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "target": "esp32s3", - "builds": [ - { - "name": "xingzhi-cube-1.54tft-dual", - "sdkconfig_append": [] - }, - { - "name": "xingzhi-cube-1.54tft-dual-wechatui", - "sdkconfig_append": [ - "CONFIG_USE_WECHAT_MESSAGE_STYLE=y" - ] - } - ] -} \ No newline at end of file diff --git a/main/boards/xingzhi-cube-1.54tft-dual/xingzhi_cube_1_54tft_dual_board.cc b/main/boards/xingzhi-cube-1.54tft-dual/xingzhi_cube_1_54tft_dual_board.cc deleted file mode 100644 index 27719dd2..00000000 --- a/main/boards/xingzhi-cube-1.54tft-dual/xingzhi_cube_1_54tft_dual_board.cc +++ /dev/null @@ -1,243 +0,0 @@ -#include "ml307_board.h" -#include "audio_codecs/no_audio_codec.h" -#include "display/lcd_display.h" -#include "system_reset.h" -#include "application.h" -#include "button.h" -#include "config.h" -#include "power_save_timer.h" -#include "iot/thing_manager.h" -#include "led/single_led.h" -#include "assets/lang_config.h" -#include "../xingzhi-cube-1.54tft-wifi/power_manager.h" -#include "boards/common/dual_network_board.h" - -#include -#include -#include - -#include -#include - -#define TAG "XINGZHI_CUBE_1_54TFT_DUAL" - -LV_FONT_DECLARE(font_puhui_20_4); -LV_FONT_DECLARE(font_awesome_20_4); - - -class XINGZHI_CUBE_1_54TFT_DUAL : DualNetworkBoard { -private: - Button boot_button_; - Button volume_up_button_; - Button volume_down_button_; - SpiLcdDisplay* display_; - PowerSaveTimer* power_save_timer_; - PowerManager* power_manager_; - esp_lcd_panel_io_handle_t panel_io_ = nullptr; - esp_lcd_panel_handle_t panel_ = nullptr; - - void InitializePowerManager() { - power_manager_ = new PowerManager(GPIO_NUM_38); - power_manager_->OnChargingStatusChanged([this](bool is_charging) { - if (is_charging) { - power_save_timer_->SetEnabled(false); - } else { - power_save_timer_->SetEnabled(true); - } - }); - } - - void InitializePowerSaveTimer() { - rtc_gpio_init(GPIO_NUM_21); - rtc_gpio_set_direction(GPIO_NUM_21, RTC_GPIO_MODE_OUTPUT_ONLY); - rtc_gpio_set_level(GPIO_NUM_21, 1); - - power_save_timer_ = new PowerSaveTimer(-1, 60, 300); - power_save_timer_->OnEnterSleepMode([this]() { - ESP_LOGI(TAG, "Enabling sleep mode"); - display_->SetChatMessage("system", ""); - display_->SetEmotion("sleepy"); - GetBacklight()->SetBrightness(1); - }); - power_save_timer_->OnExitSleepMode([this]() { - display_->SetChatMessage("system", ""); - display_->SetEmotion("neutral"); - GetBacklight()->RestoreBrightness(); - }); - power_save_timer_->OnShutdownRequest([this]() { - ESP_LOGI(TAG, "Shutting down"); - rtc_gpio_set_level(GPIO_NUM_21, 0); - // 启用保持功能，确保睡眠期间电平不变 - rtc_gpio_hold_en(GPIO_NUM_21); - esp_lcd_panel_disp_on_off(panel_, false); //关闭显示 - esp_deep_sleep_start(); - }); - power_save_timer_->SetEnabled(true); - } - - void InitializeSpi() { - spi_bus_config_t buscfg = {}; - buscfg.mosi_io_num = DISPLAY_SDA; - buscfg.miso_io_num = GPIO_NUM_NC; - buscfg.sclk_io_num = DISPLAY_SCL; - buscfg.quadwp_io_num = GPIO_NUM_NC; - buscfg.quadhd_io_num = GPIO_NUM_NC; - buscfg.max_transfer_sz = DISPLAY_WIDTH * DISPLAY_HEIGHT * sizeof(uint16_t); - ESP_ERROR_CHECK(spi_bus_initialize(SPI3_HOST, &buscfg, SPI_DMA_CH_AUTO)); - } - - void InitializeButtons() { - boot_button_.OnPressDown([this]() { - auto& app = Application::GetInstance(); - if (GetNetworkType() == NetworkType::WIFI) { - if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { - // cast to WifiBoard - auto& wifi_board = static_cast(GetCurrentBoard()); - wifi_board.ResetWifiConfiguration(); - } - } - }); - - boot_button_.OnClick([this]() { - power_save_timer_->WakeUp(); - auto& app = Application::GetInstance(); - app.ToggleChatState(); - }); - - boot_button_.OnLongPress([this]() { - SwitchNetType(); - auto& app = Application::GetInstance(); - app.Reboot(); - }); - - - volume_up_button_.OnClick([this]() { - power_save_timer_->WakeUp(); - auto codec = GetAudioCodec(); - auto volume = codec->output_volume() + 10; - if (volume > 100) { - volume = 100; - } - codec->SetOutputVolume(volume); - GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume)); - }); - - volume_up_button_.OnLongPress([this]() { - power_save_timer_->WakeUp(); - GetAudioCodec()->SetOutputVolume(100); - GetDisplay()->ShowNotification(Lang::Strings::MAX_VOLUME); - }); - - volume_down_button_.OnClick([this]() { - power_save_timer_->WakeUp(); - auto codec = GetAudioCodec(); - auto volume = codec->output_volume() - 10; - if (volume < 0) { - volume = 0; - } - codec->SetOutputVolume(volume); - GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume)); - }); - - volume_down_button_.OnLongPress([this]() { - power_save_timer_->WakeUp(); - GetAudioCodec()->SetOutputVolume(0); - GetDisplay()->ShowNotification(Lang::Strings::MUTED); - }); - } - - void InitializeSt7789Display() { - ESP_LOGD(TAG, "Install panel IO"); - esp_lcd_panel_io_spi_config_t io_config = {}; - io_config.cs_gpio_num = DISPLAY_CS; - io_config.dc_gpio_num = DISPLAY_DC; - io_config.spi_mode = 3; - io_config.pclk_hz = 80 * 1000 * 1000; - io_config.trans_queue_depth = 10; - io_config.lcd_cmd_bits = 8; - io_config.lcd_param_bits = 8; - ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI3_HOST, &io_config, &panel_io_)); - - ESP_LOGD(TAG, "Install LCD driver"); - esp_lcd_panel_dev_config_t panel_config = {}; - panel_config.reset_gpio_num = DISPLAY_RES; - panel_config.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB; - panel_config.bits_per_pixel = 16; - ESP_ERROR_CHECK(esp_lcd_new_panel_st7789(panel_io_, &panel_config, &panel_)); - ESP_ERROR_CHECK(esp_lcd_panel_reset(panel_)); - ESP_ERROR_CHECK(esp_lcd_panel_init(panel_)); - ESP_ERROR_CHECK(esp_lcd_panel_swap_xy(panel_, DISPLAY_SWAP_XY)); - ESP_ERROR_CHECK(esp_lcd_panel_mirror(panel_, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y)); - ESP_ERROR_CHECK(esp_lcd_panel_invert_color(panel_, true)); - - display_ = new SpiLcdDisplay(panel_io_, panel_, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, - DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY, - { - .text_font = &font_puhui_20_4, - .icon_font = &font_awesome_20_4, -#if CONFIG_USE_WECHAT_MESSAGE_STYLE - .emoji_font = font_emoji_32_init(), -#else - .emoji_font = font_emoji_64_init(), -#endif - }); - } - - void InitializeIot() { - auto& thing_manager = iot::ThingManager::GetInstance(); - thing_manager.AddThing(iot::CreateThing("Speaker")); - thing_manager.AddThing(iot::CreateThing("Screen")); - thing_manager.AddThing(iot::CreateThing("Battery")); - } - -public: - XINGZHI_CUBE_1_54TFT_DUAL() : - DualNetworkBoard(ML307_TX_PIN, ML307_RX_PIN, 4096), - boot_button_(BOOT_BUTTON_GPIO, false, 3000), - volume_up_button_(VOLUME_UP_BUTTON_GPIO), - volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { - InitializePowerManager(); - InitializePowerSaveTimer(); - InitializeSpi(); - InitializeButtons(); - InitializeSt7789Display(); - InitializeIot(); - GetBacklight()->RestoreBrightness(); - } - - virtual AudioCodec* GetAudioCodec() override { - static NoAudioCodecSimplex 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); - return &audio_codec; - } - - virtual Display* GetDisplay() override { - return display_; - } - - virtual Backlight* GetBacklight() override { - static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT); - return &backlight; - } - - virtual bool GetBatteryLevel(int& level, bool& charging, bool& discharging) override { - static bool last_discharging = false; - charging = power_manager_->IsCharging(); - discharging = power_manager_->IsDischarging(); - if (discharging != last_discharging) { - power_save_timer_->SetEnabled(discharging); - last_discharging = discharging; - } - level = power_manager_->GetBatteryLevel(); - return true; - } - - virtual void SetPowerSaveMode(bool enabled) override { - if (!enabled) { - power_save_timer_->WakeUp(); - } - DualNetworkBoard::SetPowerSaveMode(enabled); - } -}; - -DECLARE_BOARD(XINGZHI_CUBE_1_54TFT_DUAL); diff --git a/main/boards/xingzhi-cube-1.54tft-ml307/xingzhi-cube-1.54tft-ml307.cc b/main/boards/xingzhi-cube-1.54tft-ml307/xingzhi-cube-1.54tft-ml307.cc index 0d183957..5f6bd53a 100644 --- a/main/boards/xingzhi-cube-1.54tft-ml307/xingzhi-cube-1.54tft-ml307.cc +++ b/main/boards/xingzhi-cube-1.54tft-ml307/xingzhi-cube-1.54tft-ml307.cc @@ -1,4 +1,4 @@ -#include "ml307_board.h" +#include "dual_network_board.h" #include "audio_codecs/no_audio_codec.h" #include "display/lcd_display.h" #include "system_reset.h" @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -23,7 +24,7 @@ LV_FONT_DECLARE(font_puhui_20_4); LV_FONT_DECLARE(font_awesome_20_4); -class XINGZHI_CUBE_1_54TFT_ML307 : public Ml307Board { +class XINGZHI_CUBE_1_54TFT_ML307 : public DualNetworkBoard { private: Button boot_button_; Button volume_up_button_; @@ -88,8 +89,21 @@ private: boot_button_.OnClick([this]() { power_save_timer_->WakeUp(); auto& app = Application::GetInstance(); + if (GetNetworkType() == NetworkType::WIFI) { + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + // cast to WifiBoard + auto& wifi_board = static_cast(GetCurrentBoard()); + wifi_board.ResetWifiConfiguration(); + } + } app.ToggleChatState(); }); + boot_button_.OnDoubleClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting || app.GetDeviceState() == kDeviceStateWifiConfiguring) { + SwitchNetworkType(); + } + }); volume_up_button_.OnClick([this]() { power_save_timer_->WakeUp(); @@ -172,7 +186,7 @@ private: public: XINGZHI_CUBE_1_54TFT_ML307() : - Ml307Board(ML307_TX_PIN, ML307_RX_PIN, 4096), + DualNetworkBoard(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) { @@ -216,7 +230,7 @@ public: if (!enabled) { power_save_timer_->WakeUp(); } - Ml307Board::SetPowerSaveMode(enabled); + DualNetworkBoard::SetPowerSaveMode(enabled); } };