Skip to content
This repository was archived by the owner on Jan 29, 2023. It is now read-only.

Commit 1f968e3

Browse files
khoih-progkhoih-prog
authored
v1.1.0 fix missing Timer3 and Timer4 code
### Releases v1.1.0 1. Fix missing code for Timer3 and Timer4
1 parent e744133 commit 1f968e3

10 files changed

+87
-41
lines changed

‎changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
## Table of Contents
1313

1414
* [Changelog](#changelog)
15+
* [Releases v1.1.0](#releases-v110)
1516
* [Releases v1.0.0](#releases-v100)
1617

1718
---
@@ -20,6 +21,10 @@
2021
## Changelog
2122

2223

24+
### Releases v1.1.0
25+
26+
1. Fix missing code for Timer3 and Timer4
27+
2328
### Releases v1.0.0
2429

2530
1. Initial coding for AVR **ATmega164(A/P), ATmega324(A/P/PA/PB), ATmega644(A/P), ATmega1284(P)** using [MightyCore](https://github.com/MCUdude/MightyCore)

‎library.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ATmega_TimerInterrupt",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"keywords": "timer, interrupt, timer-interrupt, hardware, isr, isr-based, hardware-timer, mission-critical, accuracy, precise, avr, atmega, atmega164, atmega324, atmega644, atmega1284, atmega16, atmega32, atmega8535, mightycore",
55
"description": "This library enables you to use Interrupt from Hardware Timers on an AVR ATmega164, ATmega324, ATmega644, ATmega1284 with MCUdude MightyCore. 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.",
66
"authors":

‎library.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ATmega_TimerInterrupt
2-
version=1.0.0
2+
version=1.1.0
33
author=Khoi Hoang
44
maintainer=Khoi Hoang <khoih.prog@gmail.com>
55
sentence=This library enables you to use Interrupt from Hardware Timers on an AVR ATmega164, ATmega324, ATmega644, ATmega1284 with MCUdude MightyCore

‎src/ATmega_TimerInterrupt.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
Therefore, their executions are not blocked by bad-behaving functions / tasks.
1313
This important feature is absolutely necessary for mission-critical tasks.
1414
15-
Version: 1.0.0
15+
Version: 1.1.0
1616
1717
Version Modified By Date Comments
1818
------- ----------- ---------- -----------
19-
1.0.0 K Hoang 22/08/2022 Initial coding
19+
1.0.0 K Hoang 22/08/2022 Initial coding for AVR ATmega164, ATmega324, ATmega644, ATmega1284 with MightyCore
20+
1.1.0 K Hoang 22/08/2022 Fix missing code for Timer3 and Timer4
2021
****************************************************************************************************************************/
2122

2223
#pragma once

‎src/ATmega_TimerInterrupt.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
Therefore, their executions are not blocked by bad-behaving functions / tasks.
1313
This important feature is absolutely necessary for mission-critical tasks.
1414
15-
Version: 1.0.0
15+
Version: 1.1.0
1616
1717
Version Modified By Date Comments
1818
------- ----------- ---------- -----------
1919
1.0.0 K Hoang 22/08/2022 Initial coding for AVR ATmega164, ATmega324, ATmega644, ATmega1284 with MightyCore
20+
1.1.0 K Hoang 22/08/2022 Fix missing code for Timer3 and Timer4
2021
****************************************************************************************************************************/
2122

2223
#pragma once
@@ -115,13 +116,13 @@
115116
#include "TimerInterrupt_Generic_Debug.h"
116117

117118
#ifndef ATMEGA_TIMER_INTERRUPT_VERSION
118-
#define ATMEGA_TIMER_INTERRUPT_VERSION "ATmega_TimerInterrupt v1.0.0"
119+
#define ATMEGA_TIMER_INTERRUPT_VERSION "ATmega_TimerInterrupt v1.1.0"
119120

120121
#define ATMEGA_TIMER_INTERRUPT_VERSION_MAJOR 1
121-
#define ATMEGA_TIMER_INTERRUPT_VERSION_MINOR 0
122+
#define ATMEGA_TIMER_INTERRUPT_VERSION_MINOR 1
122123
#define ATMEGA_TIMER_INTERRUPT_VERSION_PATCH 0
123124

124-
#define ATMEGA_TIMER_INTERRUPT_VERSION_INT 1000000
125+
#define ATMEGA_TIMER_INTERRUPT_VERSION_INT 1001000
125126
#endif
126127

127128
#include <avr/interrupt.h>

‎src/ATmega_TimerInterrupt_Impl.h‎

Lines changed: 64 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
Therefore, their executions are not blocked by bad-behaving functions / tasks.
1313
This important feature is absolutely necessary for mission-critical tasks.
1414
15-
Version: 1.0.0
15+
Version: 1.1.0
1616
1717
Version Modified By Date Comments
1818
------- ----------- ---------- -----------
1919
1.0.0 K Hoang 22/08/2022 Initial coding for AVR ATmega164, ATmega324, ATmega644, ATmega1284 with MightyCore
20+
1.1.0 K Hoang 22/08/2022 Fix missing code for Timer3 and Timer4
2021
****************************************************************************************************************************/
2122

2223
#pragma once
@@ -71,6 +72,37 @@ void ATmega_TimerInterrupt::init(int8_t timer)
7172

7273
break;
7374
#endif
75+
76+
#if defined(TCCR3A) && defined(TCCR3B) && defined(TIMSK3)
77+
case 3:
78+
// 16 bit timer
79+
TCCR3A = 0;
80+
TCCR3B = 0;
81+
bitWrite(TCCR3B, WGM32, 1);
82+
bitWrite(TCCR3B, CS30, 1);
83+
84+
TISR_LOGWARN(F("T3"));
85+
86+
break;
87+
#endif
88+
89+
#if defined(TCCR4A) && defined(TCCR4B) && defined(TIMSK4)
90+
case 4:
91+
// 16 bit timer
92+
TCCR4A = 0;
93+
TCCR4B = 0;
94+
#if defined(WGM42)
95+
bitWrite(TCCR4B, WGM42, 1);
96+
#elif defined(CS43)
97+
// TODO this may not be correct
98+
bitWrite(TCCR4B, CS43, 1);
99+
#endif
100+
bitWrite(TCCR4B, CS40, 1);
101+
102+
TISR_LOGWARN(F("T4"));
103+
104+
break;
105+
#endif
74106
}
75107

76108
_timer = timer;
@@ -138,16 +170,6 @@ void ATmega_TimerInterrupt::set_OCR()
138170
bitWrite(TIMSK4, OCIE4A, 1);
139171
break;
140172
#endif
141-
142-
#if defined(OCR5A) && defined(TIMSK5) && defined(OCIE5A)
143-
case 5:
144-
_OCRValueToUse = min(MAX_COUNT_16BIT, _OCRValueRemaining);
145-
OCR5A = _OCRValueToUse;
146-
_OCRValueRemaining -= _OCRValueToUse;
147-
148-
bitWrite(TIMSK5, OCIE5A, 1);
149-
break;
150-
#endif
151173
}
152174

153175
// Flag _OCRValue == 0 => end of long timer
@@ -326,6 +348,16 @@ bool ATmega_TimerInterrupt::setFrequency(float frequency, timer_callback_p callb
326348
TISR_LOGWARN1(F("TCCR1B ="), TCCR1B);
327349
}
328350
#endif
351+
352+
#if defined(TCCR3B)
353+
else if (_timer == 3)
354+
TCCR3B = (TCCR3B & andMask) | _prescalerIndex; //prescalarbits;
355+
#endif
356+
357+
#if defined(TCCR4B)
358+
else if (_timer == 4)
359+
TCCR4B = (TCCR4B & andMask) | _prescalerIndex; //prescalarbits;
360+
#endif
329361

330362
// Set the OCR for the given timer,
331363
// set the toggle count,
@@ -381,15 +413,6 @@ void ATmega_TimerInterrupt::detachInterrupt(void)
381413

382414
break;
383415
#endif
384-
385-
#if defined(TIMSK5) && defined(OCIE5A)
386-
case 5:
387-
bitWrite(TIMSK5, OCIE5A, 0);
388-
389-
TISR_LOGWARN(F("Disable T5"));
390-
391-
break;
392-
#endif
393416
}
394417

395418
//sei();//allow interrupts
@@ -449,15 +472,6 @@ void ATmega_TimerInterrupt::reattachInterrupt(unsigned long duration)
449472

450473
break;
451474
#endif
452-
453-
#if defined(TIMSK5) && defined(OCIE5A)
454-
case 5:
455-
bitWrite(TIMSK5, OCIE5A, 1);
456-
457-
TISR_LOGWARN(F("Enable T5"));
458-
459-
break;
460-
#endif
461475
}
462476

463477
//sei();//allow interrupts
@@ -490,6 +504,16 @@ void ATmega_TimerInterrupt::pauseTimer(void)
490504
TISR_LOGWARN1(F("TCCR1B ="), TCCR1B);
491505
}
492506
#endif
507+
508+
#if defined(TCCR3B)
509+
else if (_timer == 3)
510+
TCCR3B = (TCCR3B & andMask);
511+
#endif
512+
513+
#if defined(TCCR4B)
514+
else if (_timer == 4)
515+
TCCR4B = (TCCR4B & andMask);
516+
#endif
493517
}
494518

495519
// Just reconnect clock source, continue from the current count
@@ -517,8 +541,19 @@ void ATmega_TimerInterrupt::resumeTimer(void)
517541
TISR_LOGWARN1(F("TCCR1B ="), TCCR1B);
518542
}
519543
#endif
544+
545+
#if defined(TCCR3B)
546+
else if (_timer == 3)
547+
TCCR3B = (TCCR3B & andMask) | _prescalerIndex; //prescalarbits;
548+
#endif
549+
550+
#if defined(TCCR4B)
551+
else if (_timer == 4)
552+
TCCR4B = (TCCR4B & andMask) | _prescalerIndex; //prescalarbits;
553+
#endif
520554
}
521555

556+
//////////////////////////////////////////////
522557

523558
#if USE_TIMER_1
524559
#ifndef TIMER1_INSTANTIATED

‎src/ISR_Timer.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
Therefore, their executions are not blocked by bad-behaving functions / tasks.
1313
This important feature is absolutely necessary for mission-critical tasks.
1414
15-
Version: 1.0.0
15+
Version: 1.1.0
1616
1717
Version Modified By Date Comments
1818
------- ----------- ---------- -----------
1919
1.0.0 K Hoang 22/08/2022 Initial coding for AVR ATmega164, ATmega324, ATmega644, ATmega1284 with MightyCore
20+
1.1.0 K Hoang 22/08/2022 Fix missing code for Timer3 and Timer4
2021
*****************************************************************************************************************************/
2122

2223
#pragma once

‎src/ISR_Timer.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
Therefore, their executions are not blocked by bad-behaving functions / tasks.
1313
This important feature is absolutely necessary for mission-critical tasks.
1414
15-
Version: 1.0.0
15+
Version: 1.1.0
1616
1717
Version Modified By Date Comments
1818
------- ----------- ---------- -----------
1919
1.0.0 K Hoang 22/08/2022 Initial coding for AVR ATmega164, ATmega324, ATmega644, ATmega1284 with MightyCore
20+
1.1.0 K Hoang 22/08/2022 Fix missing code for Timer3 and Timer4
2021
*****************************************************************************************************************************/
2122

2223
#pragma once

‎src/ISR_Timer_Impl.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
Therefore, their executions are not blocked by bad-behaving functions / tasks.
1313
This important feature is absolutely necessary for mission-critical tasks.
1414
15-
Version: 1.0.0
15+
Version: 1.1.0
1616
1717
Version Modified By Date Comments
1818
------- ----------- ---------- -----------
1919
1.0.0 K Hoang 22/08/2022 Initial coding for AVR ATmega164, ATmega324, ATmega644, ATmega1284 with MightyCore
20+
1.1.0 K Hoang 22/08/2022 Fix missing code for Timer3 and Timer4
2021
*****************************************************************************************************************************/
2122

2223
#pragma once

‎src/TimerInterrupt_Generic_Debug.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
Therefore, their executions are not blocked by bad-behaving functions / tasks.
1313
This important feature is absolutely necessary for mission-critical tasks.
1414
15-
Version: 1.0.0
15+
Version: 1.1.0
1616
1717
Version Modified By Date Comments
1818
------- ----------- ---------- -----------
1919
1.0.0 K Hoang 22/08/2022 Initial coding for AVR ATmega164, ATmega324, ATmega644, ATmega1284 with MightyCore
20+
1.1.0 K Hoang 22/08/2022 Fix missing code for Timer3 and Timer4
2021
*****************************************************************************************************************************/
2122

2223
#pragma once

0 commit comments

Comments
 (0)