v1.7.0 to fix bug

### Releases v1.7.0

1. Fix bug resulting wrong frequency for some low frequencies.

Author: khoih-prog

README.md

@@ -821,7 +821,7 @@ While software timer, **programmed for 2s, is activated after more than 10.000s
 ```
 
 Starting ISR_16_Timers_Array_Complex on Arduino AVR UNO, Nano, etc.
-TimerInterrupt v1.6.0
+TimerInterrupt v1.7.0
 CPU Frequency = 16 MHz
 Starting  ITimer1 OK, millis() = 7
 SimpleTimer : 2, ms : 10007, Dms : 10007
@@ -971,7 +971,7 @@ The following is the sample terminal output when running example [Change_Interva
 
 ```
 Starting Change_Interval on Arduino AVR Mega2560/ADK
-TimerInterrupt v1.6.0
+TimerInterrupt v1.7.0
 CPU Frequency = 16 MHz
 Starting  ITimer1 OK, millis() = 5
 Starting  ITimer3 OK, millis() = 8
@@ -999,7 +999,7 @@ The following is the sample terminal output when running example [Change_Interva
 
 ```
 Starting Change_Interval_HF on Arduino AVR UNO, Nano, etc.
-TimerInterrupt v1.6.0
+TimerInterrupt v1.7.0
 CPU Frequency = 16 MHz
 [TISR] T1
 [TISR] Freq * 1000 = 5000000.00
@@ -1035,14 +1035,14 @@ Changing Frequency, Timer2 = 500
 
 ---
 
-### 4. Change_Interval on Arduino AVR Mega2560 board
+### 4. Change_Interval_HF on Arduino AVR Mega2560 board
 
-The following is the sample terminal output when running example [Change_Interval_HF](examples/Change_Interval_HF) on **AVR Mega2560** to demonstrate how to change Timer Interval on-the-fly
+The following is the sample terminal output when running example [Change_Interval_HF](examples/Change_Interval_HF) on **AVR Mega2560** to demonstrate how to change High Frequency Timer Interval on-the-fly
 
 ```
 
 Starting Change_Interval_HF on Arduino AVR Mega2560/ADK
-TimerInterrupt v1.6.0
+TimerInterrupt v1.7.0
 CPU Frequency = 16 MHz
 [TISR] T1
 [TISR] Freq * 1000 = 5000000.00
@@ -1137,6 +1137,7 @@ Submit issues to: [TimerInterrupt issues](https://github.com/khoih-prog/TimerInt
 12. Add support to **Generic or Sparkfun AVR ATmega128RFA1** such as **ATMEGA128RFA1_DEV_BOARD, etc.**
 13. Add Timer3 and Timer4 support to **ATmega32U4 and ATmega16U4**.
 14. Fix bug resulting half frequency when using high frequencies.
+15. Fix bug resulting wrong frequency for some low frequencies.
 
 ---
 ---

changelog.md

@@ -11,6 +11,7 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Releases v1.7.0](#releases-v170)
   * [Releases v1.6.0](#releases-v160)
   * [Releases v1.5.0](#releases-v150)
   * [Releases v1.4.1](#releases-v141)
@@ -27,6 +28,10 @@
 
 ## Changelog
 
+### Releases v1.7.0
+
+1. Fix bug resulting wrong frequency for some low frequencies.
+
 ### Releases v1.6.0
 
 1. Fix bug resulting half frequency when using high frequencies. Check [Frequencies are half of what I expect #22](https://github.com/khoih-prog/TimerInterrupt/discussions/22)

library.json

@@ -1,6 +1,6 @@
 {
   "name": "TimerInterrupt",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "keywords": "timer, interrupt, timer-interrupt, hardware, isr, isr-based, hardware-timer, mission-critical, accuracy, precise, atmega, atmega2560, atmega1280, atmega16u4, atmega32u4, 32u4,  atmega328p, nano, uno, leonardo, yun, yun-mini, esplora, gemma, mega, feather, adafruit, 16u4, atmega128, atmega168, atmegang, atmega8, attiny85",
   "description": "This library enables you to use Interrupt from Hardware Timers on an Arduino, Adafruit or Sparkfun AVR board, such as Nano, UNO, Mega, Leonardo, YUN, Teensy, Feather_32u4, Feather_328P, Pro Micro, etc. It now supports 16 ISR-based timers, while consuming only 1 hardware Timer. Timers' interval is very long (ulong millisecs). The most important feature is they're ISR-based timers. Therefore, their executions are not blocked by bad-behaving functions or tasks. This important feature is absolutely necessary for mission-critical tasks.",
   "authors":

library.properties

@@ -1,5 +1,5 @@
 name=TimerInterrupt
-version=1.6.0
+version=1.7.0
 author=Khoi Hoang
 maintainer=Khoi Hoang <[email protected]>
 sentence=This library enables you to use Interrupt from Hardware Timers on an Arduino, Adafruit or Sparkfun AVR board, such as Nano, UNO, Mega, Leonardo, YUN, Teensy, Feather_32u4, Feather_328P, Pro Micro, etc.

src/ISR_Timer-Impl.h

@@ -18,7 +18,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.6.0
+  Version: 1.7.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,6 +34,7 @@
   1.4.1   K.Hoang      02/04/2021 Add support to Sparkfun 32U4, 328(P), 128RFA1 such as AVR_PROMICRO, REDBOT, etc.
   1.5.0   K.Hoang      08/05/2021 Add Timer 3 and 4 to 32U4. Add Timer auto-selection to examples.
   1.6.0   K.Hoang      15/11/2021 Fix bug resulting half frequency when using high frequencies.
+  1.7.0   K.Hoang      19/11/2021 Fix bug resulting wrong frequency for some frequencies.
 *****************************************************************************************************************************/
 
 #pragma once

src/ISR_Timer.h

@@ -18,7 +18,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.6.0
+  Version: 1.7.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,6 +34,7 @@
   1.4.1   K.Hoang      02/04/2021 Add support to Sparkfun 32U4, 328(P), 128RFA1 such as AVR_PROMICRO, REDBOT, etc.
   1.5.0   K.Hoang      08/05/2021 Add Timer 3 and 4 to 32U4. Add Timer auto-selection to examples.
   1.6.0   K.Hoang      15/11/2021 Fix bug resulting half frequency when using high frequencies.
+  1.7.0   K.Hoang      19/11/2021 Fix bug resulting wrong frequency for some frequencies.
 *****************************************************************************************************************************/
 
 #pragma once
@@ -42,7 +43,7 @@
 #define ISR_TIMER_H
 
 #ifndef TIMER_INTERRUPT_VERSION
-  #define TIMER_INTERRUPT_VERSION       "TimerInterrupt v1.6.0"
+  #define TIMER_INTERRUPT_VERSION       "TimerInterrupt v1.7.0"
 #endif
 
 #include "TimerInterrupt_Generic_Debug.h"

src/TimerInterrupt-Impl.h

@@ -18,7 +18,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.6.0
+  Version: 1.7.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,6 +34,7 @@
   1.4.1   K.Hoang      02/04/2021 Add support to Sparkfun 32U4, 328(P), 128RFA1 such as AVR_PROMICRO, REDBOT, etc.
   1.5.0   K.Hoang      08/05/2021 Add Timer 3 and 4 to 32U4. Add Timer auto-selection to examples.
   1.6.0   K.Hoang      15/11/2021 Fix bug resulting half frequency when using high frequencies.
+  1.7.0   K.Hoang      19/11/2021 Fix bug resulting wrong frequency for some frequencies.
 ****************************************************************************************************************************/
 
 #pragma once

src/TimerInterrupt.h

@@ -18,7 +18,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.6.0
+  Version: 1.7.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,6 +34,7 @@
   1.4.1   K.Hoang      02/04/2021 Add support to Sparkfun 32U4, 328(P), 128RFA1 such as AVR_PROMICRO, REDBOT, etc.
   1.5.0   K.Hoang      08/05/2021 Add Timer 3 and 4 to 32U4. Add Timer auto-selection to examples.
   1.6.0   K.Hoang      15/11/2021 Fix bug resulting half frequency when using high frequencies.
+  1.7.0   K.Hoang      19/11/2021 Fix bug resulting wrong frequency for some frequencies.
 ****************************************************************************************************************************/
 
 #pragma once
@@ -116,7 +117,7 @@
 #include "TimerInterrupt_Generic_Debug.h"
 
 #ifndef TIMER_INTERRUPT_VERSION
-  #define TIMER_INTERRUPT_VERSION       "TimerInterrupt v1.6.0"
+  #define TIMER_INTERRUPT_VERSION       "TimerInterrupt v1.7.0"
 #endif
 
 #include <avr/interrupt.h>
@@ -368,20 +369,41 @@ class TimerInterrupt
 #if TIMER_INTERRUPT_USING_ATMEGA_32U4
         if (_timer == 4)
         {
+          if (_OCRValueRemaining < MAX_COUNT_8BIT)
+          {
+            set_OCR();
+          }
+          
           _OCRValueRemaining -= min(MAX_COUNT_8BIT, _OCRValueRemaining);
         }
         else
         {
+          if (_OCRValueRemaining < MAX_COUNT_16BIT)
+          {
+            set_OCR();
+          }
+        
           _OCRValueRemaining -= min(MAX_COUNT_16BIT, _OCRValueRemaining);
         }
 #else
+        if (_OCRValueRemaining < MAX_COUNT_16BIT)
+        {
+          set_OCR();
+        }
+          
         _OCRValueRemaining -= min(MAX_COUNT_16BIT, _OCRValueRemaining);
 #endif      
       }
       else
+      {
+        if (_OCRValueRemaining < MAX_COUNT_8BIT)
+        {
+          set_OCR();
+        }
+          
         _OCRValueRemaining -= min(MAX_COUNT_8BIT, _OCRValueRemaining);
+      }
 
-      //if (_OCRValueRemaining == 0)
       if (_OCRValueRemaining <= 0)
       {
         // Reset value for next cycle
@@ -401,24 +423,9 @@ class TimerInterrupt
       noInterrupts();
 
       // Reset value for next cycle, have to deduct the value already loaded to OCR register
-
-      if (_timer != 2)
-      {
-#if TIMER_INTERRUPT_USING_ATMEGA_32U4
-        if (_timer == 4)
-        {
-          _OCRValueRemaining = _OCRValue - min(MAX_COUNT_8BIT, _OCRValueRemaining);
-        }
-        else
-        {
-          _OCRValueRemaining = _OCRValue - min(MAX_COUNT_16BIT, _OCRValueRemaining);
-        }
-#else      
-        _OCRValueRemaining = _OCRValue - min(MAX_COUNT_16BIT, _OCRValueRemaining);
-#endif        
-      }  
-      else
-        _OCRValueRemaining = _OCRValue - min(MAX_COUNT_8BIT, _OCRValueRemaining);
+      
+      _OCRValueRemaining = _OCRValue;
+      set_OCR();
 
       _timerDone = false;
 
@@ -495,15 +502,11 @@ class TimerInterrupt
 
             ITimer1.callback();
 
-            if (ITimer1.get_OCRValueRemaining() > MAX_COUNT_16BIT)
+            if (ITimer1.get_OCRValue() > MAX_COUNT_16BIT)
             {
               // To reload _OCRValueRemaining as well as _OCR register to MAX_COUNT_16BIT if _OCRValueRemaining > MAX_COUNT_16BIT
               ITimer1.reload_OCRValue();
             }
-            else
-            {
-              // Signal timer done
-            }
 
             if (countLocal > 0)                  
               ITimer1.setCount(countLocal - 1);
@@ -547,15 +550,11 @@ class TimerInterrupt
 
             ITimer2.callback();
 
-            if (ITimer2.get_OCRValueRemaining() > MAX_COUNT_8BIT)
+            if (ITimer2.get_OCRValue() > MAX_COUNT_8BIT)
             {
               // To reload _OCRValueRemaining as well as _OCR register to MAX_COUNT_8BIT if _OCRValueRemaining > MAX_COUNT_8BIT
               ITimer2.reload_OCRValue();
             }
-            else
-            {
-              // Signal timer done
-            }
 
             if (countLocal > 0)
              ITimer2.setCount(countLocal - 1);
@@ -602,15 +601,11 @@ class TimerInterrupt
 
               ITimer3.callback();
 
-              if (ITimer3.get_OCRValueRemaining() > MAX_COUNT_16BIT)
+              if (ITimer3.get_OCRValue() > MAX_COUNT_16BIT)
               {
                 // To reload _OCRValueRemaining as well as _OCR register to MAX_COUNT_16BIT if _OCRValueRemaining > MAX_COUNT_16BIT
                 ITimer3.reload_OCRValue();
               }
-              else
-              {
-                // Signal timer done
-              }
 
               if (countLocal > 0)
                 ITimer3.setCount(countLocal - 1);     
@@ -662,15 +657,11 @@ class TimerInterrupt
 
               ITimer4.callback();
 
-              if (ITimer4.get_OCRValueRemaining() > MAX_COUNT_16BIT)
+              if (ITimer4.get_OCRValue() > MAX_COUNT_16BIT)
               {
                 // To reload _OCRValueRemaining as well as _OCR register to MAX_COUNT_16BIT if _OCRValueRemaining > MAX_COUNT_16BIT
                 ITimer4.reload_OCRValue();
               }
-              else
-              {
-                // Signal timer done
-              }
 
               if (countLocal > 0)
                 ITimer4.setCount(countLocal - 1);       
@@ -720,15 +711,11 @@ class TimerInterrupt
 
               ITimer5.callback();
 
-              if (ITimer5.get_OCRValueRemaining() > MAX_COUNT_16BIT)
+              if (ITimer5.get_OCRValue() > MAX_COUNT_16BIT)
               {
                 // To reload _OCRValueRemaining as well as _OCR register to MAX_COUNT_16BIT if _OCRValueRemaining > MAX_COUNT_16BIT
                 ITimer5.reload_OCRValue();
               }
-              else
-              {
-                // Signal timer done
-              } 
 
               if (countLocal > 0)
                 ITimer5.setCount(countLocal - 1);

src/TimerInterrupt_Generic_Debug.h

@@ -18,7 +18,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.6.0
+  Version: 1.7.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,6 +34,7 @@
   1.4.1   K.Hoang      02/04/2021 Add support to Sparkfun 32U4, 328(P), 128RFA1 such as AVR_PROMICRO, REDBOT, etc.
   1.5.0   K.Hoang      08/05/2021 Add Timer 3 and 4 to 32U4. Add Timer auto-selection to examples.
   1.6.0   K.Hoang      15/11/2021 Fix bug resulting half frequency when using high frequencies.
+  1.7.0   K.Hoang      19/11/2021 Fix bug resulting wrong frequency for some frequencies.
  *****************************************************************************************************************************/
 
 #pragma once

src_cpp/ISR_Timer.cpp

@@ -18,7 +18,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.6.0
+  Version: 1.7.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,6 +34,7 @@
   1.4.1   K.Hoang      02/04/2021 Add support to Sparkfun 32U4, 328(P), 128RFA1 such as AVR_PROMICRO, REDBOT, etc.
   1.5.0   K.Hoang      08/05/2021 Add Timer 3 and 4 to 32U4. Add Timer auto-selection to examples.
   1.6.0   K.Hoang      15/11/2021 Fix bug resulting half frequency when using high frequencies.
+  1.7.0   K.Hoang      19/11/2021 Fix bug resulting wrong frequency for some frequencies.
 *****************************************************************************************************************************/
 
 #include "ISR_Timer.h"