Skip to content

fix(settings_ui): drop esp_timer_set_arg use #128

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

Merged
baba-dev merged 1 commit into from
Sep 19, 2025
Merged

fix(settings_ui): drop esp_timer_set_arg use #128

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
20 changes: 11 additions & 9 deletions components/settings_ui/src/settings_ui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ static const char* TAG = "settings_ui";

static esp_timer_handle_t s_dim_timer = NULL;

static settings_ui_runtime_t* s_dim_state = NULL;

static void dim_timer_callback(void* arg)
{
settings_ui_runtime_t* state = (settings_ui_runtime_t*)arg;
(void)arg;
settings_ui_runtime_t* state = s_dim_state;
if (!state)
{
return;
Expand Down Expand Up @@ -59,11 +62,13 @@ esp_err_t settings_ui_schedule_dim(settings_ui_runtime_t* state, uint32_t timeou
{
return ESP_ERR_INVALID_ARG;
}
s_dim_state = state;

if (!s_dim_timer)
{
const esp_timer_create_args_t args = {
.callback = &dim_timer_callback,
.arg = state,
.arg = NULL,
.name = "ui_dim",
};
esp_err_t err = esp_timer_create(&args, &s_dim_timer);
Expand All @@ -73,12 +78,6 @@ esp_err_t settings_ui_schedule_dim(settings_ui_runtime_t* state, uint32_t timeou
}
}

esp_err_t err = esp_timer_set_arg(s_dim_timer, state);
if (err != ESP_OK)
{
return err;
}

if (esp_timer_is_active(s_dim_timer))
{
esp_timer_stop(s_dim_timer);
Expand All @@ -89,9 +88,12 @@ esp_err_t settings_ui_schedule_dim(settings_ui_runtime_t* state, uint32_t timeou

void settings_ui_cancel_dim(settings_ui_runtime_t* state)
{
(void)state;
if (s_dim_timer && esp_timer_is_active(s_dim_timer))
{
esp_timer_stop(s_dim_timer);
}
if (state == s_dim_state)
{
s_dim_state = NULL;
}
}
Loading