From 0d6dfd6e47cbeff1e10f0c536824e5f7259b21e8 Mon Sep 17 00:00:00 2001
From: Birte Kristina Friesel <derf@finalrewind.org>
Date: Sun, 11 Feb 2024 10:16:15 +0100
Subject: [PATCH] fix atmega2560 timer
---
include/arch/atmega2560/driver/timer.h | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/include/arch/atmega2560/driver/timer.h b/include/arch/atmega2560/driver/timer.h
index 1529c86..39385b1 100644
--- a/include/arch/atmega2560/driver/timer.h
+++ b/include/arch/atmega2560/driver/timer.h
@@ -19,19 +19,16 @@ class Timer {
inline void setup_khz(uint16_t const frequency) { // 16 MHz base
OCR4A = frequency ? 16000 / frequency : 65535;
- TCCR4A = 0;
- TCCR4B = _BV(WGM42);
prescaler = _BV(CS40);
}
- inline void setup_hz(uint16_t const frequency) { // 16 MHz / 256 == 62.5 kHz base
- OCR4A = frequency ? 62500 / frequency : 65535;
- TCCR4A = 0;
- TCCR4B = _BV(WGM42);
+ inline void setup_hz(uint16_t const frequency) { // 16 MHz / 1024 == 15625 Hz base
+ OCR4A = frequency ? 15625 / frequency : 65535;
prescaler = _BV(CS42);
}
inline void start(unsigned char const interrupt) {
TCNT4 = 0;
- TCCR4B |= prescaler;
+ TCCR4A = 0;
+ TCCR4B = _BV(WGM42) | prescaler;
if (interrupt) {
TIMSK4 = _BV(OCIE4A);
}
--
GitLab