commit 13c8960f3b786cd83c6f8a249b2379e390739ade
parent 9efe32ee6c57f89a290b6146e47322f9081f9612
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Thu, 30 Dec 2021 11:25:16 +0100
Merge branch 'dsp56300' into dsp56300_ui
Diffstat:
6 files changed, 169 insertions(+), 162 deletions(-)
diff --git a/source/jucePlugin/VirusController.cpp b/source/jucePlugin/VirusController.cpp
@@ -2,10 +2,9 @@
#include "VirusController.h"
#include "PluginProcessor.h"
-// TODO: all sysex structs can be refactored to common instead of including this!
-#include "../virusLib/microcontroller.h"
+#include "../virusLib/microcontrollerTypes.h"
-using MessageType = virusLib::Microcontroller::SysexMessageType;
+using MessageType = virusLib::SysexMessageType;
namespace Virus
{
diff --git a/source/virusLib/CMakeLists.txt b/source/virusLib/CMakeLists.txt
@@ -8,6 +8,7 @@ set(SOURCES
midiOutParser.cpp midiOutParser.h
romfile.cpp romfile.h
microcontroller.cpp microcontroller.h
+ microcontrollerTypes.h
)
target_sources(virusLib PRIVATE ${SOURCES})
diff --git a/source/virusLib/microcontroller.cpp b/source/virusLib/microcontroller.cpp
@@ -10,7 +10,7 @@
using namespace dsp56k;
using namespace synthLib;
-constexpr virusLib::Microcontroller::PlayMode g_defaultPlayMode = virusLib::Microcontroller::PlayModeSingle;
+constexpr virusLib::PlayMode g_defaultPlayMode = virusLib::PlayModeSingle;
constexpr uint32_t g_sysexPresetHeaderSize = 9;
constexpr uint32_t g_singleRamBankCount = 2;
diff --git a/source/virusLib/microcontroller.h b/source/virusLib/microcontroller.h
@@ -11,168 +11,13 @@
#include <list>
#include <mutex>
+#include "microcontrollerTypes.h"
+
namespace virusLib
{
class Microcontroller
{
public:
- enum SysexMessageType : uint8_t
- {
- DUMP_SINGLE = 0x10,
- DUMP_MULTI = 0x11,
- REQUEST_SINGLE = 0x30,
- REQUEST_MULTI = 0x31,
- REQUEST_BANK_SINGLE = 0x32,
- REQUEST_BANK_MULTI = 0x33,
- REQUEST_ARRANGEMENT = 0x34, // current Multi + all referenced Singles in the Multi. Only the Singles whose parts are enabled in the Multi are sent
- REQUEST_GLOBAL = 0x35, // All parameters not related to a single or a multi
- REQUEST_TOTAL = 0x36, // Single RAM Banks + Multi RAM Bank + Global
- REQUEST_CONTROLLER_DUMP = 0x37, // Sends the current Single edit buffer as individual controller/polypressure/sysex
-
- PARAM_CHANGE_A = 0x70,
- PARAM_CHANGE_B = 0x71,
- PARAM_CHANGE_C = 0x72,
- };
-
- enum ControlCommand : uint8_t
- {
- AUDITION = 01,
-
- // Multi
- MULTI_NAME_CHAR_0 = 5,
- MULTI_NAME_CHAR_1 = 6,
- MULTI_NAME_CHAR_2 = 7,
- MULTI_NAME_CHAR_3 = 8,
- MULTI_NAME_CHAR_4 = 9,
- MULTI_NAME_CHAR_5 = 10,
- MULTI_NAME_CHAR_6 = 11,
- MULTI_NAME_CHAR_7 = 12,
- MULTI_NAME_CHAR_8 = 13,
- MULTI_NAME_CHAR_9 = 14,
-
- MULTI_DELAY_OUTPUT_SELECT = 22,
-
- UNK1a = 26,
- UNK1b = 27,
- UNK1c = 28,
- UNK1d = 29,
-
- // Multi parts
- PART_BANK_SELECT = 31, // The change is executed once a program change is received
- PART_BANK_CHANGE = 32, // The change is executed immediately
- PART_PROGRAM_CHANGE = 33,
- PART_MIDI_CHANNEL = 34,
- PART_LOW_KEY = 35,
- PART_HIGH_KEY = 36,
- PART_TRANSPOSE = 37,
- PART_DETUNE = 38,
- PART_VOLUME = 39,
- PART_MIDI_VOLUME_INIT = 40,
- PART_OUTPUT_SELECT = 41,
-
- SECOND_OUTPUT_SELECT = 45,
-
- UNK35 = 53,
- UNK36 = 54,
-
- // Multi parts
- PART_ENABLE = 72,
- PART_MIDI_VOLUME_ENABLE = 73,
- PART_HOLD_PEDAL_ENABLE = 74,
- PART_KEYB_TO_MIDI = 75,
- UNK76 = 76,
- PART_NOTE_STEAL_PRIO = 77,
- PART_PROG_CHANGE_ENABLE = 78,
-
- INPUT_THRU_LEVEL = 90,
- INPUT_BOOST = 91,
- MASTER_TUNE = 92,
- DEVICE_ID = 93,
- MIDI_CONTROL_LOW_PAGE = 94,
- MIDI_CONTROL_HIGH_PAGE = 95,
- MIDI_ARPEGGIATOR_SEND = 96,
- MULTI_PROGRAM_CHANGE = 105,
- MIDI_CLOCK_RX = 106,
- UNK6d = 109,
- PLAY_MODE = 122,
- PART_NUMBER = 123,
- GLOBAL_CHANNEL = 124,
- LED_MODE = 125,
- LCD_CONTRAST = 126,
- PANEL_DESTINATION = 121,
- MASTER_VOLUME = 127
- };
-
- enum MultiDump : uint8_t
- {
- MD_NAME_CHAR_0 = 4,
- MD_NAME_CHAR_1 = 5,
- MD_NAME_CHAR_2 = 6,
- MD_NAME_CHAR_3 = 7,
- MD_NAME_CHAR_4 = 8,
- MD_NAME_CHAR_5 = 9,
- MD_NAME_CHAR_6 = 10,
- MD_NAME_CHAR_7 = 11,
- MD_NAME_CHAR_8 = 12,
- MD_NAME_CHAR_9 = 13,
-
- MD_CLOCK_TEMPO = 15,
- MD_DELAY_MODE = 16,
- MD_DELAY_TIME = 17,
- MD_DELAY_FEEDBACK = 18,
- MD_DELAY_RATE = 19,
- MD_DELAY_DEPTH = 20,
- MD_DELAY_SHAPE = 21,
- MD_DELAY_OUTPUT_SELECT = 22,
- MD_DELAY_CLOCK = 23,
- MD_DELAY_COLOR = 24,
-
- MD_PART_BANK_NUMBER = 32,
- MD_PART_PROGRAM_NUMBER = 48,
- MD_PART_MIDI_CHANNEL = 64,
- MD_PART_LOW_KEY = 80,
- MD_PART_HIGH_KEY = 96,
- MD_PART_TRANSPOSE = 112,
- MD_PART_DETUNE = 128,
- MD_PART_VOLUME = 144,
- MD_PART_MIDI_VOLUME_INIT = 160,
- MD_PART_OUTPUT_SELECT = 176,
- MD_PART_EFFECT_SEND = 192,
- MD_PART_STATE = 240,
- };
-
- enum MultiPartStateBits : uint8_t
- {
- MD_PART_ENABLE,
- MD_PART_MIDI_VOLUME_ENABLE,
- MD_PART_HOLD_PEDAL_ENABLE,
- MD_PART_KEYB_TO_MIDI,
- MD_PART_INTERNAL_BIT4,
- MD_PART_NOTE_STEAL_PRIORITY,
- MD_PART_PROG_CHANGE_ENABLE
- };
-
- enum Page
- {
- PAGE_A = 0x70,
- PAGE_B = 0x71,
- PAGE_C = 0x72,
- };
-
- enum ProgramType
- {
- SINGLE = 0x40
- };
-
- enum PlayMode
- {
- PlayModeSingle,
- PlayModeMultiSingle, // This one is just a different view of multi mode on the hardware, not needed
- PlayModeMulti,
- };
-
- const uint8_t OMNI_DEVICE_ID = 0x10;
-
using TPreset = ROMFile::TPreset;
explicit Microcontroller(dsp56k::HDI08& hdi08, ROMFile& romFile);
diff --git a/source/virusLib/microcontrollerTypes.h b/source/virusLib/microcontrollerTypes.h
@@ -0,0 +1,161 @@
+#pragma once
+
+namespace virusLib
+{
+ enum SysexMessageType : uint8_t
+ {
+ DUMP_SINGLE = 0x10,
+ DUMP_MULTI = 0x11,
+ REQUEST_SINGLE = 0x30,
+ REQUEST_MULTI = 0x31,
+ REQUEST_BANK_SINGLE = 0x32,
+ REQUEST_BANK_MULTI = 0x33,
+ REQUEST_ARRANGEMENT = 0x34, // current Multi + all referenced Singles in the Multi. Only the Singles whose parts are enabled in the Multi are sent
+ REQUEST_GLOBAL = 0x35, // All parameters not related to a single or a multi
+ REQUEST_TOTAL = 0x36, // Single RAM Banks + Multi RAM Bank + Global
+ REQUEST_CONTROLLER_DUMP = 0x37, // Sends the current Single edit buffer as individual controller/polypressure/sysex
+
+ PARAM_CHANGE_A = 0x70,
+ PARAM_CHANGE_B = 0x71,
+ PARAM_CHANGE_C = 0x72,
+ };
+
+ enum ControlCommand : uint8_t
+ {
+ AUDITION = 01,
+
+ // Multi
+ MULTI_NAME_CHAR_0 = 5,
+ MULTI_NAME_CHAR_1 = 6,
+ MULTI_NAME_CHAR_2 = 7,
+ MULTI_NAME_CHAR_3 = 8,
+ MULTI_NAME_CHAR_4 = 9,
+ MULTI_NAME_CHAR_5 = 10,
+ MULTI_NAME_CHAR_6 = 11,
+ MULTI_NAME_CHAR_7 = 12,
+ MULTI_NAME_CHAR_8 = 13,
+ MULTI_NAME_CHAR_9 = 14,
+
+ MULTI_DELAY_OUTPUT_SELECT = 22,
+
+ UNK1a = 26,
+ UNK1b = 27,
+ UNK1c = 28,
+ UNK1d = 29,
+
+ // Multi parts
+ PART_BANK_SELECT = 31, // The change is executed once a program change is received
+ PART_BANK_CHANGE = 32, // The change is executed immediately
+ PART_PROGRAM_CHANGE = 33,
+ PART_MIDI_CHANNEL = 34,
+ PART_LOW_KEY = 35,
+ PART_HIGH_KEY = 36,
+ PART_TRANSPOSE = 37,
+ PART_DETUNE = 38,
+ PART_VOLUME = 39,
+ PART_MIDI_VOLUME_INIT = 40,
+ PART_OUTPUT_SELECT = 41,
+
+ SECOND_OUTPUT_SELECT = 45,
+
+ UNK35 = 53,
+ UNK36 = 54,
+
+ // Multi parts
+ PART_ENABLE = 72,
+ PART_MIDI_VOLUME_ENABLE = 73,
+ PART_HOLD_PEDAL_ENABLE = 74,
+ PART_KEYB_TO_MIDI = 75,
+ UNK76 = 76,
+ PART_NOTE_STEAL_PRIO = 77,
+ PART_PROG_CHANGE_ENABLE = 78,
+
+ INPUT_THRU_LEVEL = 90,
+ INPUT_BOOST = 91,
+ MASTER_TUNE = 92,
+ DEVICE_ID = 93,
+ MIDI_CONTROL_LOW_PAGE = 94,
+ MIDI_CONTROL_HIGH_PAGE = 95,
+ MIDI_ARPEGGIATOR_SEND = 96,
+ MULTI_PROGRAM_CHANGE = 105,
+ MIDI_CLOCK_RX = 106,
+ UNK6d = 109,
+ PLAY_MODE = 122,
+ PART_NUMBER = 123,
+ GLOBAL_CHANNEL = 124,
+ LED_MODE = 125,
+ LCD_CONTRAST = 126,
+ PANEL_DESTINATION = 121,
+ MASTER_VOLUME = 127
+ };
+
+ enum MultiDump : uint8_t
+ {
+ MD_NAME_CHAR_0 = 4,
+ MD_NAME_CHAR_1 = 5,
+ MD_NAME_CHAR_2 = 6,
+ MD_NAME_CHAR_3 = 7,
+ MD_NAME_CHAR_4 = 8,
+ MD_NAME_CHAR_5 = 9,
+ MD_NAME_CHAR_6 = 10,
+ MD_NAME_CHAR_7 = 11,
+ MD_NAME_CHAR_8 = 12,
+ MD_NAME_CHAR_9 = 13,
+
+ MD_CLOCK_TEMPO = 15,
+ MD_DELAY_MODE = 16,
+ MD_DELAY_TIME = 17,
+ MD_DELAY_FEEDBACK = 18,
+ MD_DELAY_RATE = 19,
+ MD_DELAY_DEPTH = 20,
+ MD_DELAY_SHAPE = 21,
+ MD_DELAY_OUTPUT_SELECT = 22,
+ MD_DELAY_CLOCK = 23,
+ MD_DELAY_COLOR = 24,
+
+ MD_PART_BANK_NUMBER = 32,
+ MD_PART_PROGRAM_NUMBER = 48,
+ MD_PART_MIDI_CHANNEL = 64,
+ MD_PART_LOW_KEY = 80,
+ MD_PART_HIGH_KEY = 96,
+ MD_PART_TRANSPOSE = 112,
+ MD_PART_DETUNE = 128,
+ MD_PART_VOLUME = 144,
+ MD_PART_MIDI_VOLUME_INIT = 160,
+ MD_PART_OUTPUT_SELECT = 176,
+ MD_PART_EFFECT_SEND = 192,
+ MD_PART_STATE = 240,
+ };
+
+ enum MultiPartStateBits : uint8_t
+ {
+ MD_PART_ENABLE,
+ MD_PART_MIDI_VOLUME_ENABLE,
+ MD_PART_HOLD_PEDAL_ENABLE,
+ MD_PART_KEYB_TO_MIDI,
+ MD_PART_INTERNAL_BIT4,
+ MD_PART_NOTE_STEAL_PRIORITY,
+ MD_PART_PROG_CHANGE_ENABLE
+ };
+
+ enum Page
+ {
+ PAGE_A = 0x70,
+ PAGE_B = 0x71,
+ PAGE_C = 0x72,
+ };
+
+ enum ProgramType
+ {
+ SINGLE = 0x40
+ };
+
+ enum PlayMode
+ {
+ PlayModeSingle,
+ PlayModeMultiSingle, // This one is just a different view of multi mode on the hardware, not needed
+ PlayModeMulti,
+ };
+
+ static constexpr uint8_t OMNI_DEVICE_ID = 0x10;
+}
+\ No newline at end of file
diff --git a/source/virusTestConsole/virusTestConsole.cpp b/source/virusTestConsole/virusTestConsole.cpp
@@ -51,7 +51,7 @@ void audioCallback(dsp56k::Audio* audio)
break;
case 64:
LOG("Sending Preset");
- microcontroller->writeSingle(0, Microcontroller::SINGLE, preset);
+ microcontroller->writeSingle(0, SINGLE, preset);
break;
case 128:
LOG("Sending Note On");
