This commit is contained in:
2025-09-14 08:05:40 +03:00
parent a617ea30cc
commit 879ab76ff9
2 changed files with 22 additions and 21 deletions

View File

@@ -5,7 +5,6 @@ volatile static bool _is_dimmer_work = false;
volatile static uint8_t _dimmer_value = 0;
volatile static uint8_t _dimmer_count = 0;
static bool _is_initialized = false;
static uint8_t _prescaler = 0;
static avr_err_t _zh_avr_ac_dimmer_validate_config(const zh_avr_ac_dimmer_init_config_t *config);
static void _zh_avr_ac_dimmer_gpio_init(void);
@@ -77,22 +76,23 @@ void zh_avr_ac_dimmer_isr_handler(void)
{
if (_dimmer_value != 0)
{
if (_dimmer_value == 100)
if (_dimmer_value >= 100)
{
TIMSK0 &= ~(1 << OCIE0A);
switch (_init_config.triac_port)
{
case AVR_PORTB:
PORTB |= (1 << _init_config.triac_gpio);
_delay_us(2);
_delay_us(ZH_TRIAC_TIME);
PORTB &= ~(1 << _init_config.triac_gpio);
break;
case AVR_PORTC:
PORTC |= (1 << _init_config.triac_gpio);
_delay_us(2);
_delay_us(ZH_TRIAC_TIME);
PORTC &= ~(1 << _init_config.triac_gpio);
case AVR_PORTD:
PORTD |= (1 << _init_config.triac_gpio);
_delay_us(2);
_delay_us(ZH_TRIAC_TIME);
PORTD &= ~(1 << _init_config.triac_gpio);
break;
default:
@@ -102,7 +102,7 @@ void zh_avr_ac_dimmer_isr_handler(void)
else
{
TCNT0 = 0;
TCCR0B |= _prescaler;
TIFR0 = (1 << OCF0A);
TIMSK0 |= (1 << OCIE0A);
}
}
@@ -174,15 +174,15 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
{
case ZH_50HZ:
OCR0A = 99;
_prescaler = (1 << CS01);
TCCR0B |= (1 << CS01);
break;
case ZH_60HZ:
OCR0A = 82;
_prescaler = (1 << CS01);
TCCR0B |= (1 << CS01);
break;
case ZH_400HZ:
OCR0A = 99;
_prescaler = (1 << CS00);
TCCR0B |= (1 << CS00);
break;
default:
break;
@@ -193,15 +193,15 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
{
case ZH_50HZ:
OCR0A = 24;
_prescaler = (1 << CS01) | (1 << CS00);
TCCR0B |= (1 << CS01) | (1 << CS00);
break;
case ZH_60HZ:
OCR0A = 165;
_prescaler = (1 << CS01);
TCCR0B |= (1 << CS01);
break;
case ZH_400HZ:
OCR0A = 24;
_prescaler = (1 << CS01);
TCCR0B |= (1 << CS01);
break;
default:
break;
@@ -212,15 +212,15 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
{
case ZH_50HZ:
OCR0A = 249;
_prescaler = (1 << CS01);
TCCR0B |= (1 << CS01);
break;
case ZH_60HZ:
OCR0A = 207;
_prescaler = (1 << CS01);
TCCR0B |= (1 << CS01);
break;
case ZH_400HZ:
OCR0A = 249;
_prescaler = (1 << CS00);
TCCR0B |= (1 << CS00);
break;
default:
break;
@@ -235,25 +235,24 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
ISR(TIMER0_COMPA_vect)
{
if (_dimmer_count == (100 - _dimmer_value))
if (_dimmer_count >= (100 - _dimmer_value))
{
_dimmer_count = 0;
TCCR0B = 0;
TIMSK0 = 0;
TIMSK0 &= ~(1 << OCIE0A);
switch (_init_config.triac_port)
{
case AVR_PORTB:
PORTB |= (1 << _init_config.triac_gpio);
_delay_us(2);
_delay_us(ZH_TRIAC_TIME);
PORTB &= ~(1 << _init_config.triac_gpio);
break;
case AVR_PORTC:
PORTC |= (1 << _init_config.triac_gpio);
_delay_us(2);
_delay_us(ZH_TRIAC_TIME);
PORTC &= ~(1 << _init_config.triac_gpio);
case AVR_PORTD:
PORTD |= (1 << _init_config.triac_gpio);
_delay_us(2);
_delay_us(ZH_TRIAC_TIME);
PORTD &= ~(1 << _init_config.triac_gpio);
break;
default: