alexey.zholtikov/Esp32Dimmer
1
0
Fork 0
mirror of https://github.com/pmarchini/Esp32Dimmer.git synced 2026-02-07 11:18:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Address code review feedback: validation, error handling, and performance

Browse Source 
Co-authored-by: pmarchini <49943249+pmarchini@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-25 11:58:48 +00:00
parent 5bf67e9a0c
commit 427baca9ee
1 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/components/esp32-triac-dimmer-driver/esp32-triac-dimmer-driver.c
View File

@@ -40,7 +40,6 @@ typedef struct {
static timer_event_t event_queue[MAX_TIMER_EVENTS]; static timer_event_t event_queue[MAX_TIMER_EVENTS];
static volatile int event_queue_size = 0; static volatile int event_queue_size = 0;
static uint64_t alarm_interval_ticks = 100; // Will be calculated based on AC frequency static uint64_t alarm_interval_ticks = 100; // Will be calculated based on AC frequency
static volatile bool timer_event_pending = false;
dimmertyp *createDimmer(gpio_num_t user_dimmer_pin, gpio_num_t zc_dimmer_pin) dimmertyp *createDimmer(gpio_num_t user_dimmer_pin, gpio_num_t zc_dimmer_pin)
@@ -107,10 +106,17 @@ static int find_next_event_index(void)
* @param timestamp Absolute timestamp when event should occur * @param timestamp Absolute timestamp when event should occur
* @param dimmer_id Which dimmer this event affects * @param dimmer_id Which dimmer this event affects
* @param event_type Type of event (fire or end pulse) * @param event_type Type of event (fire or end pulse)
* @return true if event was scheduled, false if queue is full * @return true if event was scheduled, false if queue is full or invalid input
*/ */
static bool schedule_timer_event(uint64_t timestamp, uint8_t dimmer_id, timer_event_type_t event_type) static bool schedule_timer_event(uint64_t timestamp, uint8_t dimmer_id, timer_event_type_t event_type)
{ {
// Validate dimmer_id to prevent array bounds violations
if (dimmer_id >= ALL_DIMMERS)
{
ESP_LOGE(TAG, "Invalid dimmer_id: %d (max: %d)", dimmer_id, ALL_DIMMERS - 1);
return false;
}
// Find an empty slot // Find an empty slot
for (int i = 0; i < MAX_TIMER_EVENTS; i++) for (int i = 0; i < MAX_TIMER_EVENTS; i++)
{ {
@@ -438,33 +444,52 @@ static void IRAM_ATTR onTimerISR(void *para)
gptimer_get_raw_count(gptimer, &current_time); gptimer_get_raw_count(gptimer, &current_time);
// Process all events that should fire at or before current time // Process all events that should fire at or before current time
int next_event_idx = find_next_event_index(); // Note: We scan through all events once to avoid O(n²) complexity
while (next_event_idx >= 0 && event_queue[next_event_idx].timestamp <= current_time) // This is acceptable since MAX_TIMER_EVENTS is small (100)
for (int i = 0; i < MAX_TIMER_EVENTS; i++)
{ {
timer_event_t *event = &event_queue[next_event_idx]; if (!event_queue[i].active)
continue;
if (event->event_type == EVENT_FIRE_TRIAC) if (event_queue[i].timestamp > current_time)
continue;
timer_event_t *event = &event_queue[i];
// Validate dimmer_id to prevent array bounds violations
if (event->dimmer_id < ALL_DIMMERS)
{ {
// Fire the triac if (event->event_type == EVENT_FIRE_TRIAC)
gpio_set_level(dimOutPin[event->dimmer_id], 1); {
// Fire the triac
gpio_set_level(dimOutPin[event->dimmer_id], 1);
// Schedule pulse end event // Schedule pulse end event
uint64_t pulse_end_time = current_time + ((uint64_t)pulseWidth * alarm_interval_ticks); uint64_t pulse_end_time = current_time + ((uint64_t)pulseWidth * alarm_interval_ticks);
schedule_timer_event(pulse_end_time, event->dimmer_id, EVENT_END_PULSE); bool scheduled = schedule_timer_event(pulse_end_time, event->dimmer_id, EVENT_END_PULSE);
// If scheduling failed, turn off triac immediately to prevent it staying on
if (!scheduled)
{
gpio_set_level(dimOutPin[event->dimmer_id], 0);
ESP_LOGE(TAG, "Failed to schedule pulse end for dimmer %d", event->dimmer_id);
}
}
else if (event->event_type == EVENT_END_PULSE)
{
// Turn off triac gate
gpio_set_level(dimOutPin[event->dimmer_id], 0);
zeroCross[event->dimmer_id] = 0;
dimCounter[event->dimmer_id] = 0;
}
} }
else if (event->event_type == EVENT_END_PULSE) else
{ {
// Turn off triac gate ESP_LOGE(TAG, "Invalid dimmer_id in event: %d", event->dimmer_id);
gpio_set_level(dimOutPin[event->dimmer_id], 0);
zeroCross[event->dimmer_id] = 0;
dimCounter[event->dimmer_id] = 0;
} }
// Remove processed event // Remove processed event
remove_event(next_event_idx); remove_event(i);
// Find next event
next_event_idx = find_next_event_index();
} }
// Legacy code for backward compatibility and toggle mode // Legacy code for backward compatibility and toggle mode