wirtz
/
uClock
mirror of https://github.com/midilab/uClock
1
0
Fork 0
Code Issues Releases Wiki Activity

getTempo() fix for slave sync when receiving stop byte

Browse Source
pull/7/head 0.10.5
midilab 3 years ago
parent 6ff4120cc4
commit ebcae69b87
3 changed files with 17 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      library.properties
  2. 23
      src/uClock.cpp
  3. 6
      src/uClock.h

4
library.properties
Unescape View File

@ -1,10 +1,10 @@
name=uClock name=uClock
version=0.10.2 version=0.10.5
author=Romulo Silva <contact@midilab.co>, Manuel Odendahl <wesen@ruinwesen.com> author=Romulo Silva <contact@midilab.co>, Manuel Odendahl <wesen@ruinwesen.com>
maintainer=Romulo Silva <contact@midilab.co> maintainer=Romulo Silva <contact@midilab.co>
sentence=BPM clock generator for Arduino and Teensy boards sentence=BPM clock generator for Arduino and Teensy boards
paragraph=A Library to implement BPM clock tick calls using hardware interruption. Tested on ATmega168/328, ATmega16u4/32u4, ATmega2560 and Teensy LC. paragraph=A Library to implement BPM clock tick calls using hardware interruption. Tested on ATmega168/328, ATmega16u4/32u4, ATmega2560 and Teensy LC.
category=Midi category=Midi
url=https://github.com/midilab/uClock url=https://github.com/midilab/uClock
architectures=avr architectures=avr,arm
includes=uClock.h includes=uClock.h

23
src/uClock.cpp
Unescape View File

@ -3,10 +3,10 @@
* Project BPM clock generator for Arduino * Project BPM clock generator for Arduino
* @brief A Library to implement BPM clock tick calls using hardware timer1 interruption. Tested on ATmega168/328, ATmega16u4/32u4 and ATmega2560. * @brief A Library to implement BPM clock tick calls using hardware timer1 interruption. Tested on ATmega168/328, ATmega16u4/32u4 and ATmega2560.
* Derived work from mididuino MidiClock class. (c) 2008 - 2011 - Manuel Odendahl - wesen@ruinwesen.com * Derived work from mididuino MidiClock class. (c) 2008 - 2011 - Manuel Odendahl - wesen@ruinwesen.com
* @version 0.10.2 * @version 0.10.5
* @author Romulo Silva * @author Romulo Silva
* @date 08/21/2020 * @date 08/14/2021
* @license MIT - (c) 2020 - Romulo Silva - contact@midilab.co * @license MIT - (c) 2021 - Romulo Silva - contact@midilab.co
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -187,18 +187,14 @@ float uClockClass::getTempo()
{ {
if (mode == EXTERNAL_CLOCK) { if (mode == EXTERNAL_CLOCK) {
uint32_t acc = 0; uint32_t acc = 0;
uint8_t acc_counter = 0;
for (uint8_t i=0; i < EXT_INTERVAL_BUFFER_SIZE; i++) { for (uint8_t i=0; i < EXT_INTERVAL_BUFFER_SIZE; i++) {
if ( ext_interval_buffer[i] != 0) {
acc += ext_interval_buffer[i]; acc += ext_interval_buffer[i];
++acc_counter;
}
} }
if (acc != 0) { if (acc != 0) {
// get average interval, because MIDI sync world is a wild place... // get average interval, because MIDI sync world is a wild place...
//tempo = (((float)freq_resolution/24) * 60) / (float)(acc / acc_counter); //tempo = (((float)freq_resolution/24) * 60) / (float)(acc / EXT_INTERVAL_BUFFER_SIZE);
// derivated one time calc value = ( freq_resolution / 24 ) * 60 // derivated one time calc value = ( freq_resolution / 24 ) * 60
tempo = (float)(156250.0 / (acc / acc_counter)); tempo = (float)(156250.0 / (acc / EXT_INTERVAL_BUFFER_SIZE));
} }
} }
return tempo; return tempo;
@ -294,9 +290,6 @@ void uClockClass::handleExternalClock()
last_interval = clock_diff(last_clock, _clock); last_interval = clock_diff(last_clock, _clock);
last_clock = _clock; last_clock = _clock;
// accumulate interval incomming ticks data for getTempo() smooth reads on slave mode
ext_interval_buffer[ext_interval_idx++ % EXT_INTERVAL_BUFFER_SIZE] = last_interval;
// slave tick me! // slave tick me!
external_tick++; external_tick++;
@ -309,6 +302,12 @@ void uClockClass::handleExternalClock()
break; break;
case STARTED: case STARTED:
// accumulate interval incomming ticks data for getTempo() smooth reads on slave mode
if(++ext_interval_idx >= EXT_INTERVAL_BUFFER_SIZE) {
ext_interval_idx = 0;
}
ext_interval_buffer[ext_interval_idx] = last_interval;
if (external_tick == 1) { if (external_tick == 1) {
interval = last_interval; interval = last_interval;
} else { } else {

6
src/uClock.h
Unescape View File

@ -3,10 +3,10 @@
* Project BPM clock generator for Arduino * Project BPM clock generator for Arduino
* @brief A Library to implement BPM clock tick calls using hardware timer1 interruption. Tested on ATmega168/328, ATmega16u4/32u4 and ATmega2560. * @brief A Library to implement BPM clock tick calls using hardware timer1 interruption. Tested on ATmega168/328, ATmega16u4/32u4 and ATmega2560.
* Derived work from mididuino MidiClock class. (c) 2008 - 2011 - Manuel Odendahl - wesen@ruinwesen.com * Derived work from mididuino MidiClock class. (c) 2008 - 2011 - Manuel Odendahl - wesen@ruinwesen.com
* @version 0.10.2 * @version 0.10.5
* @author Romulo Silva * @author Romulo Silva
* @date 08/21/2020 * @date 08/14/2021
* @license MIT - (c) 2020 - Romulo Silva - contact@midilab.co * @license MIT - (c) 2021 - Romulo Silva - contact@midilab.co
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

Write Preview
Loading…
Cancel
Save