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

fix for ordering variables setup on init to make it work smoothly with setDrift()

Browse Source
pull/7/head
midilab 4 years ago
parent 40aad3ff96
commit 71d23ee358
2 changed files with 6 additions and 6 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. 10
      src/uClock.cpp
  2. 2
      src/uClock.h

10
src/uClock.cpp
Unescape View File

@ -3,7 +3,7 @@
* 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.1 * @version 0.8.2
* @author Romulo Silva * @author Romulo Silva
* @date 08/21/2020 * @date 08/21/2020
* @license MIT - (c) 2020 - Romulo Silva - contact@midilab.co * @license MIT - (c) 2020 - Romulo Silva - contact@midilab.co
@ -53,13 +53,14 @@ static inline uint16_t clock_diff(uint16_t old_clock, uint16_t new_clock)
uClockClass::uClockClass() uClockClass::uClockClass()
{ {
// 4 is good for usb-to-midi hid
// 11 is good for native 31250bps midi interface // 11 is good for native 31250bps midi interface
// 4 is good for usb-to-midi hid
drift = 11; drift = 11;
pll_x = 220; pll_x = 220;
start_timer = 0;
state = PAUSED;
mode = INTERNAL_CLOCK; mode = INTERNAL_CLOCK;
resetCounters(); resetCounters();
setTempo(120);
onClock96PPQNCallback = NULL; onClock96PPQNCallback = NULL;
onClock32PPQNCallback = NULL; onClock32PPQNCallback = NULL;
@ -70,8 +71,7 @@ uClockClass::uClockClass()
void uClockClass::init() void uClockClass::init()
{ {
start_timer = 0; setTempo(120);
state = PAUSED;
// //
// Configure timers and prescale // Configure timers and prescale
// Timmer1: ATMega128, ATMega328, AtMega16U4 and AtMega32U4 // Timmer1: ATMega128, ATMega328, AtMega16U4 and AtMega32U4

2
src/uClock.h
Unescape View File

@ -3,7 +3,7 @@
* 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.1 * @version 0.8.2
* @author Romulo Silva * @author Romulo Silva
* @date 08/21/2020 * @date 08/21/2020
* @license MIT - (c) 2020 - Romulo Silva - contact@midilab.co * @license MIT - (c) 2020 - Romulo Silva - contact@midilab.co

Write Preview
Loading…
Cancel
Save