Commit: 13f2c2577fb09ed88112d8bdba71fbcf28e847ab - CAmiDion (git)

電子楽器CAmiDionのArduinoスケッチ（C++）です。回路図も置いてあります。

Commit MetaInfo

• Revisão: 13f2c2577fb09ed88112d8bdba71fbcf28e847ab (tree)
• Hora: 2016-04-23 13:39:42
• Autor: Akiyoshi Kamide <kamide@yk.r...>
• Commiter: Akiyoshi Kamide

Mensagem de Log

[BUGFIX] 波形を先頭から戻って最後に行こうとすると文字化けするバグの修正
音色テーブルのチューニング
CAmiDionConfig.hの誤記修正

Mudança Sumário

• modified: CAmiDion.ino
• modified: CAmiDionConfig.h
• modified: instruments.ino

Diff

--- a/CAmiDion.ino
+++ b/CAmiDion.ino
@@ -1,6 +1,6 @@
 //
 // CAmiDion - Musical Chord Instrument
-//  ver.20160422
+//  ver.20160423
 //  by Akiyoshi Kamide (Twitter: @akiyoshi_kamide)
 //  http://kamide.b.osdn.me/camidion/
 //  http://osdn.jp/users/kamide/pf/CAmiDion/
@@ -109,9 +109,8 @@ class WaveSelecter {
     void changeWaveform(char offset) {
       if( ! offset ) return;
       MidiChannel *cp = PWMDACSynth::getChannel(current_midi_channel);
-      for( byte i = 0; i < NumberOf(wavetables); i++ ) {
-        if( (PROGMEM const byte *)pgm_read_word(wavetables + i) != cp->wavetable )
-          continue;
+      for( char i = 0; i < NumberOf(wavetables); i++ ) {
+        if( (PROGMEM const byte *)pgm_read_word(wavetables + i) != cp->wavetable ) continue;
         if ( (i += offset) < 0) i += NumberOf(wavetables);
         else if (i >= NumberOf(wavetables)) i -= NumberOf(wavetables);
         cp->wavetable = (PROGMEM const byte *)pgm_read_word(wavetables + i);

--- a/CAmiDionConfig.h
+++ b/CAmiDionConfig.h
@@ -50,7 +50,7 @@
 #define DRUM_VELOCITY 100
 // Drum
 #define DRUM_NOTE_NUMBER 36   // Bass Drum 1
-#define DRUM_MIDI_CHANNEL 10;
+#define DRUM_MIDI_CHANNEL 10
 
 ////////////////////////////////////////////////////////
 // Automatic definition

--- a/instruments.ino
+++ b/instruments.ino
@@ -1,149 +1,166 @@
 
 #if defined(OCTAVE_ANALOG_PIN)
+// General MIDI instruments
 PROGMEM const Instrument instruments[] = {
+  // Piano
   {sawtoothWavetable, {9, 0, 11, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
+  {guitarWavetable, {9, 0, 11, 4}},
+  {sawtoothWavetable, {9, 0, 10, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
+  {sawtoothWavetable, {8, 0, 10, 4}},
 
+  // Chromatic Percussion
+  {sawtoothWavetable, {9, 0, 10, 4}},
   {sineWavetable, {9, 0, 11, 4}},
-  {sineWavetable, {9, 0, 11, 4}},
-  {sineWavetable, {9, 0, 9, 4}},
+  {sineWavetable, {9, 0, 10, 3}},
   {sineWavetable, {9, 0, 11, 4}},
   {sineWavetable, {8, 0, 8, 4}},
   {sineWavetable, {7, 0, 7, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
   {sawtoothWavetable, {9, 0, 9, 4}},
 
+  // Organ
   {guitarWavetable, {9, 255, 11, 4}},
   {sawtoothWavetable, {9, 255, 11, 4}},
   {guitarWavetable, {9, 255, 11, 4}},
-  {guitarWavetable, {9, 255, 11, 4}},
-  {guitarWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
   {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 9}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 8}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
 
+  // Guitar
   {guitarWavetable, {9, 0, 11, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
   {guitarWavetable, {9, 0, 11, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
-  {randomWavetable, {9, 0, 10, 4}},
+  {guitarWavetable, {9, 0, 11, 4}},
+  {sawtoothWavetable, {9, 0, 10, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
   {randomWavetable, {9, 8, 10, 4}},
 
+  // Bass
   {guitarWavetable, {9, 0, 11, 4}},
   {guitarWavetable, {9, 0, 11, 4}},
-  {guitarWavetable, {9, 0, 11, 4}},
-  {guitarWavetable, {9, 0, 11, 4}},
+  {guitarWavetable, {9, 192, 9, 3}},
+  {guitarWavetable, {9, 192, 9, 6}},
   {sawtoothWavetable, {9, 0, 11, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
-  {sawtoothWavetable, {9, 8, 10, 4}},
-  {guitarWavetable, {9, 15, 11, 9}},
+  {sawtoothWavetable, {9, 128, 10, 4}},
+  {sawtoothWavetable, {9, 192, 11, 4}},
 
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {8, 255, 8, 4}},
-  {sineWavetable, {9, 0, 10, 4}},
-  {randomWavetable, {9, 0, 10, 4}},
+  // Strings
+  {sawtoothWavetable, {9, 255, 10, 6}},
+  {sawtoothWavetable, {9, 255, 10, 6}},
+  {sawtoothWavetable, {9, 255, 10, 6}},
+  {sawtoothWavetable, {9, 255, 10, 6}},
+  {guitarWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {8, 0, 8, 4}},
+  {sineWavetable, {9, 0, 11, 4}},
+  {randomWavetable, {9, 0, 10, 3}},
 
+  // Ensemble
   {triangleWavetable, {9, 255, 11, 6}},
-  {triangleWavetable, {9, 255, 11, 11}},
   {triangleWavetable, {9, 255, 11, 9}},
+  {triangleWavetable, {9, 255, 11, 6}},
   {triangleWavetable, {9, 255, 11, 7}},
-  {guitarWavetable, {9, 255, 11, 9}},
-  {sawtoothWavetable, {9, 255, 11, 9}},
-  {sineWavetable, {9, 255, 11, 9}},
-  {squareWavetable, {8, 0, 9, 3}},
-
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
   {guitarWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {guitarWavetable, {9, 255, 11, 4}},
-
-  {guitarWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {triangleWavetable, {9, 255, 11, 4}},
-
-  {guitarWavetable, {9, 255, 11, 9}},
-  {guitarWavetable, {9, 255, 11, 9}},
-  {sineWavetable, {9, 255, 11, 9}},
-  {triangleWavetable, {9, 255, 11, 9}},
-  {randomWavetable, {9, 255, 11, 9}},
-  {triangleWavetable, {9, 255, 11, 9}},
-  {sineWavetable, {9, 255, 11, 9}},
-  {sineWavetable, {9, 255, 11, 8}},
+  {sawtoothWavetable, {9, 128, 9, 4}},
+  {sineWavetable, {9, 255, 11, 4}},
+  {squareWavetable, {8, 0, 9, 3}},
 
-  {squareWavetable, {9, 255, 11, 4}},
+  // Brass
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {guitarWavetable, {9, 255, 11, 7}},
+  {sawtoothWavetable, {9, 128, 9, 5}},
+  {sawtoothWavetable, {9, 192, 9, 5}},
+  {guitarWavetable, {9, 192, 10, 5}},
+
+  // Reed
+  {guitarWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
   {sawtoothWavetable, {9, 255, 11, 4}},
-  {triangleWavetable, {9, 255, 11, 4}},
-  {triangleWavetable, {9, 128, 8, 4}},
-  {sawtoothWavetable, {9, 128, 8, 4}},
-  {sawtoothWavetable, {9, 128, 8, 4}},
-  {guitarWavetable, {9, 255, 11, 4}},
   {sawtoothWavetable, {9, 255, 11, 4}},
+  {triangleWavetable, {9, 255, 11, 5}},
 
+  // Pipe
   {guitarWavetable, {9, 255, 11, 6}},
-  {guitarWavetable, {9, 255, 11, 11}},
-  {guitarWavetable, {4, 128, 8, 9}},
+  {guitarWavetable, {9, 255, 11, 7}},
+  {sineWavetable, {9, 255, 11, 6}},
+  {triangleWavetable, {9, 255, 11, 7}},
+  {randomWavetable, {9, 128, 10, 6}},
+  {triangleWavetable, {9, 255, 11, 7}},
+  {sineWavetable, {9, 255, 11, 7}},
+  {sineWavetable, {9, 255, 11, 7}},
+
+  // Synth Lead
+  {squareWavetable, {9, 255, 11, 3}},
+  {sawtoothWavetable, {9, 255, 11, 3}},
+  {triangleWavetable, {9, 255, 11, 5}},
+  {triangleWavetable, {9, 128, 8, 6}},
+  {sawtoothWavetable, {9, 192, 8, 5}},
+  {sawtoothWavetable, {9, 192, 8, 5}},
+  {guitarWavetable, {9, 192, 11, 5}},
+  {sawtoothWavetable, {9, 255, 11, 3}},
+
+  // Synth Pad
+  {guitarWavetable, {9, 255, 11, 5}},
+  {guitarWavetable, {9, 255, 11, 9}},
+  {guitarWavetable, {4, 192, 9, 4}},
   {guitarWavetable, {9, 255, 11, 6}},
-  {guitarWavetable, {9, 128, 8, 4}},
-  {sawtoothWavetable, {9, 255, 11, 11}},
+  {guitarWavetable, {9, 192, 10, 8}},
+  {sawtoothWavetable, {9, 255, 11, 10}},
+  {guitarWavetable, {9, 255, 11, 8}},
   {sawtoothWavetable, {9, 255, 11, 10}},
-  {sawtoothWavetable, {9, 255, 11, 11}},
 
-  {sawtoothWavetable, {9, 128, 8, 4}},
-  {sawtoothWavetable, {9, 255, 11, 11}},
-  {sawtoothWavetable, {9, 128, 8, 4}},
-  {guitarWavetable, {9, 128, 8, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 11}},
+  // Synth Effects
+  {guitarWavetable, {9, 128, 9, 4}},
+  {sawtoothWavetable, {9, 128, 10, 10}},
+  {triangleWavetable, {9, 192, 8, 4}},
+  {guitarWavetable, {9, 0, 11, 4}},
+  {sawtoothWavetable, {10, 0, 11, 3}},
+  {triangleWavetable, {9, 0, 11, 10}},
   {guitarWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
 
+  // Ethnic
   {sawtoothWavetable, {9, 0, 11, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
+  {sawtoothWavetable, {9, 0, 9, 4}},
   {sawtoothWavetable, {9, 0, 11, 4}},
   {sawtoothWavetable, {8, 0, 8, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
-  {sawtoothWavetable, {9, 0, 11, 4}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
+  {sawtoothWavetable, {9, 255, 11, 6}},
 
-  {squareWavetable, {9, 0, 11, 4}},
+  // Percussive
+  {squareWavetable, {9, 64, 9, 4}},
   {sawtoothWavetable, {8, 0, 8, 4}},
-  {guitarWavetable, {9, 0, 11, 4}},
+  {guitarWavetable, {9, 0, 11, 5}},
   {sineWavetable, {8, 0, 8, 4}},
   {randomWavetable, {8, 0, 8, 4}},
-  {sineWavetable, {8, 0, 8, 4}},
+  {triangleWavetable, {8, 0, 8, 4}},
   {randomWavetable, {8, 0, 8, 4}},
-  {randomWavetable, {8, 255, 8, 14}},
+  {randomWavetable, {8, 255, 7, 12}},
 
+  // Sound Effects
   {randomWavetable, {8, 0, 8, 4}},
   {randomWavetable, {8, 0, 8, 4}},
-  {randomWavetable, {10, 8, 10, 13}},
+  {randomWavetable, {10, 64, 12, 12}},
   {sineWavetable, {9, 255, 11, 4}},
-  {sawtoothWavetable, {9, 255, 11, 4}},
-  {randomWavetable, {9, 255, 11, 13}},
-  {randomWavetable, {10, 128, 10, 13}},
-  {randomWavetable, {9, 0, 9, 3}},
+  {randomWavetable, {9, 255, 11, 4}},
+  {randomWavetable, {9, 255, 11, 12}},
+  {randomWavetable, {10, 255, 10, 11}},
+  {randomWavetable, {9, 0, 10, 3}},
 };
 #endif