begin the great digital cleanup
This commit is contained in:
Gordon JC Pearce
parent
357cbbac9a
commit
eb86b3c7d3
@ -145,7 +145,7 @@ void Chassis::run(const float **, float **outputs, uint32_t frames, const MidiEv
|
||||
}
|
||||
|
||||
// printf("voice %d note = %02x ff71 = %04x\n",i, s.voice[i].note, s.voice[i].ff71 );
|
||||
s.voice[i].gate(s);
|
||||
s.voice[i].envelope(s);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
/*
|
||||
Chassis polysynth framework
|
||||
|
||||
@ -19,17 +18,21 @@
|
||||
|
||||
// contains the emulation of the digital bits
|
||||
|
||||
#include "digital.hpp"
|
||||
|
||||
#include <cmath>
|
||||
#include <cstdio>
|
||||
|
||||
#include "voice.hpp"
|
||||
|
||||
using namespace Digital;
|
||||
|
||||
bool Voice::isFree() {
|
||||
return ff10 == false;
|
||||
}
|
||||
|
||||
void Voice::calcPitch(Synth &s) {
|
||||
uint32_t bc, de, ea, a;
|
||||
uint32_t bc, ea, a;
|
||||
|
||||
// 03ad
|
||||
ea = 0x1818;
|
||||
@ -185,7 +188,7 @@ void Voice::off() {
|
||||
}
|
||||
}
|
||||
|
||||
void Voice::gate(Synth &s) {
|
||||
void Voice::envelope(Synth &s) {
|
||||
uint16_t bc, ea = env;
|
||||
|
||||
ff11 = ff10;
|
||||
@ -210,7 +213,7 @@ h051e:
|
||||
ea -= bc;
|
||||
bc = ea;
|
||||
|
||||
ea = (ea * decay_table[s.patchRam.env_d]) >> 16;
|
||||
ea = (ea * decayTable[s.patchRam.env_d]) >> 16;
|
||||
ea += s.patchRam.env_s << 7;
|
||||
// printf("returning from decay phase\n");
|
||||
goto h0590;
|
||||
@ -226,14 +229,14 @@ h054a:
|
||||
ff33 = false;
|
||||
ff08 = false;
|
||||
bc = ea;
|
||||
ea = (ea * decay_table[s.patchRam.env_r]) >> 16;
|
||||
ea = (ea * decayTable[s.patchRam.env_r]) >> 16;
|
||||
// printf("returning from release phase\n");
|
||||
goto h0590;
|
||||
|
||||
h0563:
|
||||
// printf("attack phase\n");
|
||||
ff08 = false;
|
||||
ea += attack_table[s.patchRam.env_a];
|
||||
ea += attackTable[s.patchRam.env_a];
|
||||
if (ea & 0xc000) {
|
||||
ea = 0x3fff;
|
||||
ff33 = true;
|
||||
@ -248,7 +251,7 @@ h0590:
|
||||
void Synth::lfoDelay() {
|
||||
// compute LFO delay
|
||||
|
||||
uint16_t a, bc, d, de, ea, tos;
|
||||
uint16_t a, bc, d, ea, tos;
|
||||
|
||||
// 030d
|
||||
if (!keyon /* ff11 */) goto h036b; // skip ahead if no notes are pressed
|
||||
|
||||
@ -64,11 +64,7 @@ void Voice::run(Synth &s, float *buffer, uint32_t samples) {
|
||||
while (true) {
|
||||
if (pulseStage == 0) {
|
||||
if (phase < pw) break;
|
||||
#if 0
|
||||
t = (phase - pw) / omega;
|
||||
#else
|
||||
t = (phase - pw) / (lastpw - pw + omega);
|
||||
#endif
|
||||
y -= poly3blep0(t) * sqr;
|
||||
delay -= poly3blep1(t) * sqr;
|
||||
pulseStage = 1;
|
||||
@ -77,7 +73,7 @@ void Voice::run(Synth &s, float *buffer, uint32_t samples) {
|
||||
if (pulseStage == 1) {
|
||||
if (phase < 1) break;
|
||||
|
||||
float t = (phase - 1) / omega;
|
||||
t = (phase - 1) / omega;
|
||||
y += poly3blep0(t) * (saw + sqr);
|
||||
delay += poly3blep1(t) * (saw + sqr);
|
||||
|
||||
@ -123,6 +119,3 @@ void Voice::run(Synth &s, float *buffer, uint32_t samples) {
|
||||
buffer[i] += (gain * b4 * vr58c106);
|
||||
}
|
||||
}
|
||||
|
||||
void Voice::filter(Synth &s, float *buffer, uint32_t samples) {
|
||||
}
|
||||
@ -32,9 +32,8 @@ class Voice {
|
||||
void off();
|
||||
bool isFree();
|
||||
void run(Synth &s, float *buffer, uint32_t samples);
|
||||
void gate(Synth &s);
|
||||
void envelope(Synth &s);
|
||||
void calcPitch(Synth &s);
|
||||
void filter(Synth &s, float *buffer, uint32_t samples);
|
||||
|
||||
uint16_t ff71 = 0; // stores pitch + fraction
|
||||
|
||||
@ -68,40 +67,6 @@ class Voice {
|
||||
float vr58c106 = 0;
|
||||
|
||||
float b1, b2, b3, b4;
|
||||
|
||||
uint16_t attack_table[128] = {
|
||||
0x4000, 0x2000, 0x1000, 0x0aaa, 0x0800, 0x0666, 0x0555, 0x0492, 0x0400,
|
||||
0x038e, 0x0333, 0x02e9, 0x02ab, 0x0276, 0x0249, 0x0222, 0x0200, 0x01e2,
|
||||
0x01c7, 0x01af, 0x0199, 0x0186, 0x0174, 0x0164, 0x0155, 0x0148, 0x013b,
|
||||
0x012f, 0x0124, 0x011a, 0x0111, 0x0108, 0x0100, 0x00f8, 0x00f1, 0x00ea,
|
||||
0x00e4, 0x00dd, 0x00d8, 0x00d2, 0x00cd, 0x00c8, 0x00c3, 0x00bf, 0x00ba,
|
||||
0x00b6, 0x00b2, 0x00ae, 0x00ab, 0x00a7, 0x00a4, 0x00a1, 0x009e, 0x009b,
|
||||
0x0098, 0x0095, 0x0092, 0x0090, 0x008d, 0x008b, 0x0089, 0x0086, 0x0084,
|
||||
0x0082, 0x007f, 0x007d, 0x007a, 0x0077, 0x0074, 0x0072, 0x006f, 0x006c,
|
||||
0x0069, 0x0067, 0x0064, 0x0061, 0x005e, 0x005c, 0x0059, 0x0056, 0x0053,
|
||||
0x0050, 0x004e, 0x004b, 0x0048, 0x0045, 0x0042, 0x0040, 0x003f, 0x003d,
|
||||
0x003c, 0x003a, 0x0039, 0x0037, 0x0036, 0x0034, 0x0033, 0x0031, 0x0030,
|
||||
0x002e, 0x002d, 0x002b, 0x002a, 0x0028, 0x0027, 0x0025, 0x0024, 0x0022,
|
||||
0x0021, 0x0021, 0x0020, 0x0020, 0x001f, 0x001f, 0x001e, 0x001e, 0x001d,
|
||||
0x001d, 0x001c, 0x001c, 0x001b, 0x001b, 0x001a, 0x0019, 0x0018, 0x0017,
|
||||
0x0016, 0x0015};
|
||||
|
||||
uint16_t decay_table[128] = {
|
||||
0x1000, 0x3000, 0x5000, 0x7000, 0x9000, 0xa000, 0xa800, 0xb000, 0xb800,
|
||||
0xc000, 0xc800, 0xd000, 0xd800, 0xe000, 0xe800, 0xf000, 0xf080, 0xf100,
|
||||
0xf180, 0xf200, 0xf280, 0xf300, 0xf380, 0xf400, 0xf480, 0xf500, 0xf580,
|
||||
0xf600, 0xf680, 0xf700, 0xf780, 0xf800, 0xf880, 0xf900, 0xf980, 0xfa00,
|
||||
0xfa80, 0xfb00, 0xfb80, 0xfc00, 0xfc80, 0xfd00, 0xfd80, 0xfe00, 0xfe0c,
|
||||
0xfe18, 0xfe24, 0xfe30, 0xfe3c, 0xfe48, 0xfe54, 0xfe60, 0xfe6c, 0xfe78,
|
||||
0xfe84, 0xfe90, 0xfe9c, 0xfea8, 0xfeb4, 0xfec0, 0xfecc, 0xfed8, 0xfee4,
|
||||
0xfef0, 0xfefc, 0xff08, 0xff0c, 0xff10, 0xff14, 0xff18, 0xff1c, 0xff20,
|
||||
0xff24, 0xff28, 0xff2c, 0xff30, 0xff34, 0xff38, 0xff3c, 0xff40, 0xff44,
|
||||
0xff48, 0xff4c, 0xff50, 0xff54, 0xff58, 0xff5c, 0xff60, 0xff64, 0xff68,
|
||||
0xff6c, 0xff70, 0xff74, 0xff78, 0xff7c, 0xff80, 0xff84, 0xff88, 0xff8c,
|
||||
0xff90, 0xff94, 0xff98, 0xff9c, 0xffa0, 0xffa4, 0xffa8, 0xffac, 0xffb0,
|
||||
0xffb4, 0xffb8, 0xffbc, 0xffc0, 0xffc4, 0xffc8, 0xffcc, 0xffd0, 0xffd4,
|
||||
0xffd8, 0xffdc, 0xffe0, 0xffe4, 0xffe8, 0xffec, 0xfff0, 0xfff1, 0xfff2,
|
||||
0xfff3, 0xfff4};
|
||||
};
|
||||
class Synth {
|
||||
public:
|
||||
@ -161,54 +126,6 @@ class Synth {
|
||||
uint8_t switch2 = 24;
|
||||
} patchRam;
|
||||
|
||||
uint8_t lfoDepthTable[128] = {
|
||||
0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
|
||||
0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
|
||||
0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21,
|
||||
0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
|
||||
0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
|
||||
0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c,
|
||||
0x4e, 0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x62, 0x64,
|
||||
0x66, 0x68, 0x6a, 0x6c, 0x6e, 0x70, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c,
|
||||
0x80, 0x84, 0x88, 0x8c, 0x90, 0x94, 0x98, 0x9c, 0xa0, 0xa4, 0xa8, 0xac,
|
||||
0xb0, 0xb4, 0xb8, 0xbc, 0xc0, 0xc4, 0xc8, 0xcc, 0xd0, 0xd4, 0xd8, 0xdc,
|
||||
0xe0, 0xe4, 0xe8, 0xec, 0xf0, 0xf8, 0xff, 0xff};
|
||||
uint16_t lfoRateTable[128] = {
|
||||
0x0005, 0x000f, 0x0019, 0x0028, 0x0037, 0x0046, 0x0050, 0x005a, 0x0064,
|
||||
0x006e, 0x0078, 0x0082, 0x008c, 0x0096, 0x00a0, 0x00aa, 0x00b4, 0x00be,
|
||||
0x00c8, 0x00d2, 0x00dc, 0x00e6, 0x00f0, 0x00fa, 0x0104, 0x010e, 0x0118,
|
||||
0x0122, 0x012c, 0x0136, 0x0140, 0x014a, 0x0154, 0x015e, 0x0168, 0x0172,
|
||||
0x017c, 0x0186, 0x0190, 0x019a, 0x01a4, 0x01ae, 0x01b8, 0x01c2, 0x01cc,
|
||||
0x01d6, 0x01e0, 0x01ea, 0x01f4, 0x01fe, 0x0208, 0x0212, 0x021c, 0x0226,
|
||||
0x0230, 0x023a, 0x0244, 0x024e, 0x0258, 0x0262, 0x026c, 0x0276, 0x0280,
|
||||
0x028a, 0x029a, 0x02aa, 0x02ba, 0x02ca, 0x02da, 0x02ea, 0x02fa, 0x030a,
|
||||
0x031a, 0x032a, 0x033a, 0x034a, 0x035a, 0x036a, 0x037a, 0x038a, 0x039a,
|
||||
0x03aa, 0x03ba, 0x03ca, 0x03da, 0x03ea, 0x03fa, 0x040a, 0x041a, 0x042a,
|
||||
0x043a, 0x044a, 0x045a, 0x046a, 0x047a, 0x048a, 0x04be, 0x04f2, 0x0526,
|
||||
0x055a, 0x058e, 0x05c2, 0x05f6, 0x062c, 0x0672, 0x06b8, 0x0708, 0x0758,
|
||||
0x07a8, 0x07f8, 0x085c, 0x08c0, 0x0924, 0x0988, 0x09ec, 0x0a50, 0x0ab4,
|
||||
0x0b18, 0x0b7c, 0x0be0, 0x0c58, 0x0cd0, 0x0d48, 0x0dde, 0x0e74, 0x0f0a,
|
||||
0x0fa0, 0x1000};
|
||||
|
||||
uint16_t attackTable[128] = {
|
||||
0x4000, 0x2000, 0x1000, 0x0aaa, 0x0800, 0x0666, 0x0555, 0x0492, 0x0400,
|
||||
0x038e, 0x0333, 0x02e9, 0x02ab, 0x0276, 0x0249, 0x0222, 0x0200, 0x01e2,
|
||||
0x01c7, 0x01af, 0x0199, 0x0186, 0x0174, 0x0164, 0x0155, 0x0148, 0x013b,
|
||||
0x012f, 0x0124, 0x011a, 0x0111, 0x0108, 0x0100, 0x00f8, 0x00f1, 0x00ea,
|
||||
0x00e4, 0x00dd, 0x00d8, 0x00d2, 0x00cd, 0x00c8, 0x00c3, 0x00bf, 0x00ba,
|
||||
0x00b6, 0x00b2, 0x00ae, 0x00ab, 0x00a7, 0x00a4, 0x00a1, 0x009e, 0x009b,
|
||||
0x0098, 0x0095, 0x0092, 0x0090, 0x008d, 0x008b, 0x0089, 0x0086, 0x0084,
|
||||
0x0082, 0x007f, 0x007d, 0x007a, 0x0077, 0x0074, 0x0072, 0x006f, 0x006c,
|
||||
0x0069, 0x0067, 0x0064, 0x0061, 0x005e, 0x005c, 0x0059, 0x0056, 0x0053,
|
||||
0x0050, 0x004e, 0x004b, 0x0048, 0x0045, 0x0042, 0x0040, 0x003f, 0x003d,
|
||||
0x003c, 0x003a, 0x0039, 0x0037, 0x0036, 0x0034, 0x0033, 0x0031, 0x0030,
|
||||
0x002e, 0x002d, 0x002b, 0x002a, 0x0028, 0x0027, 0x0025, 0x0024, 0x0022,
|
||||
0x0021, 0x0021, 0x0020, 0x0020, 0x001f, 0x001f, 0x001e, 0x001e, 0x001d,
|
||||
0x001d, 0x001c, 0x001c, 0x001b, 0x001b, 0x001a, 0x0019, 0x0018, 0x0017,
|
||||
0x0016, 0x0015};
|
||||
|
||||
uint16_t lfoDelayTable[8] = {
|
||||
0xffff, 0x0419, 0x020c, 0x015e, 0x0100, 0x0100, 0x0100, 0x0100};
|
||||
|
||||
float pitchCV[104];
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user