wip:

This reverts commit 6d69f5a42e.

include/zh_avr_ac_dimmer.h

@@ -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() \
     {                                          \

version.txt

@@ -1 +1 @@
-1.0.2
+1.0.1

zh_avr_ac_dimmer.c

@@ -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 & _init_config.zero_cross_gpio) == _init_config.zero_cross_gpio)
+        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 & _init_config.zero_cross_gpio) == _init_config.zero_cross_gpio)
+        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 & _init_config.zero_cross_gpio) == _init_config.zero_cross_gpio)
+        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);
+                    // _delay_us(ZH_TRIAC_TIME);
-                    PORTB &= ~(1 << _init_config.triac_gpio);
+                    // PORTB &= ~(1 << _init_config.triac_gpio);
                     break;
                 case AVR_PORTC:
                     PORTC |= (1 << _init_config.triac_gpio);
-                    _delay_us(ZH_TRIAC_TIME);
+                    // _delay_us(ZH_TRIAC_TIME);
-                    PORTC &= ~(1 << _init_config.triac_gpio);
+                    // PORTC &= ~(1 << _init_config.triac_gpio);
                 case AVR_PORTD:
                     PORTD |= (1 << _init_config.triac_gpio);
-                    _delay_us(ZH_TRIAC_TIME);
+                    // _delay_us(10);
-                    PORTD &= ~(1 << _init_config.triac_gpio);
+                    // 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;
 }