Second try with more functionality plugged in and compiling...

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;
 		}
 

src/midikeyboard.cpp

@@ -35,8 +35,8 @@ TMIDIPacketHandler * const CMIDIKeyboard::s_pMIDIPacketHandler[MaxInstances] =
 	MIDIPacketHandler3
 };
 
-CMIDIKeyboard::CMIDIKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, unsigned nInstance)
+CMIDIKeyboard::CMIDIKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserInterface *pUI, unsigned nInstance)
-:	CMIDIDevice (pSynthesizer, pConfig),
+:	CMIDIDevice (pSynthesizer, pConfig, pUI),
 	m_nInstance (nInstance),
 	m_pMIDIDevice (0)
 {

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);

src/pckeyboard.cpp

@@ -60,8 +60,8 @@ static TKeyInfo KeyTable[] =
 
 CPCKeyboard *CPCKeyboard::s_pThis = 0;
 
-CPCKeyboard::CPCKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig)
+CPCKeyboard::CPCKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserInterface *pUI)
-:	CMIDIDevice (pSynthesizer, pConfig),
+:	CMIDIDevice (pSynthesizer, pConfig, pUI),
 	m_pKeyboard (0)
 {
 	s_pThis = this;

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);

src/serialmididevice.cpp

@@ -29,8 +29,8 @@
 LOGMODULE("serialmididevice");
 
 CSerialMIDIDevice::CSerialMIDIDevice (CMiniDexed *pSynthesizer, CInterruptSystem *pInterrupt,
-				      CConfig *pConfig)
+				      CConfig *pConfig, CUserInterface *pUI)
-:	CMIDIDevice (pSynthesizer, pConfig),
+:	CMIDIDevice (pSynthesizer, pConfig, pUI),
 	m_pConfig (pConfig),
 	m_Serial (pInterrupt, TRUE),
 	m_nSerialState (0),

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);

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; i<MAX_BUTTONS; i++) {
+		if (m_buttons[i].getPinNumber() == midiPin) {
+			m_buttons[i].Write (nMidiData);
+		}
+	}
+	
+}

src/uibuttons.h

@@ -69,9 +69,10 @@ public:
 	
 	BtnTrigger ReadTrigger (void);
 	BtnEvent Read (void);
+	void Write (unsigned nValue); // MIDI buttons only!
 
 	static BtnTrigger triggerTypeFromString(const char* triggerString);
-
+	
 private:
 	// Pin number
 	unsigned m_pinNumber;
@@ -122,6 +123,8 @@ public:
 	void Update (void);
 
 	void ResetButton (unsigned pinNumber);
+
+	void BtnMIDICCHandler (unsigned nMidiCC, unsigned nMidiData);
 	
 private:
 	// Array of normal GPIO buttons and "MIDI buttons"

src/userinterface.cpp

@@ -27,8 +27,6 @@
 
 LOGMODULE ("ui");
 
-unsigned CUserInterface::nMIDIButtonCh = 255;
-
 CUserInterface::CUserInterface (CMiniDexed *pMiniDexed, CGPIOManager *pGPIOManager, CI2CMaster *pI2CMaster, CConfig *pConfig)
 :	m_pMiniDexed (pMiniDexed),
 	m_pGPIOManager (pGPIOManager),
@@ -131,7 +129,7 @@ bool CUserInterface::Initialize (void)
 	}
 
 	m_pUIButtons->RegisterEventHandler (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);
+	}
 }

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;