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

Upgrade components

Browse Source
This commit is contained in:
Terrence
2025-05-07 04:55:51 +08:00
parent b00c5b50c3
commit fd6235750d
10 changed files with 209 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
main/boards/df-k10/df_k10_board.cc
View File

@@ -31,6 +31,16 @@ private:
button_handle_t btn_a;
button_handle_t btn_b;
static Df_K10Board* instance_;
static uint8_t GetButtonALevel(button_driver_t *button_driver) {
return instance_->IoExpanderGetLevel(IO_EXPANDER_PIN_NUM_2);
}
static uint8_t GetButtonBLevel(button_driver_t *button_driver) {
return instance_->IoExpanderGetLevel(IO_EXPANDER_PIN_NUM_12);
}
void InitializeI2c() {
// Initialize I2C peripheral
i2c_master_bus_config_t i2c_bus_cfg = {
@@ -96,24 +106,19 @@ private:
}
}
void InitializeButtons() {
instance_ = this;
// Button A
button_config_t btn_a_config = {
.type = BUTTON_TYPE_CUSTOM,
.long_press_time = 1000,
.short_press_time = 50,
.custom_button_config = {
.active_level = 0,
.button_custom_init =nullptr,
.button_custom_get_key_value = [](void *param) -> uint8_t {
auto self = static_cast<Df_K10Board*>(param);
return self->IoExpanderGetLevel(IO_EXPANDER_PIN_NUM_2);
},
.button_custom_deinit = nullptr,
.priv = this,
},
.short_press_time = 50
};
btn_a = iot_button_create(&btn_a_config);
iot_button_register_cb(btn_a, BUTTON_SINGLE_CLICK, [](void* button_handle, void* usr_data) {
button_driver_t btn_a_driver = {
.enable_power_save = false,
.get_key_level = GetButtonALevel
};
ESP_ERROR_CHECK(iot_button_create(&btn_a_config, &btn_a_driver, &btn_a));
iot_button_register_cb(btn_a, BUTTON_SINGLE_CLICK, nullptr, [](void* button_handle, void* usr_data) {
auto self = static_cast<Df_K10Board*>(usr_data);
auto& app = Application::GetInstance();
if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
@@ -121,7 +126,7 @@ private:
}
app.ToggleChatState();
}, this);
iot_button_register_cb(btn_a, BUTTON_LONG_PRESS_START, [](void* button_handle, void* usr_data) {
iot_button_register_cb(btn_a, BUTTON_LONG_PRESS_START, nullptr, [](void* button_handle, void* usr_data) {
auto self = static_cast<Df_K10Board*>(usr_data);
auto codec = self->GetAudioCodec();
auto volume = codec->output_volume() - 10;
@@ -134,22 +139,15 @@ private:
// Button B
button_config_t btn_b_config = {
.type = BUTTON_TYPE_CUSTOM,
.long_press_time = 1000,
.short_press_time = 50,
.custom_button_config = {
.active_level = 0,
.button_custom_init =nullptr,
.button_custom_get_key_value = [](void *param) -> uint8_t {
auto self = static_cast<Df_K10Board*>(param);
return self->IoExpanderGetLevel(IO_EXPANDER_PIN_NUM_12);
},
.button_custom_deinit = nullptr,
.priv = this,
},
.short_press_time = 50
};
btn_b = iot_button_create(&btn_b_config);
iot_button_register_cb(btn_b, BUTTON_SINGLE_CLICK, [](void* button_handle, void* usr_data) {
button_driver_t btn_b_driver = {
.enable_power_save = false,
.get_key_level = GetButtonBLevel
};
ESP_ERROR_CHECK(iot_button_create(&btn_b_config, &btn_b_driver, &btn_b));
iot_button_register_cb(btn_b, BUTTON_SINGLE_CLICK, nullptr, [](void* button_handle, void* usr_data) {
auto self = static_cast<Df_K10Board*>(usr_data);
auto& app = Application::GetInstance();
if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
@@ -157,7 +155,7 @@ private:
}
app.ToggleChatState();
}, this);
iot_button_register_cb(btn_b, BUTTON_LONG_PRESS_START, [](void* button_handle, void* usr_data) {
iot_button_register_cb(btn_b, BUTTON_LONG_PRESS_START, nullptr, [](void* button_handle, void* usr_data) {
auto self = static_cast<Df_K10Board*>(usr_data);
auto codec = self->GetAudioCodec();
auto volume = codec->output_volume() + 10;
@@ -253,3 +251,5 @@ public:
};
DECLARE_BOARD(Df_K10Board);
Df_K10Board* Df_K10Board::instance_ = nullptr;