summaryrefslogtreecommitdiffstats
path: root/PolyDrums_v0_1_3_DelayLPF
diff options
context:
space:
mode:
Diffstat (limited to 'PolyDrums_v0_1_3_DelayLPF')
-rw-r--r--PolyDrums_v0_1_3_DelayLPF/ADSRslow.h307
-rw-r--r--PolyDrums_v0_1_3_DelayLPF/PolyDrums_v0_1_3_DelayLPF.ino495
-rw-r--r--PolyDrums_v0_1_3_DelayLPF/Wave.h183
-rw-r--r--PolyDrums_v0_1_3_DelayLPF/hihatc909.h57
-rw-r--r--PolyDrums_v0_1_3_DelayLPF/hihato909.h103
-rw-r--r--PolyDrums_v0_1_3_DelayLPF/kick909.h119
-rw-r--r--PolyDrums_v0_1_3_DelayLPF/snare909.h116
7 files changed, 0 insertions, 1380 deletions
diff --git a/PolyDrums_v0_1_3_DelayLPF/ADSRslow.h b/PolyDrums_v0_1_3_DelayLPF/ADSRslow.h
deleted file mode 100644
index 760d136..0000000
--- a/PolyDrums_v0_1_3_DelayLPF/ADSRslow.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * ADSR.h
- *
- * Copyright 2012 Tim Barrass.
- *
- * This file is part of Mozzi.
- *
- * Mozzi is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mozzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mozzi. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef ADSR_H_
-#define ADSR_H_
-
-#include "Arduino.h"
-//#include <util/atomic.h>
-#include "Line.h"
-#include "mozzi_fixmath.h"
-
-/** A simple ADSR envelope generator.
-@todo Test whether using the template parameter makes any difference to speed,
-and rationalise which units which do and don't need them.
-Template objects are messy when you try to use pointers to them,
-you have to include the whole template shebang in the pointer handling.
-*/
-template <unsigned int CONTROL_UPDATE_RATE>
-class ADSR
-{
-private:
-
- const unsigned int AUDIO_TICKS_PER_CONTROL;
-
- unsigned int phase_control_step_counter;
- unsigned int phase_num_control_steps;
-
- enum {ATTACK,DECAY,SUSTAIN,RELEASE,IDLE};
-
-
- struct phase{
- byte phase_type;
- unsigned int control_steps;
- unsigned long audio_steps;
- Q8n0 level;
- }attack,decay,sustain,release,idle;
-
- phase * current_phase;
-
- // Linear audio rate transitions for envelope
- Line <unsigned long> transition;
-
- inline
- unsigned int convertMsecToControlSteps(unsigned int msec){
- return (uint) (((ulong)msec*CONTROL_UPDATE_RATE)>>10); // approximate /1000 with shift
- }
-
- inline
- void setPhase(phase * next_phase) {
- phase_control_step_counter = 0;
- phase_num_control_steps = next_phase->control_steps;
- transition.set(Q8n0_to_Q16n16(next_phase->level),next_phase-> control_steps);
- current_phase = next_phase;
- }
-
-
-
- inline
- void checkForAndSetNextPhase(phase * next_phase) {
- if (++phase_control_step_counter >= phase_num_control_steps){
- setPhase(next_phase);
- }
- }
-
-
- inline
- void checkForAndSetIdle() {
- if (++phase_control_step_counter >= phase_num_control_steps){
- transition.set(0,0,1);
- current_phase = &idle;
- }
- }
-
-
-
-inline
- void setTime(phase * p, unsigned int msec)
- {
- p->control_steps=convertMsecToControlSteps(msec);
- p->audio_steps = (ulong) p->control_steps * AUDIO_TICKS_PER_CONTROL;
- }
-
-
-public:
-
- /** Constructor.
- */
- ADSR():AUDIO_TICKS_PER_CONTROL(AUDIO_RATE/CONTROL_UPDATE_RATE)
- {
- attack.phase_type = ATTACK;
- decay.phase_type = DECAY;
- sustain.phase_type = SUSTAIN;
- release.phase_type = RELEASE;
- idle.phase_type = IDLE;
- release.level = 0;
- }
-
-
-/** Updates the internal controls of the ADSR.
- Call this in updateControl().
- */
- void update(){ // control rate
-
- switch(current_phase->phase_type) {
-
- case ATTACK:
- checkForAndSetNextPhase(&decay);
- break;
-
- case DECAY:
- checkForAndSetNextPhase(&sustain);
- break;
-
- case SUSTAIN:
- checkForAndSetNextPhase(&release);
- break;
-
- case RELEASE:
- checkForAndSetIdle();
- break;
-
- }
- }
-
- /** Advances one audio step along the ADSR and returns the level.
- Call this in updateAudio().
- @return the next value, as an unsigned int.
- */
- inline
- unsigned int next()
- {
- return Q16n16_to_Q16n0(transition.next());
- }
-
-
-
- /** Start the attack phase of the ADSR. THis will restart the ADSR no matter what phase it is up to.
- */
- inline
- void noteOn(){
- setPhase(&attack);
- }
-
-
-
- /** Start the release phase of the ADSR.
- @todo fix release for rate rather than steps (time), so it releases at the same rate whatever the current level.
- */
- inline
- void noteOff(){
- setPhase(&release);
- }
-
-
-
-
-
- /** Set the attack level of the ADSR.
- @param value the attack level.
- */
- inline
- void setAttackLevel(byte value)
- {
- attack.level=value;
- }
-
-
-
- /** Set the decay level of the ADSR.
- @param value the decay level.
- */
- inline
- void setDecayLevel(byte value)
- {
- decay.level=value;
- }
-
-
- /** Set the sustain level of the ADSR.
- @param value the sustain level. Usually the same as the decay level,
- for a steady sustained note.
- */
- inline
- void setSustainLevel(byte value)
- {
- sustain.level=value;
- }
-
- /** Set the release level of the ADSR. Normally you'd make this 0,
- but you have the option of some other value.
- @param value the release level (normally 0).
- */
- inline
- void setReleaseLevel(byte value)
- {
- release.level=value;
- }
-
-
-
- /** Set the attack and decay levels of the ADSR. This assumes a conventional
- ADSR where the sustain continues at the same level as the decay, till the release ramps to 0.
- @param attack the new attack level.
- @param value the new sustain level.
- */
- inline
- void setADLevels(byte attack, byte decay)
- {
- setAttackLevel(attack);
- setDecayLevel(decay);
- setSustainLevel(decay);
- setReleaseLevel(0);
- }
-
-
-
-
-
-
-
- /** Set the attack time of the ADSR in milliseconds.
- The actual time taken will be resolved within the resolution of CONTROL_RATE.
- @param value the unsigned int attack time in milliseconds.
- */
- inline
- void setAttackTime(unsigned int msec)
- {
- setTime(&attack, msec);
- }
-
-
- /** Set the decay time of the ADSR in milliseconds.
- The actual time taken will be resolved within the resolution of CONTROL_RATE.
- @param value the unsigned int decay time in milliseconds.
- */
- inline
- void setDecayTime(unsigned int msec)
- {
- setTime(&decay, msec);
- }
-
-
- /** Set the sustain time of the ADSR in milliseconds.
- The actual time taken will be resolved within the resolution of CONTROL_RATE.
- The sustain phase will finish if the ADSR recieves a noteOff().
- @param value the unsigned int sustain time in milliseconds.
- */
- inline
- void setSustainTime(unsigned int msec)
- {
- setTime(&sustain, msec);
- }
-
-
-
- /** Set the release time of the ADSR in milliseconds.
- The actual time taken will be resolved within the resolution of CONTROL_RATE.
- @param value the unsigned int release time in milliseconds.
- */
- inline
- void setReleaseTime(unsigned int msec)
- {
- setTime(&release, msec);
- }
-
-
-
- /** Set the attack, decay and release times of the ADSR in milliseconds.
- The actual times will be resolved within the resolution of CONTROL_RATE.
- @param attack_ms the new attack time in milliseconds.
- @param decay_ms the new decay time in milliseconds.
- @param decay_ms the new sustain time in milliseconds.
- @param release_ms the new release time in milliseconds.
- */
- inline
- void setTimes(unsigned int attack_ms, unsigned int decay_ms, unsigned int sustain_ms, unsigned int release_ms)
- {
- setAttackTime(attack_ms);
- setDecayTime(decay_ms);
- setSustainTime(sustain_ms);
- setReleaseTime(release_ms);
- }
-
-
-};
-
-#endif /* ADSR_H_ */
-
diff --git a/PolyDrums_v0_1_3_DelayLPF/PolyDrums_v0_1_3_DelayLPF.ino b/PolyDrums_v0_1_3_DelayLPF/PolyDrums_v0_1_3_DelayLPF.ino
deleted file mode 100644
index 2b612f4..0000000
--- a/PolyDrums_v0_1_3_DelayLPF/PolyDrums_v0_1_3_DelayLPF.ino
+++ /dev/null
@@ -1,495 +0,0 @@
-
-/* Example of a sound being triggered by MIDI input.
- *
- * Demonstrates playing notes with Mozzi in response to MIDI input,
- * using the standard Arduino MIDI library:
- * http://playground.arduino.cc/Main/MIDILibrary
- *
- * Mozzi help/discussion/announcements:
- * https://groups.google.com/forum/#!forum/mozzi-users
- *
- * Tim Barrass 2013.
- * This example code is in the public domain.
- *
- * sgreen - modified to use standard Arduino midi library, added saw wave, lowpass filter
- * Audio output from pin 9 (pwm)
- * Midi plug pin 2 (centre) to Arduino gnd, pin 5 to RX (0)
- * http://www.philrees.co.uk/midiplug.htm
- * Now with drums! (still has all this code in there, commented out : )
-
-S Green:
-mod controller/ribbon is low pass filter cut-off
-big button switches between tri/rectangle/noise/saw
-(noise is at constant frequency)
-
-NB think mostly fixed, but may still be possible to crash filter with loud sounds, hit reset!
-
- */
-
-
-#include <MIDI.h>
-#include <MozziGuts.h>
-#include <Oscil.h> // oscillator template
-#include <Line.h> // for envelope
-#include <Sample.h>
-#include <mozzi_utils.h>
-#include <mozzi_analog.h>
-
-#include <tables/sin2048_int8.h> // sine table for oscillator
-//#include <tables/saw2048_int8.h>
-//#include <tables/triangle2048_int8.h>
-
-#include <mozzi_midi.h>
-#include <ADSRslow.h>
-#include <fixedMath.h>
-#include <LowPassFilter.h>
-#include "Wave.h"
-#include <WaveShaper.h>
-#include <tables/waveshape_compress_512_to_488_int16.h>
-
-#define MAX_NOTES 3
-//Dave G: now seems to do 2+ note polyphony without clicking (higher notes are a bit grainy)
-int threshold=255/(MAX_NOTES);
-
-#define DRUM_SAMPLES 1
-
-#if DRUM_SAMPLES
-#include "kick909.h"
-#include "snare909.h"
-#include "hihatc909.h"
-#include "hihato909.h"
-#endif
-
-// use #define for CONTROL_RATE, not a constant
-#define CONTROL_RATE 128 // powers of 2 please
-
-#define ENABLE_MIDI 1
-#define DEBUG 0
-#define BPM 120
-#define STEPS_PER_BEAT 4
-
-unsigned long stepCounter = 0;
-unsigned long ticksPerStep = (60*CONTROL_RATE) / (BPM*STEPS_PER_BEAT);
-
-// audio sinewave oscillator
-//Oscil <SIN2048_NUM_CELLS, AUDIO_RATE> osc(SIN2048_DATA);
-//Oscil <SAW2048_NUM_CELLS, AUDIO_RATE> osc(SAW2048_DATA);
-//Oscil <TRIANGLE2048_NUM_CELLS, AUDIO_RATE> osc(TRIANGLE2048_DATA);
-//Wave myosc;
-//Wave lfo;
-Oscil <SIN2048_NUM_CELLS, AUDIO_RATE> lfo(SIN2048_DATA);
-WaveShaper <int> aCompress(WAVESHAPE_COMPRESS_512_TO_488_DATA); // to compress instead of dividing by 2 after adding signals
-
-struct Channel {
- Wave osc;
- //Oscil <TRIANGLE2048_NUM_CELLS, AUDIO_RATE> osc;
- ADSR <CONTROL_RATE> env;
- ADSR <CONTROL_RATE> fxenv;
- byte note;
- byte gain;
-};
-Channel chan[MAX_NOTES];
-byte currentChan = 0;
-
-// envelope generator
-//ADSR <CONTROL_RATE> envelope;
-LowPassFilter lpf;
-int crushCtrl = 0;
-int gain = 32;
-float octave = 1.0f;
-
-boolean enableDrums = true;
-
-int freeChan=0;
-int step = 0;
-int waveType = 0;
-
-byte kickOn=1;
-byte snareOn=1;
-byte hatsOn=1;
-
-int button0_old = 0;
-int button1_old = 0;
-
-#if DRUM_SAMPLES
-// drums
-Sample <kick909_NUM_CELLS, AUDIO_RATE> kickSamp(kick909_DATA);
-Sample <snare909_NUM_CELLS, AUDIO_RATE> snareSamp(snare909_DATA);
-Sample <hihatc909_NUM_CELLS, AUDIO_RATE> hihatcSamp(hihatc909_DATA);
-Sample <hihato_NUM_CELLS, AUDIO_RATE> hihatoSamp(hihato_DATA);
-#endif
-
-byte pattern[4][16] = {
- //0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0 hhc
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, // 1 hho
- 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, // 2 snare
- 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, // 3 kick
-};
-
-// pin defines
-#define LED 13 // to see if MIDI is being recieved
-#define BUTTON0_PIN 2
-#define BUTTON1_PIN 3
-
-// forward declarations
-void HandleNoteOn(byte channel, byte note, byte velocity);
-void HandleNoteOff(byte channel, byte note, byte velocity);
-void HandleControlChange (byte channel, byte number, byte value);
-void HandlePitchBend (byte channel, int bend);
-
-void setup() {
- // init IO pins
- pinMode(LED, OUTPUT);
-
-#if 0
- pinMode(BUTTON0_PIN, INPUT);
- digitalWrite(BUTTON0_PIN, HIGH); // turn on pull-up resistor
-
- pinMode(BUTTON1_PIN, INPUT);
- digitalWrite(BUTTON1_PIN, HIGH); // turn on pull-up resistor
-#endif
-
-#if DEBUG
- Serial.begin(57600); // for debugging
-#endif
-
-#if ENABLE_MIDI
- // Initiate MIDI communications, listen to all channels
- MIDI.begin(MIDI_CHANNEL_OMNI);
-
- // Connect the HandleNoteOn function to the library, so it is called upon reception of a NoteOn.
- MIDI.setHandleNoteOn(HandleNoteOn); // Put only the name of the function
- MIDI.setHandleNoteOff(HandleNoteOff); // Put only the name of the function
- MIDI.setHandleControlChange(HandleControlChange);
- MIDI.setHandlePitchBend(HandlePitchBend);
- MIDI.setHandleContinue(HandleContinue);
- MIDI.setHandleStop(HandleStop);
- MIDI.setHandleStart(HandleStart);
- MIDI.setHandleProgramChange(HandleProgramChange);
-
-#endif
-
-#if 0
- //osc.setFreq(440u); // default frequency
- //myosc.setFreq(440.0f);
- myosc.setFreq(440.0f*4.0f);
- myosc.setPulseWidth(32);
-
- envelope.setADLevels(255, 200);
- envelope.setTimes(50, 200, 65535, 5000);
-#endif
-
- for(int i=0; i<MAX_NOTES; i++)
- {
- chan[i].osc.setType(WAVE_TRI);
- //chan[i].osc.setTable(TRIANGLE2048_DATA);
- chan[i].osc.setPulseWidth(16);
- chan[i].note=128;
- chan[i].env.setADLevels(127,127);
- chan[i].env.setTimes(10, 10, 0, 1020);
-// chan[i].fxenv.setADLevels(255,255);
-// chan[i].fxenv.setTimes(10, 10, 0, 2000);
- }
-
- //lfo.setType(WAVE_TRI);
- lfo.setFreq(10.0f);
-
- lpf.setResonance(128);
- lpf.setCutoffFreq(190);
-
-#if DRUM_SAMPLES
- kickSamp.setFreq((float) kick909_SAMPLERATE / (float) kick909_NUM_CELLS);
- snareSamp.setFreq((float) snare909_SAMPLERATE / (float) snare909_NUM_CELLS);
- hihatcSamp.setFreq((float) hihatc909_SAMPLERATE / (float) hihatc909_NUM_CELLS);
- hihatoSamp.setFreq((float) hihato_SAMPLERATE / (float) hihato_NUM_CELLS);
- //snareSamp.start();
-#endif
-
- //setupFastAnalogRead(); // optional
- adcEnableInterrupt(); // for analog reads
-
- startMozzi(CONTROL_RATE);
-}
-
-void HandleProgramChange (byte channel, byte number)
-{
-
- // change wave
- waveType = (number) & 3;
-
- for(int i=0; i<MAX_NOTES; i++)
- {
-#if 0
- switch(waveType) {
- case 0:
- chan[i].osc.setTable(TRIANGLE2048_DATA);
- break;
- case 1:
- chan[i].osc.setTable(SAW2048_DATA);
- break;
- case 2:
- chan[i].osc.setTable(SIN2048_DATA);
- break;
- }
-#else
- for(int i=0; i<MAX_NOTES; i++)
- {
- chan[i].osc.setType((WaveType) waveType);
- }
-#endif
- }
-}
-
-
-void HandleNoteOn(byte channel, byte note, byte velocity) {
- //osc.setFreq(mtof(note)); // simple but less accurate frequency
- //osc.setFreq_Q16n16(Q16n16_mtof(Q8n0_to_Q16n16(note))); // accurate frequency
- //myosc.setFreq(mtof(note)); // accurate frequency
- //envelope.noteOn();
-
- // start note on next channel - now with v basic "note priority"!
-int index;
-int empty=99;
- for(int i=0; i<MAX_NOTES; i++)
- {
- index=(currentChan+i)%MAX_NOTES;
- if (chan[index].gain==0) {empty=index; break;}
- }
-
-if (empty==99) // ie all no empty channels found so far?
- {
- for(int i=0; i<MAX_NOTES; i++)
- {
- index=(currentChan+i)%MAX_NOTES;
- if (chan[index].note==128) {empty=index; break;}
- }
- }
-
-if (empty<99) {currentChan=empty;} else
- {
- currentChan = (currentChan + 1) % MAX_NOTES; // add 1, wrap around
- }
-
- chan[currentChan].note = note;
- chan[currentChan].osc.setFreq(mtof(note)); // accurate frequency?
- if (waveType==1) {chan[currentChan].osc.setFreq(mtof(note+24));} //high triangle
- chan[currentChan].env.noteOn();
-// chan[currentChan].fxenv.noteOn();
-
- digitalWrite(LED,HIGH);
-}
-
-void HandleNoteOff(byte channel, byte note, byte velocity) {
- //envelope.noteOff();
-
- // find which channel was playing this note
- for(int i=0; i<MAX_NOTES; i++) {
- if (chan[i].note == note) {
- // kill it
- chan[i].env.noteOff();
- chan[i].note=128;
- }
- }
-
- digitalWrite(LED,LOW);
-}
-
-void HandleControlChange (byte channel, byte number, byte value)
-{
- // http://www.indiana.edu/~emusic/cntrlnumb.html
- switch(number) {
- case 1: // modulation wheel
- //gain = value*2;
- lpf.setCutoffFreq( int(value*1.5f) ); // control messages are in [0, 127] range
- lpf.setResonance( int(value*1.4f) );
-// for(int i=0; i<MAX_NOTES; i++) {chan[i].env.setTimes(10, 10, 0, 900+value); }
- break;
-/*
- case 105:
- lpf.setCutoffFreq(value*2); // control messages are in [0, 127] range
- break;
-*/
- case 106:
- //lpf.setResonance(value*2);
- crushCtrl = value;
- break;
- }
-}
-
-// pitchbend = control strip + button on Keytar
-void HandlePitchBend (byte channel, int bend)
-{
- //bend value from +/-8192
- //lfo.setFreq((unsigned int) (bend+8192)>>7);
- for(int i=0; i<MAX_NOTES; i++) {
- chan[i].osc.setPulseWidth((bend+8192) >> 8);
- }
-
-}
-
-void HandleStop () { //this is the Back button on the Xbox keyboard
-// octave *= 2.0f;
-// if (octave > 16.0f) octave = 1.0f;
-//Dave G: no longer used : )
-kickOn=(! kickOn);
-}
-
-void HandleStart () { //this is the Back button on the Xbox keyboard
-// octave *= 2.0f;
-// if (octave > 16.0f) octave = 1.0f;
-//Dave G: no longer used : )
-hatsOn=(! hatsOn);
-}
-
-void HandleContinue () { // the big round button on all keytars
-snareOn=(! snareOn);
-}
-
-void updateControl(){
-#if ENABLE_MIDI
- MIDI.read();
-#endif
-
- //envelope.update();
-
- // update playing envelopes
- for(int i=0; i<MAX_NOTES; i++) {
- chan[i].env.update();
-// chan[i].fxenv.update();
- //int tremolo=( chan[i].fxenv.next() & 0b00111111 );
- int tremolo=chan[i].env.next();
- chan[i].gain=(tremolo * (tremolo&0b00011111) )>>5;
- if (chan[i].gain>threshold) {chan[i].gain=threshold;}
- // threshold=255/MAX_NOTES, genuinely not sure if this is best approach but stops crashes :)
- }
-
-#if 0
- // push buttons
- int button0 = !digitalRead(BUTTON0_PIN); // active low
- int button1 = !digitalRead(BUTTON1_PIN);
-
- /*
- if (button0) {
- // trigger
- //envelope.noteOn();
- //lpf.reset();
- digitalWrite(LED, HIGH);
- } else {
- digitalWrite(LED, LOW);
- }
- */
-
- if (button0 && !button0_old) {
- lfo.setType((WaveType) ((((int) lfo.getType()) + 1) % 3));
- }
- button0_old = button0;
-
- if (button1 & !button1_old) {
- waveType = (waveType + 1) & 3;
- //myosc.setType((WaveType) waveType);
- for(int i=0; i<MAX_NOTES; i++)
- {
- chan[i].osc.setType((WaveType) waveType);
- }
- }
- button1_old = button1;
-#endif
-
-#if DRUM_SAMPLES
- if (enableDrums) {
- // drums
- stepCounter++;
- if (stepCounter > ticksPerStep) {
- step = (step+1) & 0xf;
- stepCounter = 0;
-
-//if (step==0 || step==8) {HandleNoteOn(1, 48, 128); }
-
- //semi-perceptible BPM-locked phaser
- int filterlevel=step; if (step>7) {filterlevel=15-step;}
- lpf.setCutoffFreq( (filterlevel+11) <<3 ); //maps to 72-192
- lpf.setResonance( (filterlevel+10) <<3);
- if (pattern[0][step] && hatsOn) hihatcSamp.start();
- if (pattern[1][step] && hatsOn) hihatoSamp.start();
- if (pattern[2][step] && snareOn) snareSamp.start();
- if (pattern[3][step] && kickOn) kickSamp.start();
- }
- }
-#endif
-
-#if 0
- // knobs
- int knob0 = adcGetResult(0); // [0, 1023]
- int knob1 = adcGetResult(1);
- //lpf.setCutoffFreq(knob0>>2);
- //lpf.setResonance(knob1>>2);
-
- //crushCtrl = knob1>>7;
- lfo.setFreq((float) knob0);
- //myosc.setFreq((float) knob1);
- //myosc.setFreq((unsigned int) knob0*20);
- //myosc.setPulseWidth((unsigned char) (knob1>>2));
-
- // start the next read cycle in the background
- adcReadAllChannels();
-#endif
-
-#if DEBUG
- Serial.println(knob0);
-#endif
-}
-
-// strip the low bits off!
-int bitCrush(int x, int a)
-{
- return (x>>a)<<a;
-}
-
-int updateAudio()
-{
- //int x = (int) (envelope.next() * osc.next())>>8;
- //int x = (int) (envelope.next() * myosc.next())>>8;
- //int x = (int) (envelope.next() * (lfo.next() * myosc.next())>>8)>>8;
- //int x = (int) lfo.next();
- //int x = (int) (lfo.next() * myosc.next())>>8;
- //int x = (int) (envelope.next() * lpf.next(myosc.next()))>>8;
- //int x = (envelope.next() * lpf.next(osc.next()))>>8;
- //x = bitCrush(x, crushCtrl>>4);
- //x = bitCrush(x, crushCtrl);
- //x = (x * crushCtrl)>>4; // simple gain
- //x = x>>2;
- //x = lpf.next(x);
-
- // sum up channels
- int x = 0;
- for(int i=0; i<MAX_NOTES; i++) {
- x += (int) (chan[i].gain * chan[i].osc.next())>>8;
- }
-
-//Dave G: helps crash less if goes through some sort of waveshaper here?
- x = aCompress.next(256u + x);
-
- //x = (x*gain)>>8;
- //x = (x * lfo.next())>>8;
- x = lpf.next(x);
-
-#if DRUM_SAMPLES
- if (enableDrums) {
- // drums please!
- int drums = kickSamp.next() + snareSamp.next() + hihatcSamp.next() + hihatoSamp.next();
- //drums = (drums>>4)<<4;
- x += drums;
- }
-#endif
-
- return x;
-}
-
-
-void loop() {
- audioHook(); // required here
-}
-
-
-
diff --git a/PolyDrums_v0_1_3_DelayLPF/Wave.h b/PolyDrums_v0_1_3_DelayLPF/Wave.h
deleted file mode 100644
index a9afd72..0000000
--- a/PolyDrums_v0_1_3_DelayLPF/Wave.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Wave.h
- *
- * Simon Green 2013.
- *
- * Based on Mozzi "Oscil.h"
- */
-
-#ifndef WAVE_H_
-#define WAVE_H_
-
-#include "Arduino.h"
-#include "mozzi_fixmath.h"
-#include <util/atomic.h>
-
-// fractional bits for oscillator index precision
-#define OSCIL_F_BITS 16
-#define OSCIL_F_BITS_AS_MULTIPLIER 65536
-#define NUM_TABLE_CELLS 256
-#define ADJUST_FOR_NUM_TABLE_CELLS 8
-#define UPDATE_RATE AUDIO_RATE
-
-/** Generate waveform
-*/
-
-enum WaveType { WAVE_SAW=0, WAVE_TRI, WAVE_RECT, WAVE_NOISE };
-
-class Wave
-{
-public:
- /** Constructor. "Wave mywave;" makes a Wave oscillator
- */
- Wave () {
- phase_fractional = 0;
- phase_increment_fractional = 0;
- wavetype = WAVE_SAW;
- noise = 0xACE1;
- pulse_width = 128;
- }
-
- /** Increments one step along the phase.
- @return the next value.
- */
- inline
- char next()
- {
- incrementPhase();
-
- char w;
- //ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
- {
- int n = (phase_fractional >> OSCIL_F_BITS) & (NUM_TABLE_CELLS-1);
- switch(wavetype) {
- case WAVE_SAW:
- w = n - 128;
- break;
- case WAVE_TRI:
- if (n & 0x80) // >= 128
- w = ((n^0xFF)<<1)-128;
- else
- w = (n<<1)-128;
- break;
- case WAVE_RECT:
- if (n > pulse_width)
- w = 127;
- else
- w = -127;
- break;
- case WAVE_NOISE:
- noise = (noise >> 1) ^ (-(noise & 1) & 0xB400u);
- w = noise>>8;
- break;
- }
- }
- return w;
- }
-
- /** Set the wave type
- */
- inline
- void setType(WaveType x)
- {
- wavetype = x;
- }
-
- WaveType getType() { return wavetype; }
-
- /** Set the pulse width for rectangle wave
- */
- inline
- void setPulseWidth(unsigned char x)
- {
- pulse_width = x;
- }
-
- /** Set the oscillator frequency with an unsigned int. This is faster than using a
- float, so it's useful when processor time is tight, but it can be tricky with
- low and high frequencies, depending on the size of the wavetable being used. If
- you're not getting the results you expect, try explicitly using a float, or try
- setFreq_Q24n8() or or setFreq_Q16n16().
- @param frequency to play the wave table.
- */
- inline
- void setFreq (unsigned int frequency) {
- ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
- {
- phase_increment_fractional = ((((unsigned long)NUM_TABLE_CELLS<<ADJUST_FOR_NUM_TABLE_CELLS)*frequency)/UPDATE_RATE) << (OSCIL_F_BITS - ADJUST_FOR_NUM_TABLE_CELLS);
- }
- }
-
-
- /** Set the oscillator frequency with a float. Using a float is the most reliable
- way to set frequencies, -Might- be slower than using an int but you need either
- this, setFreq_Q24n8() or setFreq_Q16n16() for fractional frequencies.
- @param frequency to play the wave table.
- */
- inline
- void setFreq(float frequency)
- { // 1 us - using float doesn't seem to incur measurable overhead with the oscilloscope
- ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
- {
- phase_increment_fractional = (unsigned long)((((float)NUM_TABLE_CELLS * frequency)/UPDATE_RATE) * OSCIL_F_BITS_AS_MULTIPLIER);
- }
- }
-
-
- /** Set the frequency using Q24n8 fixed-point number format.
- This might be faster than the float version for setting low frequencies such as
- 1.5 Hz, or other values which may not work well with your table size. A Q24n8
- representation of 1.5 is 384 (ie. 1.5 * 256). Can't be used with UPDATE_RATE
- less than 64 Hz.
- @param frequency in Q24n8 fixed-point number format.
- */
- inline
- void setFreq_Q24n8(Q24n8 frequency)
- {
- ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
- {
- //phase_increment_fractional = (frequency* (NUM_TABLE_CELLS>>3)/(UPDATE_RATE>>6)) << (F_BITS-(8-3+6));
- phase_increment_fractional = (((((unsigned long)NUM_TABLE_CELLS<<ADJUST_FOR_NUM_TABLE_CELLS)>>3)*frequency)/(UPDATE_RATE>>6))
- << (OSCIL_F_BITS - ADJUST_FOR_NUM_TABLE_CELLS - (8-3+6));
- }
- }
-
-
- /** Set the frequency using Q16n16 fixed-point number format. This is useful in
- combination with Q16n16_mtof(), a fast alternative to mtof(), using Q16n16
- fixed-point format instead of floats. Note: this should work OK with tables 2048 cells or smaller and
- frequencies up to 4096 Hz. Can't be used with UPDATE_RATE less than 64 Hz.
- @param frequency in Q16n16 fixed-point number format.
- */
- inline
- void setFreq_Q16n16(Q16n16 frequency)
- {
- ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
- {
- //phase_increment_fractional = ((frequency * (NUM_TABLE_CELLS>>7))/(UPDATE_RATE>>6)) << (F_BITS-16+1);
- phase_increment_fractional = (((((unsigned long)NUM_TABLE_CELLS<<ADJUST_FOR_NUM_TABLE_CELLS)>>7)*frequency)/(UPDATE_RATE>>6))
- << (OSCIL_F_BITS - ADJUST_FOR_NUM_TABLE_CELLS - 16 + 1);
-
- }
- }
-
-private:
- /** Increments the phase of the oscillator without returning a sample.
- */
- inline
- void incrementPhase()
- {
- //phase_fractional += (phase_increment_fractional | 1); // odd phase incr, attempt to reduce frequency spurs in output
- phase_fractional += phase_increment_fractional;
- }
-
- unsigned long phase_fractional;
- volatile unsigned long phase_increment_fractional;
-
- unsigned char pulse_width;
- uint16_t noise;
-
- WaveType wavetype;
-};
-
-#endif /* WAVE_H_ */
diff --git a/PolyDrums_v0_1_3_DelayLPF/hihatc909.h b/PolyDrums_v0_1_3_DelayLPF/hihatc909.h
deleted file mode 100644
index d52992d..0000000
--- a/PolyDrums_v0_1_3_DelayLPF/hihatc909.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef hihatc909_H_
-#define hihatc909_H_
-
-#include "Arduino.h"
-#include <avr/pgmspace.h>
-
-#define hihatc909_NUM_CELLS 1024
-#define hihatc909_SAMPLERATE 16384
-
-const char __attribute__((progmem)) hihatc909_DATA [] = {1, -2, 1, -2, 2, 0, -4,
-13, -18, 2, 3, 3, -1, 4, -9, 7, -5, -2, 4, -22, 23, -7, -8, -2, 7, -5, -8, 12,
--4, 7, 7, -21, 12, -3, -18, 8, 1, 4, -20, 4, -5, -4, -2, 0, -2, -7, 3, -3, -3,
--4, 3, -9, 12, -5, 20, 2, -25, 19, 0, 8, -12, -6, 4, 0, 15, -7, 8, 19, -9, -6,
-0, -1, 0, -3, 12, -12, 7, 9, -18, 2, 4, 1, -7, -4, 7, 2, -3, 0, -3, 1, -2, -4,
--4, -11, 7, -8, -2, 11, 2, 8, -1, 4, -3, -1, -2, -9, -6, -3, 3, -9, -9, 4, 1,
--5, 1, 5, 0, 2, 2, -3, 9, 6, -7, 3, 5, 0, -2, 0, 7, -3, -2, -2, -3, 4, -2, 2,
--3, 2, 0, -14, 4, 3, -4, 0, -5, 3, -2, -9, 3, 0, -1, -1, -5, -1, 5, -4, -6, 7,
-1, -2, 2, 0, 4, -1, -7, 1, 3, 3, -1, -1, 6, 1, -2, 0, 3, -5, -9, 1, -1, -2, 0,
--2, -1, 2, -1, -7, -2, -1, 1, -1, -4, 7, -5, -4, 5, 1, 1, 1, -2, 3, 2, -4, 0, 1,
-3, -3, 1, -2, 0, 2, -1, 2, -2, -2, 0, -4, -3, 3, -3, 0, -1, -3, 2, -3, -6, 6,
--2, 0, 1, 2, 0, -2, 2, 1, 1, -5, 1, -3, -2, -4, 3, -2, -2, 0, -2, 2, -4, 1, 4,
--4, -1, 1, -1, -1, -2, 2, 1, 1, -4, 5, -4, 0, 1, -4, 3, -2, -1, 3, 0, -3, 0, -1,
--1, -1, 0, -4, 3, -1, -3, 2, -1, -1, 0, 0, 1, 1, -1, 1, -2, -1, -1, -4, -1, 4,
--1, -2, 1, 0, 1, 0, 0, -1, 1, 0, 0, -1, 1, -3, 0, -1, -3, 2, -2, 1, 0, -2, -3,
-1, -1, -3, 1, -1, -2, 1, 1, -2, -1, 0, 0, -2, 0, -1, -2, 2, -1, 0, -2, 1, -2, 0,
-0, -4, 1, -1, -2, 1, 0, -2, 0, -2, 3, 0, -2, 1, 0, -1, -1, 1, -1, 0, 0, -1, 0,
-0, 0, -2, -1, 0, -1, 0, 0, -2, 0, 0, -2, -2, 0, -1, -1, 1, 0, -2, 0, 1, -1, 1,
--1, 0, -1, 0, -1, -1, -1, -2, 1, 0, 0, 0, 0, 0, 0, -2, 0, 0, -1, -1, -1, 0, -1,
-1, -1, -1, -1, -1, 1, -3, 0, -1, -1, 0, -1, -1, -1, 0, -1, -1, 0, -2, 0, 0, 0,
--2, -1, 1, -1, 0, 0, -1, 0, 0, 0, -1, -2, 0, -2, -1, 0, 0, -1, 0, 0, -2, 0, -1,
--1, -1, 0, -1, 0, 0, 0, -1, -1, 0, -1, 0, 0, 0, -2, 0, -1, -1, 0, -1, -1, 0, -1,
--1, 0, -1, 0, -1, 0, 0, 0, 0, 0, 0, -1, 1, -1, -1, -1, -1, 0, 0, -1, 0, -1, -1,
-0, -1, -1, 0, 0, -1, 0, 0, -1, 0, -1, -1, 0, -1, 0, -1, 0, -1, 0, 0, -1, 0, -1,
-0, -1, 0, 0, 0, -1, 0, 0, -1, 0, 0, 0, 0, 0, -1, 0, -1, 0, 0, -1, 0, -1, 0, 0,
--1, 0, 0, -1, 0, 0, 0, -1, 0, -1, 0, -1, -1, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0,
--1, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, 0,
--1, 0, -1, 0, -1, -1, 0, -1, 0, -1, -1, 0, 0, 0, -1, -1, 0, -1, 0, 0, -1, -1, 0,
--1, 0, 0, -1, 0, 0, 0, -1, -1, -1, -1, 0, -1, 0, 0, -1, 0, -1, -1, 0, -1, 0, 0,
--1, 0, -1, 0, 0, -1, -1, 0, 0, -1, -1, -1, 0, 0, 0, -1, -1, -1, -1, 0, -1, 0, 0,
--1, -1, 0, 0, 0, -1, 0, -1, -1, -1, 0, -1, 0, 0, -1, 0, -1, 0, -1, 0, -1, 0, 0,
--1, 0, -1, 0, -1, 0, 0, 0, -1, -1, 0, -1, -1, 0, -1, 0, 0, 0, 0, -1, 0, 0, -1,
-0, -1, -1, 0, -1, -1, 0, -1, -1, 0, 0, -1, 0, -1, 0, -1, -1, 0, -1, -1, 0, -1,
--1, 0, -1, -1, -1, 0, 0, 0, -1, -1, 0, 0, 0, -1, 0, 0, -1, 0, 0, -1, -1, 0, -1,
--1, 0, -1, 0, 0, -1, -1, 0, -1, 0, -1, -1, 0, -1, 0, -1, -1, 0, -1, 0, -1, 0, 0,
--1, 0, -1, 0, -1, 0, 0, -1, 0, 0, -1, 0, -1, -1, 0, -1, 0, 0, 0, -1, 0, -1, 0,
-0, -1, 0, -1, -1, 0, -1, -1, 0, 0, -1, 0, 0, -1, 0, -1, 0, 0, -1, 0, -1, 0, 0,
--1, 0, 0, -1, -1, 0, -1, -1, 0, -1, 0, 0, -1, -1, -1, 0, -1, -1, 0, 0, 0, 0, 0,
--1, 0, 0, 0, -1, 0, -1, 0, 0, -1, 0, -1, -1, 0, 0, -1, -1, 0, -1, 0, -1, -1, 0,
--1, 0, 0, -1, -1, 0, -1, -1, 0, -1, -1, 0, -1, -1, -1, 0, 0, -1, -1, 0, -1, -1,
-0, -1, 0, -1, 0, -1, -1, -1, 0, 0, -1, -1, -1, 0, -1, 0, -1, -1, -1, 0, 0, -1,
-0, 0, 0, -1, -1, 0, -1, 0, 0, -1, 0, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, 0, 0,
-0, -1, -1, 0, -1, -1, 0, -1, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0,
--1, 0, 0, -1, 0, -1, 0, -1, -1, 0, -1, 0, -1, -1, 0, -1, 0, 0, -1, 0, -1, 0, -1,
-0, 0, -1, 0, -1, 0, -1, 0, 0, 0, -1, -1, -1, 0, 0, -1, 0, -1, 0, -1, 0, -1, -1,
-0, -1, 0, -1, 0, 0, -1, 0, 0, -1, 0, -1, 0, -1, 0, 0, -1, 0, -1, };
-
- #endif /* hihatc909_H_ */
diff --git a/PolyDrums_v0_1_3_DelayLPF/hihato909.h b/PolyDrums_v0_1_3_DelayLPF/hihato909.h
deleted file mode 100644
index a36f866..0000000
--- a/PolyDrums_v0_1_3_DelayLPF/hihato909.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef hihato_H_
-#define hihato_H_
-
-#include "Arduino.h"
-#include <avr/pgmspace.h>
-
-#define hihato_NUM_CELLS 2048
-#define hihato_SAMPLERATE 16384
-
-const char __attribute__((progmem)) hihato_DATA [] = {0, -1, 0, -1, 0, -1, 0,
--1, 0, -1, 0, -1, 0, -1, 0, -1, 0, 0, -2, 4, -4, -1, 3, 1, -8, 7, -2, -9, 3, -1,
-1, -3, 0, -2, 4, -3, -4, -1, -3, 3, -2, -5, -1, 2, -1, -3, -1, 4, -2, 4, -3, -2,
-4, -1, 6, 0, 8, -5, -5, 2, -2, 2, -2, -2, 7, -4, 6, -11, -6, 11, -6, 1, 4, 0,
--14, 11, -6, -1, -2, -8, 5, -13, 1, 0, -8, 2, 7, 3, 1, -8, 5, 2, 2, -2, -8, 11,
--1, 0, 2, -1, -3, 2, -3, -9, 2, -4, 6, -3, 1, 9, -7, -3, 2, -2, -2, -13, 2, 9,
--3, 4, -3, 4, -6, 3, -1, -7, 13, -5, 3, 1, 1, -5, -13, 1, -2, 8, 0, 2, -4, 6,
--1, 2, 3, -12, 4, -16, 0, -7, 2, 0, -3, 10, -6, 6, -3, -9, -2, 11, -7, -7, 11,
-9, -3, 1, -1, -5, -6, -4, 2, -11, 8, 2, -4, 14, 0, -9, 7, -4, 6, -2, -10, -3, 1,
-4, -12, 10, -1, 1, 0, 2, -3, 0, 5, 0, 5, -6, 0, -1, 0, -8, -3, -1, -1, 1, -3, 3,
--3, 4, 8, -12, 0, -2, -7, 9, 2, 3, -6, -1, -4, 2, -7, -5, 12, -4, 7, 0, -2, 3,
--1, -2, -3, 1, -3, -1, 2, -1, 2, -8, 1, 7, -8, -3, 1, 5, 4, -3, -3, 1, -3, -13,
-2, 0, 1, 2, -13, 4, 4, 4, 0, 6, 2, -6, -9, -5, 12, -3, 1, -10, 10, -1, -7, 3,
--2, 9, -18, 0, -5, 11, -4, 0, 6, -13, 3, -13, 14, 3, -5, 0, -3, 3, 1, -2, 1, 7,
-5, -8, 6, 0, -8, 2, -3, 4, -6, 1, -14, 7, 8, -10, 7, -11, 10, -8, -13, 13, -3,
-1, -2, 4, -4, -2, 0, 0, 8, -8, 2, 3, 5, -2, -1, -1, 4, 1, -13, 2, 2, -3, -5, 2,
--1, 2, -2, 0, 0, 4, -6, -5, 6, -1, 2, -5, 1, 10, -8, -7, 8, -6, 6, 3, -15, 2, 0,
--8, 6, 5, -4, 2, 0, -6, 5, -2, -4, 2, -3, -1, 5, -2, -2, 0, 1, 4, -8, 2, 4, 0,
-0, -2, -1, -3, -1, -5, -3, 6, -18, 5, 10, -6, 10, -3, -4, 3, 1, -11, 4, -3, 5,
--2, -7, 7, -5, 3, -4, 4, -3, 3, -3, -2, 6, -2, 4, -5, 5, -3, -9, -3, -4, 1, -2,
-5, 2, -2, 7, -4, -5, 3, 0, 2, 2, -5, -2, 6, 5, -11, 3, -6, 2, 0, -3, 5, -4, 5,
--6, 7, -11, 4, -3, -5, 1, -8, 4, -11, 17, 1, -3, -6, -2, 7, -2, -1, -5, 13, -5,
--8, 1, 5, 3, -10, 5, -5, -4, 7, -7, 8, 5, 1, -2, -8, 7, -8, -2, 2, 1, 4, -5, -5,
--2, 10, -10, -2, 1, -8, 0, -2, 5, 8, -4, -2, -4, 0, 4, -4, 1, -2, 5, 0, 8, -2,
-1, -2, -4, 3, -6, 3, 0, -2, 2, 2, -5, -1, -7, -3, 1, 2, -6, 3, 0, -5, 6, -6, -1,
-4, -2, -9, 4, 1, 3, 3, -2, 2, -1, -5, -2, 8, -1, -4, -6, 7, 2, 0, -3, 1, 2, -2,
-1, -7, 5, -9, -2, 3, -4, 3, -1, -8, -3, 1, 0, -7, 5, 3, -3, -7, 2, 6, -2, 3, -7,
-8, -7, 2, 1, 3, 7, -6, -1, -1, -2, -3, 5, -6, 3, 1, 0, -2, -1, -6, -5, 1, 3, 2,
--4, 2, -2, -1, 0, -1, -3, -2, -5, -3, 3, 4, -1, 8, 0, -2, 0, -5, 1, 2, -3, -2,
-8, -4, 0, -5, -2, -1, -3, 0, 5, 3, -8, 0, 0, 7, -7, -2, -1, -3, -3, -1, 1, 7, 5,
--7, 1, 1, 4, -4, -3, 2, 5, -2, -6, 1, 1, -3, -7, -1, 3, -8, 3, -1, 2, 6, -11, 4,
-1, -2, 0, -2, -3, 6, 6, -6, -1, 1, 2, 1, -1, -2, -1, -1, -5, 3, 0, -1, -1, -7,
-0, -5, -1, 4, 0, 6, 0, -3, 1, 6, -5, 0, -3, -7, 6, -2, -2, 1, 5, -4, 4, -7, -4,
-6, -3, 1, 0, -1, -4, -5, 2, -2, -5, 3, 1, 4, -1, 0, 1, 4, -1, -5, -1, -6, 2, -4,
--1, 2, -1, 1, -4, -2, 0, 1, 2, -1, 0, 2, -2, 0, 4, 0, -4, 1, -5, 1, -2, 1, 4, 0,
-2, 1, -3, -9, 0, -1, 2, -6, -2, 4, 1, -1, -4, 1, -1, 0, -3, 1, 1, 1, 0, 0, 6,
--1, -8, -2, 1, 0, -2, -2, 5, 1, -3, -2, 5, 0, -3, -5, -8, 2, 1, 1, 0, 2, 2, -4,
--1, -2, 2, -5, 0, 6, -4, 5, 0, -4, 1, -4, -8, 6, -3, -4, 4, -3, 3, 0, -1, -2, 1,
--2, -2, 1, -2, -1, 0, 3, 1, 2, -1, -2, 0, -5, -1, 0, 7, 2, -4, 0, -2, -1, -2,
--1, 0, 1, -4, -3, 5, 2, -2, 2, -4, 2, -6, -6, 6, -1, 4, -2, 0, 1, -1, -1, -1, 2,
--3, 2, -5, -1, 4, -2, -1, -2, 2, -4, -5, 1, 2, 3, -1, 4, 1, -3, -2, -2, -2, 0,
-2, -5, -2, 2, -1, 4, -4, -5, 3, -7, 2, 3, -3, 1, 2, 1, 1, -2, -3, 2, -4, 1, 0,
--1, 4, 1, -4, 2, -3, -3, 2, -7, 0, 4, -1, -2, 1, 1, -7, 4, -1, -1, -1, -6, 3, 4,
-0, -1, 1, -4, 3, -5, -3, 4, -2, 1, 0, 0, 1, 0, -2, -2, -2, -3, -2, -1, 0, 3, -1,
-0, 0, -1, -1, -4, 1, 1, 1, 2, -2, 2, 0, -2, 0, -3, -2, -2, 0, 2, 1, -1, 0, -1,
--2, 0, -3, 1, 1, -2, -3, 1, 0, 0, 1, -1, 1, -4, -1, 1, 3, 0, -1, 0, -1, -1, -4,
-1, -1, 1, -1, -1, 3, -3, 0, -1, 2, -3, -2, 1, -3, 2, 2, -2, 0, 1, -6, 1, -1, 0,
-3, -2, 0, 2, -2, -4, 1, -2, -2, -2, 2, -2, 2, 0, 0, 3, -2, 1, -2, 0, -3, 0, 1,
--1, 0, -1, 2, -4, -2, 1, -4, 2, 0, -2, 1, 3, -2, 0, -1, -2, -3, -2, 1, -1, 0, 1,
-4, -2, 2, -2, -4, 1, -3, -2, 1, 0, -2, 0, 0, -1, 0, -2, -2, 1, 0, 1, 0, 2, 1,
--4, -2, 0, 0, -4, 1, -2, 1, 1, -4, 5, -1, -1, -2, -3, -1, 0, -3, -1, 4, -2, 0,
-1, -1, 0, -2, -1, 2, -2, 1, 2, -1, 2, -1, -2, -1, -2, -5, -1, 1, 0, 0, 1, -2, 0,
--1, -2, -1, 1, 0, -4, 1, 0, 1, -1, 2, -2, -4, -1, -1, 4, 0, -2, 0, -1, 0, 0, -5,
-1, 1, -3, 0, 0, -2, 3, -1, -2, 3, -5, 0, 2, 0, 0, -2, -2, 1, 2, -6, 0, 1, -1, 1,
--3, -1, 3, -2, -3, 2, 0, -3, 0, -2, 2, 1, -4, 2, 1, -2, -2, 1, -1, 4, -4, -4, 2,
-2, -1, -1, -1, -4, 2, -3, 2, 2, -2, 0, -1, 0, 2, -3, -2, 2, 0, -4, -1, 1, -2, 2,
--2, -1, 0, -2, -1, 1, -1, -1, 3, 0, -1, -1, 0, -1, -2, 1, -1, 1, -1, 2, 1, -1,
--2, -1, 0, -5, 1, 0, -1, 2, 0, -2, -3, -1, 1, -2, -1, 1, 0, 1, 1, -2, 2, 0, -3,
--1, 0, -2, -1, 2, -1, -1, 2, -3, -1, 2, -3, -2, -1, -1, -1, 1, -2, 1, 1, -1, 0,
--2, 0, -2, 1, -1, 1, 1, 0, 0, -2, 0, -2, -1, -4, 0, 1, 0, 1, -1, 0, -1, -4, -2,
--1, -1, -1, 0, 1, 2, -1, -3, 1, 0, 0, -1, -1, 0, 1, -3, 0, 2, 0, -2, -4, -1, 1,
--1, -2, 2, 2, -1, -1, 0, -2, 1, -3, -3, 2, 0, -1, -1, 2, 1, -1, -2, -1, 0, -1,
--2, 0, 1, -1, -2, 0, 2, -3, -1, 0, -2, 1, -1, 0, 3, -1, 0, -1, 0, -1, -1, -2,
--1, 1, -1, 1, -3, -1, -1, -1, -1, -1, -1, -3, 2, -2, -1, 1, -1, 1, -2, -2, 1, 1,
-0, -1, 1, -1, 0, -2, 1, 2, -3, 0, 0, -1, 0, -1, -2, 1, 0, -4, -1, 1, 0, 2, -3,
--1, 1, -1, -2, 1, -1, 2, -1, -2, 1, -2, 0, -2, 0, 1, -2, -1, 0, 2, 0, -2, -1, 0,
--1, -2, -1, 1, 3, -3, -2, 0, 0, -1, 0, 0, -1, -1, -3, -1, 1, 0, -2, 0, -1, 0,
--2, 0, 0, 1, -1, 0, 1, -1, 3, -2, 0, 0, -3, 0, 2, -2, -1, 2, -1, -1, -1, -2, 0,
--2, -2, 0, -1, -3, 0, 0, 0, 0, -3, 0, -1, 0, 0, 0, 1, 1, -1, -3, 0, 0, 0, -1,
--3, 0, 1, -2, -1, 2, -2, -1, 0, -4, 1, 0, -2, 1, -1, 1, -1, 0, 0, 0, -1, -1, 0,
--1, 1, -1, -1, 1, -1, -1, -2, -1, -1, -2, 0, 1, 0, -1, 1, -1, 0, 1, -1, -2, 1,
-0, -2, 3, 0, 0, 0, -2, 0, -1, -1, -1, 0, -1, -1, -2, -1, 0, -2, -1, 0, -1, 0, 0,
-0, 1, -1, 0, 0, -3, 0, 0, -1, 0, -1, 1, -1, 0, -1, -1, 0, -2, -1, 0, -1, -2, -1,
-2, -1, -1, -1, -1, 1, -2, 1, -1, 0, 1, 0, -2, 0, 0, -3, 2, -2, -1, 0, -1, 0, 1,
-1, -3, 1, -1, -2, 1, -3, 0, 1, -1, 0, 0, -2, 1, 0, -2, 0, -1, -1, 0, -2, -1, -1,
--1, 0, -1, -1, 0, 0, -2, 1, -1, -1, 0, -1, 1, -1, 0, -1, 1, -1, -3, 1, -1, 0,
--1, 0, 0, 0, 0, -2, -1, -1, 1, -3, -1, 2, -1, 0, -1, 0, 0, -2, -1, 1, -1, 0, -1,
--2, 1, -1, -2, 0, 0, -1, -2, -2, 1, 1, -1, -2, 1, 0, -2, 0, 0, 0, 0, -2, 0, 1,
--1, 0, -1, 0, -2, -1, -1, 1, 0, -1, 0, -1, 0, -1, -2, 1, -1, -2, 1, 0, 1, 0, -1,
-0, 0, -2, -1, 1, -1, 0, -1, 0, 0, -1, -1, -1, 1, -3, -1, 0, 0, 0, -1, 1, 1, 0,
--3, 0, 0, -1, 0, -1, 1, -1, 0, -1, 1, 1, -3, -2, 0, 0, 0, -1, 0, 1, -2, -2, -1,
-0, -1, -1, -1, 1, 0, -1, 1, -1, 0, -1, -1, -2, 1, -2, 0, 1, -1, 1, -1, 0, -1, 0,
--1, 0, 0, -1, 1, -1, 1, 0, -1, -2, 0, 0, -3, 0, -1, 1, -1, -2, 0, -1, 0, -1, -1,
-0, -1, 0, 0, 1, -1, 1, -1, -2, 1, -2, 0, 0, -1, 0, 0, -1, -1, 1, -2, -2, 0, -1,
-0, -1, 0, -1, 0, -1, -1, -1, -1, 0, -1, 1, 0, 0, 0, -1, -1, 0, 1, -1, 0, 0, -1,
-0, -1, 0, 0, -1, -2, 0, -1, -1, 0, -1, 1, 0, -1, 0, -1, -2, 0, 0, -1, 0, -1, -1,
-0, -1, -1, -2, 0, 1, -1, -1, 0, 0, 0, -1, 0, 0, 0, -1, -1, 0, -1, 0, -1, -1, -1,
--1, 0, 1, -1, -2, 1, -1, 0, -1, -1, -1, 0, -1, -1, 0, -1, 1, 0, 0, 0, -1, -1, 0,
--2, 0, -1, 0, 1, -2, -1, -1, 0, 0, -3, 1, 0, -1, 0, 0, 0, -2, 0, -2, 1, -1, -2,
-1, 0, 0, -2, 0, 1, -2, -1, -1, -1, 1, -1, -1, -1, 1, -1, -1, 0, -1, 0, -1, 0, 0,
-1, -1, 0, 0, -1, 0, -2, 0, -1, 0, -1, 1, 0, -2, -2, 0, 0, -3, -1, 0, -1, 0, 0,
--1, 0, };
-
- #endif /* hihato_H_ */
diff --git a/PolyDrums_v0_1_3_DelayLPF/kick909.h b/PolyDrums_v0_1_3_DelayLPF/kick909.h
deleted file mode 100644
index 3ddf8cd..0000000
--- a/PolyDrums_v0_1_3_DelayLPF/kick909.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef kick909_H_
-#define kick909_H_
-
-#include "Arduino.h"
-#include <avr/pgmspace.h>
-
-#define kick909_NUM_CELLS 2048
-#define kick909_SAMPLERATE 16384
-
-const char __attribute__((progmem)) kick909_DATA [] = {-1, 0, -1, 0, -1, 0, 0,
-0, 0, 0, 0, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, 0, -1, 0, -1, 0, 0, -1, 0, -1,
-0, -1, 0, -1, 0, 0, -1, 0, -1, 0, 0, -1, -1, -2, -2, -3, -3, -2, -2, -2, -1, -1,
--1, -1, 0, 0, 1, 2, 3, 3, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 8, 9, 9, 10, 14, 17,
-20, 24, 29, 50, 57, 49, 53, 54, 53, 53, 54, 53, 53, 53, 52, 51, 50, 48, 46, 45,
-44, 42, 40, 38, 35, 33, 30, 26, 23, 19, 15, 12, 8, 5, 1, -2, -6, -9, -11, -13,
--16, -17, -18, -20, -22, -23, -24, -24, -25, -26, -27, -27, -27, -27, -28, -28,
--28, -28, -27, -27, -27, -26, -25, -24, -24, -23, -21, -20, -19, -17, -15, -13,
--12, -10, -8, -5, -3, -1, 1, 3, 6, 8, 10, 12, 14, 17, 19, 21, 24, 25, 28, 30,
-32, 33, 35, 36, 37, 37, 38, 38, 39, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-40, 40, 39, 38, 38, 37, 37, 36, 36, 35, 34, 33, 32, 32, 30, 29, 28, 26, 24, 22,
-20, 18, 17, 15, 13, 11, 9, 8, 6, 5, 3, 1, -1, -2, -4, -5, -7, -8, -9, -11, -13,
--14, -16, -17, -18, -19, -20, -21, -22, -24, -25, -25, -26, -27, -27, -28, -29,
--29, -30, -30, -30, -30, -31, -31, -31, -31, -31, -32, -31, -32, -32, -32, -32,
--32, -32, -32, -32, -32, -32, -32, -32, -31, -31, -31, -30, -30, -30, -29, -28,
--28, -27, -27, -26, -26, -25, -25, -24, -23, -22, -21, -20, -20, -19, -18, -17,
--16, -15, -14, -13, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, 0, 1, 2, 3, 4, 6,
-6, 8, 9, 10, 11, 12, 12, 13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 27,
-28, 29, 30, 30, 31, 32, 33, 33, 34, 34, 34, 34, 35, 35, 35, 36, 36, 36, 36, 36,
-36, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 36, 36, 36, 36,
-36, 35, 35, 35, 34, 34, 34, 33, 33, 32, 32, 32, 32, 31, 31, 30, 30, 29, 29, 28,
-28, 27, 27, 26, 25, 25, 24, 23, 23, 21, 21, 20, 19, 18, 17, 16, 15, 14, 12, 11,
-10, 9, 8, 7, 7, 6, 5, 4, 3, 2, 1, 0, -2, -3, -4, -4, -5, -6, -7, -8, -8, -9,
--10, -11, -12, -12, -13, -14, -15, -16, -16, -17, -18, -19, -20, -20, -21, -22,
--23, -23, -24, -25, -25, -26, -26, -27, -27, -28, -29, -29, -29, -30, -30, -31,
--31, -32, -32, -32, -32, -33, -33, -33, -33, -33, -33, -34, -34, -34, -34, -34,
--34, -34, -34, -34, -34, -34, -34, -34, -35, -35, -35, -35, -35, -35, -35, -35,
--35, -35, -35, -35, -34, -34, -34, -34, -33, -33, -33, -33, -33, -32, -32, -32,
--32, -31, -31, -31, -31, -31, -30, -30, -30, -29, -29, -29, -28, -28, -28, -27,
--27, -26, -26, -25, -25, -24, -24, -23, -23, -22, -21, -21, -20, -19, -19, -18,
--17, -17, -16, -15, -14, -14, -13, -12, -12, -11, -10, -9, -9, -8, -7, -6, -5,
--5, -4, -3, -2, -1, -1, 0, 1, 2, 3, 3, 4, 5, 6, 7, 7, 8, 9, 10, 11, 12, 12, 13,
-14, 15, 16, 16, 17, 18, 19, 20, 20, 21, 22, 23, 24, 24, 25, 26, 26, 27, 28, 28,
-29, 29, 30, 30, 31, 31, 31, 32, 32, 32, 32, 33, 33, 32, 33, 33, 34, 34, 34, 34,
-34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-35, 35, 35, 35, 35, 35, 35, 35, 35, 34, 34, 34, 34, 33, 33, 32, 33, 33, 32, 32,
-32, 31, 31, 31, 31, 30, 30, 30, 29, 29, 29, 28, 28, 28, 27, 27, 26, 26, 26, 25,
-25, 24, 24, 23, 22, 22, 21, 20, 20, 19, 18, 17, 17, 16, 15, 14, 13, 12, 11, 11,
-10, 9, 8, 7, 6, 5, 4, 4, 3, 2, 1, 0, -1, -1, -2, -3, -4, -5, -5, -6, -7, -8, -9,
--9, -10, -11, -12, -12, -13, -14, -14, -15, -16, -17, -17, -18, -19, -19, -20,
--21, -21, -22, -23, -23, -24, -24, -25, -26, -26, -27, -27, -28, -28, -29, -30,
--30, -30, -31, -31, -32, -32, -32, -33, -33, -33, -34, -34, -34, -34, -34, -35,
--35, -35, -35, -35, -35, -35, -35, -36, -36, -36, -36, -36, -36, -36, -36, -36,
--36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36,
--35, -35, -35, -35, -35, -34, -34, -34, -34, -34, -33, -33, -33, -33, -32, -32,
--32, -32, -31, -31, -31, -31, -30, -30, -30, -29, -29, -29, -28, -28, -27, -27,
--26, -26, -26, -25, -24, -24, -23, -23, -22, -21, -21, -20, -19, -19, -18, -17,
--17, -16, -15, -15, -14, -13, -12, -12, -11, -10, -9, -9, -8, -7, -6, -6, -5,
--4, -3, -3, -2, -1, 0, 0, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 11, 11, 12, 13,
-14, 15, 15, 16, 17, 18, 19, 19, 20, 21, 22, 22, 23, 24, 25, 25, 26, 26, 27, 28,
-28, 29, 29, 29, 30, 30, 30, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 33, 33, 32,
-33, 33, 34, 33, 33, 32, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 33, 33, 32, 33, 33, 32, 32, 32, 32, 31,
-31, 31, 31, 30, 30, 30, 29, 29, 29, 29, 28, 28, 28, 27, 27, 26, 26, 26, 25, 25,
-24, 24, 23, 23, 22, 22, 21, 20, 20, 19, 18, 18, 17, 16, 15, 14, 13, 12, 12, 11,
-10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 1, 0, -1, -2, -3, -3, -4, -5, -6, -7, -7, -8, -9,
--10, -10, -11, -12, -12, -13, -14, -14, -15, -15, -16, -17, -17, -18, -18, -19,
--19, -20, -20, -21, -21, -22, -22, -23, -23, -24, -24, -25, -25, -25, -26, -26,
--27, -27, -27, -27, -28, -28, -28, -28, -29, -29, -29, -29, -29, -29, -29, -29,
--29, -29, -29, -30, -30, -30, -30, -30, -29, -29, -29, -29, -29, -29, -29, -29,
--29, -29, -29, -29, -29, -29, -29, -29, -29, -28, -28, -28, -28, -28, -28, -28,
--28, -27, -27, -27, -27, -27, -26, -26, -26, -26, -26, -25, -25, -25, -25, -25,
--24, -24, -24, -24, -23, -23, -23, -23, -23, -22, -22, -22, -21, -21, -21, -21,
--20, -20, -20, -19, -19, -19, -18, -18, -18, -17, -17, -17, -16, -16, -15, -15,
--15, -14, -14, -13, -13, -13, -12, -12, -12, -11, -11, -10, -10, -10, -9, -9,
--8, -8, -8, -7, -7, -7, -6, -6, -5, -5, -5, -4, -4, -4, -3, -3, -3, -2, -2, -1,
--1, -1, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 6, 6,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6,
-6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2,
-2, 2, 1, 1, 1, 1, 1, 0, 0, 0, 0, -1, -1, -1, -1, -2, -2, -2, -2, -3, -3, -3, -3,
--4, -4, -4, -4, -4, -5, -5, -5, -5, -6, -6, -6, -6, -6, -6, -7, -7, -7, -7, -7,
--8, -8, -8, -8, -8, -8, -8, -9, -9, -9, -9, -9, -9, -9, -9, -10, -10, -10, -10,
--10, -10, -10, -10, -10, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11,
--11, -11, -11, -11, -11, -11, -11, -11, -12, -11, -11, -11, -11, -11, -11, -11,
--11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11,
--11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -10, -10,
--10, -10, -10, -10, -10, -10, -10, -10, -10, -10, -10, -10, -10, -10, -9, -9,
--9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -8, -8, -8, -8, -8, -8, -8,
--8, -8, -8, -8, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -6, -6, -6, -6, -6, -6,
--6, -6, -6, -6, -6, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -4, -4, -4, -4,
--4, -4, -4, -4, -4, -4, -4, -4, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
--3, -3, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
--3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -4, -4, -4, -4, -4, -4, -4,
--4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
--4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
--4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
--4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
--4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
--4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
--3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
--3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
--3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
--3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
--3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -2,
--3, -2, -3, -2, -3, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, };
-
- #endif /* kick909_H_ */
diff --git a/PolyDrums_v0_1_3_DelayLPF/snare909.h b/PolyDrums_v0_1_3_DelayLPF/snare909.h
deleted file mode 100644
index d42b2e3..0000000
--- a/PolyDrums_v0_1_3_DelayLPF/snare909.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifndef snare909_H_
-#define snare909_H_
-
-#include "Arduino.h"
-#include <avr/pgmspace.h>
-
-#define snare909_NUM_CELLS 2048
-#define snare909_SAMPLERATE 16384
-
-const char __attribute__((progmem)) snare909_DATA [] = {0, -1, 0, -1, 0, -1, 0,
--1, 0, -1, 0, -1, 0, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0,
--1, 0, 0, -2, -2, 0, -2, -1, -3, -2, 4, -3, -7, -2, 1, -7, 6, -3, -2, -6, -8, 8,
--6, 0, -3, -1, -7, 0, -4, -11, -2, 3, -7, -9, 19, -1, 33, 43, 22, 60, 57, 49,
-58, 55, 68, 65, 62, 60, 60, 69, 64, 61, 57, 58, 43, 50, 39, 37, 27, 17, 21, 15,
-11, -2, -6, -12, -6, -23, -7, -22, -30, -22, -25, -27, -26, -31, -31, -21, -18,
--8, -18, -4, 3, 1, 8, 12, 12, 19, 14, 42, 28, 21, 43, 45, 49, 46, 46, 43, 55,
-44, 47, 44, 30, 46, 34, 38, 42, 24, 34, 27, 45, 23, 28, 38, 35, 36, 23, 30, 28,
-40, 23, 32, 35, 29, 31, 31, 30, 28, 30, 30, 12, 13, 18, 8, 7, -2, 5, 6, -1, -7,
--5, -9, -10, -11, -13, -17, -22, -25, -24, -24, -33, -28, -24, -30, -20, -28,
--41, -28, -29, -26, -27, -37, -26, -29, -32, -20, -31, -26, -15, -20, -9, -14,
--15, -12, -6, -7, -3, 8, 6, 15, 16, 12, 21, 30, 25, 35, 35, 29, 46, 44, 38, 49,
-34, 48, 44, 44, 55, 38, 50, 41, 52, 43, 43, 53, 44, 56, 46, 39, 41, 44, 42, 42,
-44, 41, 43, 35, 38, 39, 26, 30, 36, 31, 27, 26, 21, 20, 15, 9, 8, -2, 0, 10,
--10, -13, -3, -17, -14, -14, -18, -7, -30, -24, -32, -26, -28, -37, -23, -35,
--25, -40, -31, -34, -46, -30, -42, -38, -26, -37, -33, -32, -27, -32, -23, -23,
--20, -13, -11, -10, -18, 0, -13, -3, -8, 3, -6, 4, 19, -1, 12, 14, 19, 10, 13,
-9, 20, 19, 21, 23, 21, 34, 21, 24, 34, 20, 31, 28, 31, 36, 24, 33, 23, 31, 27,
-30, 35, 37, 26, 17, 21, 19, 27, 21, 24, 17, 23, 19, 24, 19, 4, 23, 7, 15, 17,
-14, 24, 8, 15, 10, 5, 6, 11, 12, -5, 9, 9, 10, 9, 1, 5, 0, -2, -2, 1, 1, -7, 0,
-3, -2, -2, -8, -8, -19, -4, -18, -6, -4, -11, -5, -15, -1, -28, -12, -19, -10,
--15, -23, -19, -23, -9, -25, -22, -21, -22, -18, -23, -18, -16, -31, -28, -23,
--20, -27, -15, -26, -23, -22, -23, -16, -22, -29, -20, -11, -29, -12, -17, -14,
--15, -12, -16, -22, -21, -8, -11, -16, -8, -13, -12, -8, -15, -14, -9, -14, -2,
--13, 3, -9, -12, 9, 3, 0, 7, -3, 0, 9, 2, 9, 7, 5, 4, 18, 12, 3, 14, 17, 16, 19,
-14, 6, 21, 24, 23, 18, 24, 18, 11, 25, 25, 20, 24, 22, 5, 27, 20, 13, 25, 28,
-17, 19, 11, 14, 24, 10, 23, 10, 23, 19, 16, 9, 14, 9, 14, 17, 6, 13, 8, 11, -1,
-17, 9, 0, 6, 4, -1, 3, -12, -10, -4, -12, -9, -14, -5, -24, -11, -14, -21, -16,
--13, -18, -30, -17, -29, -25, -21, -21, -29, -30, -15, -34, -30, -21, -29, -25,
--26, -28, -36, -27, -30, -28, -25, -21, -11, -31, -18, -21, -12, -12, -12, -13,
--17, -15, -17, 0, -21, -9, 3, -3, -1, -7, 2, -3, 3, 3, -9, 13, 8, 5, -3, 9, 13,
-3, 18, 6, 13, 13, 15, 12, 7, 10, 14, 12, 11, 3, 12, 15, 17, 6, 7, 26, -1, 16,
-19, 8, 16, 12, 15, 1, 10, 20, 7, 7, 8, 17, 1, 3, 12, 8, 7, 10, 9, -4, 1, -3, 5,
-1, 0, 1, 4, 3, -6, 1, -2, -2, -10, -7, -1, -3, -4, -19, 0, -10, -13, -4, -15,
--8, -4, -13, -24, -10, -8, -13, -10, -11, -24, -14, -18, -6, -9, -24, -20, -10,
--12, -18, -11, -14, -13, -18, -17, -28, -8, -27, -20, -14, -15, -11, -18, -9,
--16, -15, -17, -16, -6, -13, -17, 3, -25, -1, -11, -4, -6, -8, -5, -14, 0, -11,
-5, -3, 0, 0, -1, -12, 0, -2, -5, 6, 5, 4, 4, -11, 2, 3, -4, 12, 1, 5, -2, 3, -3,
-0, 2, 6, 7, -7, 2, 1, 6, 5, -2, 0, 2, 1, 9, 1, 9, -5, -6, 7, -2, 5, -3, 16, -1,
-1, 2, 4, 10, -3, 17, -2, 6, 7, 2, 9, -2, 1, -6, 10, -5, -1, 3, -8, 11, -6, 7,
--1, -7, 2, -3, -6, 1, -3, -11, -3, -3, -7, -12, -4, -7, -10, -9, -18, -6, -11,
--20, -3, -12, -6, -10, -24, -9, -16, -18, -9, -18, -20, -11, -9, -15, -24, -10,
--20, -27, -13, -14, -13, -19, -18, -23, -21, -17, -14, -22, -15, -21, -19, -14,
--19, -11, -15, -15, -17, -17, -18, -12, -12, -12, -8, -10, -17, -9, -14, -3, -5,
--10, -9, -10, -8, -10, 7, -5, -3, 0, -2, 3, -3, 6, -6, -7, -1, 3, 5, 1, 4, -12,
-8, 5, -1, 11, 6, -4, 3, 6, -1, 10, 1, 7, 2, 7, 6, -6, 2, 3, 3, 1, 6, 0, -3, 5,
-5, 7, 1, -3, -2, -2, 6, 2, -3, 0, 3, 4, -4, 2, -5, -1, -2, -4, 0, -8, -8, -5, 2,
--9, -6, -1, -2, -9, -6, -12, 1, -10, -14, -9, -13, -10, -10, -9, -10, -7, -17,
--3, -13, -7, -12, -15, -16, -10, -9, -16, -7, -11, -11, -13, -14, -9, -11, -16,
--17, -12, -10, -16, -10, -11, -14, -4, -14, -17, -7, -12, -6, -16, -2, -7, -9,
--10, -9, -5, -18, 1, -8, 0, 1, -9, -16, -4, -3, -6, 4, -9, -2, -10, 0, 1, -10,
-3, -1, -3, -2, -4, 0, 3, -3, 0, -1, 0, 2, -4, 2, -3, -8, 0, -5, 5, -7, -4, 3,
--9, 6, -10, 5, 1, -4, 2, -8, 2, -6, 2, -1, 2, -2, -6, 1, -6, -5, -3, 7, -8, -5,
-2, -7, -1, -8, 3, 0, 0, 1, -6, -3, -5, -3, -3, -9, -6, 1, -7, -5, -3, -3, -6,
--11, -5, -1, -8, -15, -1, -8, -8, 0, -13, -9, 0, -14, -10, -9, -9, -11, -3, -11,
--14, -7, -5, -4, -12, -18, -16, -2, -19, -7, -13, -5, -12, -10, -6, -23, -4,
--10, -11, -8, -10, -14, -12, -5, -14, -13, -3, -8, -16, -10, -8, -15, -6, -13,
--10, -11, -8, -6, -12, -9, -8, -10, -10, -8, -4, -13, -5, -6, -11, 2, -14, -2,
--6, -7, -1, -11, 1, -4, -9, 3, -3, 2, -8, -1, -2, -7, -1, 0, 4, -3, 3, -7, 2,
--3, -1, 1, -3, -2, -1, 7, -4, 1, -2, -2, -4, -3, 8, -9, 1, -1, -3, 4, -6, 3, 3,
-0, -1, -5, -7, -2, 1, -4, 3, 0, -9, 0, -4, 4, -5, -4, 1, -3, -4, -5, -3, -7, -8,
--7, 2, -9, -8, -2, -7, -3, -10, -6, -4, -12, -6, -10, -7, -10, -10, -5, -11, -3,
--7, -13, -10, -8, -6, -15, -7, -7, -11, -9, -11, -8, -10, -11, -8, -6, -12, -8,
--10, -8, -6, -10, -7, -8, -7, -8, -11, -3, -4, -5, -6, -12, -8, -6, -6, -3, -6,
--6, -6, -2, 1, -12, -5, -4, -6, -1, -1, -7, -5, -4, -3, 1, -6, 2, -6, 0, -5, -9,
-4, -7, -2, 2, -3, 1, -3, -4, -4, -1, -2, -4, 3, -5, -2, -3, -4, -1, -4, 1, -1,
--10, 1, 0, -9, 2, -3, -6, -2, 6, -5, -6, -2, -3, -3, -4, -4, -6, -1, -5, -6, -1,
--2, -9, -1, -2, -5, -3, 0, -5, -7, -5, -8, -1, -7, -6, -4, -2, -6, -7, -7, -8,
--5, 0, -4, -12, -4, -10, -3, -4, -11, -3, -6, -6, -6, -9, -7, -9, -7, -5, -7,
--2, -10, -10, -3, -10, -5, -7, -10, -6, -12, -6, -9, -4, -7, -8, -5, -12, -6,
--5, -4, -9, -4, -7, -5, -5, -8, -7, -7, -9, -7, -5, -11, -3, -6, -3, -5, -8, -4,
--3, -6, -8, -6, -5, -4, -5, -6, -2, -6, -6, -2, -5, -3, -4, -5, -7, -3, -2, -2,
--2, -9, 1, -3, -8, 0, -3, 0, -5, -3, -2, -1, 0, -3, -3, -4, 1, -2, -8, 3, -1,
--5, 1, 0, -3, -4, -4, -1, 0, -3, 2, -6, -1, -3, -6, 2, -4, -3, -3, -1, -1, -5,
--3, 0, 0, -6, -1, -4, -5, -3, 0, -1, -4, -8, -4, 0, -9, 0, -4, -5, -4, -1, -5,
--6, -4, -6, -3, -6, -6, -9, -4, -4, -7, -4, -3, -10, -6, -6, -5, -5, -8, -5, -9,
--5, -6, -5, -6, -9, -8, -4, -5, -10, -3, -7, -6, -6, -4, -6, -9, -4, -6, -2, -7,
--2, -3, -7, -4, -7, -3, -5, -3, -4, -7, -4, -3, -3, -2, -1, -5, -4, -3, -4, -3,
--3, -2, -3, -1, -3, -7, 0, -3, 2, -1, -5, -3, -1, -3, -5, 1, -8, 2, -5, 0, -1,
--6, -1, -2, 2, -5, -1, -1, -2, -2, -1, -6, 0, -5, -2, 0, -5, -2, -4, 1, -5, -4,
--2, 0, -5, -3, 0, -5, -1, -2, -3, -3, -4, -2, -3, -3, -5, -4, -2, -6, -3, -6,
--4, -3, -6, -3, -2, -5, -5, -5, -4, -5, -3, -3, -8, -2, -6, -3, -4, -9, -1, -8,
--4, -4, -7, -2, -6, -3, -5, -4, -3, -5, -3, -8, -4, -8, -5, -3, -8, -1, -7, -2,
--4, -6, -5, -3, -4, -3, -4, -4, -1, -5, -2, -5, -2, -3, -4, -3, -5, -2, -4, -1,
--4, -4, -1, -3, -1, -4, -4, -3, -2, -3, -1, -3, -5, -2, -1, -3, -2, 0, -4, -2,
--3, -4, -2, -3, -2, -2, -1, -3, -4, -2, -3, -2, -3, 0, -5, -2, -1, -3, -1, -2,
--1, -5, -2, -1, -2, -2, -2, -1, -2, -2, -3, -2, -4, -2, -1, -3, -2, -2, -2, -2,
--1, -4, -4, -1, -3, -2, -1, -6, -1, -4, -4, -2, -5, -1, -4, -1, -4, -4, -2, -3,
--4, -2, -4, -4, -3, -4, -1, -5, -5, -3, -3, -4, -4, -5, -3, -3, -6, -4, -4, -3,
--4, -4, -3, -4, -3, -5, -5, -4, -6, -2, -6, -3, -4, -4, -3, -5, -2, -5, -5, -3,
--3, -4, -4, -4, -2, -3, -4, -4, -4, -2, -3, -3, -3, -3, -3, -2, -2, -4, -1, -2,
--3, -1, -3, -1, -2, -3, -3, -1, -4, -3, -1, -2, -2, -1, -2, -2, -2, -3, -1, -2,
--1, -1, -3, -2, -1, -2, -2, -2, -1, -1, -1, -2, -2, -1, -2, -1, -2, -2, -1, -2,
--2, -2, -1, -2, -2, -1, -2, -2, -1, -2, -2, -2, -2, -1, -2, -3, -2, -2, -2, -2,
--2, -2, -2, -2, -3, -3, -2, -2, -3, -2, -3, -3, -3, -3, -2, -3, -2, -3, -3, -3,
--3, -2, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -2, -3, -3, -3,
--3, -3, -3, -3, -3, -3, -2, -3, -3, -2, -3, -2, -2, -2, -2, -2, -3, -2, -2, -3,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--1, -2, -2, -2, -2, -1, -2, -1, -1, -2, -2, -1, -2, -1, -2, -2, -2, -2, -1, -2,
--2, -2, -2, -1, -1, -2, -1, -2, -1, -2, -2, -1, -1, -1, -2, -1, -2, -1, -2, -1,
--1, -2, -1, -1, -1, -1, -1, -1, -2, -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
--2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -1, -1, -1, -1, };
-
- #endif /* snare909_H_ */