96f34ec70f
* otto v1.4.0 MCP 1.使用MCP协议控制机器人 2.gif继承lcdDisplay，避免修改lcdDisplay * otto v1.4.1 gif as components gif as components * electronBot v1.1.0 mcp 1.增加electronBot支持 2.mcp协议 3.gif 作为组件 4.display子类 * 规范代码 1.规范代码 2.修复切换主题死机bug * fix(ota): 修复 ottoRobot和electronBot OTA 升级崩溃问题 bug * 1.增加robot舵机初始位置校准 2.fix(mcp_sever) 超出范围异常捕获类型 bug * refactor: Update Electron and Otto emoji display implementations - Removed GIF selection from Kconfig for Electron and Otto boards. - Updated Electron and Otto bot versions to 2.0.4 in their respective config files. - Refactored emoji display classes to utilize EmojiCollection for managing emojis. - Enhanced chat label setup and status display functionality in both classes. - Cleaned up unused code and improved initialization logging for emoji displays. * Rename OTTO_ICON_FONT.c to otto_icon_font.c * Rename OTTO_ICON_FONT.c to otto_icon_font.c * refactor: Update Otto emoji display configurations and functionalities - Changed chat label text mode to circular scrolling for both Otto and Electron emoji displays. - Bumped Otto robot version to 2.0.5 in the configuration file. - Added new actions for Otto robot including Sit, WhirlwindLeg, Fitness, Greeting, Shy, RadioCalisthenics, MagicCircle, and Showcase. - Enhanced servo sequence handling and added support for executing custom servo sequences. - Improved logging and error handling for servo sequence execution. * refactor: Update chat label long mode for Electron and Otto emoji displays - Changed chat label text mode from wrap to circular scrolling for both Electron and Otto emoji displays. - Improved consistency in chat label setup across both implementations. * Update Otto robot README with new actions and parameters * Update Otto controller parameters for oscillation settings - Changed default oscillation period from 500ms to 300ms. - Increased default steps from 5.0 to 8.0. - Updated default amplitude from 20 degrees to 0 degrees. - Enhanced documentation with new examples for oscillation modes and sequences. * Fix default amplitude initialization in Otto controller to use a single zero instead of two digits. * chore: update txp666/otto-emoji-gif-component version to 1.0.3 in idf_component.yml * Refactor Otto controller - Consolidated movement actions into a unified tool for the Otto robot, allowing for a single action command with various parameters. - Removed individual movement tools (walk, turn, jump, etc.) and replaced them with a more flexible action system. * Enhance Otto robot functionality by adding WebSocket control server and IP address retrieval feature. Updated config to support WebSocket, and revised README to include new control options and usage examples. * Add camera support for Otto Robot board - Introduced configuration option to enable the Otto Robot camera in Kconfig. - Updated config.h to define camera-related GPIO pins and settings. - Modified config.json to include camera configuration. - Enhanced otto_robot.cc to initialize I2C and camera components when the camera is enabled. - Adjusted power_manager.h to manage battery updates during camera operations. - Removed unused SetupChatLabel method from OttoEmojiDisplay class. * Refactor Otto Robot configuration and initialization - Removed the camera configuration option from Kconfig and related code. - Introduced a new HardwareConfig struct to encapsulate hardware pin definitions and settings. - Updated config.h to define camera and non-camera configurations using the new struct. - Refactored otto_controller.cc and otto_robot.cc to utilize the HardwareConfig struct for initialization. - Enhanced camera detection and initialization logic based on hardware version. - Improved audio codec initialization based on configuration settings. * Refactor emoji initialization for Electron and Otto boards to use Assets system - Removed direct emoji initialization from `InitializeElectronEmojis` and `InitializeOttoEmojis` methods, delegating the responsibility to the Assets system. - Updated `CMakeLists.txt` to set `DEFAULT_EMOJI_COLLECTION` to `otto-gif` for both boards. - Enhanced `build_default_assets.py` to support alias mapping for Otto GIF emojis. - Updated `idf_component.yml` to bump `otto-emoji-gif-component` version to `^1.0.5` for improved functionality.
88 lines
3.8 KiB
C++
88 lines
3.8 KiB
C++
#include "electron_emoji_display.h"
|
|
|
|
#include <esp_log.h>
|
|
|
|
#include <cstring>
|
|
#include <vector>
|
|
|
|
#include "assets.h"
|
|
#include "assets/lang_config.h"
|
|
#include "display/lvgl_display/emoji_collection.h"
|
|
#include "display/lvgl_display/lvgl_image.h"
|
|
#include "display/lvgl_display/lvgl_theme.h"
|
|
|
|
#define TAG "ElectronEmojiDisplay"
|
|
ElectronEmojiDisplay::ElectronEmojiDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y,
|
|
bool swap_xy)
|
|
: SpiLcdDisplay(panel_io, panel, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy) {
|
|
InitializeElectronEmojis();
|
|
SetupChatLabel();
|
|
}
|
|
|
|
void ElectronEmojiDisplay::InitializeElectronEmojis() {
|
|
ESP_LOGI(TAG, "Electron表情初始化将由Assets系统处理");
|
|
// 表情初始化已移至assets系统,通过DEFAULT_EMOJI_COLLECTION=otto-gif配置
|
|
// assets.cc会从assets分区加载GIF表情并设置到theme
|
|
|
|
// 设置默认表情为staticstate
|
|
SetEmotion("staticstate");
|
|
}
|
|
|
|
void ElectronEmojiDisplay::SetupChatLabel() {
|
|
DisplayLockGuard lock(this);
|
|
|
|
if (chat_message_label_) {
|
|
lv_obj_del(chat_message_label_);
|
|
}
|
|
|
|
chat_message_label_ = lv_label_create(container_);
|
|
lv_label_set_text(chat_message_label_, "");
|
|
lv_obj_set_width(chat_message_label_, width_ * 0.9); // 限制宽度为屏幕宽度的 90%
|
|
lv_label_set_long_mode(chat_message_label_, LV_LABEL_LONG_SCROLL_CIRCULAR); // 设置为自动换行模式
|
|
lv_obj_set_style_text_align(chat_message_label_, LV_TEXT_ALIGN_CENTER, 0); // 设置文本居中对齐
|
|
lv_obj_set_style_text_color(chat_message_label_, lv_color_white(), 0);
|
|
SetTheme(LvglThemeManager::GetInstance().GetTheme("dark"));
|
|
}
|
|
|
|
LV_FONT_DECLARE(OTTO_ICON_FONT);
|
|
void ElectronEmojiDisplay::SetStatus(const char* status) {
|
|
auto lvgl_theme = static_cast<LvglTheme*>(current_theme_);
|
|
auto text_font = lvgl_theme->text_font()->font();
|
|
DisplayLockGuard lock(this);
|
|
if (!status) {
|
|
ESP_LOGE(TAG, "SetStatus: status is nullptr");
|
|
return;
|
|
}
|
|
|
|
if (strcmp(status, Lang::Strings::LISTENING) == 0) {
|
|
lv_obj_set_style_text_font(status_label_, &OTTO_ICON_FONT, 0);
|
|
lv_label_set_text(status_label_, "\xEF\x84\xB0"); // U+F130 麦克风图标
|
|
lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_add_flag(network_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_add_flag(battery_label_, LV_OBJ_FLAG_HIDDEN);
|
|
return;
|
|
} else if (strcmp(status, Lang::Strings::SPEAKING) == 0) {
|
|
lv_obj_set_style_text_font(status_label_, &OTTO_ICON_FONT, 0);
|
|
lv_label_set_text(status_label_, "\xEF\x80\xA8"); // U+F028 说话图标
|
|
lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_add_flag(network_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_add_flag(battery_label_, LV_OBJ_FLAG_HIDDEN);
|
|
return;
|
|
} else if (strcmp(status, Lang::Strings::CONNECTING) == 0) {
|
|
lv_obj_set_style_text_font(status_label_, &OTTO_ICON_FONT, 0);
|
|
lv_label_set_text(status_label_, "\xEF\x83\x81"); // U+F0c1 连接图标
|
|
lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
|
|
return;
|
|
} else if (strcmp(status, Lang::Strings::STANDBY) == 0) {
|
|
lv_obj_set_style_text_font(status_label_, text_font, 0);
|
|
lv_label_set_text(status_label_, "");
|
|
lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
|
|
return;
|
|
}
|
|
|
|
lv_obj_set_style_text_font(status_label_, text_font, 0);
|
|
lv_label_set_text(status_label_, status);
|
|
lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_clear_flag(network_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_clear_flag(battery_label_, LV_OBJ_FLAG_HIDDEN);
|
|
} |