Now you can adjust pitch and intonation
This commit is contained in:
parent
c915b0ee69
commit
036dcf592e
|
|
@ -0,0 +1,3 @@
|
|||
BasedOnStyle: Chromium
|
||||
ColumnLimit: 0
|
||||
PointerAlignment: Right
|
||||
|
|
@ -6,8 +6,10 @@ struct Fingering {
|
|||
bool alt; // Alternate fingering: sounds more choked
|
||||
};
|
||||
|
||||
#define n(note) {note, false}
|
||||
#define P(note) {note, true}
|
||||
#define n(note) \
|
||||
{ note, false }
|
||||
#define P(note) \
|
||||
{ note, true }
|
||||
|
||||
#define CCCC n(NOTE_CS5), n(NOTE_CS5), n(NOTE_CS5), n(NOTE_CS5)
|
||||
#define CCDD n(NOTE_CS5), n(NOTE_CS5), n(NOTE_D5), n(NOTE_D5)
|
||||
|
|
|
|||
2
pipe.cpp
2
pipe.cpp
|
|
@ -1,6 +1,6 @@
|
|||
#include "pipe.h"
|
||||
#include "tuning.h"
|
||||
#include "fingering.h"
|
||||
#include "tuning.h"
|
||||
|
||||
// Kludge time: this is something I did just to make my breadboard look nicer.
|
||||
#define KEY_OFFSET 2
|
||||
|
|
|
|||
4
pipe.h
4
pipe.h
|
|
@ -1,9 +1,9 @@
|
|||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
#include <SparkFun_Qwiic_Button.h>
|
||||
#include <Adafruit_MPR121.h>
|
||||
#include <SparkFun_Qwiic_Button.h>
|
||||
#include <paj7620.h>
|
||||
#include <stdint.h>
|
||||
#include "tuning.h"
|
||||
|
||||
class Pipe {
|
||||
|
|
|
|||
51
tuning.cpp
51
tuning.cpp
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
#include <math.h>
|
||||
|
||||
// 12th root of 2, used for Twelvetone Equal Temperament
|
||||
#define TET_CONST 1.059463
|
||||
|
||||
Tuning::Tuning(Note base, float pitch, TuningSystem system) {
|
||||
Setup(base, pitch, system);
|
||||
}
|
||||
|
|
@ -14,18 +11,20 @@ Tuning::Tuning(Note base, float pitch) {
|
|||
|
||||
// I like just Intonation.
|
||||
Tuning::Tuning() {
|
||||
#if 0
|
||||
Tuning(NOTE_D4, PITCH_CONCERT_D4, TUNINGSYSTEM_JUST);
|
||||
#endif
|
||||
}
|
||||
|
||||
Note Tuning::GetBaseNote() { return baseNote; }
|
||||
Note Tuning::GetBaseNote() {
|
||||
return baseNote;
|
||||
}
|
||||
|
||||
void Tuning::SetTuningSystem(TuningSystem system) {
|
||||
Setup(baseNote, GetPitch(baseNote), system);
|
||||
}
|
||||
|
||||
TuningSystem Tuning::GetSystem() { return system; }
|
||||
TuningSystem Tuning::GetTuningSystem() {
|
||||
return system;
|
||||
}
|
||||
|
||||
// setupOctaves computes the entire tuning frequency chart.
|
||||
//
|
||||
|
|
@ -53,7 +52,7 @@ void Tuning::setupOctaves(Note base) {
|
|||
void Tuning::setupEqual(Note base, float pitch) {
|
||||
pitches[base] = pitch;
|
||||
for (int i = 1; i < 12; i++) {
|
||||
pitches[base + i] = pitches[base + i - 1] * TET_CONST;
|
||||
pitches[base + i] = pitches[base + i - 1] * TET_SEMITONE_MULTIPLIER;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -95,17 +94,43 @@ void Tuning::Setup(Note base, float pitch, TuningSystem system) {
|
|||
setupOctaves(base);
|
||||
}
|
||||
|
||||
void Tuning::Setup(Note base, float pitch) { Setup(base, pitch, system); }
|
||||
void Tuning::Setup(Note base, float pitch) {
|
||||
Setup(base, pitch, system);
|
||||
}
|
||||
|
||||
float Tuning::GetPitch(Note note) { return pitches[note]; }
|
||||
float Tuning::GetPitch(Note note) {
|
||||
return pitches[note];
|
||||
}
|
||||
|
||||
Note NearestNote(float pitch) {
|
||||
return Note(round(log2(pitch / PITCH_CONCERT_C0)));
|
||||
return Note(round(log(pitch / PITCH_CONCERT_C0) / log(TET_SEMITONE_MULTIPLIER)));
|
||||
}
|
||||
|
||||
const char *noteNames[]{
|
||||
"C ", "C#", "D ", "Eb", "E ", "F ", "F#", "G ", "Ab", "A ", "Bb", "B ",
|
||||
"C",
|
||||
"C#",
|
||||
"D",
|
||||
"Eb",
|
||||
"E",
|
||||
"F",
|
||||
"F#",
|
||||
"G",
|
||||
"Ab",
|
||||
"A",
|
||||
"Bb",
|
||||
"B",
|
||||
};
|
||||
|
||||
const char *NoteName(Note note) { return noteNames[note % 12]; }
|
||||
const char *NoteName(Note note) {
|
||||
return noteNames[note % 12];
|
||||
}
|
||||
|
||||
const char *TuningSystemName(TuningSystem system) {
|
||||
switch (system) {
|
||||
case TUNINGSYSTEM_EQUAL:
|
||||
return "Equal";
|
||||
case TUNINGSYSTEM_JUST:
|
||||
default:
|
||||
return "Just";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
136
tuning.h
136
tuning.h
|
|
@ -4,19 +4,118 @@
|
|||
enum TuningSystem {
|
||||
TUNINGSYSTEM_JUST,
|
||||
TUNINGSYSTEM_EQUAL,
|
||||
TUNINGSYSTEM_MAX = TUNINGSYSTEM_EQUAL,
|
||||
};
|
||||
#define TUNINGSYSTEM_MAX TUNINGSYSTEM_EQUAL
|
||||
|
||||
enum Note {
|
||||
NOTE_C0, NOTE_CS0, NOTE_D0, NOTE_DS0, NOTE_E0, NOTE_F0, NOTE_FS0, NOTE_G0, NOTE_GS0, NOTE_A0, NOTE_AS0, NOTE_B0,
|
||||
NOTE_C1, NOTE_CS1, NOTE_D1, NOTE_DS1, NOTE_E1, NOTE_F1, NOTE_FS1, NOTE_G1, NOTE_GS1, NOTE_A1, NOTE_AS1, NOTE_B1,
|
||||
NOTE_C2, NOTE_CS2, NOTE_D2, NOTE_DS2, NOTE_E2, NOTE_F2, NOTE_FS2, NOTE_G2, NOTE_GS2, NOTE_A2, NOTE_AS2, NOTE_B2,
|
||||
NOTE_C3, NOTE_CS3, NOTE_D3, NOTE_DS3, NOTE_E3, NOTE_F3, NOTE_FS3, NOTE_G3, NOTE_GS3, NOTE_A3, NOTE_AS3, NOTE_B3,
|
||||
NOTE_C4, NOTE_CS4, NOTE_D4, NOTE_DS4, NOTE_E4, NOTE_F4, NOTE_FS4, NOTE_G4, NOTE_GS4, NOTE_A4, NOTE_AS4, NOTE_B4,
|
||||
NOTE_C5, NOTE_CS5, NOTE_D5, NOTE_DS5, NOTE_E5, NOTE_F5, NOTE_FS5, NOTE_G5, NOTE_GS5, NOTE_A5, NOTE_AS5, NOTE_B5,
|
||||
NOTE_C6, NOTE_CS6, NOTE_D6, NOTE_DS6, NOTE_E6, NOTE_F6, NOTE_FS6, NOTE_G6, NOTE_GS6, NOTE_A6, NOTE_AS6, NOTE_B6,
|
||||
NOTE_C7, NOTE_CS7, NOTE_D7, NOTE_DS7, NOTE_E7, NOTE_F7, NOTE_FS7, NOTE_G7, NOTE_GS7, NOTE_A7, NOTE_AS7, NOTE_B7,
|
||||
NOTE_C8, NOTE_CS8, NOTE_D8, NOTE_DS8, NOTE_E8, NOTE_F8, NOTE_FS8, NOTE_G8, NOTE_GS8, NOTE_A8, NOTE_AS8, NOTE_B8,
|
||||
NOTE_C0,
|
||||
NOTE_CS0,
|
||||
NOTE_D0,
|
||||
NOTE_DS0,
|
||||
NOTE_E0,
|
||||
NOTE_F0,
|
||||
NOTE_FS0,
|
||||
NOTE_G0,
|
||||
NOTE_GS0,
|
||||
NOTE_A0,
|
||||
NOTE_AS0,
|
||||
NOTE_B0,
|
||||
NOTE_C1,
|
||||
NOTE_CS1,
|
||||
NOTE_D1,
|
||||
NOTE_DS1,
|
||||
NOTE_E1,
|
||||
NOTE_F1,
|
||||
NOTE_FS1,
|
||||
NOTE_G1,
|
||||
NOTE_GS1,
|
||||
NOTE_A1,
|
||||
NOTE_AS1,
|
||||
NOTE_B1,
|
||||
NOTE_C2,
|
||||
NOTE_CS2,
|
||||
NOTE_D2,
|
||||
NOTE_DS2,
|
||||
NOTE_E2,
|
||||
NOTE_F2,
|
||||
NOTE_FS2,
|
||||
NOTE_G2,
|
||||
NOTE_GS2,
|
||||
NOTE_A2,
|
||||
NOTE_AS2,
|
||||
NOTE_B2,
|
||||
NOTE_C3,
|
||||
NOTE_CS3,
|
||||
NOTE_D3,
|
||||
NOTE_DS3,
|
||||
NOTE_E3,
|
||||
NOTE_F3,
|
||||
NOTE_FS3,
|
||||
NOTE_G3,
|
||||
NOTE_GS3,
|
||||
NOTE_A3,
|
||||
NOTE_AS3,
|
||||
NOTE_B3,
|
||||
NOTE_C4,
|
||||
NOTE_CS4,
|
||||
NOTE_D4,
|
||||
NOTE_DS4,
|
||||
NOTE_E4,
|
||||
NOTE_F4,
|
||||
NOTE_FS4,
|
||||
NOTE_G4,
|
||||
NOTE_GS4,
|
||||
NOTE_A4,
|
||||
NOTE_AS4,
|
||||
NOTE_B4,
|
||||
NOTE_C5,
|
||||
NOTE_CS5,
|
||||
NOTE_D5,
|
||||
NOTE_DS5,
|
||||
NOTE_E5,
|
||||
NOTE_F5,
|
||||
NOTE_FS5,
|
||||
NOTE_G5,
|
||||
NOTE_GS5,
|
||||
NOTE_A5,
|
||||
NOTE_AS5,
|
||||
NOTE_B5,
|
||||
NOTE_C6,
|
||||
NOTE_CS6,
|
||||
NOTE_D6,
|
||||
NOTE_DS6,
|
||||
NOTE_E6,
|
||||
NOTE_F6,
|
||||
NOTE_FS6,
|
||||
NOTE_G6,
|
||||
NOTE_GS6,
|
||||
NOTE_A6,
|
||||
NOTE_AS6,
|
||||
NOTE_B6,
|
||||
NOTE_C7,
|
||||
NOTE_CS7,
|
||||
NOTE_D7,
|
||||
NOTE_DS7,
|
||||
NOTE_E7,
|
||||
NOTE_F7,
|
||||
NOTE_FS7,
|
||||
NOTE_G7,
|
||||
NOTE_GS7,
|
||||
NOTE_A7,
|
||||
NOTE_AS7,
|
||||
NOTE_B7,
|
||||
NOTE_C8,
|
||||
NOTE_CS8,
|
||||
NOTE_D8,
|
||||
NOTE_DS8,
|
||||
NOTE_E8,
|
||||
NOTE_F8,
|
||||
NOTE_FS8,
|
||||
NOTE_G8,
|
||||
NOTE_GS8,
|
||||
NOTE_A8,
|
||||
NOTE_AS8,
|
||||
NOTE_B8,
|
||||
NOTE_ZERO = 0,
|
||||
NOTE_SEMITONE = 1,
|
||||
NOTE_WHOLETONE = 2,
|
||||
|
|
@ -28,6 +127,13 @@ enum Note {
|
|||
#define PITCH_CONCERT_A4 440.00
|
||||
#define PITCH_CONCERT_D4 293.66
|
||||
|
||||
// Twelvetone Equal Temperament semitone multiplier
|
||||
// Take any frequency and multiply it by this magic number to get a semitone higher!
|
||||
// Divide to get a semitone lower!
|
||||
// This is an approximation of exp(2, 1/12),
|
||||
// which was worked out in around the 1500s.
|
||||
#define TET_SEMITONE_MULTIPLIER 1.059463
|
||||
|
||||
class Tuning {
|
||||
public:
|
||||
// name contains the name of the current tuning system
|
||||
|
|
@ -39,7 +145,7 @@ public:
|
|||
void Setup(Note base, float pitch, TuningSystem system);
|
||||
void Setup(Note base, float pitch);
|
||||
void SetTuningSystem(TuningSystem system);
|
||||
TuningSystem GetSystem();
|
||||
TuningSystem GetTuningSystem();
|
||||
Note GetBaseNote();
|
||||
float GetPitch(Note note);
|
||||
|
||||
|
|
@ -56,9 +162,11 @@ private:
|
|||
// NearestNote returns the note nearest to pitch.
|
||||
Note NearestNote(float pitch);
|
||||
|
||||
// NoteName return the name of a note (without octave).
|
||||
// NoteName returns the name of a note (without octave).
|
||||
const char *NoteName(Note note);
|
||||
|
||||
// TuningSystemName returns the name of a tuning system.
|
||||
const char *TuningSystemName(TuningSystem system);
|
||||
|
||||
// Make notes support some arithmetic
|
||||
inline Note toNote(int a) {
|
||||
|
|
@ -97,3 +205,7 @@ inline int operator/(const Note a, const int b) {
|
|||
inline int operator/(const Note a, const Note b) {
|
||||
return int(a) / b;
|
||||
}
|
||||
|
||||
inline TuningSystem operator++(TuningSystem &a) {
|
||||
return a = TuningSystem((int(a) + 1) % int(TUNINGSYSTEM_MAX + 1));
|
||||
}
|
||||
|
|
|
|||
107
uilleann.ino
107
uilleann.ino
|
|
@ -3,7 +3,6 @@
|
|||
#include <Adafruit_SSD1306.h>
|
||||
#include <Audio.h>
|
||||
#include <Fonts/FreeSans9pt7b.h>
|
||||
#include <SparkFun_Qwiic_Button.h>
|
||||
#include <Wire.h>
|
||||
#include <paj7620.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -22,14 +21,12 @@ Pipe pipe;
|
|||
Tuning tuning = Tuning(NOTE_D4, PITCH_CONCERT_D4, TUNINGSYSTEM_JUST);
|
||||
|
||||
Adafruit_SSD1306 display(128, 32, &Wire, -1);
|
||||
int currentPatch = 0;
|
||||
|
||||
// Settings
|
||||
uint8_t intonation = 0;
|
||||
int16_t pitchAdjust = 0;
|
||||
uint8_t patch[4] = {0};
|
||||
float volume[4] = {0};
|
||||
const char *settingNames[4] = {"c", "r", "d", "*"};
|
||||
const char *buildDate = __DATE__;
|
||||
|
||||
// Pipes
|
||||
FMVoice Chanter;
|
||||
|
|
@ -109,7 +106,7 @@ void diag(const char *fmt, ...) {
|
|||
display.setTextSize(1);
|
||||
|
||||
display.setCursor(56, 24);
|
||||
display.print(__DATE__);
|
||||
display.print(buildDate);
|
||||
|
||||
#if 0
|
||||
display.setCursor(0, 16);
|
||||
|
|
@ -171,8 +168,7 @@ void setup() {
|
|||
// Turn on drones
|
||||
for (int i = 0; i < 3; i++) {
|
||||
Note note = NOTE_D4 - (NOTE_OCTAVE * i);
|
||||
float pitch =
|
||||
tuning.GetPitch(note) * (0.01 * (i - 1)); // Detune just a touch
|
||||
float pitch = tuning.GetPitch(note) * (0.01 * (i - 1)); // Detune just a touch
|
||||
Drones[i].LoadPatch(&Bank[0]);
|
||||
Drones[i].NoteOn(pitch);
|
||||
}
|
||||
|
|
@ -187,25 +183,22 @@ void setup() {
|
|||
}
|
||||
|
||||
void loop() {
|
||||
static bool forceDisplayUpdate = true;
|
||||
|
||||
pipe.Update();
|
||||
diag("loop %d", millis());
|
||||
|
||||
#if defined(ADAFRUIT_TRELLIS_M4_EXPRESS)
|
||||
trellis.tick();
|
||||
|
||||
trellis.setPixelColor(1, trellis.ColorHSV(millis(), 255, 120));
|
||||
{
|
||||
uint16_t color = trellis.ColorHSV(64 * pipe.kneeClosedness, 255, 120);
|
||||
trellis.setPixelColor(0, color);
|
||||
}
|
||||
#endif
|
||||
|
||||
// If we're infinitely (for the sensor) off the knee,
|
||||
// go into setup mode!
|
||||
if (pipe.kneeClosedness == 0) {
|
||||
doSetup();
|
||||
forceDisplayUpdate = true;
|
||||
} else {
|
||||
doPlay();
|
||||
doPlay(forceDisplayUpdate);
|
||||
forceDisplayUpdate = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -225,12 +218,21 @@ void loop() {
|
|||
*
|
||||
*/
|
||||
void doSetup() {
|
||||
static unsigned long quietUntil = 0;
|
||||
|
||||
// Stuff can set quietUntil to stop responding to keys for a bit
|
||||
#define quiet() quietUntil = millis() + 200
|
||||
if (millis() < quietUntil) {
|
||||
return;
|
||||
}
|
||||
|
||||
display.clearDisplay();
|
||||
|
||||
bool alt = pipe.Pressed(7);
|
||||
|
||||
// Draw indicator bar
|
||||
display.fillRect(126, 0, 2, 32, SSD1306_WHITE);
|
||||
display.setFont(0);
|
||||
display.setTextSize(1);
|
||||
display.setCursor(0, 0);
|
||||
|
||||
|
|
@ -238,7 +240,7 @@ void doSetup() {
|
|||
// Show settings for each of Chanter, Regulators, Drones
|
||||
for (int i = 0; i < 3; i++) {
|
||||
int p = patch[i];
|
||||
int16_t x = 0;
|
||||
int16_t x = 1;
|
||||
int16_t y = i * 8;
|
||||
|
||||
display.setCursor(x, y);
|
||||
|
|
@ -265,31 +267,71 @@ void doSetup() {
|
|||
display.print(Bank[p].name);
|
||||
}
|
||||
} else {
|
||||
if (pipe.Pressed(6)) {
|
||||
float freq = PITCH_CONCERT_D4 + pitchAdjust;
|
||||
Note note = NearestNote(freq);
|
||||
|
||||
display.setCursor(0, 0);
|
||||
if (pipe.Pressed(6)) {
|
||||
TuningSystem system = tuning.GetTuningSystem();
|
||||
float freq = tuning.GetPitch(NOTE_D4);
|
||||
Note note = NearestNote(freq);
|
||||
int octave = int(note) / 12;
|
||||
|
||||
if (pipe.JustPressed(3) || pipe.JustPressed(2)) {
|
||||
tuning.Setup(NOTE_A4, PITCH_CONCERT_A4, TUNINGSYSTEM_EQUAL);
|
||||
if (pipe.Pressed(3) && pipe.Pressed(2)) {
|
||||
++system;
|
||||
} else if (pipe.Pressed(3)) {
|
||||
freq = tuning.GetPitch(++note);
|
||||
} else if (pipe.Pressed(2)) {
|
||||
freq = tuning.GetPitch(--note);
|
||||
}
|
||||
tuning.Setup(NOTE_D4, freq, system);
|
||||
}
|
||||
|
||||
if (pipe.Pressed(1) || pipe.Pressed(0)) {
|
||||
if (pipe.Pressed(1) && pipe.Pressed(0)) {
|
||||
freq = PITCH_CONCERT_D4;
|
||||
quiet();
|
||||
} else if (pipe.Pressed(1)) {
|
||||
freq *= 1.001;
|
||||
} else if (pipe.Pressed(0)) {
|
||||
freq /= 1.001;
|
||||
}
|
||||
tuning.Setup(NOTE_D4, freq);
|
||||
note = NearestNote(freq);
|
||||
}
|
||||
|
||||
display.setFont(&FreeSans9pt7b);
|
||||
display.setCursor(0, 12);
|
||||
display.print(NoteName(note));
|
||||
display.setCursor(6 + 6, 0);
|
||||
display.print(octave);
|
||||
display.setCursor(48, 12);
|
||||
display.print(freq);
|
||||
|
||||
display.setCursor(0, 27);
|
||||
display.print(TuningSystemName(system));
|
||||
} else if (pipe.Pressed(5)) {
|
||||
display.print("fn2");
|
||||
} else if (pipe.Pressed(4)) {
|
||||
display.print("fn3");
|
||||
} else {
|
||||
display.setCursor(56, 8);
|
||||
display.setTextSize(2);
|
||||
display.setFont(&FreeSans9pt7b);
|
||||
display.setCursor(64, 18);
|
||||
display.print("Setup");
|
||||
|
||||
display.setFont();
|
||||
display.setTextSize(1);
|
||||
display.setCursor(0, 16);
|
||||
display.print("build");
|
||||
display.setCursor(0, 24);
|
||||
display.print(buildDate);
|
||||
}
|
||||
}
|
||||
|
||||
display.display();
|
||||
}
|
||||
|
||||
void doPlay() {
|
||||
void doPlay(bool forceUpdate) {
|
||||
static uint8_t last_note = 0;
|
||||
bool updateDisplay = false;
|
||||
bool updateDisplay = forceUpdate;
|
||||
|
||||
if (pipe.silent) {
|
||||
Chanter.NoteOff();
|
||||
|
|
@ -332,19 +374,16 @@ void doPlay() {
|
|||
|
||||
if (updateDisplay) {
|
||||
display.clearDisplay();
|
||||
display.setFont(&FreeSans9pt7b);
|
||||
|
||||
if (Chanter.patch) {
|
||||
display.setCursor(0, 32);
|
||||
display.print(Chanter.patch->name);
|
||||
}
|
||||
|
||||
display.setCursor(0, 16);
|
||||
display.setTextSize(2);
|
||||
display.print(Chanter.patch->name);
|
||||
|
||||
display.setCursor(0, 0);
|
||||
display.setTextSize(2);
|
||||
display.print(note_name);
|
||||
|
||||
display.setCursor(40, 0);
|
||||
display.setTextSize(1);
|
||||
display.print(pipe.kneeClosedness);
|
||||
|
||||
display.display();
|
||||
last_note = pipe.note;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue