Dateien hochladen nach „“

MicroDexed.ino

@@ -648,7 +648,7 @@ void setup()
 #endif
 
   LCDML.OTHER_jumpToFunc(UI_func_voice_select);
-  timer1.begin(sequencer, 90000, false);
+  timer1.begin(sequencer, seq_tempo_ms / 2, false);
 }
 
 void loop()
@@ -693,19 +693,6 @@ void loop()
         lcd.print( seq_chord_names[arp_chord][2]);
         lcd.print( seq_chord_names[arp_chord][3]);
       }
-      else if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_drum_monitor)) // UI is in Drum Status Monitor
-      {
-        for (uint8_t i = 0; i < NUM_DRUMS; i++)
-        {
-          lcd.setCursor( i * 2, 1);
-          if (Drum[i]->isPlaying() ) {
-            lcd.write(49 + i);
-          } else
-          {
-            lcd.write(32);
-          }
-        }
-      }
     }
   }
   // CONTROL-RATE-EVENT-HANDLING
@@ -1777,6 +1764,11 @@ void init_MIDI_send_CC(void)
   VOLUME HELPER
 ******************************************************************************/
 
+void set_drums_volume(float vol)
+{
+  master_mixer_r.gain(2, vol);
+  master_mixer_l.gain(2, vol);
+}
 void set_volume(uint8_t v, uint8_t m)
 {
   float tmp_v;

config.h

@@ -116,12 +116,12 @@
 #define DRUM_MIDI_CHANNEL 10
 
 // NUMBER OF SAMPLES IN DRUMSET
-#define NUM_DRUMSET_CONFIG 70
+#define NUM_DRUMSET_CONFIG 69
 
 // SEQUENCER 
 
-#define NUM_SEQ_PATTERN 10
+#define NUM_SEQ_PATTERN 24
-#define NUM_SEQ_TRACKS 4
+#define NUM_SEQ_TRACKS 6
 
 // CHORUS parameters
 #define MOD_DELAY_SAMPLE_BUFFER int32_t(TIME_MS2SAMPLES(20.0)) // 20.0 ms delay buffer. 
@@ -197,7 +197,7 @@
 #define ENABLE_LCD_UI 1
 #define STANDARD_LCD_I2C
 //#define OLED_SPI
-//#define TESTDISPLAY20x4  //Currently for testing I2C Display 20x4
+//#define TESTDISPLAY20x4  //Currently for testing I2C Display 20x4 aka type "2004"
 
 // LCD Display
 //I2C_DISPLAY only
@@ -297,8 +297,8 @@
 #define BANK_NAME_LEN 11 // 10 (plus '\0')
 #define VOICE_NAME_LEN 12 // 11 (plus '\0')
 #define FILENAME_LEN BANK_NAME_LEN + VOICE_NAME_LEN
+//#define DRUM_NAME_LEN 9
 #define DRUM_NAME_LEN 17
-
 #define FX_CONFIG_PATH "FXCFG"
 #define FX_CONFIG_NAME "FXCFG"
 #define PERFORMANCE_CONFIG_PATH "PCFG"