diff --git a/.gitignore b/.gitignore index 11bef8b..6ad1469 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,7 @@ sdcard *.swp *.swo -CMSIS_5/ -Synth_Dexed/ -circle-stdlib/ +CMSIS_5/** +Synth_Dexed/** +circle-stdlib/** .vscode/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 064ffe4..a70e358 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,12 @@ [submodule "circle-stdlib"] path = circle-stdlib url = https://github.com/smuehlst/circle-stdlib + ignore = all [submodule "Synth_Dexed"] path = Synth_Dexed url = https://codeberg.org/dcoredump/Synth_Dexed.git + ignore = all [submodule "CMSIS_5"] path = CMSIS_5 url = https://github.com/ARM-software/CMSIS_5 + ignore = all diff --git a/src/minidexed.cpp b/src/minidexed.cpp index b9fb752..ac3b79a 100644 --- a/src/minidexed.cpp +++ b/src/minidexed.cpp @@ -27,20 +27,11 @@ #include #include #include -//#include -//#include -//#include "circle_stdlib_app.h" -//#include "mididevice.h" - const char WLANFirmwarePath[] = "SD:firmware/"; const char WLANConfigFile[] = "SD:wpa_supplicant.conf"; #define FTPUSERNAME "admin" #define FTPPASSWORD "admin" -/* -const char WLANFirmwarePath[] = "SD:firmware/"; -const char WLANConfigFile[] = "SD:wpa_supplicant.conf"; -*/ LOGMODULE ("minidexed"); @@ -289,9 +280,7 @@ bool CMiniDexed::Initialize (void) } #endif InitNetwork(); - - - //CMIDIDevice->InitializeRTP(); + return true; } @@ -1849,10 +1838,7 @@ void CMiniDexed::UpdateNetwork() LOGNOTE("Network up and running at: %s", static_cast(IPString)); - if (m_UDPMIDI.Initialize ()) - { - LOGNOTE ("RTP MIDI interface enabled"); - } + m_UDPMIDI.Initialize(); m_pFTPDaemon = new CFTPDaemon(FTPUSERNAME, FTPPASSWORD); diff --git a/src/udpmididevice.cpp b/src/udpmididevice.cpp index f24d580..6080132 100644 --- a/src/udpmididevice.cpp +++ b/src/udpmididevice.cpp @@ -35,18 +35,8 @@ CUDPMIDIDevice::CUDPMIDIDevice (CMiniDexed *pSynthesizer, : CMIDIDevice (pSynthesizer, pConfig, pUI), m_pSynthesizer (pSynthesizer), m_pConfig (pConfig) - - - //m_Serial (pInterrupt, TRUE), - //m_nSerialState (0), - //m_nSysEx (0), - //m_SendBuffer (&m_Serial) { AddDevice ("udp"); - /*for (unsigned nTG = 0; nTG < CConfig::ToneGenerators; nTG++) - { - m_ChannelMap[nTG] = Disabled; - }*/ } CUDPMIDIDevice::~CUDPMIDIDevice (void) @@ -86,7 +76,6 @@ void CUDPMIDIDevice::OnAppleMIDIDataReceived(const u8* pData, size_t nSize) void CUDPMIDIDevice::OnAppleMIDIConnect(const CIPAddress* pIPAddress, const char* pName) { LOGNOTE("RTP Device connected"); - //AddDevice ("udp1"); } void CUDPMIDIDevice::OnAppleMIDIDisconnect(const CIPAddress* pIPAddress, const char* pName) diff --git a/src/udpmididevice.h b/src/udpmididevice.h index e0119e1..f20cc79 100644 --- a/src/udpmididevice.h +++ b/src/udpmididevice.h @@ -30,11 +30,6 @@ #include "net/applemidi.h" #include "net/udpmidi.h" -//#include -//#include -//#include -//#include - class CMiniDexed; class CUDPMIDIDevice : CAppleMIDIHandler, CUDPMIDIHandler, public CMIDIDevice @@ -48,26 +43,11 @@ public: virtual void OnAppleMIDIConnect(const CIPAddress* pIPAddress, const char* pName) override; virtual void OnAppleMIDIDisconnect(const CIPAddress* pIPAddress, const char* pName) override; virtual void OnUDPMIDIDataReceived(const u8* pData, size_t nSize) override; - //void OnAppleMIDIDataReceived(const u8* pData, size_t nSize); - //void OnAppleMIDIConnect(const CIPAddress* pIPAddress, const char* pName); - //void OnAppleMIDIDisconnect(const CIPAddress* pIPAddress, const char* pName); - - //void Process (void); - - //void Send (const u8 *pMessage, size_t nLength, unsigned nCable = 0) override; private: CMiniDexed *m_pSynthesizer; CConfig *m_pConfig; - //u8 m_ChannelMap[CConfig::ToneGenerators]; - //CSerialDevice m_Serial; - //unsigned m_nSerialState; - //unsigned m_nSysEx; - //u8 m_SerialMessage[MAX_MIDI_MESSAGE]; - - //CWriteBufferDevice m_SendBuffer; CBcmRandomNumberGenerator m_Random; - //CAppleMIDIHandler* m_MIDIHandler; CAppleMIDIParticipant* m_pAppleMIDIParticipant; // AppleMIDI participant instance CUDPMIDIReceiver* m_pUDPMIDIReceiver;