Plaits: fixed initialization issue in chord table

VasileiosVasilopoulos · May 15, 2020 · 99432f2 · 99432f2
1 parent 20b02f8
commit 99432f2
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 10 deletions.
diff --git a/avr_audio_bootloader b/avr_audio_bootloader
diff --git a/avrlib b/avrlib
diff --git a/avrlibx b/avrlibx
diff --git a/plaits/dsp/engine/chord_engine.cc b/plaits/dsp/engine/chord_engine.cc
@@ -37,6 +37,35 @@ namespace plaits {
 using namespace std;
 using namespace stmlib;
 
+#ifdef JON_CHORDS
+
+// Alternative chord table by Jon Butler [email protected]
+const float chords[kChordNumChords][kChordNumNotes] = {
+  // Fixed Intervals
+  { 0.00f, 0.01f, 11.99f, 12.00f },  // Octave
+  { 0.00f, 7.01f,  7.00f, 12.00f },  // Fifth
+  // Minor
+  { 0.00f, 3.00f,  7.00f, 12.00f },  // Minor
+  { 0.00f, 3.00f,  7.00f, 10.00f },  // Minor 7th
+  { 0.00f, 3.00f, 10.00f, 14.00f },  // Minor 9th
+  { 0.00f, 3.00f, 10.00f, 17.00f },  // Minor 11th
+  // Major
+  { 0.00f, 4.00f,  7.00f, 12.00f },  // Major
+  { 0.00f, 4.00f,  7.00f, 11.00f },  // Major 7th
+  { 0.00f, 4.00f, 11.00f, 14.00f },  // Major 9th
+  // Colour Chords
+  { 0.00f, 5.00f,  7.00f, 12.00f },  // Sus4
+  { 0.00f, 2.00f,  9.00f, 16.00f },  // 69
+  { 0.00f, 4.00f,  7.00f,  9.00f },  // 6th
+  { 0.00f, 7.00f, 16.00f, 23.00f },  // 10th (Spread maj7)
+  { 0.00f, 4.00f,  7.00f, 10.00f },  // Dominant 7th
+  { 0.00f, 7.00f, 10.00f, 13.00f },  // Dominant 7th (b9)
+  { 0.00f, 3.00f,  6.00f, 10.00f },  // Half Diminished
+  { 0.00f, 3.00f,  6.00f,  9.00f },  // Fully Diminished
+};
+
+#else
+
 const float chords[kChordNumChords][kChordNumNotes] = {
   { 0.00f, 0.01f, 11.99f, 12.00f },  // OCT
   { 0.00f, 7.01f,  7.00f, 12.00f },  // 5
@@ -51,6 +80,8 @@ const float chords[kChordNumChords][kChordNumNotes] = {
   { 0.00f, 4.00f,  7.00f, 12.00f },  // M
 };
 
+#endif  // JON_CHORDS
+
 void ChordEngine::Init(BufferAllocator* allocator) {
   for (int i = 0; i < kChordNumVoices; ++i) {
     divide_down_voice_[i].Init();
@@ -60,13 +91,13 @@ void ChordEngine::Init(BufferAllocator* allocator) {
   morph_lp_ = 0.0f;
   timbre_lp_ = 0.0f;
 
-  ratios_ = allocator->Allocate<float>(kChordNumChords * kChordNumVoices);
+  ratios_ = allocator->Allocate<float>(kChordNumChords * kChordNumNotes);
 }
 
 void ChordEngine::Reset() {
   for (int i = 0; i < kChordNumChords; ++i) {
-    for (int j = 0; j < kChordNumVoices; ++j) {
-      ratios_[i * kChordNumVoices + j] = SemitonesToRatio(chords[i][j]);
+    for (int j = 0; j < kChordNumNotes; ++j) {
+      ratios_[i * kChordNumNotes + j] = SemitonesToRatio(chords[i][j]);
     }
   }
 }
@@ -105,7 +136,7 @@ int ChordEngine::ComputeChordInversion(
     float inversion,
     float* ratios,
     float* amplitudes) {
-  const float* base_ratio = &ratios_[chord_index * kChordNumVoices];
+  const float* base_ratio = &ratios_[chord_index * kChordNumNotes];
   inversion = inversion * float(kChordNumNotes * 5);
 
   MAKE_INTEGRAL_FRACTIONAL(inversion);

diff --git a/plaits/dsp/engine/chord_engine.h b/plaits/dsp/engine/chord_engine.h
@@ -39,9 +39,16 @@ namespace plaits {
 
 const int kChordNumNotes = 4;
 const int kChordNumVoices = 5;
-const int kChordNumChords = 11;
 const int kChordNumHarmonics = 3;
 
+// #define JON_CHORDS
+
+#ifdef JON_CHORDS
+const int kChordNumChords = 17;
+#else
+const int kChordNumChords = 11;
+#endif  // JON_CHORDS
+
 class ChordEngine : public Engine {
  public:
   ChordEngine() { }

diff --git a/stm_audio_bootloader b/stm_audio_bootloader
diff --git a/stmlib b/stmlib
+2 −2		LICENSE
+2 −2		audio_stream_writer.py
+1 −1		fsk/decoder.cc
+1 −1		fsk/decoder.h
+2 −2		fsk/encoder.py
+2 −2		adc.cc
+2 −2		adc.h
+2 −2		audio_output.h
+2 −2		avrlib.h
+3 −2		base.h
+2 −2		boot.h
+2 −2		deprecated/devices/input_array.h
+2 −2		deprecated/devices/output_array.h
+2 −2		deprecated/devices/switch_array.h
+2 −2		devices/bicolor_led_array.h
+2 −2		devices/buffered_display.h
+2 −2		devices/external_eeprom.h
+2 −2		devices/hd44780_lcd.h
+1 −1		devices/led_array.h
+2 −2		devices/mcp492x.h
+1 −1		devices/mux4051.h
+2 −2		devices/pot_scanner.h
+2 −2		devices/rotary_encoder.h
+1 −1		devices/rotary_encoder_array.h
+2 −2		devices/sd_card.h
+2 −2		devices/shift_register.h
+2 −2		devices/switch.h
+2 −2		devices/wii_nunchuk.cc
+2 −2		devices/wii_nunchuk.h
+2 −2		filesystem/directory.cc
+2 −2		filesystem/directory.h
+2 −2		filesystem/fat_file_reader.h
+2 −2		filesystem/file.cc
+2 −2		filesystem/file.h
+2 −2		filesystem/filesystem.cc
+2 −2		filesystem/filesystem.h
+2 −2		gpio.h
+2 −2		i2c/i2c.cc
+2 −2		i2c/i2c.h
+2 −2		log2.h
+2 −2		makefile.mk
+2 −2		op.h
+2 −2		output_stream.h
+2 −2		parallel_io.h
+2 −2		random.cc
+2 −2		random.h
+2 −2		resources_manager.h
+2 −2		ring_buffer.h
+2 −2		serial.cc
+2 −2		serial.h
+2 −2		size_to_type.h
+2 −2		software_serial.h
+2 −2		spi.h
+2 −2		string.cc
+2 −2		string.h
+2 −2		task.h
+2 −2		time.cc
+2 −2		time.h
+2 −2		timer.h
+2 −2		tools/resources_compiler.py
+2 −2		ui/event_queue.h
+2 −2		watchdog_timer.h
+1 −1		README
+2 −2		avrlibx.h
+2 −2		config.mk
+2 −2		devices/adc_scanner.h
+2 −2		devices/bicolor_led_array.h
+2 −2		devices/buffered_display.h
+2 −2		devices/hd44780_lcd.h
+2 −2		devices/rotary_encoder.h
+2 −2		devices/sd_card.h
+2 −2		devices/shift_register.h
+2 −2		devices/switch.h
+2 −2		devices/twi_eeprom.h
+2 −2		filesystem/directory.cc
+2 −2		filesystem/directory.h
+2 −2		filesystem/fat_file_reader.h
+2 −2		filesystem/file.cc
+2 −2		filesystem/file.h
+2 −2		filesystem/filesystem.cc
+2 −2		filesystem/filesystem.h
+2 −2		io/adc.h
+2 −2		io/dac.h
+2 −2		io/dma.h
+2 −2		io/gpio.h
+2 −2		io/parallel_io.h
+2 −2		io/ring_buffer.h
+2 −2		io/spi.h
+2 −2		io/twi.cc
+2 −2		io/twi.h
+2 −2		io/usart.h
+2 −2		io/usart_spi.h
+2 −2		makefile.mk
+2 −2		resources/resources_manager.h
+2 −2		system/clock.h
+2 −2		system/event_system.h
+2 −2		system/init.h
+2 −2		system/time.cc
+2 −2		system/time.h
+2 −2		system/timer.h
+2 −2		tools/hex2sysex/hex2sysex.py
+2 −2		tools/hexfile/hexfile.py
+2 −2		tools/midi/midifile.py
+2 −2		tools/resources_compiler.py
+2 −2		ui/event_queue.h
+2 −2		utils/log2.h
+2 −2		utils/op.h
+2 −2		utils/output_stream.h
+2 −2		utils/random.cc
+2 −2		utils/random.h
+2 −2		utils/string.cc
+2 −2		utils/string.h