Small fixes.

pull/107/head
Holger Wirtz 3 years ago
parent 828cf443c6
commit f207753ca5
  1. 2
      addon/tools/wav2c.sh
  2. 9
      config.h
  3. 2
      dexed_sd.cpp
  4. 2
      drumset.h

@ -92,7 +92,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
EOF EOF
declare -A converted_files declare -A converted_files
NUM_DRUMSET_CONFIG=0 NUM_DRUMSET_CONFIG=1
while IFS= read -r l while IFS= read -r l
do do

@ -90,7 +90,7 @@
//************************************************************************************************* //*************************************************************************************************
//* DEBUG OUTPUT SETTINGS //* DEBUG OUTPUT SETTINGS
//************************************************************************************************* //*************************************************************************************************
//#define DEBUG 1 #define DEBUG 1
#define SERIAL_SPEED 230400 #define SERIAL_SPEED 230400
#define SHOW_XRUN 1 #define SHOW_XRUN 1
#define SHOW_CPU_LOAD_MSEC 5000 #define SHOW_CPU_LOAD_MSEC 5000
@ -116,10 +116,9 @@
#define DRUM_MIDI_CHANNEL 10 #define DRUM_MIDI_CHANNEL 10
// NUMBER OF SAMPLES IN DRUMSET // NUMBER OF SAMPLES IN DRUMSET
#define NUM_DRUMSET_CONFIG 70 #define NUM_DRUMSET_CONFIG 69
// SEQUENCER
// SEQUENCER
#define NUM_SEQ_PATTERN 10 #define NUM_SEQ_PATTERN 10
#define NUM_SEQ_TRACKS 4 #define NUM_SEQ_TRACKS 4
@ -297,7 +296,7 @@
#define BANK_NAME_LEN 11 // 10 (plus '\0') #define BANK_NAME_LEN 11 // 10 (plus '\0')
#define VOICE_NAME_LEN 12 // 11 (plus '\0') #define VOICE_NAME_LEN 12 // 11 (plus '\0')
#define FILENAME_LEN BANK_NAME_LEN + VOICE_NAME_LEN #define FILENAME_LEN BANK_NAME_LEN + VOICE_NAME_LEN
#define DRUM_NAME_LEN 17 #define DRUM_NAME_LEN 21
#define FX_CONFIG_PATH "FXCFG" #define FX_CONFIG_PATH "FXCFG"
#define FX_CONFIG_NAME "FXCFG" #define FX_CONFIG_NAME "FXCFG"

@ -34,7 +34,7 @@ using namespace TeensyTimerTool;
#include "synth_dexed.h" #include "synth_dexed.h"
#if NUM_DRUMS > 0 #if NUM_DRUMS > 0
#include "drums.h" #include "drums.h"
extern drum_config_t drum_config[NUM_DRUMSET_CONFIG]; extern drum_config_t drum_config[];
#endif #endif
extern void init_MIDI_send_CC(void); extern void init_MIDI_send_CC(void);

@ -260823,7 +260823,7 @@ PROGMEM const uint8_t DRUM_Vl1hbeep[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };
drum_config_t drum_config[NUM_DRUMSET_CONFIG] = drum_config_t drum_config[] =
{ {
{ {
DRUM_HIHAT, DRUM_HIHAT,

Loading…
Cancel
Save