Changing "Drum Main Vol" to bard indicator.

dev
Holger Wirtz 2 years ago
parent 2ff0998085
commit 3409d9229c
  1. 979
      MicroDexed.ino
  2. 2322
      UI.hpp
  3. 101
      config.h
  4. 2
      dexed_sd.cpp

File diff suppressed because it is too large Load Diff

2322
UI.hpp

File diff suppressed because it is too large Load Diff

@ -103,7 +103,7 @@
//************************************************************************************************* //*************************************************************************************************
// Number of Dexed instances // Number of Dexed instances
#if defined(ARDUINO_TEENSY36) #if defined(ARDUINO_TEENSY36)
#warning >>> Sorry, only one instance possible for Teensy-3.6 #warning>>> Sorry, only one instance possible for Teensy-3.6
#define NUM_DEXED 1 // 1 or 2 - nothing else! #define NUM_DEXED 1 // 1 or 2 - nothing else!
#else #else
#define NUM_DEXED 2 // 1 or 2 - nothing else! #define NUM_DEXED 2 // 1 or 2 - nothing else!
@ -164,23 +164,23 @@
// DELAYTIME // DELAYTIME
#if NUM_DEXED > 1 #if NUM_DEXED > 1
# if defined(ARDUINO_TEENSY41) #if defined(ARDUINO_TEENSY41)
# define DELAY_MAX_TIME 500 #define DELAY_MAX_TIME 500
# elif defined(ARDUINO_TEENSY41) #elif defined(ARDUINO_TEENSY41)
# define DELAY_MAX_TIME 250 #define DELAY_MAX_TIME 250
# else #else
# define DELAY_MAX_TIME 100 #define DELAY_MAX_TIME 100
# endif #endif
#else #else
# if defined(ARDUINO_TEENSY36) #if defined(ARDUINO_TEENSY36)
# define DELAY_MAX_TIME 400 #define DELAY_MAX_TIME 400
# elif defined(ARDUINO_TEENSY41) #elif defined(ARDUINO_TEENSY41)
# define DELAY_MAX_TIME 1000 #define DELAY_MAX_TIME 1000
# elif defined(ARDUINO_TEENSY41) #elif defined(ARDUINO_TEENSY41)
# define DELAY_MAX_TIME 500 #define DELAY_MAX_TIME 500
# else #else
# define DELAY_MAX_TIME 200 #define DELAY_MAX_TIME 200
# endif #endif
#endif #endif
//************************************************************************************************* //*************************************************************************************************
@ -190,9 +190,9 @@
#ifdef USE_FX #ifdef USE_FX
#if defined(USE_EPIANO) #if defined(USE_EPIANO)
#define AUDIO_MEM SAMPLE_RATE * NUM_DEXED * DELAY_MAX_TIME / 128000 + 36 + 14 #define AUDIO_MEM SAMPLE_RATE* NUM_DEXED* DELAY_MAX_TIME / 128000 + 36 + 14
#else #else
#define AUDIO_MEM SAMPLE_RATE * NUM_DEXED * DELAY_MAX_TIME / 128000 + 36 #define AUDIO_MEM SAMPLE_RATE* NUM_DEXED* DELAY_MAX_TIME / 128000 + 36
#endif #endif
#else #else
#if defined(USE_EPIANO) #if defined(USE_EPIANO)
@ -366,36 +366,36 @@
// Teensy-3.6 settings // Teensy-3.6 settings
#if defined(ARDUINO_TEENSY36) #if defined(ARDUINO_TEENSY36)
#undef USE_SEQUENCER #undef USE_SEQUENCER
# if defined(USE_FX) #if defined(USE_FX)
# warning >>> With enabled FX a maximum of 12 voices is possible (due to RAM and CPU limitations) #warning>>> With enabled FX a maximum of 12 voices is possible (due to RAM and CPU limitations)
# define MAX_NOTES 12 #define MAX_NOTES 12
# if F_CPU > 180000000 #if F_CPU > 180000000
# error >>> Enabled FX with clockrate more than 180MHz is not useful due to RAM limitations. #error>>> Enabled FX with clockrate more than 180MHz is not useful due to RAM limitations.
# endif #endif
# else #else
# if F_CPU == 256000000 #if F_CPU == 256000000
# warning >>> Maximum of 22 voices. #warning>>> Maximum of 22 voices.
# define MAX_NOTES 22 #define MAX_NOTES 22
# elif F_CPU == 240000000 #elif F_CPU == 240000000
# warning >>> Maximum of 20 voices. You should consider to use 256MHz overclocking to get a maximum of 22 voices. #warning>>> Maximum of 20 voices. You should consider to use 256MHz overclocking to get a maximum of 22 voices.
# define MAX_NOTES 20 #define MAX_NOTES 20
# elif F_CPU == 216000000 #elif F_CPU == 216000000
# warning >>> Maximum of 18 voices. You should consider to use 256MHz overclocking to get a maximum of 22 voices. #warning>>> Maximum of 18 voices. You should consider to use 256MHz overclocking to get a maximum of 22 voices.
# define MAX_NOTES 18 #define MAX_NOTES 18
# elif F_CPU == 192000000 #elif F_CPU == 192000000
# warning >>> Maximum of 16 voices. You should consider to use 256MHz overclocking to get a maximum of 22 voices. #warning>>> Maximum of 16 voices. You should consider to use 256MHz overclocking to get a maximum of 22 voices.
# define MAX_NOTES 16 #define MAX_NOTES 16
# elif F_CPU == 180000000 #elif F_CPU == 180000000
# warning >>> Maximum of 14 voices. You should consider to use 256MHz overclocking to get a maximum of 22 voices. #warning>>> Maximum of 14 voices. You should consider to use 256MHz overclocking to get a maximum of 22 voices.
# define MAX_NOTES 14 #define MAX_NOTES 14
# else #else
# error >>> CPU Clock below 180MHz is not supported #error>>> CPU Clock below 180MHz is not supported
# endif #endif
# endif #endif
#endif #endif
#if defined(ARDUINO_TEENSY35) #if defined(ARDUINO_TEENSY35)
#error >>> Not supported anymore!!! #error>>> Not supported anymore!!!
#endif #endif
// MIDI // MIDI
@ -467,7 +467,7 @@
#define CHORUS_LEVEL_DEFAULT 0 #define CHORUS_LEVEL_DEFAULT 0
#define DELAY_TIME_MIN 0 #define DELAY_TIME_MIN 0
#define DELAY_TIME_MAX DELAY_MAX_TIME/10 #define DELAY_TIME_MAX DELAY_MAX_TIME / 10
#define DELAY_TIME_DEFAULT 0 #define DELAY_TIME_DEFAULT 0
#define DELAY_FEEDBACK_MIN 0 #define DELAY_FEEDBACK_MIN 0
@ -660,6 +660,10 @@
#define SEQUENCE_CONFIG_DEFAULT 0 #define SEQUENCE_CONFIG_DEFAULT 0
*/ */
#define DRUMS_MAIN_VOL_MIN 0
#define DRUMS_MAIN_VOL_MAX 100
#define DRUMS_MAIN_VOL_DEFAULT 80
#define EQ_1_MIN 15 #define EQ_1_MIN 15
#define EQ_1_MAX 250 #define EQ_1_MAX 250
#define EQ_1_DEFAULT 50 #define EQ_1_DEFAULT 50
@ -944,8 +948,7 @@ enum reverb_mixer_ports {
#ifndef _MAPFLOAT #ifndef _MAPFLOAT
#define _MAPFLOAT #define _MAPFLOAT
inline float mapfloat(float val, float in_min, float in_max, float out_min, float out_max) inline float mapfloat(float val, float in_min, float in_max, float out_min, float out_max) {
{
return (val - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; return (val - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
} }
#endif #endif

@ -1123,7 +1123,7 @@ bool load_sd_sys_json(void)
{ {
// ... and if: load // ... and if: load
#ifdef DEBUG #ifdef DEBUG
Serial.print(F("Found sys configuration")); Serial.println(F("Found sys configuration"));
#endif #endif
json = SD.open(filename); json = SD.open(filename);
if (json) if (json)

Loading…
Cancel
Save