verachen/xiaozhi-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build error with IDF v5.4 (#1637)

Browse Source
This commit is contained in:
espressif2022
2026-01-09 17:19:06 +08:00
committed by GitHub
parent 1e8fefbede
commit 7240ea99f1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/boards/common/esp32_camera.cc
View File

@ -348,8 +348,8 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
} }
capture_count++; capture_count++;
} }
ESP_LOGI(TAG, "Camera init success, captured %d frames in %dms", capture_count, ESP_LOGI(TAG, "Camera init success, captured %d frames in %lums", capture_count,
(xTaskGetTickCount() - start) * portTICK_PERIOD_MS); (unsigned long)((xTaskGetTickCount() - start) * portTICK_PERIOD_MS));
self->streaming_on_ = true; self->streaming_on_ = true;
vTaskDelete(NULL); vTaskDelete(NULL);
}, },

4
main/display/emote_display.cc
View File

@ -6,6 +6,7 @@
#include <unordered_map> #include <unordered_map>
#include <tuple> #include <tuple>
#include <algorithm> #include <algorithm>
#include <cinttypes>
// Standard C headers // Standard C headers
#include <sys/time.h> #include <sys/time.h>
@ -28,7 +29,6 @@
#include "gfx.h" #include "gfx.h"
#include "expression_emote.h" #include "expression_emote.h"
LV_FONT_DECLARE(BUILTIN_TEXT_FONT);
namespace emote { namespace emote {
@ -232,7 +232,7 @@ bool EmoteDisplay::StopAnimDialog()
bool EmoteDisplay::InsertAnimDialog(const char* emoji_name, uint32_t duration_ms) bool EmoteDisplay::InsertAnimDialog(const char* emoji_name, uint32_t duration_ms)
{ {
ESP_LOGI(TAG, "InsertAnimDialog: %s, %d", emoji_name, duration_ms); ESP_LOGI(TAG, "InsertAnimDialog: %s, %" PRIu32, emoji_name, duration_ms);
if (emote_handle_ && emoji_name) { if (emote_handle_ && emoji_name) {
return emote_insert_anim_dialog(emote_handle_, emoji_name, duration_ms); return emote_insert_anim_dialog(emote_handle_, emoji_name, duration_ms);
} }