avr_libraries/zh_avr_ac_dimmer
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: avr_libraries:v1.0.1
Branches Tags
avr_libraries:main avr_libraries:dev
avr_libraries:v1.0.2 avr_libraries:v1.0.1 avr_libraries:v1.0.0
..
compare: avr_libraries:4bad25892a7bb6b3649d3962f5b723ad740f32dc
Branches Tags
avr_libraries:dev avr_libraries:main
avr_libraries:v1.0.2 avr_libraries:v1.0.1 avr_libraries:v1.0.0

4 Commits
v1.0.1 ... 4bad25892a

Author SHA1 Message Date
Alexey Zholtikov
4bad25892a wip: 2025-10-11 12:24:03 +03:00
Alexey Zholtikov
ba567605b8 wip: 2025-10-10 14:58:07 +03:00
Alexey Zholtikov
832829368c Revert "fix: changed trigger level" 
This reverts commit 6d69f5a42e.
 2025-10-10 11:00:43 +03:00
Alexey Zholtikov
6d69f5a42e fix: changed trigger level 2025-10-09 14:50:51 +03:00
2 changed files with 34 additions and 16 deletions
Expand all files Collapse all files

2
include/zh_avr_ac_dimmer.h
View File

@@ -7,7 +7,7 @@
#include "avr/interrupt.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_TRIAC_TIME 1 // Triac turn-on time (in microseconds). Depends on the type of triac. Tested on BTA16-600.
#define ZH_AVR_AC_DIMMER_INIT_CONFIG_DEFAULT() \
{ \

48
zh_avr_ac_dimmer.c
View File

@@ -1,10 +1,11 @@
#include "zh_avr_ac_dimmer.h"
// https://avr-start.ru/?p=3983
static zh_avr_ac_dimmer_init_config_t _init_config = {0};
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;
volatile static bool _is_zero_crossing = false;
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);
@@ -48,27 +49,38 @@ avr_err_t zh_avr_ac_dimmer_set(uint8_t value)
void zh_avr_ac_dimmer_isr_handler(void)
{
uint8_t flag = false;
bool flag = false;
switch (_init_config.zero_cross_port)
{
case AVR_PORTB:
if ((PINB & (1 << _init_config.zero_cross_gpio)) == 0)
if ((PINB & (1 << _init_config.zero_cross_gpio)) == (1 << _init_config.zero_cross_gpio))
{
PORTB &= ~(1 << _init_config.triac_gpio);
flag = true;
}
break;
case AVR_PORTC:
if ((PINC & (1 << _init_config.zero_cross_gpio)) == 0)
if ((PINC & (1 << _init_config.zero_cross_gpio)) == (1 << _init_config.zero_cross_gpio))
{
PORTC &= ~(1 << _init_config.triac_gpio);
flag = true;
}
break;
case AVR_PORTD:
if ((PIND & (1 << _init_config.zero_cross_gpio)) == 0)
if (((PIND & (1 << _init_config.zero_cross_gpio)) == (1 << _init_config.zero_cross_gpio)) && _is_zero_crossing == false)
{
PORTD &= ~(1 << _init_config.triac_gpio);
// flag = true;
_is_zero_crossing = true;
}
if (((PIND & (1 << _init_config.zero_cross_gpio)) == 0) && _is_zero_crossing == true)
{
// PORTD &= ~(1 << _init_config.triac_gpio);
_is_zero_crossing = false;
flag = true;
}
break;
default:
break;
}
@@ -76,24 +88,26 @@ void zh_avr_ac_dimmer_isr_handler(void)
{
if (_dimmer_value != 0)
{
if (_dimmer_value >= 100)
if (_dimmer_value == 100)
{
// cli();
TIMSK0 &= ~(1 << OCIE0A);
// sei();
switch (_init_config.triac_port)
{
case AVR_PORTB:
PORTB |= (1 << _init_config.triac_gpio);
_delay_us(ZH_TRIAC_TIME);
PORTB &= ~(1 << _init_config.triac_gpio);
// _delay_us(ZH_TRIAC_TIME);
// PORTB &= ~(1 << _init_config.triac_gpio);
break;
case AVR_PORTC:
PORTC |= (1 << _init_config.triac_gpio);
_delay_us(ZH_TRIAC_TIME);
PORTC &= ~(1 << _init_config.triac_gpio);
// _delay_us(ZH_TRIAC_TIME);
// PORTC &= ~(1 << _init_config.triac_gpio);
case AVR_PORTD:
PORTD |= (1 << _init_config.triac_gpio);
_delay_us(ZH_TRIAC_TIME);
PORTD &= ~(1 << _init_config.triac_gpio);
// _delay_us(10);
// PORTD &= ~(1 << _init_config.triac_gpio);
break;
default:
break;
@@ -101,9 +115,11 @@ void zh_avr_ac_dimmer_isr_handler(void)
}
else
{
// cli();
TCNT0 = 0;
TIFR0 = (1 << OCF0A);
TIMSK0 |= (1 << OCIE0A);
// sei();
}
}
}
@@ -173,7 +189,7 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
switch (_init_config.ac_dimmer_frequency)
{
case ZH_50HZ:
OCR0A = 99;
OCR0A = 94; // Check. 99
TCCR0B |= (1 << CS01);
break;
case ZH_60HZ:
@@ -235,7 +251,8 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
ISR(TIMER0_COMPA_vect)
{
if (_dimmer_count >= (100 - _dimmer_value))
++_dimmer_count;
if (_dimmer_count == (100 - _dimmer_value))
{
_dimmer_count = 0;
TIMSK0 &= ~(1 << OCIE0A);
@@ -259,5 +276,6 @@ ISR(TIMER0_COMPA_vect)
break;
}
}
++_dimmer_count;
TIFR0 = (1 << OCF0A);
// ++_dimmer_count;
}