From f207753ca5ee065ac448e749f90b64d7bfa15b2d Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Sun, 5 Sep 2021 13:22:52 +0200 Subject: [PATCH] Small fixes. --- addon/tools/wav2c.sh | 2 +- config.h | 9 ++++----- dexed_sd.cpp | 2 +- drumset.h | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/addon/tools/wav2c.sh b/addon/tools/wav2c.sh index 4da9dac..fd88aab 100755 --- a/addon/tools/wav2c.sh +++ b/addon/tools/wav2c.sh @@ -92,7 +92,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] = EOF declare -A converted_files -NUM_DRUMSET_CONFIG=0 +NUM_DRUMSET_CONFIG=1 while IFS= read -r l do diff --git a/config.h b/config.h index 279aa6f..7515814 100644 --- a/config.h +++ b/config.h @@ -90,7 +90,7 @@ //************************************************************************************************* //* DEBUG OUTPUT SETTINGS //************************************************************************************************* -//#define DEBUG 1 +#define DEBUG 1 #define SERIAL_SPEED 230400 #define SHOW_XRUN 1 #define SHOW_CPU_LOAD_MSEC 5000 @@ -116,10 +116,9 @@ #define DRUM_MIDI_CHANNEL 10 // NUMBER OF SAMPLES IN DRUMSET -#define NUM_DRUMSET_CONFIG 70 - -// SEQUENCER +#define NUM_DRUMSET_CONFIG 69 +// SEQUENCER #define NUM_SEQ_PATTERN 10 #define NUM_SEQ_TRACKS 4 @@ -297,7 +296,7 @@ #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 17 +#define DRUM_NAME_LEN 21 #define FX_CONFIG_PATH "FXCFG" #define FX_CONFIG_NAME "FXCFG" diff --git a/dexed_sd.cpp b/dexed_sd.cpp index a4b317a..6dc23d8 100644 --- a/dexed_sd.cpp +++ b/dexed_sd.cpp @@ -34,7 +34,7 @@ using namespace TeensyTimerTool; #include "synth_dexed.h" #if NUM_DRUMS > 0 #include "drums.h" -extern drum_config_t drum_config[NUM_DRUMSET_CONFIG]; +extern drum_config_t drum_config[]; #endif extern void init_MIDI_send_CC(void); diff --git a/drumset.h b/drumset.h index 7b150cb..c91bf77 100644 --- a/drumset.h +++ b/drumset.h @@ -260823,7 +260823,7 @@ PROGMEM const uint8_t DRUM_Vl1hbeep[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -drum_config_t drum_config[NUM_DRUMSET_CONFIG] = +drum_config_t drum_config[] = { { DRUM_HIHAT,