Skip to content

Support for passive buzzers #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matejsworkshop wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for passive buzzers #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 43 additions & 3 deletions lib/Espfc/src/Connect/Buzzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "Buzzer.hpp"
#include "Hal/Gpio.h"
#include "driver/ledc.h"

namespace Espfc {

Expand All @@ -10,8 +11,38 @@ Buzzer::Buzzer(Model& model): _model(model), _status(BUZZER_STATUS_IDLE), _wait(
int Buzzer::begin()
{
if(_model.config.pin[PIN_BUZZER] == -1) return 0;
Hal::Gpio::pinMode(_model.config.pin[PIN_BUZZER], OUTPUT);
Hal::Gpio::digitalWrite(_model.config.pin[PIN_BUZZER], (pin_status_t)_model.config.buzzer.inverted);

switch(_model.config.buzzer.type)
{
case 0:
Hal::Gpio::pinMode(_model.config.pin[PIN_BUZZER], OUTPUT);
Hal::Gpio::digitalWrite(_model.config.pin[PIN_BUZZER], (pin_status_t)_model.config.buzzer.inverted);
break;
case 1:
ledc_timer_config_t ledc_timer = {
Copy link
Copy Markdown
Owner

@rtlopez rtlopez Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You shouldn't use hardware specific api here. In this case RP2350 and RP2040 build is broken. It should be hidden behind some generic HAL, or gated by specific ifdef macro, like ESPFC_ADC_0 for example.

.speed_mode = LEDC_LOW_SPEED_MODE,
.duty_resolution = LEDC_TIMER_13_BIT,
.timer_num = LEDC_TIMER_0,
.freq_hz = static_cast<uint32_t>(_model.config.buzzer.frequency),
.clk_cfg = LEDC_AUTO_CLK
};
ledc_timer_config(&ledc_timer);

ledc_channel_config_t ledc_channel = {
.gpio_num = _model.config.pin[PIN_BUZZER],
.speed_mode = LEDC_LOW_SPEED_MODE,
.channel = LEDC_CHANNEL_0,
.intr_type = LEDC_INTR_DISABLE,
.timer_sel = LEDC_TIMER_0,
.duty = 0,
.hpoint = 0
};
ledc_channel_config(&ledc_channel);

gpio_set_drive_capability((gpio_num_t)_model.config.pin[PIN_BUZZER], GPIO_DRIVE_CAP_3);
break;
}

_model.state.buzzer.timer.setRate(100);

return 1;
Expand Down Expand Up @@ -70,7 +101,16 @@ void Buzzer::_play(bool v, int time, BuzzerPlayStatus s)

void Buzzer::_write(bool v)
{
Hal::Gpio::digitalWrite(_model.config.pin[PIN_BUZZER], (pin_status_t)(_model.config.buzzer.inverted ? !v : v));
switch(_model.config.buzzer.type)
{
case 0:
Hal::Gpio::digitalWrite(_model.config.pin[PIN_BUZZER], (pin_status_t)(_model.config.buzzer.inverted ? !v : v));
break;
case 1:
ledc_set_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, v ? 4096 : 0);
ledc_update_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0);
break;
}
}

void Buzzer::_delay(int time)
Expand Down
3 changes: 3 additions & 0 deletions lib/Espfc/src/Connect/Cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ const Cli::Param * Cli::initialize(ModelConfig& c)
static const char* currentSourceChoices[] = { PSTR("NONE"), PSTR("ADC"), NULL };
static const char* blackboxDevChoices[] = { PSTR("NONE"), PSTR("FLASH"), PSTR("SD_CARD"), PSTR("SERIAL"), NULL };
static const char* blackboxModeChoices[] = { PSTR("NORMAL"), PSTR("TEST"), PSTR("ALWAYS"), NULL };
static const char* buzzerTypeChoices[] = { PSTR("ACTIVE"), PSTR("PASSIVE"), NULL };
static const char* ledTypeChoices[] = { PSTR("SIMPLE"), PSTR("STRIP"), NULL };

size_t i = 0;
Expand Down Expand Up @@ -685,6 +686,8 @@ const Cli::Param * Cli::initialize(ModelConfig& c)
Param(PSTR("pin_spi_cs_2"), &c.pin[PIN_SPI_CS2]),
#endif
Param(PSTR("pin_buzzer_invert"), &c.buzzer.inverted),
Param(PSTR("pin_buzzer_type"), &c.buzzer.type, buzzerTypeChoices),
Param(PSTR("pin_passive_buzzer_freq"), &c.buzzer.frequency),
Param(PSTR("pin_led_invert"), &c.led.invert),
Param(PSTR("pin_led_type"), &c.led.type, ledTypeChoices),

Expand Down
Loading