From ee5fec8ea460092bfc7efcf876d97dea1666dfde Mon Sep 17 00:00:00 2001 From: Erick Ahmed Date: Fri, 9 Jan 2026 11:45:22 +0100 Subject: [PATCH] Move BPM update macro to tap-tempo.inc --- src/clockinator.S | 3 +-- src/tap-tempo.inc | 5 +++++ src/timer.inc | 5 ----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/clockinator.S b/src/clockinator.S index 9627096..8cac1e6 100644 --- a/src/clockinator.S +++ b/src/clockinator.S @@ -28,9 +28,8 @@ #define __SFR_OFFSET 0 #include -#include "led.inc" #include "timer.inc" -;#include "bpm.inc" +#include "tap-tempo.inc" ;#include "midi.inc" .global main diff --git a/src/tap-tempo.inc b/src/tap-tempo.inc index 7ca7af7..e7a051e 100644 --- a/src/tap-tempo.inc +++ b/src/tap-tempo.inc @@ -11,3 +11,8 @@ ldi r16, (1 << CS02) | (1 << CS00) ; Load prescaler value (00000101 = prescaler 1024) out TCCR0B, r16 ; Enable clock source .endm + +.MACRO SET_BPM target_high, target_low + ldi r20, \target_high + ldi r19, \target_low +.endm diff --git a/src/timer.inc b/src/timer.inc index 99587d1..43b80ad 100644 --- a/src/timer.inc +++ b/src/timer.inc @@ -56,11 +56,6 @@ timer1_set: ret -.MACRO SET_BPM target_high, target_low - ldi r20, \target_high - ldi r19, \target_low -.endm - ; ISR timer1_isr: in r21, SREG