wip:

README.md

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

include/zh_avr_ac_dimmer.h

@@ -7,8 +7,6 @@
 #include "avr/interrupt.h"
 #include "util/delay.h"
 
-#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() \
     {                                          \
         .ac_dimmer_frequency = ZH_50HZ,        \
@@ -18,39 +16,10 @@
         .triac_port = 0}
 
 #ifdef __cplusplus
-
 extern "C"
 {
 #endif
 
-#define ZH_ZERO_CROSSING_ON                           \
-    if (_is_zero_crossing == false)                   \
-    {                                                 \
-        switch (_init_config.triac_port)              \
-        {                                             \
-        case AVR_PORTB:                               \
-            PORTB &= ~(1 << _init_config.triac_gpio); \
-            break;                                    \
-        case AVR_PORTC:                               \
-            PORTC &= ~(1 << _init_config.triac_gpio); \
-        case AVR_PORTD:                               \
-            PORTD &= ~(1 << _init_config.triac_gpio); \
-            break;                                    \
-        default:                                      \
-            break;                                    \
-        }                                             \
-        _is_zero_crossing = true;                     \
-        break;                                        \
-    }
-
-#define ZH_ZERO_CROSSING_OFF       \
-    if (_is_zero_crossing == true) \
-    {                              \
-        _is_zero_crossing = false; \
-        flag = true;               \
-    }                              \
-    break;
-
     typedef enum
     {
         ZH_50HZ = 1,
@@ -72,7 +41,7 @@ extern "C"
      *
      * @param[in] config Pointer to AC dimmer initialized configuration structure. Can point to a temporary variable.
      *
-     * @note Before initialize the AC dimmer recommend initialize zh_avr_ac_dimmer_init_config_t structure with default values.
+     * @note Before initialize the expander 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
      *

version.txt

@@ -1 +0,0 @@
-1.0.1

zh_avr_ac_dimmer.c

@@ -5,7 +5,7 @@ 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 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);
@@ -42,44 +42,32 @@ avr_err_t zh_avr_ac_dimmer_stop(void)
 
 avr_err_t zh_avr_ac_dimmer_set(uint8_t value)
 {
-    ZH_ERROR_CHECK(value <= 100, AVR_ERR_INVALID_ARG);
+    ZH_ERROR_CHECK(_dimmer_value <= 100, AVR_ERR_INVALID_ARG);
     _dimmer_value = value;
     return AVR_OK;
 }
 
 void zh_avr_ac_dimmer_isr_handler(void)
 {
-    bool flag = false;
+    uint8_t flag = false;
     switch (_init_config.zero_cross_port)
     {
     case AVR_PORTB:
-        if ((PINB & (1 << _init_config.zero_cross_gpio)) == (1 << _init_config.zero_cross_gpio))
-        {
-            ZH_ZERO_CROSSING_ON;
-        }
         if ((PINB & (1 << _init_config.zero_cross_gpio)) == 0)
         {
-            ZH_ZERO_CROSSING_OFF;
+            flag = true;
         }
         break;
     case AVR_PORTC:
-        if ((PINC & (1 << _init_config.zero_cross_gpio)) == (1 << _init_config.zero_cross_gpio))
-        {
-            ZH_ZERO_CROSSING_ON;
-        }
         if ((PINC & (1 << _init_config.zero_cross_gpio)) == 0)
         {
-            ZH_ZERO_CROSSING_OFF;
+            flag = true;
         }
         break;
     case AVR_PORTD:
-        if ((PIND & (1 << _init_config.zero_cross_gpio)) == (1 << _init_config.zero_cross_gpio))
-        {
-            ZH_ZERO_CROSSING_ON;
-        }
         if ((PIND & (1 << _init_config.zero_cross_gpio)) == 0)
         {
-            ZH_ZERO_CROSSING_OFF;
+            flag = true;
         }
         break;
     default:
@@ -91,17 +79,21 @@ void zh_avr_ac_dimmer_isr_handler(void)
         {
             if (_dimmer_value == 100)
             {
-                TIMSK0 &= ~(1 << OCIE0A);
                 switch (_init_config.triac_port)
                 {
                 case AVR_PORTB:
                     PORTB |= (1 << _init_config.triac_gpio);
+                    _delay_us(5);
+                    PORTB &= ~(1 << _init_config.triac_gpio);
                     break;
                 case AVR_PORTC:
                     PORTC |= (1 << _init_config.triac_gpio);
-                    break;
+                    _delay_us(5);
+                    PORTC &= ~(1 << _init_config.triac_gpio);
                 case AVR_PORTD:
                     PORTD |= (1 << _init_config.triac_gpio);
+                    _delay_us(5);
+                    PORTD &= ~(1 << _init_config.triac_gpio);
                     break;
                 default:
                     break;
@@ -110,7 +102,7 @@ void zh_avr_ac_dimmer_isr_handler(void)
             else
             {
                 TCNT0 = 0;
-                TIFR0 = (1 << OCF0A);
+                TCCR0B |= _prescaler;
                 TIMSK0 |= (1 << OCIE0A);
             }
         }
@@ -174,24 +166,23 @@ static void _zh_avr_ac_dimmer_gpio_init(void)
 
 static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
 {
-    // Frequency calculator http://rcl-radio.ru/?p=111487.
     TCCR0A |= (1 << WGM01);
     switch (F_CPU)
     {
-    case 8000000: // When operating from an internal RC generator, frequency deviation of up to 5% is possible.
+    case 8000000:
         switch (_init_config.ac_dimmer_frequency)
         {
         case ZH_50HZ:
-            OCR0A = 94; // Timer tick every 0,00009524 sec.
-            TCCR0B |= (1 << CS01);
+            OCR0A = 99;
+            _prescaler = (1 << CS01);
             break;
-        case ZH_60HZ: // Timer tick every 0,00007937 sec.
-            OCR0A = 78;
-            TCCR0B |= (1 << CS01);
+        case ZH_60HZ:
+            OCR0A = 82;
+            _prescaler = (1 << CS01);
             break;
-        case ZH_400HZ: // Timer tick every 0,0000119 sec.
-            OCR0A = 94;
-            TCCR0B |= (1 << CS00);
+        case ZH_400HZ:
+            OCR0A = 99;
+            _prescaler = (1 << CS00);
             break;
         default:
             break;
@@ -200,17 +191,17 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
     case 16000000:
         switch (_init_config.ac_dimmer_frequency)
         {
-        case ZH_50HZ: // Timer tick every 0,0001 sec.
+        case ZH_50HZ:
             OCR0A = 24;
-            TCCR0B |= (1 << CS01) | (1 << CS00);
+            _prescaler = (1 << CS01) | (1 << CS00);
             break;
-        case ZH_60HZ: // Timer tick every 0,00008333 sec.
+        case ZH_60HZ:
             OCR0A = 165;
-            TCCR0B |= (1 << CS01);
+            _prescaler = (1 << CS01);
             break;
-        case ZH_400HZ: // Timer tick every 0,0000125 sec.
+        case ZH_400HZ:
             OCR0A = 24;
-            TCCR0B |= (1 << CS01);
+            _prescaler = (1 << CS01);
             break;
         default:
             break;
@@ -219,17 +210,17 @@ static avr_err_t _zh_avr_ac_dimmer_timer_init(void)
     case 20000000:
         switch (_init_config.ac_dimmer_frequency)
         {
-        case ZH_50HZ: // Timer tick every 0,0001 sec.
+        case ZH_50HZ:
             OCR0A = 249;
-            TCCR0B |= (1 << CS01);
+            _prescaler = (1 << CS01);
             break;
-        case ZH_60HZ: // Timer tick every 0,00008333 sec.
+        case ZH_60HZ:
             OCR0A = 207;
-            TCCR0B |= (1 << CS01);
+            _prescaler = (1 << CS01);
             break;
-        case ZH_400HZ: // Timer tick every 0,0000125 sec.
+        case ZH_400HZ:
             OCR0A = 249;
-            TCCR0B |= (1 << CS00);
+            _prescaler = (1 << CS00);
             break;
         default:
             break;
@@ -248,26 +239,26 @@ ISR(TIMER0_COMPA_vect)
     if (_dimmer_count == (100 - _dimmer_value))
     {
         _dimmer_count = 0;
-        TIMSK0 &= ~(1 << OCIE0A);
+        TCCR0B = 0;
+        TIMSK0 = 0;
         switch (_init_config.triac_port)
         {
         case AVR_PORTB:
             PORTB |= (1 << _init_config.triac_gpio);
-            _delay_us(ZH_TRIAC_TIME);
+            _delay_us(5);
             PORTB &= ~(1 << _init_config.triac_gpio);
             break;
         case AVR_PORTC:
             PORTC |= (1 << _init_config.triac_gpio);
-            _delay_us(ZH_TRIAC_TIME);
+            _delay_us(5);
             PORTC &= ~(1 << _init_config.triac_gpio);
         case AVR_PORTD:
             PORTD |= (1 << _init_config.triac_gpio);
-            _delay_us(ZH_TRIAC_TIME);
+            _delay_us(5);
             PORTD &= ~(1 << _init_config.triac_gpio);
             break;
         default:
             break;
         }
     }
-    TIFR0 = (1 << OCF0A);
 }