wirtz
/
MicroDexed
mirror of https://codeberg.org/dcoredump/MicroDexed.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Dateien hochladen nach „“

Browse Source 
retry
pull/51/head
positionhigh 4 years ago
parent d309fbf2cf
commit cff632c74f
3 changed files with 68 additions and 59 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 38
      MicroDexed.ino
  2. 77
      UI.hpp
  3. 12
      config.h

38
MicroDexed.ino
Unescape View File

@ -268,6 +268,7 @@ int16_t _midi_bpm = -1;
elapsedMillis midi_bpm_timer;
elapsedMillis long_button_pressed;
elapsedMillis control_rate;
elapsedMillis sequencer_timer;
uint8_t active_voices[NUM_DEXED];
uint8_t midi_voices[NUM_DEXED];
#ifdef SHOW_CPU_LOAD_MSEC
@ -288,7 +289,15 @@ char g_voice_name[NUM_DEXED][VOICE_NAME_LEN];
char g_bank_name[NUM_DEXED][BANK_NAME_LEN];
char receive_bank_filename[FILENAME_LEN];
uint8_t selected_instance_id = 0;
uint8_t seqsteptimer = 0;
uint32_t seqtimer_old = 0;
bool seq_running = false;
//uint8_t seqdata[1][16]={48,48,54,48,49,54,54,48,54,54,48,54,49,54,54,54};
//uint8_t seqdata[1][16]={72,72,78,72,75,78,78,72,78,78,72,78,75,78,78,78};
uint8_t seqdata[3][16] = {72, 72, 0, 72, 75, 0, 0, 72, 0, 0, 72, 0, 75, 0, 0, 0,
73, 73, 0, 73, 0, 0, 73, 73, 0, 0, 73, 73, 0, 0, 0, 0,
78, 0, 0, 78, 0, 0, 78, 0, 78, 78, 0, 0, 0, 0, 0, 0
};
#ifdef TEENSY4
#if NUM_DEXED>1
int8_t midi_decay[NUM_DEXED] = { -1, -1};
@ -316,10 +325,6 @@ extern uint8_t drum_type[NUM_DRUMS];
extern drum_config_t drum_config[NUM_DRUMCONFIG];
#endif
uint8_t seqdata[3][16];
uint8_t seqsteptimer;
bool seq_running;
#ifdef ENABLE_LCD_UI
extern LCDMenuLib2 LCDML;
#endif
@ -603,6 +608,29 @@ void loop()
ENCODER[ENC_L].update();
ENCODER[ENC_R].update();
if (seq_running) {
if (sequencer_timer > seqtimer_old + 125)
{
seqtimer_old = sequencer_timer;
if (seqdata[0][seqsteptimer] > 0) {
handleNoteOn(DRUM_MIDI_CHANNEL, seqdata[0][seqsteptimer] , 99);
}
if (seqdata[1][seqsteptimer] > 0) {
handleNoteOn(DRUM_MIDI_CHANNEL, seqdata[1][seqsteptimer] , 99);
}
if (seqdata[2][seqsteptimer] > 0) {
handleNoteOn(DRUM_MIDI_CHANNEL, seqdata[2][seqsteptimer] , 99);
}
seqsteptimer++;
}
if (seqsteptimer > 15)seqsteptimer = 0;
}
#ifdef ENABLE_LCD_UI
LCDML.loop();
#endif

77
UI.hpp
Unescape View File

@ -3533,6 +3533,26 @@ void UI_handle_OP(uint8_t param)
}
}
char const * seq_find_shortname(uint8_t seqstep)
{
char const * shortname = " ";
bool foundsound = false;
for (uint8_t d = 0; d < NUM_DRUMCONFIG - 1; d++)
{
if (seqdata[active_seq_track][seqstep] == drum_config[d].midinote)
{
shortname = drum_config[d].shortname;
foundsound = true;
break;
}
}
if (foundsound == false) shortname="-";
return shortname;
}
void UI_func_sequencer(uint8_t param)
{
bool foundsound = false;
@ -3544,8 +3564,8 @@ void UI_func_sequencer(uint8_t param)
seq_button_r = false;
// setup function
lcd.setCursor(1, 0);
strcpy(displayname, drum_config[activesample].filename);
lcd.print(*displayname + 5);
strncpy(displayname, drum_config[activesample].filename + 5, 6);
lcd.print(displayname);
lcd.setCursor(8, 0);
lcd.print("[");
lcd.setCursor(9, 0);
@ -3648,8 +3668,8 @@ void UI_func_sequencer(uint8_t param)
lcd.setCursor(0, 0);
lcd.print("[");
lcd.setCursor(1, 0);
strcpy(displayname, drum_config[activesample].filename);
lcd.print(*displayname + 5);
strncpy(displayname, drum_config[activesample].filename + 5, 6);
lcd.print(displayname);
lcd.setCursor(7, 0);
lcd.print("]");
}
@ -3689,17 +3709,7 @@ void UI_func_sequencer(uint8_t param)
lcd.setCursor(0, 1);
for (int i = 0; i < 16; i++) {
lcd.setCursor(i, 1);
for (uint8_t d = 0; d < NUM_DRUMCONFIG - 1; d++)
{
if (seqdata[active_seq_track][i] == drum_config[d].midinote)
{
lcd.print(drum_config[d].shortname ); //one letter name of Category
foundsound = true;
break;
}
}
if (foundsound == false)lcd.print("-");
foundsound = false;
lcd.print(seq_find_shortname(i) );
}
}
if (seq_menu == 3) {
@ -3710,45 +3720,16 @@ void UI_func_sequencer(uint8_t param)
lcd.setCursor(0, 1);
lcd.print("x");
lcd.setCursor(1, 1);
for (uint8_t d = 0; d < NUM_DRUMCONFIG - 1; d++)
{
if (seqdata[active_seq_track][1] == drum_config[d].midinote)
{
lcd.print(drum_config[d].shortname ); //one letter name of Category
foundsound = true;
break;
}
}
if (foundsound == false) lcd.print("-");
foundsound = false;
lcd.print(seq_find_shortname(1) );
}
if (seq_menu > 3) {
lcd.setCursor(seq_menu - 3, 1);
lcd.print("x");
lcd.setCursor(seq_menu - 4, 1);
for (uint8_t d = 0; d < NUM_DRUMCONFIG - 1; d++)
{
if (seqdata[active_seq_track][seq_menu - 4] == drum_config[d].midinote)
{
lcd.print(drum_config[d].shortname ); //one letter name of Category
foundsound = true;
break;
}
}
if (foundsound == false) lcd.print("-");
foundsound = false;
lcd.print(seq_find_shortname(seq_menu - 4) );
lcd.setCursor(seq_menu - 2, 1);
for (uint8_t d = 0; d < NUM_DRUMCONFIG - 1; d++)
{
if (seqdata[active_seq_track][seq_menu - 2] == drum_config[d].midinote)
{
lcd.print(drum_config[d].shortname ); //one letter name of Category
foundsound = true;
break;
}
}
if (foundsound == false) lcd.print("-");
foundsound = false;
lcd.print(seq_find_shortname(seq_menu - 2) );
}
}
if (LCDML.FUNC_close()) // ****** STABLE END *********

12
config.h
Unescape View File

@ -251,12 +251,12 @@
#define BUT_R_PIN 30
#else
#if defined(TEENSY4_0)
#define ENC_R_PIN_A 6
#define ENC_R_PIN_B 5
#define BUT_R_PIN 8
//#define ENC_R_PIN_A 17
//#define ENC_R_PIN_B 16
//#define BUT_R_PIN 5
//#define ENC_R_PIN_A 6
//#define ENC_R_PIN_B 5
//#define BUT_R_PIN 8
#define ENC_R_PIN_A 17
#define ENC_R_PIN_B 16
#define BUT_R_PIN 5
#else // ARDUINO_TEENSY41
#define ENC_R_PIN_A 24
#define ENC_R_PIN_B 5

Write Preview
Loading…
Cancel
Save