From 66ff12e05c2985ca5c0f1368ab9f1d343839fdd5 Mon Sep 17 00:00:00 2001 From: Nero Date: Wed, 3 Jan 2024 10:06:05 -0500 Subject: [PATCH] v2.2.2 fixes bug with On-Board Editor --- library.properties | 2 +- src/BMC-Version.h | 4 ++-- src/editor/onBoard/BMC-OBEMain.h | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/library.properties b/library.properties index abdb3f1..2cbe973 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=BMC -version=2.2.1 +version=2.2.2 author=Nero Rox maintainer=Nero Rox sentence=Fully featured MIDI Controller Library with a Companion Editor App for 32-bit Teensy boards, Requires Teensyduino. diff --git a/src/BMC-Version.h b/src/BMC-Version.h index 165c6b4..5bd2ad5 100644 --- a/src/BMC-Version.h +++ b/src/BMC-Version.h @@ -23,9 +23,9 @@ // BMC Version stored in EEPROM (for editor usage) #define BMC_VERSION_MAJ 2 #define BMC_VERSION_MIN 2 -#define BMC_VERSION_PATCH 1 +#define BMC_VERSION_PATCH 2 -#define BMC_VERSION_STR "2.2.1" +#define BMC_VERSION_STR "2.2.2" //16 bits unsigned, LSB byte is minor, MSB byte is major #define BMC_VERSION ((BMC_VERSION_MAJ<<8) | BMC_VERSION_MIN) diff --git a/src/editor/onBoard/BMC-OBEMain.h b/src/editor/onBoard/BMC-OBEMain.h index d4358e8..6d29e3a 100644 --- a/src/editor/onBoard/BMC-OBEMain.h +++ b/src/editor/onBoard/BMC-OBEMain.h @@ -83,11 +83,12 @@ class BMCOBE { } } bool checkDeviceAssignment(uint8_t t_type, uint16_t t_n, uint8_t t_dir, uint8_t t_ticks=1){ + bool ret = false; + #if defined(BMC_OBE_CUSTOM_ASSIGNMENT) if(!globals.onBoardEditorActive()){ return false; } - bool ret = false; for(uint8_t i = 0; i < 6 ; i++){ // BMC_MENU_SELECT // BMC_MENU_BACK @@ -150,6 +151,7 @@ class BMCOBE { } } #endif + return ret; } void render(){