neale
/
uilleann
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Pitch adjustment

This commit is contained in:
Neale Pickett 2020-10-17 15:25:19 -06:00
parent b4fc050f4a
commit 26fb769349
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
synth.ino
View File

@ -108,7 +108,7 @@ void setup(){
// Initialize the Trellis // Initialize the Trellis
trellis.begin(); trellis.begin();
trellis.setBrightness(20); //trellis.setBrightness(20);
AudioMemory(120); AudioMemory(120);
@ -127,13 +127,6 @@ void setup(){
AudioMemoryUsageMaxReset(); AudioMemoryUsageMaxReset();
} }
void wtfSetPitch(float freq) {
for (int i=0; i<4; i++) {
Operator op = Bank[currentPatch].operators[i];
oscs[i]->frequency(op.baseFrequency + freq*op.multiplier);
}
}
void setPitch(float freq) { void setPitch(float freq) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
Operator op = Bank[currentPatch].operators[i]; Operator op = Bank[currentPatch].operators[i];
@ -158,25 +151,38 @@ void noteOff() {
} }
AudioInterrupts(); AudioInterrupts();
} }
#define BUTTON_UP 7
#define BUTTON_RESET 15
#define BUTTON_DOWN 31
#define BUTTON_PITCH 24
int16_t pitchAdjust = 0;
#define PITCH_RANGE
void trellisLoop() { void trellisLoop() {
trellis.tick(); trellis.tick();
while (trellis.available()) { // Pitch adjust
keypadEvent e = trellis.read(); if (trellis.isPressed(BUTTON_PITCH)) {
int keyindex = e.bit.KEY; if (trellis.isPressed(BUTTON_DOWN)) {
if (e.bit.EVENT == KEY_JUST_PRESSED) { pitchAdjust -= 4;
trellis.setPixelColor(keyindex, 0x600000);
noteOn(JustPitches[NOTE_D3 + keyindex]);
} else if (e.bit.EVENT == KEY_JUST_RELEASED){
noteOff();
trellis.setPixelColor(keyindex, 0);
} }
if (trellis.isPressed(BUTTON_UP)) {
pitchAdjust += 4;
}
if (trellis.isPressed(BUTTON_RESET)) {
pitchAdjust = 0;
}
float adj = pow(2, pitchAdjust / 32768.0);
setupJustPitches(NOTE_D4, PITCH_D4*adj);
trellis.setPixelColor(BUTTON_PITCH, trellis.ColorHSV(uint16_t(pitchAdjust), 255, 80));
} }
} }
#define CLOSEDVAL 0x30 const uint8_t CLOSEDVAL=0x30;
#define OPENVAL 0x70 const uint8_t OPENVAL=0x70;
bool playing = false; bool playing = false;
@ -196,6 +202,7 @@ void loop() {
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
uint16_t val = cap.filteredData(i+KEY_OFFSET); uint16_t val = cap.filteredData(i+KEY_OFFSET);
uint8_t c = 0; uint8_t c = 0;
if (val < OPENVAL) { if (val < OPENVAL) {
bitSet(keys, i); bitSet(keys, i);
c = 7; c = 7;
@ -212,6 +219,7 @@ void loop() {
} }
// print key states // print key states
oled.rectFill(32 - 4*i, 40, 3, c); oled.rectFill(32 - 4*i, 40, 3, c);
trellis.setPixelColor(i, 1 << c);
} }
note = uilleann_matrix[keys]; note = uilleann_matrix[keys];
@ -223,6 +231,7 @@ void loop() {
note = note & 0x7f; note = note & 0x7f;
gnote = gnote & 0x7f; gnote = gnote & 0x7f;
// All keys closed + knee = no sound // All keys closed + knee = no sound
if (knee) { if (knee) {
oled.rectFill(36, 42, 3, 3); oled.rectFill(36, 42, 3, 3);