some cleanup

.gitignore

@@ -48,4 +48,5 @@ sdcard
 
 CMSIS_5/
 Synth_Dexed/
-circle-stdlib/
+circle-stdlib/
+.vscode/

build.sh

@@ -14,8 +14,6 @@ else
     export TOOLCHAIN_PREFIX="arm-none-eabi-"
 fi
 
-SDHOST=$([ "${RPI}" == 3 ] && echo "" || echo "")
-
 # Define system options
 OPTIONS="-o USE_PWM_AUDIO_ON_ZERO -o SAVE_VFP_REGS_ON_IRQ -o REALTIME -o SCREEN_DMA_BURST_LENGTH=1"
 if [ "${RPI}" -gt "1" ]; then

src/minidexed.cpp

@@ -69,14 +69,7 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
 	m_bSetNewPerformance (false),
 	m_bDeletePerformance (false),
 	m_bLoadPerformanceBusy(false),
-	/*
-	m_pNet(nullptr),
-	m_pNetDevice(nullptr),
-	m_WLAN(WLANFirmwarePath),
-	m_WPASupplicant(WLANConfigFile),
-	m_bNetworkReady(false),
-	*/
-	//CNetSubSystem* const pNet = CNetSubSystem::Get();
+
 	m_pNet(nullptr),
 	m_pNetDevice(nullptr),
 	m_WLAN(WLANFirmwarePath),
@@ -1840,20 +1833,6 @@ unsigned CMiniDexed::getModController (unsigned controller, unsigned parameter,
 }
 
 void CMiniDexed::UpdateNetwork()
-/*{
-	CNetSubSystem* const pNet = CNetSubSystem::Get();
-	if (!m_bNetworkReady){
-		
-		m_bNetworkReady = true;
-		CString IPString;
-		pNet->GetConfig()->GetIPAddress()->Format(&IPString);
-		LOGNOTE("Network up and running at: %s", static_cast<const char *>(IPString));
-	}
-	if (!pNet)
-		return;
-	
-}*/
-
 {
 	//CNetSubSystem* const pNet = CNetSubSystem::Get();
 	if (!m_pNet)
@@ -1891,33 +1870,6 @@ void CMiniDexed::UpdateNetwork()
 
 	}
 }
-/*
-void CMiniDexed::UpdateNetwork()
-{
-	if (!m_pNet)
-		return;
-
-	bool bNetIsRunning = m_pNet->IsRunning();
-	if (strcmp(m_pConfig->GetNetworkType(), "ethernet") == 0)
-		bNetIsRunning &= m_pNetDevice->IsLinkUp();
-	else if (strcmp(m_pConfig->GetNetworkType(), "wifi") == 0)
-		bNetIsRunning &= m_WPASupplicant.IsConnected();
-
-	if (!m_bNetworkReady && bNetIsRunning)
-	{
-		m_bNetworkReady = true;
-
-		CString IPString;
-		m_pNet->GetConfig()->GetIPAddress()->Format(&IPString);
-
-		LOGNOTE("Network up and running at: %s", static_cast<const char *>(IPString));
-	}
-	else if (m_bNetworkReady && !bNetIsRunning)
-	{
-		m_bNetworkReady = false;
-		LOGNOTE("Network disconnected.");
-	}
-}*/
 
 bool CMiniDexed::InitNetwork()
 {

src/minidexed.h

@@ -47,9 +47,6 @@
 #include "effect_mixer.hpp"
 #include "effect_platervbstereo.h"
 #include "effect_compressor.h"
-//#include <circle/net/netsubsystem.h>
-//#include <wlan/bcm4343.h>
-//#include <wlan/hostap/wpa_supplicant/wpasupplicant.h>
 #include "udpmididevice.h"
 #include "net/ftpdaemon.h"
 
@@ -320,19 +317,7 @@ private:
 	unsigned m_nDeletePerformanceID;
 	bool m_bLoadPerformanceBusy;
 	bool m_bSaveAsDeault;
-	//CNetSubSystem* m_pNet;
-	//CWPASupplicant m_WPASupplicant;
-	// Networking
-	//CNetSubSystem &mNet;
-	/*
-	CNetSubSystem* m_pNet;
-	CNetDevice* m_pNetDevice;
-	CBcm4343Device m_WLAN;
-	CWPASupplicant m_WPASupplicant;
-	bool m_bNetworkReady;
-	CBcmRandomNumberGenerator m_Random;
-	*/
-	// Networking
+
 	CNetSubSystem* m_pNet;
 	CNetDevice* m_pNetDevice;
 	CBcm4343Device m_WLAN;