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

set i2c freq to 400000

Browse Source
This commit is contained in:
Terrence
2025-03-06 06:27:36 +08:00
parent 20696b37f9
commit 70cb3410b0
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/application.cc
View File

@@ -45,7 +45,8 @@ Application::Application() {
}, },
.arg = this, .arg = this,
.dispatch_method = ESP_TIMER_TASK, .dispatch_method = ESP_TIMER_TASK,
.name = "clock_timer" .name = "clock_timer",
.skip_unhandled_events = true
}; };
esp_timer_create(&clock_timer_args, &clock_timer_handle_); esp_timer_create(&clock_timer_args, &clock_timer_handle_);
} }

2
main/boards/common/i2c_device.cc
View File

@@ -9,7 +9,7 @@ I2cDevice::I2cDevice(i2c_master_bus_handle_t i2c_bus, uint8_t addr) {
i2c_device_config_t i2c_device_cfg = { i2c_device_config_t i2c_device_cfg = {
.dev_addr_length = I2C_ADDR_BIT_LEN_7, .dev_addr_length = I2C_ADDR_BIT_LEN_7,
.device_address = addr, .device_address = addr,
.scl_speed_hz = 100000, .scl_speed_hz = 400 * 1000,
.scl_wait_us = 0, .scl_wait_us = 0,
.flags = { .flags = {
.disable_ack_check = 0, .disable_ack_check = 0,

23
main/boards/m5stack-core-s3/m5stack_core_s3.cc
View File

@@ -113,7 +113,7 @@ public:
tp_.y = ((read_buffer_[3] & 0x0F) << 8) | read_buffer_[4]; tp_.y = ((read_buffer_[3] & 0x0F) << 8) | read_buffer_[4];
} }
const TouchPoint_t& GetTouchPoint() { inline const TouchPoint_t& GetTouchPoint() {
return tp_; return tp_;
} }
@@ -203,15 +203,13 @@ private:
vTaskDelay(pdMS_TO_TICKS(50)); vTaskDelay(pdMS_TO_TICKS(50));
} }
static void touchpad_timer_callback(void* arg) { void PollTouchpad() {
auto& board = (M5StackCoreS3Board&)Board::GetInstance();
auto touchpad = board.GetTouchpad();
static bool was_touched = false; static bool was_touched = false;
static int64_t touch_start_time = 0; static int64_t touch_start_time = 0;
const int64_t TOUCH_THRESHOLD_MS = 500; // 触摸时长阈值，超过500ms视为长按 const int64_t TOUCH_THRESHOLD_MS = 500; // 触摸时长阈值，超过500ms视为长按
touchpad->UpdateTouchPoint(); ft6336_->UpdateTouchPoint();
auto touch_point = touchpad->GetTouchPoint(); auto& touch_point = ft6336_->GetTouchPoint();
// 检测触摸开始 // 检测触摸开始
if (touch_point.num > 0 && !was_touched) { if (touch_point.num > 0 && !was_touched) {
@@ -228,7 +226,7 @@ private:
auto& app = Application::GetInstance(); auto& app = Application::GetInstance();
if (app.GetDeviceState() == kDeviceStateStarting && if (app.GetDeviceState() == kDeviceStateStarting &&
!WifiStation::GetInstance().IsConnected()) { !WifiStation::GetInstance().IsConnected()) {
board.ResetWifiConfiguration(); ResetWifiConfiguration();
} }
app.ToggleChatState(); app.ToggleChatState();
} }
@@ -241,8 +239,11 @@ private:
// 创建定时器，20ms 间隔 // 创建定时器，20ms 间隔
esp_timer_create_args_t timer_args = { esp_timer_create_args_t timer_args = {
.callback = touchpad_timer_callback, .callback = [](void* arg) {
.arg = NULL, M5StackCoreS3Board* board = (M5StackCoreS3Board*)arg;
board->PollTouchpad();
},
.arg = this,
.dispatch_method = ESP_TIMER_TASK, .dispatch_method = ESP_TIMER_TASK,
.name = "touchpad_timer", .name = "touchpad_timer",
.skip_unhandled_events = true, .skip_unhandled_events = true,
@@ -374,10 +375,6 @@ public:
static CustomBacklight backlight(pmic_); static CustomBacklight backlight(pmic_);
return &backlight; return &backlight;
} }
Ft6336* GetTouchpad() {
return ft6336_;
}
}; };
DECLARE_BOARD(M5StackCoreS3Board); DECLARE_BOARD(M5StackCoreS3Board);