Compare commits

..

1 Commits

Author SHA1 Message Date
40f352bcc7 feat: initial 2025-09-14 08:13:38 +03:00
4 changed files with 29 additions and 27 deletions

View File

@@ -41,15 +41,15 @@ int main(void)
zh_avr_ac_dimmer_start(); zh_avr_ac_dimmer_start();
for (;;) for (;;)
{ {
for (uint8_t i = 0; i <= 100; ++i) for (uint8_t i = 1; i <= 100; ++i)
{ {
zh_avr_ac_dimmer_set(i); zh_avr_ac_dimmer_set(i);
_delay_ms(100); _delay_ms(50);
} }
for (uint8_t i = 100; i >= 0; --i) for (uint8_t i = 100; i >= 1; --i)
{ {
zh_avr_ac_dimmer_set(i); zh_avr_ac_dimmer_set(i);
_delay_ms(100); _delay_ms(50);
} }
} }
return 0; return 0;

View File

@@ -7,6 +7,8 @@
#include "avr/interrupt.h" #include "avr/interrupt.h"
#include "util/delay.h" #include "util/delay.h"
#define ZH_TRIAC_TIME 2 // Triac turn-on time (in microseconds). Depends on the type of triac. Tested on BTA16-600.
#define ZH_AVR_AC_DIMMER_INIT_CONFIG_DEFAULT() \ #define ZH_AVR_AC_DIMMER_INIT_CONFIG_DEFAULT() \
{ \ { \
.ac_dimmer_frequency = ZH_50HZ, \ .ac_dimmer_frequency = ZH_50HZ, \
@@ -41,7 +43,7 @@ extern "C"
* *
* @param[in] config Pointer to AC dimmer initialized configuration structure. Can point to a temporary variable. * @param[in] config Pointer to AC dimmer initialized configuration structure. Can point to a temporary variable.
* *
* @note Before initialize the expander recommend initialize zh_avr_ac_dimmer_init_config_t structure with default values. * @note Before initialize the AC dimmer recommend initialize zh_avr_ac_dimmer_init_config_t structure with default values.
* *
* @code zh_avr_ac_dimmer_init_config_t config = ZH_AVR_AC_DIMMER_INIT_CONFIG_DEFAULT @endcode * @code zh_avr_ac_dimmer_init_config_t config = ZH_AVR_AC_DIMMER_INIT_CONFIG_DEFAULT @endcode
* *

1
version.txt Normal file
View File

@@ -0,0 +1 @@
1.0.0

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_value = 0;
volatile static uint8_t _dimmer_count = 0; volatile static uint8_t _dimmer_count = 0;
static bool _is_initialized = false; 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 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); 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 != 0)
{ {
if (_dimmer_value == 100) if (_dimmer_value >= 100)
{ {
TIMSK0 &= ~(1 << OCIE0A);
switch (_init_config.triac_port) switch (_init_config.triac_port)
{ {
case AVR_PORTB: case AVR_PORTB:
PORTB |= (1 << _init_config.triac_gpio); PORTB |= (1 << _init_config.triac_gpio);
_delay_us(5); _delay_us(ZH_TRIAC_TIME);
PORTB &= ~(1 << _init_config.triac_gpio); PORTB &= ~(1 << _init_config.triac_gpio);
break; break;
case AVR_PORTC: case AVR_PORTC:
PORTC |= (1 << _init_config.triac_gpio); PORTC |= (1 << _init_config.triac_gpio);
_delay_us(5); _delay_us(ZH_TRIAC_TIME);
PORTC &= ~(1 << _init_config.triac_gpio); PORTC &= ~(1 << _init_config.triac_gpio);
case AVR_PORTD: case AVR_PORTD:
PORTD |= (1 << _init_config.triac_gpio); PORTD |= (1 << _init_config.triac_gpio);
_delay_us(5); _delay_us(ZH_TRIAC_TIME);
PORTD &= ~(1 << _init_config.triac_gpio); PORTD &= ~(1 << _init_config.triac_gpio);
break; break;
default: default:
@@ -102,7 +102,7 @@ void zh_avr_ac_dimmer_isr_handler(void)
else else
{ {
TCNT0 = 0; TCNT0 = 0;
TCCR0B |= _prescaler; TIFR0 = (1 << OCF0A);
TIMSK0 |= (1 << OCIE0A); TIMSK0 |= (1 << OCIE0A);
} }
} }
@@ -174,15 +174,15 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
{ {
case ZH_50HZ: case ZH_50HZ:
OCR0A = 99; OCR0A = 99;
_prescaler = (1 << CS01); TCCR0B |= (1 << CS01);
break; break;
case ZH_60HZ: case ZH_60HZ:
OCR0A = 82; OCR0A = 82;
_prescaler = (1 << CS01); TCCR0B |= (1 << CS01);
break; break;
case ZH_400HZ: case ZH_400HZ:
OCR0A = 99; OCR0A = 99;
_prescaler = (1 << CS00); TCCR0B |= (1 << CS00);
break; break;
default: default:
break; break;
@@ -193,15 +193,15 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
{ {
case ZH_50HZ: case ZH_50HZ:
OCR0A = 24; OCR0A = 24;
_prescaler = (1 << CS01) | (1 << CS00); TCCR0B |= (1 << CS01) | (1 << CS00);
break; break;
case ZH_60HZ: case ZH_60HZ:
OCR0A = 165; OCR0A = 165;
_prescaler = (1 << CS01); TCCR0B |= (1 << CS01);
break; break;
case ZH_400HZ: case ZH_400HZ:
OCR0A = 24; OCR0A = 24;
_prescaler = (1 << CS01); TCCR0B |= (1 << CS01);
break; break;
default: default:
break; break;
@@ -212,15 +212,15 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
{ {
case ZH_50HZ: case ZH_50HZ:
OCR0A = 249; OCR0A = 249;
_prescaler = (1 << CS01); TCCR0B |= (1 << CS01);
break; break;
case ZH_60HZ: case ZH_60HZ:
OCR0A = 207; OCR0A = 207;
_prescaler = (1 << CS01); TCCR0B |= (1 << CS01);
break; break;
case ZH_400HZ: case ZH_400HZ:
OCR0A = 249; OCR0A = 249;
_prescaler = (1 << CS00); TCCR0B |= (1 << CS00);
break; break;
default: default:
break; break;
@@ -235,30 +235,29 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
ISR(TIMER0_COMPA_vect) ISR(TIMER0_COMPA_vect)
{ {
++_dimmer_count; if (_dimmer_count >= (100 - _dimmer_value))
if (_dimmer_count == (100 - _dimmer_value))
{ {
_dimmer_count = 0; _dimmer_count = 0;
TCCR0B = 0; TIMSK0 &= ~(1 << OCIE0A);
TIMSK0 = 0;
switch (_init_config.triac_port) switch (_init_config.triac_port)
{ {
case AVR_PORTB: case AVR_PORTB:
PORTB |= (1 << _init_config.triac_gpio); PORTB |= (1 << _init_config.triac_gpio);
_delay_us(5); _delay_us(ZH_TRIAC_TIME);
PORTB &= ~(1 << _init_config.triac_gpio); PORTB &= ~(1 << _init_config.triac_gpio);
break; break;
case AVR_PORTC: case AVR_PORTC:
PORTC |= (1 << _init_config.triac_gpio); PORTC |= (1 << _init_config.triac_gpio);
_delay_us(5); _delay_us(ZH_TRIAC_TIME);
PORTC &= ~(1 << _init_config.triac_gpio); PORTC &= ~(1 << _init_config.triac_gpio);
case AVR_PORTD: case AVR_PORTD:
PORTD |= (1 << _init_config.triac_gpio); PORTD |= (1 << _init_config.triac_gpio);
_delay_us(5); _delay_us(ZH_TRIAC_TIME);
PORTD &= ~(1 << _init_config.triac_gpio); PORTD &= ~(1 << _init_config.triac_gpio);
break; break;
default: default:
break; break;
} }
} }
++_dimmer_count;
} }