From 46b587020c74da29ed32d332891eb13faa92b5e0 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Tue, 17 Mar 2020 11:08:19 +0100 Subject: [PATCH] Fixes. --- MicroDexed.ino | 7 ++----- config.h | 2 +- dexed.cpp | 9 ++++++++- dexed.h | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/MicroDexed.ino b/MicroDexed.ino index 208a266..5bdc3b2 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -1714,11 +1714,8 @@ void show_patch(uint8_t instance_id) { char vn[VOICE_NAME_LEN]; - if (instance_id < 0xFF) - { - Serial.print(F("INSTANCE ")); - Serial.println(instance_id, DEC); - } + Serial.print(F("INSTANCE ")); + Serial.println(instance_id, DEC); memset(vn, 0, sizeof(vn)); Serial.println(F("+==========================================================================================================+")); diff --git a/config.h b/config.h index 74bc612..5397f7f 100644 --- a/config.h +++ b/config.h @@ -85,7 +85,7 @@ #define MOD_FILTER_OUTPUT MOD_NO_FILTER_OUTPUT // MOD_LINKWITZ_RILEY_FILTER_OUTPUT MOD_BUTTERWORTH_FILTER_OUTPUT MOD_NO_FILTER_OUTPUT #define MOD_FILTER_CUTOFF_HZ 3000 // FX-CHAIN ENABLE/DISABLE -#define USE_FX 1 +//#define USE_FX 1 //************************************************************************************************* //* AUDIO SOFTWARE SETTINGS diff --git a/dexed.cpp b/dexed.cpp index 5b50e05..da2a8d0 100644 --- a/dexed.cpp +++ b/dexed.cpp @@ -83,6 +83,8 @@ Dexed::Dexed(int rate) sustain = false; + velocity_level = (100.0 / 127.0); + setEngineType(DEXED_ENGINE); } @@ -168,7 +170,7 @@ void Dexed::keydown(int16_t pitch, uint8_t velo) { } pitch += data[144] - TRANSPOSE_FIX; - velo = (((float)velo) * velocity_level + 0.5); // 100/127 + velo = float(velo) * velocity_level + 0.5; // 100/127 int previousKeyDown = lastKeyDown; lastKeyDown = pitch; @@ -733,3 +735,8 @@ void Dexed::setVelocityLevel(uint8_t velocity_level) { velocity_level = float(velocity_level) / 127.0; } + +float Dexed::getVelocityLevel(void) +{ + return (velocity_level); +} diff --git a/dexed.h b/dexed.h index 1132dec..77fb005 100644 --- a/dexed.h +++ b/dexed.h @@ -173,6 +173,7 @@ class Dexed void setATController(uint8_t at_range, uint8_t pb_assign); void setPortamentoMode(uint8_t portamento_mode, uint8_t portamento_glissando, uint8_t portamento_time); void setVelocityLevel(uint8_t velocity_level); + float getVelocityLevel(void); ProcessorVoice voices[MAX_NOTES]; Controllers controllers;