devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

fixbug: button driver cannot be in stack memory

Browse Source
This commit is contained in:
Terrence
2025-05-09 03:56:51 +08:00
parent a0ad3e6dc3
commit 724f440fab
4 changed files with 42 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/boards/sensecap-watcher/sensecap_watcher.cc
View File

@@ -95,6 +95,7 @@ private:
esp_lcd_panel_io_handle_t panel_io_ = nullptr;
esp_lcd_panel_handle_t panel_ = nullptr;
uint32_t long_press_cnt_;
button_driver_t* btn_driver_ = nullptr;
static SensecapWatcher* instance_;
void InitializePowerSaveTimer() {
@@ -230,11 +231,6 @@ private:
ESP_LOGI(TAG, "Knob initialized with pins A:%d B:%d", BSP_KNOB_A_PIN, BSP_KNOB_B_PIN);
}
// 添加一个静态成员实例指针，用于按钮回调
static uint8_t GetKnobButtonLevel(button_driver_t *button_driver) {
return instance_->IoExpanderGetLevel(BSP_KNOB_BTN);
}
void InitializeButton() {
// 设置静态实例指针
instance_ = this;
@@ -249,12 +245,13 @@ private:
.long_press_time = 2000,
.short_press_time = 0
};
button_driver_t btn_driver = {
.enable_power_save = false,
.get_key_level = GetKnobButtonLevel
btn_driver_ = (button_driver_t*)calloc(1, sizeof(button_driver_t));
btn_driver_->enable_power_save = false;
btn_driver_->get_key_level = [](button_driver_t *button_driver) -> uint8_t {
return !instance_->IoExpanderGetLevel(BSP_KNOB_BTN);
};
ESP_ERROR_CHECK(iot_button_create(&btn_config, &btn_driver, &btns));
ESP_ERROR_CHECK(iot_button_create(&btn_config, btn_driver_, &btns));
iot_button_register_cb(btns, BUTTON_SINGLE_CLICK, nullptr, [](void* button_handle, void* usr_data) {
auto self = static_cast<SensecapWatcher*>(usr_data);