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

GPIO LED更新，可以设置LEDC定时器和控制通道 (#439)

Browse Source 
* 添加普通LED支持，支持不同状态亮度设置和呼吸灯效果

* GPIO LED更新，可以设置LEDC定时器和控制通道
This commit is contained in:
HonestQiao
2025-04-03 02:25:03 +08:00
committed by GitHub
parent c9dfcb7c93
commit 0ac2f09bb0
3 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/CMakeLists.txt
View File

@@ -39,7 +39,7 @@ elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_ML307)
elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_ESP32) elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_ESP32)
set(BOARD_TYPE "bread-compact-esp32") set(BOARD_TYPE "bread-compact-esp32")
elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_ESP32_LCD) elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_ESP32_LCD)
set(BOARD_TYPE "bread-compact-esp32-lcd") set(BOARD_TYPE "bread-compact-esp32-lcd")
elseif(CONFIG_BOARD_TYPE_DF_K10) elseif(CONFIG_BOARD_TYPE_DF_K10)
set(BOARD_TYPE "df-k10") set(BOARD_TYPE "df-k10")
elseif(CONFIG_BOARD_TYPE_ESP_BOX_3) elseif(CONFIG_BOARD_TYPE_ESP_BOX_3)
@@ -133,7 +133,7 @@ elseif(CONFIG_BOARD_TYPE_XINGZHI_Cube_1_54TFT_ML307)
elseif(CONFIG_BOARD_TYPE_SENSECAP_WATCHER) elseif(CONFIG_BOARD_TYPE_SENSECAP_WATCHER)
set(BOARD_TYPE "sensecap-watcher") set(BOARD_TYPE "sensecap-watcher")
elseif(CONFIG_BOARD_TYPE_ESP32_CGC) elseif(CONFIG_BOARD_TYPE_ESP32_CGC)
set(BOARD_TYPE "esp32-cgc") set(BOARD_TYPE "esp32-cgc")
endif() endif()
file(GLOB BOARD_SOURCES file(GLOB BOARD_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc

26
main/led/gpio_led.cc
View File

@@ -20,11 +20,19 @@
#define LEDC_LS_MODE LEDC_LOW_SPEED_MODE #define LEDC_LS_MODE LEDC_LOW_SPEED_MODE
#define LEDC_LS_CH0_CHANNEL LEDC_CHANNEL_0 #define LEDC_LS_CH0_CHANNEL LEDC_CHANNEL_0
#define LEDC_DUTY (4096) #define LEDC_DUTY (8191)
#define LEDC_FADE_TIME (1000) #define LEDC_FADE_TIME (1000)
// GPIO_LED // GPIO_LED
GpioLed::GpioLed(gpio_num_t gpio, int output_invert) { GpioLed::GpioLed(gpio_num_t gpio)
: GpioLed(gpio, 0, LEDC_LS_TIMER, LEDC_LS_CH0_CHANNEL) {
}
GpioLed::GpioLed(gpio_num_t gpio, int output_invert)
: GpioLed(gpio, output_invert, LEDC_LS_TIMER, LEDC_LS_CH0_CHANNEL) {
}
GpioLed::GpioLed(gpio_num_t gpio, int output_invert, ledc_timer_t timer_num, ledc_channel_t channel) {
// If the gpio is not connected, you should use NoLed class // If the gpio is not connected, you should use NoLed class
assert(gpio != GPIO_NUM_NC); assert(gpio != GPIO_NUM_NC);
@@ -33,20 +41,20 @@ GpioLed::GpioLed(gpio_num_t gpio, int output_invert) {
* that will be used by LED Controller * that will be used by LED Controller
*/ */
ledc_timer_config_t ledc_timer = {}; ledc_timer_config_t ledc_timer = {};
ledc_timer.duty_resolution = LEDC_TIMER_13_BIT; // resolution of PWM duty ledc_timer.duty_resolution = LEDC_TIMER_13_BIT; // resolution of PWM duty
ledc_timer.freq_hz = 4000; // frequency of PWM signal ledc_timer.freq_hz = 4000; // frequency of PWM signal
ledc_timer.speed_mode = LEDC_LS_MODE; // timer mode ledc_timer.speed_mode = LEDC_LS_MODE; // timer mode
ledc_timer.timer_num = LEDC_LS_TIMER; // timer index ledc_timer.timer_num = timer_num; // timer index
ledc_timer.clk_cfg = LEDC_AUTO_CLK; // Auto select the source clock ledc_timer.clk_cfg = LEDC_AUTO_CLK; // Auto select the source clock
ESP_ERROR_CHECK(ledc_timer_config(&ledc_timer)); ESP_ERROR_CHECK(ledc_timer_config(&ledc_timer));
ledc_channel_.channel = LEDC_LS_CH0_CHANNEL, ledc_channel_.channel = channel,
ledc_channel_.duty = 0, ledc_channel_.duty = 0,
ledc_channel_.gpio_num = gpio, ledc_channel_.gpio_num = gpio,
ledc_channel_.speed_mode = LEDC_LS_MODE, ledc_channel_.speed_mode = LEDC_LS_MODE,
ledc_channel_.hpoint = 0, ledc_channel_.hpoint = 0,
ledc_channel_.timer_sel = LEDC_LS_TIMER, ledc_channel_.timer_sel = timer_num,
ledc_channel_.flags.output_invert = output_invert & 0x01, ledc_channel_.flags.output_invert = output_invert & 0x01,
// Set LED Controller with previously prepared configuration // Set LED Controller with previously prepared configuration
@@ -86,7 +94,11 @@ GpioLed::~GpioLed() {
void GpioLed::SetBrightness(uint8_t brightness) { void GpioLed::SetBrightness(uint8_t brightness) {
duty_ = brightness * LEDC_DUTY / 100; if (brightness == 100) {
duty_ = LEDC_DUTY;
} else {
duty_ = brightness * LEDC_DUTY / 100;
}
} }
void GpioLed::TurnOn() { void GpioLed::TurnOn() {

16
main/led/gpio_led.h
View File

@@ -11,13 +11,18 @@
#include <mutex> #include <mutex>
class GpioLed : public Led { class GpioLed : public Led {
public: public:
GpioLed(gpio_num_t gpio, int output_invert=0); GpioLed(gpio_num_t gpio);
GpioLed(gpio_num_t gpio, int output_invert);
GpioLed(gpio_num_t gpio, int output_invert, ledc_timer_t timer_num, ledc_channel_t channel);
virtual ~GpioLed(); virtual ~GpioLed();
void OnStateChanged() override; void OnStateChanged() override;
void TurnOn();
void TurnOff();
void SetBrightness(uint8_t brightness);
private: private:
std::mutex mutex_; std::mutex mutex_;
TaskHandle_t blink_task_ = nullptr; TaskHandle_t blink_task_ = nullptr;
ledc_channel_config_t ledc_channel_ = {0}; ledc_channel_config_t ledc_channel_ = {0};
@@ -34,12 +39,9 @@ private:
void BlinkOnce(); void BlinkOnce();
void Blink(int times, int interval_ms); void Blink(int times, int interval_ms);
void StartContinuousBlink(int interval_ms); void StartContinuousBlink(int interval_ms);
void TurnOn();
void TurnOff();
void SetBrightness(uint8_t brightness);
void StartFadeTask(); void StartFadeTask();
void OnFadeEnd(); void OnFadeEnd();
static bool FadeCallback(const ledc_cb_param_t *param, void *user_arg); static bool FadeCallback(const ledc_cb_param_t *param, void *user_arg);
}; };
#endif // _GPIO_LED_H_ #endif // _GPIO_LED_H_