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

Added selection of MIDI channel.

Browse Source 
Added auto-store for volume/midi-channel and voice/bank.
Small fixes.
pull/4/head
Holger Wirtz 6 years ago
parent 69f8a44309
commit f0cbc8d3ab
5 changed files with 144 additions and 67 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. 67
      MicroDexed.ino
  2. 97
      UI.cpp
  3. 8
      UI.h
  4. 16
      config.h
  5. 7
      dexed_sysex.cpp

67
MicroDexed.ino
Unescape View File

@ -81,7 +81,7 @@ uint32_t overload = 0;
uint32_t peak = 0; uint32_t peak = 0;
uint16_t render_time_max = 0; uint16_t render_time_max = 0;
uint8_t bank = 0; uint8_t bank = 0;
uint8_t max_loaded_banks=0; uint8_t max_loaded_banks = 0;
uint8_t voice = 0; uint8_t voice = 0;
float vol = VOLUME; float vol = VOLUME;
float vol_right = 1.0; float vol_right = 1.0;
@ -183,8 +183,8 @@ void setup()
sd_card_available = true; sd_card_available = true;
// read all bank names // read all bank names
max_loaded_banks=get_bank_names(); max_loaded_banks = get_bank_names();
strip_extension(bank_names[bank],bank_name); strip_extension(bank_names[bank], bank_name);
// read all voice name for actual bank // read all voice name for actual bank
get_voice_names_from_bank(bank); get_voice_names_from_bank(bank);
@ -352,15 +352,6 @@ void handle_input(void)
return; return;
} }
#endif #endif
#ifndef MASTER_KEY_MIDI
int enc1_val = enc1.read();
if (but1.update())
;
// place handling of encoder and showing values on lcd here
#endif
} }
#ifdef DEBUG #ifdef DEBUG
@ -405,8 +396,7 @@ bool handle_master_key(uint8_t data)
Serial.print(F("Loading voice number ")); Serial.print(F("Loading voice number "));
Serial.println(num, DEC); Serial.println(num, DEC);
#endif #endif
EEPROM.update(EEPROM_OFFSET + EEPROM_VOICE_ADDR, num); eeprom_write_sound();
update_eeprom_checksum();
#ifdef I2C_DISPLAY #ifdef I2C_DISPLAY
lcd.show(1, 0, 2, voice + 1); lcd.show(1, 0, 2, voice + 1);
lcd.show(1, 2, 1, " "); lcd.show(1, 2, 1, " ");
@ -434,8 +424,6 @@ bool handle_master_key(uint8_t data)
else if (num > 10 && num <= 20) else if (num > 10 && num <= 20)
{ {
bank = num - 10; bank = num - 10;
EEPROM.update(EEPROM_OFFSET + EEPROM_BANK_ADDR, bank);
update_eeprom_checksum();
#ifdef DEBUG #ifdef DEBUG
Serial.print(F("Bank switch to: ")); Serial.print(F("Bank switch to: "));
Serial.println(bank, DEC); Serial.println(bank, DEC);
@ -443,7 +431,7 @@ bool handle_master_key(uint8_t data)
#ifdef I2C_DISPLAY #ifdef I2C_DISPLAY
if (get_voice_names_from_bank(bank)) if (get_voice_names_from_bank(bank))
{ {
strip_extension(bank_names[bank],bank_name); strip_extension(bank_names[bank], bank_name);
lcd.show(0, 0, 2, bank + 1); lcd.show(0, 0, 2, bank + 1);
lcd.show(0, 2, 1, " "); lcd.show(0, 2, 1, " ");
lcd.show(0, 3, 10, bank_name); lcd.show(0, 3, 10, bank_name);
@ -584,10 +572,7 @@ void set_volume(float v, float vr, float vl)
vol_left = vl; vol_left = vl;
#ifndef I2C_DISPLAY #ifndef I2C_DISPLAY
EEPROM.update(EEPROM_OFFSET + EEPROM_MASTER_VOLUME_ADDR, uint8_t(vol * UCHAR_MAX)); eeprom_write_volume();
EEPROM.update(EEPROM_OFFSET + EEPROM_VOLUME_RIGHT_ADDR, uint8_t(vol_right * UCHAR_MAX));
EEPROM.update(EEPROM_OFFSET + EEPROM_VOLUME_LEFT_ADDR, uint8_t(vol_left * UCHAR_MAX));
update_eeprom_checksum();
#endif #endif
#ifdef DEBUG #ifdef DEBUG
uint8_t tmp; uint8_t tmp;
@ -706,12 +691,9 @@ void initial_values_from_eeprom(void)
#ifdef DEBUG #ifdef DEBUG
Serial.print(F(" - mismatch -> initializing EEPROM!")); Serial.print(F(" - mismatch -> initializing EEPROM!"));
#endif #endif
EEPROM.update(EEPROM_OFFSET + EEPROM_BANK_ADDR, bank); eeprom_write_sound();
EEPROM.update(EEPROM_OFFSET + EEPROM_VOICE_ADDR, voice); eeprom_write_volume();
EEPROM.update(EEPROM_OFFSET + EEPROM_MASTER_VOLUME_ADDR, uint8_t(vol * UCHAR_MAX)); eeprom_write_midichannel();
EEPROM.update(EEPROM_OFFSET + EEPROM_VOLUME_RIGHT_ADDR, uint8_t(vol_right * UCHAR_MAX));
EEPROM.update(EEPROM_OFFSET + EEPROM_VOLUME_LEFT_ADDR, uint8_t(vol_left * UCHAR_MAX));
update_eeprom_checksum();
} }
else else
{ {
@ -720,6 +702,7 @@ void initial_values_from_eeprom(void)
vol = float(EEPROM.read(EEPROM_OFFSET + EEPROM_MASTER_VOLUME_ADDR)) / UCHAR_MAX; vol = float(EEPROM.read(EEPROM_OFFSET + EEPROM_MASTER_VOLUME_ADDR)) / UCHAR_MAX;
vol_right = float(EEPROM.read(EEPROM_OFFSET + EEPROM_VOLUME_RIGHT_ADDR)) / UCHAR_MAX; vol_right = float(EEPROM.read(EEPROM_OFFSET + EEPROM_VOLUME_RIGHT_ADDR)) / UCHAR_MAX;
vol_left = float(EEPROM.read(EEPROM_OFFSET + EEPROM_VOLUME_LEFT_ADDR)) / UCHAR_MAX; vol_left = float(EEPROM.read(EEPROM_OFFSET + EEPROM_VOLUME_LEFT_ADDR)) / UCHAR_MAX;
midi_channel = EEPROM.read(EEPROM_OFFSET + EEPROM_MIDICHANNEL_ADDR);
} }
#ifdef DEBUG #ifdef DEBUG
Serial.println(); Serial.println();
@ -768,6 +751,36 @@ uint32_t eeprom_crc32(uint16_t calc_start, uint16_t calc_bytes) // base code fro
return (crc); return (crc);
} }
void eeprom_write_sound(void)
{
EEPROM.update(EEPROM_OFFSET + EEPROM_BANK_ADDR, bank);
EEPROM.update(EEPROM_OFFSET + EEPROM_VOICE_ADDR, voice);
update_eeprom_checksum();
#ifdef DEBUG
Serial.println(F("Sound written to EEPROM"));
#endif
}
void eeprom_write_volume(void)
{
EEPROM.update(EEPROM_OFFSET + EEPROM_MASTER_VOLUME_ADDR, uint8_t(vol * UCHAR_MAX));
EEPROM.update(EEPROM_OFFSET + EEPROM_VOLUME_RIGHT_ADDR, uint8_t(vol_right * UCHAR_MAX));
EEPROM.update(EEPROM_OFFSET + EEPROM_VOLUME_LEFT_ADDR, uint8_t(vol_left * UCHAR_MAX));
update_eeprom_checksum();
#ifdef DEBUG
Serial.println(F("Volume written to EEPROM"));
#endif
}
void eeprom_write_midichannel(void)
{
EEPROM.update(EEPROM_OFFSET + EEPROM_MIDICHANNEL_ADDR, midi_channel);
update_eeprom_checksum();
#ifdef DEBUG
Serial.println(F("MIDI channel written to EEPROM"));
#endif
}
#if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC) #if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC)
void show_cpu_and_mem_usage(void) void show_cpu_and_mem_usage(void)
{ {

97
UI.cpp
Unescape View File

@ -33,6 +33,7 @@
#ifdef I2C_DISPLAY // selecting sounds by encoder, button and display #ifdef I2C_DISPLAY // selecting sounds by encoder, button and display
elapsedMillis ui_back_to_main; elapsedMillis ui_back_to_main;
elapsedMillis autostore_sound;
void handle_ui(void) void handle_ui(void)
{ {
@ -40,10 +41,15 @@ void handle_ui(void)
{ {
lcd.clear(); lcd.clear();
ui_show_main(); ui_show_main();
EEPROM.update(EEPROM_OFFSET + EEPROM_MASTER_VOLUME_ADDR, uint8_t(vol * UCHAR_MAX)); eeprom_write_volume();
EEPROM.update(EEPROM_OFFSET + EEPROM_VOLUME_RIGHT_ADDR, uint8_t(vol_right * UCHAR_MAX)); eeprom_write_midichannel();
EEPROM.update(EEPROM_OFFSET + EEPROM_VOLUME_LEFT_ADDR, uint8_t(vol_left * UCHAR_MAX)); }
update_eeprom_checksum();
if (autostore_sound >= AUTOSTORE_MS && (ui_main_state == UI_MAIN_VOICE_SELECTED || ui_main_state == UI_MAIN_BANK_SELECTED))
{
ui_main_state = UI_MAIN_VOICE;
ui_show_main();
eeprom_write_sound();
} }
for (uint8_t i = 0; i < NUM_ENCODER; i++) for (uint8_t i = 0; i < NUM_ENCODER; i++)
@ -56,34 +62,44 @@ void handle_ui(void)
switch (i) switch (i)
{ {
case 0: // left button pressed case 0: // left button pressed
switch (ui_state)
{
case UI_MAIN:
enc[i].write(map(vol * 100, 0, 100, 0, ENC_VOL_STEPS));
enc_val[i] = enc[i].read();
ui_show_volume();
break;
case UI_VOLUME:
enc[i].write(midi_channel);
enc_val[i] = enc[i].read();
ui_show_midichannel();
break;
case UI_MIDICHANNEL:
enc[i].write(map(vol * 100, 0, 100, 0, ENC_VOL_STEPS));
enc_val[i] = enc[i].read();
ui_show_main();
break;
}
break;
case 1: // right button pressed
switch (ui_main_state) switch (ui_main_state)
{ {
case UI_MAIN_BANK: case UI_MAIN_BANK:
case UI_MAIN_BANK_SELECTED: case UI_MAIN_BANK_SELECTED:
ui_main_state = UI_MAIN_VOICE; ui_main_state = UI_MAIN_VOICE;
enc[1].write(voice); enc[i].write(voice);
enc_val[1] = enc[1].read(); enc_val[i] = enc[i].read();
break; break;
case UI_MAIN_VOICE: case UI_MAIN_VOICE:
case UI_MAIN_VOICE_SELECTED: case UI_MAIN_VOICE_SELECTED:
ui_main_state = UI_MAIN_BANK; ui_main_state = UI_MAIN_BANK;
enc[1].write(bank); enc[i].write(bank);
enc_val[1] = enc[1].read(); enc_val[i] = enc[i].read();
break;
}
break; break;
case 1: // right button pressed
if (ui_main_state == UI_MAIN_VOICE_SELECTED)
{
ui_main_state = UI_MAIN_VOICE;
load_sysex(bank, voice);
EEPROM.update(EEPROM_OFFSET + EEPROM_BANK_ADDR, bank);
EEPROM.update(EEPROM_OFFSET + EEPROM_VOICE_ADDR, voice);
update_eeprom_checksum();
} }
ui_show_main();
break; break;
} }
ui_show_main();
#ifdef DEBUG #ifdef DEBUG
Serial.print(F("Button ")); Serial.print(F("Button "));
Serial.println(i, DEC); Serial.println(i, DEC);
@ -97,6 +113,10 @@ void handle_ui(void)
switch (i) switch (i)
{ {
case 0: // left encoder moved case 0: // left encoder moved
switch (ui_state)
{
case UI_MAIN:
case UI_VOLUME:
if (enc[i].read() <= 0) if (enc[i].read() <= 0)
enc[i].write(0); enc[i].write(0);
else if (enc[i].read() >= ENC_VOL_STEPS) else if (enc[i].read() >= ENC_VOL_STEPS)
@ -104,6 +124,16 @@ void handle_ui(void)
set_volume(float(map(enc[i].read(), 0, ENC_VOL_STEPS, 0, 100)) / 100, vol_left, vol_right); set_volume(float(map(enc[i].read(), 0, ENC_VOL_STEPS, 0, 100)) / 100, vol_left, vol_right);
ui_show_volume(); ui_show_volume();
break; break;
case UI_MIDICHANNEL:
if (enc[i].read() <= 0)
enc[i].write(0);
else if (enc[i].read() >= 16)
enc[i].write(16);
midi_channel = enc[i].read();
ui_show_midichannel();
break;
}
break;
case 1: // right encoder moved case 1: // right encoder moved
switch (ui_main_state) switch (ui_main_state)
{ {
@ -116,6 +146,8 @@ void handle_ui(void)
enc[i].write(max_loaded_banks - 1); enc[i].write(max_loaded_banks - 1);
bank = enc[i].read(); bank = enc[i].read();
get_voice_names_from_bank(bank); get_voice_names_from_bank(bank);
load_sysex(bank, voice);
autostore_sound = 0;
break; break;
case UI_MAIN_VOICE: case UI_MAIN_VOICE:
ui_main_state = UI_MAIN_VOICE_SELECTED; ui_main_state = UI_MAIN_VOICE_SELECTED;
@ -125,6 +157,8 @@ void handle_ui(void)
else if (enc[i].read() > MAX_VOICES - 1) else if (enc[i].read() > MAX_VOICES - 1)
enc[i].write(MAX_VOICES - 1); enc[i].write(MAX_VOICES - 1);
voice = enc[i].read(); voice = enc[i].read();
load_sysex(bank, voice);
autostore_sound = 0;
break; break;
} }
ui_show_main(); ui_show_main();
@ -190,12 +224,36 @@ void ui_show_main(void)
} }
} }
void ui_show_midichannel(void)
{
ui_back_to_main = 0;
if (ui_state != UI_MIDICHANNEL)
{
lcd.clear();
lcd.show(0, 0, LCD_CHARS, "MIDI Channel");
}
if (midi_channel == MIDI_CHANNEL_OMNI)
lcd.show(1, 0, 4, "OMNI");
else
{
lcd.show(1, 0, 2, midi_channel);
if (midi_channel == 1)
lcd.show(1, 2, 2, " ");
}
ui_state = UI_MIDICHANNEL;
}
void ui_show_volume(void) void ui_show_volume(void)
{ {
ui_back_to_main = 0; ui_back_to_main = 0;
if (ui_state != UI_VOLUME) if (ui_state != UI_VOLUME)
{
lcd.clear();
lcd.show(0, 0, LCD_CHARS, "Volume"); lcd.show(0, 0, LCD_CHARS, "Volume");
}
lcd.show(0, LCD_CHARS - 3, 3, vol * 100); lcd.show(0, LCD_CHARS - 3, 3, vol * 100);
if (vol == 0.0) if (vol == 0.0)
@ -214,5 +272,4 @@ void ui_show_volume(void)
} }
ui_state = UI_VOLUME; ui_state = UI_VOLUME;
} }
#endif #endif

8
UI.h
Unescape View File

@ -26,6 +26,7 @@
#include "config.h" #include "config.h"
#include <Bounce.h> #include <Bounce.h>
#include <EEPROM.h> #include <EEPROM.h>
#include <MIDI.h>
#include "LiquidCrystalPlus_I2C.h" #include "LiquidCrystalPlus_I2C.h"
#include "Encoder4.h" #include "Encoder4.h"
@ -46,14 +47,19 @@ extern char bank_name[BANK_NAME_LEN];
extern char voice_name[VOICE_NAME_LEN]; extern char voice_name[VOICE_NAME_LEN];
extern uint8_t ui_state; extern uint8_t ui_state;
extern uint8_t ui_main_state; extern uint8_t ui_main_state;
extern uint8_t midi_channel;
extern void update_eeprom_checksum(void); extern void update_eeprom_checksum(void);
extern void set_volume(float v, float vr, float vl); extern void set_volume(float v, float vr, float vl);
extern void eeprom_write_sound(void);
extern void eeprom_write_volume(void);
extern void eeprom_write_midichannel(void);
void handle_ui(void); void handle_ui(void);
void ui_show_main(void); void ui_show_main(void);
void ui_show_volume(void); void ui_show_volume(void);
void ui_show_midichannel(void);
enum ui_states {UI_MAIN, UI_VOLUME}; enum ui_states {UI_MAIN, UI_VOLUME, UI_MIDICHANNEL};
enum ui_main_states {UI_MAIN_BANK, UI_MAIN_VOICE, UI_MAIN_BANK_SELECTED, UI_MAIN_VOICE_SELECTED}; enum ui_main_states {UI_MAIN_BANK, UI_MAIN_VOICE, UI_MAIN_BANK_SELECTED, UI_MAIN_VOICE_SELECTED};
class MyEncoder : public Encoder class MyEncoder : public Encoder

16
config.h
Unescape View File

@ -28,12 +28,11 @@
// ATTENTION! For better latency you have to redefine AUDIO_BLOCK_SAMPLES from // ATTENTION! For better latency you have to redefine AUDIO_BLOCK_SAMPLES from
// 128 to 64 in <ARDUINO-IDE-DIR>/cores/teensy3/AudioStream.h // 128 to 64 in <ARDUINO-IDE-DIR>/cores/teensy3/AudioStream.h
#ifndef CONFIG_H_INCLUDED #ifndef CONFIG_H_INCLUDED
#define CONFIG_H_INCLUDED #define CONFIG_H_INCLUDED
// Initial values // Initial values
#define VERSION 1.0 #define VERSION 1.0.0
#define MIDI_DEVICE Serial1 #define MIDI_DEVICE Serial1
#define USE_ONBOARD_USB_HOST 1 #define USE_ONBOARD_USB_HOST 1
#define TEENSY_AUDIO_BOARD 1 #define TEENSY_AUDIO_BOARD 1
@ -43,9 +42,9 @@
#define DEFAULT_SYSEXSOUND 0 #define DEFAULT_SYSEXSOUND 0
//#define DEXED_ENGINE DEXED_ENGINE_MODERN //#define DEXED_ENGINE DEXED_ENGINE_MODERN
#ifndef TEENSY_AUDIO_BOARD #ifndef TEENSY_AUDIO_BOARD
#define AUDIO_MEM 4 #define AUDIO_MEM 16
#else #else
#define AUDIO_MEM 2 #define AUDIO_MEM 80
#endif #endif
#define SAMPLE_RATE 44100 #define SAMPLE_RATE 44100
#define MAX_BANKS 99 #define MAX_BANKS 99
@ -61,12 +60,12 @@
#endif #endif
// Master key handling (comment for disabling) // Master key handling (comment for disabling)
#define MASTER_KEY_MIDI MIDI_C7 //#define MASTER_KEY_MIDI MIDI_C7
#define MASTER_NUM1 MIDI_C2 #define MASTER_NUM1 MIDI_C2
// Debug output // Debug output
#define SERIAL_SPEED 38400 #define SERIAL_SPEED 38400
//#define DEBUG 1 #define DEBUG 1
#define SHOW_MIDI_EVENT 1 #define SHOW_MIDI_EVENT 1
#define SHOW_XRUN 1 #define SHOW_XRUN 1
#define SHOW_CPU_LOAD_MSEC 5000 #define SHOW_CPU_LOAD_MSEC 5000
@ -97,6 +96,7 @@
#define LCD_CHARS 16 #define LCD_CHARS 16
#define LCD_LINES 2 #define LCD_LINES 2
#define UI_AUTO_BACK_MS 2000 #define UI_AUTO_BACK_MS 2000
#define AUTOSTORE_MS 5000
// Encoder with button // Encoder with button
#define ENC_VOL_STEPS 43 #define ENC_VOL_STEPS 43
@ -114,7 +114,7 @@
// EEPROM address // EEPROM address
#define EEPROM_OFFSET 0 #define EEPROM_OFFSET 0
#define EEPROM_DATA_LENGTH 5 #define EEPROM_DATA_LENGTH 6
#define EEPROM_CRC32_ADDR EEPROM.length()-sizeof(uint32_t) #define EEPROM_CRC32_ADDR EEPROM.length()-sizeof(uint32_t)
#define EEPROM_BANK_ADDR 0 #define EEPROM_BANK_ADDR 0
@ -122,5 +122,5 @@
#define EEPROM_MASTER_VOLUME_ADDR 2 #define EEPROM_MASTER_VOLUME_ADDR 2
#define EEPROM_VOLUME_RIGHT_ADDR 3 #define EEPROM_VOLUME_RIGHT_ADDR 3
#define EEPROM_VOLUME_LEFT_ADDR 4 #define EEPROM_VOLUME_LEFT_ADDR 4
#define EEPROM_MIDICHANNEL_ADDR 5
#endif #endif

7
dexed_sysex.cpp
Unescape View File

@ -56,7 +56,7 @@ void strip_extension(char* s, char* target)
char tmp[BANK_NAME_LEN]; char tmp[BANK_NAME_LEN];
char* token; char* token;
strcpy(tmp,s); strcpy(tmp, s);
token = strtok(tmp, "."); token = strtok(tmp, ".");
if (token == NULL) if (token == NULL)
strcpy(target, "*ERROR*"); strcpy(target, "*ERROR*");
@ -169,7 +169,7 @@ bool get_voice_names_from_bank(uint8_t b)
return (false); return (false);
} }
} }
else
return (false); return (false);
} }
@ -219,8 +219,9 @@ uint8_t get_bank_names(void)
bool load_sysex(uint8_t b, uint8_t v) bool load_sysex(uint8_t b, uint8_t v)
{ {
#if DEBUG
bool found = false; bool found = false;
#endif
v %= MAX_VOICES; v %= MAX_VOICES;
b %= MAX_BANKS; b %= MAX_BANKS;

Write Preview
Loading…
Cancel
Save