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

release 0.8.1. clock tunnings for better PC/Ableton sync

Browse Source
pull/7/head 0.8.1
midilab 4 years ago
parent 13f14b4755
commit ed4755e5bd
3 changed files with 28 additions and 33 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. 47
      src/uClock.cpp
  3. 8
      src/uClock.h

4
library.properties
Unescape View File

@ -1,10 +1,10 @@
name=uClock name=uClock
version=0.8 version=0.8.1
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 sentence=BPM clock generator for Arduino
paragraph=A Library to implement BPM clock tick calls using hardware timer1 interruption. Tested on ATmega168/328, ATmega16u4/32u4 and ATmega2560. paragraph=A Library to implement BPM clock tick calls using hardware timer1 interruption. Tested on ATmega168/328, ATmega16u4/32u4 and ATmega2560.
category=Uncategorized category=Music
url=https://github.com/midilab/uClock url=https://github.com/midilab/uClock
architectures=avr architectures=avr
includes=uClock.h includes=uClock.h

47
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.8 * @version 0.8.1
* @author Romulo Silva * @author Romulo Silva
* @date 10/06/17 * @date 08/21/2020
* @license MIT - (c) 2017 - Romulo Silva - contact@midilab.co * @license MIT - (c) 2020 - 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"),
@ -27,7 +27,7 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
// TODO: use decimal for timming prescision: 120.10, 120.20 // TODO: use float for decimal timming precision: 120.10, 120.20
// each 0.1 bpm equals 15.625 intervals on 16Mhz clock // each 0.1 bpm equals 15.625 intervals on 16Mhz clock
// each 1 bpm equals 156.250 intervals on 16Mhz clock // each 1 bpm equals 156.250 intervals on 16Mhz clock
@ -35,6 +35,8 @@
namespace umodular { namespace clock { namespace umodular { namespace clock {
uint8_t _tmpSREG;
static inline uint32_t phase_mult(uint32_t val) static inline uint32_t phase_mult(uint32_t val)
{ {
return (val * PHASE_FACTOR) >> 8; return (val * PHASE_FACTOR) >> 8;
@ -51,8 +53,8 @@ static inline uint16_t clock_diff(uint16_t old_clock, uint16_t new_clock)
uClockClass::uClockClass() uClockClass::uClockClass()
{ {
pll_x = 220;
mode = INTERNAL_CLOCK; mode = INTERNAL_CLOCK;
state = PAUSED;
resetCounters(); resetCounters();
setTempo(120); setTempo(120);
@ -65,29 +67,27 @@ uClockClass::uClockClass()
void uClockClass::init() void uClockClass::init()
{ {
uint8_t tmpSREG; start_timer = 0;
state = PAUSED;
// //
// Configure timers and prescale // Configure timers and prescale
// Timmer1: ATMega128, ATMega328, AtMega16U4 and AtMega32U4 // Timmer1: ATMega128, ATMega328, AtMega16U4 and AtMega32U4
tmpSREG = SREG; _tmpSREG = SREG;
cli(); cli();
// Waveform Generation Mode (WGM) 16-bit timer settings // Waveform Generation Mode (WGM) 16-bit timer settings
// WGM10, WGM12 // (WGM10, WGM12) Mode 5: Fast Pulse Width Modulation (PWM), 8-bit
// Mode 5: Fast Pulse Width Modulation (PWM), 8-bit
// Clock Speed Selection // Clock Speed Selection
// CS10: Clock (No prescaling) // CS10: Clock (No prescaling)
TCCR1A = _BV(WGM10); TCCR1A = _BV(WGM10);
TCCR1B = _BV(CS10) | _BV(WGM12); // every cycle TCCR1B = _BV(CS10) | _BV(WGM12);
TIMSK1 |= _BV(TOIE1); TIMSK1 |= _BV(TOIE1);
SREG = tmpSREG; SREG = _tmpSREG;
} }
void uClockClass::start() void uClockClass::start()
{ {
start_timer = millis();
resetCounters(); resetCounters();
start_timer = millis();
if (onClockStartCallback) { if (onClockStartCallback) {
onClockStartCallback(); onClockStartCallback();
@ -100,16 +100,13 @@ void uClockClass::start()
} }
} }
void uClockClass::stop() void uClockClass::stop()
{ {
resetCounters(); resetCounters();
start_timer = 0;
if (onClockStopCallback) { if (onClockStopCallback) {
onClockStopCallback(); onClockStopCallback();
} }
//state = PAUSED;
} }
void uClockClass::pause() void uClockClass::pause()
@ -123,26 +120,26 @@ void uClockClass::pause()
} }
} }
void uClockClass::setTempo(uint16_t _tempo) void uClockClass::setTempo(uint16_t bpm)
{ {
if (mode == EXTERNAL_CLOCK) { if (mode == EXTERNAL_CLOCK) {
return; return;
} }
if (tempo == _tempo) { if (tempo == bpm) {
return; return;
} }
if (_tempo > 300 || _tempo == 0) { if (bpm > 300 || bpm == 0) {
return; return;
} }
uint8_t tmpSREG = SREG; _tmpSREG = SREG;
cli(); cli();
tempo = _tempo; tempo = bpm;
//interval = 62500 / (tempo * 24 / 60) - 4; //interval = 62500 / (tempo * 24 / 60) - 4;
interval = (uint16_t)(156250 / tempo) - 4; interval = (uint16_t)(156250 / tempo) - 4;
SREG = tmpSREG; SREG = _tmpSREG;
} }
uint16_t uClockClass::getTempo() uint16_t uClockClass::getTempo()
@ -177,8 +174,6 @@ void uClockClass::resetCounters()
mod6_counter = 0; mod6_counter = 0;
indiv96th_counter = 0; indiv96th_counter = 0;
inmod6_counter = 0; inmod6_counter = 0;
pll_x = 220;
start_timer = 0;
} }
// TODO: Tap stuff // TODO: Tap stuff

8
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.8 * @version 0.8.1
* @author Romulo Silva * @author Romulo Silva
* @date 10/06/17 * @date 08/21/2020
* @license MIT - (c) 2017 - Romulo Silva - contact@midilab.co * @license MIT - (c) 2020 - 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"),
@ -112,7 +112,7 @@ class uClockClass {
void start(); void start();
void stop(); void stop();
void pause(); void pause();
void setTempo(uint16_t tempo); void setTempo(uint16_t bpm);
uint16_t getTempo(); uint16_t getTempo();
// external timming control // external timming control

Write Preview
Loading…
Cancel
Save