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

Add final optimizations: event type validation, pre-calculated pulse width, early termination

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

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

@@ -40,6 +40,7 @@ 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 uint64_t pulse_width_ticks = 200; // Pre-calculated pulse width in ticks
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)
@@ -117,6 +118,13 @@ static bool schedule_timer_event(uint64_t timestamp, uint8_t dimmer_id, timer_ev
return false; return false;
} }
// Validate event_type
if (event_type != EVENT_FIRE_TRIAC && event_type != EVENT_END_PULSE)
{
ESP_LOGE(TAG, "Invalid event_type: %d", event_type);
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++)
{ {
@@ -163,6 +171,10 @@ void config_alarm(gptimer_handle_t *timer, int ACfreq)
// Store the interval in ticks for use in event scheduling // Store the interval in ticks for use in event scheduling
alarm_interval_ticks = (uint64_t)(1000000 * m_calculated_interval); alarm_interval_ticks = (uint64_t)(1000000 * m_calculated_interval);
ESP_LOGI(TAG, "Timer interval in ticks: %llu", alarm_interval_ticks); ESP_LOGI(TAG, "Timer interval in ticks: %llu", alarm_interval_ticks);
// Pre-calculate pulse width in ticks for ISR efficiency
pulse_width_ticks = (uint64_t)pulseWidth * alarm_interval_ticks;
ESP_LOGI(TAG, "Pulse width in ticks: %llu", pulse_width_ticks);
ESP_LOGI(TAG, "Timer configuration - configure interrupt and timer"); ESP_LOGI(TAG, "Timer configuration - configure interrupt and timer");
ESP_LOGI(TAG, "Timer configuration - configure alarm"); ESP_LOGI(TAG, "Timer configuration - configure alarm");
@@ -445,11 +457,14 @@ static void IRAM_ATTR onTimerISR(void *para)
// Process all events that should fire at or before current time // Process all events that should fire at or before current time
// Note: We scan through all events once to avoid O(n²) complexity // Note: We scan through all events once to avoid O(n²) complexity
// This is acceptable since MAX_TIMER_EVENTS is small (100) // Early termination when all active events have been checked
for (int i = 0; i < MAX_TIMER_EVENTS; i++) int processed_events = 0;
for (int i = 0; i < MAX_TIMER_EVENTS && processed_events < event_queue_size; i++)
{ {
if (!event_queue[i].active) if (!event_queue[i].active)
continue; continue;
processed_events++; // Count this active event
if (event_queue[i].timestamp > current_time) if (event_queue[i].timestamp > current_time)
continue; continue;
@@ -464,8 +479,8 @@ static void IRAM_ATTR onTimerISR(void *para)
// Fire the triac // Fire the triac
gpio_set_level(dimOutPin[event->dimmer_id], 1); gpio_set_level(dimOutPin[event->dimmer_id], 1);
// Schedule pulse end event // Schedule pulse end event using pre-calculated pulse width
uint64_t pulse_end_time = current_time + ((uint64_t)pulseWidth * alarm_interval_ticks); uint64_t pulse_end_time = current_time + pulse_width_ticks;
bool scheduled = 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 scheduling failed, turn off triac immediately to prevent it staying on