From db808d4cfc3f9b040ee06a9db694101a5cfe026a Mon Sep 17 00:00:00 2001 From: diyelectromusic <68612569+diyelectromusic@users.noreply.github.com> Date: Tue, 23 Aug 2022 18:16:05 +0100 Subject: [PATCH] Second try with more functionality plugged in and compiling... --- src/mididevice.cpp | 7 ++++--- src/midikeyboard.cpp | 4 ++-- src/midikeyboard.h | 2 +- src/pckeyboard.cpp | 4 ++-- src/pckeyboard.h | 2 +- src/serialmididevice.cpp | 4 ++-- src/serialmididevice.h | 2 +- src/uibuttons.cpp | 24 ++++++++++++++++++++++++ src/uibuttons.h | 5 ++++- src/userinterface.cpp | 11 +++++++---- src/userinterface.h | 4 ++-- 11 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/mididevice.cpp b/src/mididevice.cpp index 7bc1263..463dc9c 100644 --- a/src/mididevice.cpp +++ b/src/mididevice.cpp @@ -60,9 +60,10 @@ LOGMODULE ("mididevice"); CMIDIDevice::TDeviceMap CMIDIDevice::s_DeviceMap; -CMIDIDevice::CMIDIDevice (CMiniDexed *pSynthesizer, CConfig *pConfig) +CMIDIDevice::CMIDIDevice (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserInterface *pUI) : m_pSynthesizer (pSynthesizer), - m_pConfig (pConfig) + m_pConfig (pConfig), + m_pUI (pUI) { for (unsigned nTG = 0; nTG < CConfig::ToneGenerators; nTG++) { @@ -190,7 +191,7 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign { break; } - CUserInterface::UIMIDICCHandler (ucChannel, pMessage[1], pMessage[2]); + m_pUI->UIMIDICCHandler (ucChannel, pMessage[1], pMessage[2]); break; } diff --git a/src/midikeyboard.cpp b/src/midikeyboard.cpp index 054352c..169f165 100644 --- a/src/midikeyboard.cpp +++ b/src/midikeyboard.cpp @@ -35,8 +35,8 @@ TMIDIPacketHandler * const CMIDIKeyboard::s_pMIDIPacketHandler[MaxInstances] = MIDIPacketHandler3 }; -CMIDIKeyboard::CMIDIKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, unsigned nInstance) -: CMIDIDevice (pSynthesizer, pConfig), +CMIDIKeyboard::CMIDIKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserInterface *pUI, unsigned nInstance) +: CMIDIDevice (pSynthesizer, pConfig, pUI), m_nInstance (nInstance), m_pMIDIDevice (0) { diff --git a/src/midikeyboard.h b/src/midikeyboard.h index a530c25..0868f9c 100644 --- a/src/midikeyboard.h +++ b/src/midikeyboard.h @@ -39,7 +39,7 @@ public: static const unsigned MaxInstances = 4; public: - CMIDIKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, unsigned nInstance = 0); + CMIDIKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserInterface *pUI, unsigned nInstance = 0); ~CMIDIKeyboard (void); void Process (boolean bPlugAndPlayUpdated); diff --git a/src/pckeyboard.cpp b/src/pckeyboard.cpp index fbd8ea5..79fe92c 100644 --- a/src/pckeyboard.cpp +++ b/src/pckeyboard.cpp @@ -60,8 +60,8 @@ static TKeyInfo KeyTable[] = CPCKeyboard *CPCKeyboard::s_pThis = 0; -CPCKeyboard::CPCKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig) -: CMIDIDevice (pSynthesizer, pConfig), +CPCKeyboard::CPCKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserInterface *pUI) +: CMIDIDevice (pSynthesizer, pConfig, pUI), m_pKeyboard (0) { s_pThis = this; diff --git a/src/pckeyboard.h b/src/pckeyboard.h index 6baf520..ceea6c4 100644 --- a/src/pckeyboard.h +++ b/src/pckeyboard.h @@ -31,7 +31,7 @@ class CMiniDexed; class CPCKeyboard : public CMIDIDevice { public: - CPCKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig); + CPCKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserInterface *pUI); ~CPCKeyboard (void); void Process (boolean bPlugAndPlayUpdated); diff --git a/src/serialmididevice.cpp b/src/serialmididevice.cpp index cdb5153..e3b383d 100644 --- a/src/serialmididevice.cpp +++ b/src/serialmididevice.cpp @@ -29,8 +29,8 @@ LOGMODULE("serialmididevice"); CSerialMIDIDevice::CSerialMIDIDevice (CMiniDexed *pSynthesizer, CInterruptSystem *pInterrupt, - CConfig *pConfig) -: CMIDIDevice (pSynthesizer, pConfig), + CConfig *pConfig, CUserInterface *pUI) +: CMIDIDevice (pSynthesizer, pConfig, pUI), m_pConfig (pConfig), m_Serial (pInterrupt, TRUE), m_nSerialState (0), diff --git a/src/serialmididevice.h b/src/serialmididevice.h index 1f3619e..1a5b465 100644 --- a/src/serialmididevice.h +++ b/src/serialmididevice.h @@ -38,7 +38,7 @@ class CMiniDexed; class CSerialMIDIDevice : public CMIDIDevice { public: - CSerialMIDIDevice (CMiniDexed *pSynthesizer, CInterruptSystem *pInterrupt, CConfig *pConfig); + CSerialMIDIDevice (CMiniDexed *pSynthesizer, CInterruptSystem *pInterrupt, CConfig *pConfig, CUserInterface *pUI); ~CSerialMIDIDevice (void); boolean Initialize (void); diff --git a/src/uibuttons.cpp b/src/uibuttons.cpp index e0e7b98..aca84d1 100644 --- a/src/uibuttons.cpp +++ b/src/uibuttons.cpp @@ -190,6 +190,19 @@ CUIButton::BtnTrigger CUIButton::ReadTrigger (void) return BtnTriggerNone; } +void CUIButton::Write (unsigned nValue) { + // This only makes sense for MIDI buttons. + unsigned pin = getPinNumber(); + if (isMidiPin(pin)) + { + if (m_pin) + { + // Update the "MIDI Pin" + m_pin->Write(nValue); + } + } +} + CUIButton::BtnEvent CUIButton::Read (void) { BtnTrigger trigger = ReadTrigger(); @@ -423,3 +436,14 @@ void CUIButtons::ResetButton (unsigned pinNumber) } } } + +void CUIButtons::BtnMIDICCHandler (unsigned nMidiCC, unsigned nMidiData) +{ + unsigned midiPin = ccToMidiPin(nMidiCC); + for (unsigned i=0; iRegisterEventHandler (UIButtonsEventStub, this); - nMIDIButtonCh = m_pConfig->GetMIDIButtonCh (); + m_nMIDIButtonCh = m_pConfig->GetMIDIButtonCh (); LOGDBG ("Button User Interface initialized"); @@ -334,9 +332,14 @@ void CUserInterface::UIButtonsEventStub (CUIButton::BtnEvent Event, void *pParam void CUserInterface::UIMIDICCHandler (unsigned nMidiCh, unsigned nMidiCC, unsigned nMidiData) { - if ((nMIDIButtonCh != nMidiCh) && (nMIDIButtonCh != 0)) + if ((m_nMIDIButtonCh != nMidiCh) && (m_nMIDIButtonCh != 0)) { // Message not on the MIDI Button channel and MIDI buttons not in OMNI mode return; } + + if (m_pUIButtons) + { + m_pUIButtons->BtnMIDICCHandler (nMidiCC, nMidiData); + } } diff --git a/src/userinterface.h b/src/userinterface.h index 956b6b6..59c7123 100644 --- a/src/userinterface.h +++ b/src/userinterface.h @@ -53,7 +53,7 @@ public: bool bArrowDown, bool bArrowUp); // To be called from the MIDI device on reception of a MIDI CC message - static void UIMIDICCHandler (unsigned nMidiCh, unsigned nMidiCC, unsigned nMidiData); + void UIMIDICCHandler (unsigned nMidiCh, unsigned nMidiCC, unsigned nMidiData); private: void LCDWrite (const char *pString); // Print to optional HD44780 display @@ -76,7 +76,7 @@ private: CUIButtons *m_pUIButtons; - static unsigned nMIDIButtonCh; + unsigned m_nMIDIButtonCh; CKY040 *m_pRotaryEncoder; bool m_bSwitchPressed;