Merge pull request #10 from UniversityRadioYork/vs2015-2

BAPS 2.7.0

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -277,3 +277,5 @@ __pycache__/
 # Cake - Uncomment if you are using it
 # tools/**
 # !tools/packages.config
+
+*.cache

BAPSController/AssemblyInfo.cpp

@@ -14,12 +14,12 @@ using namespace System::Security::Permissions;
 [assembly:AssemblyTitleAttribute("BAPS USB Controller")];
 [assembly:AssemblyDescriptionAttribute(".NET wrapper for the 2nd generation BAPS Controller")];
 [assembly:AssemblyConfigurationAttribute("Private")];
-[assembly:AssemblyCompanyAttribute("Uni-Software")];
+[assembly:AssemblyCompanyAttribute("URY")];
 [assembly:AssemblyProductAttribute("BAPS USB Controller")];
-[assembly:AssemblyCopyrightAttribute("Copyright (c)  2008")];
-[assembly:AssemblyTrademarkAttribute("Uni-Software")];
+[assembly:AssemblyCopyrightAttribute("Copyright (c)  2018")];
+[assembly:AssemblyTrademarkAttribute("University Radio York")];
 [assembly:AssemblyCultureAttribute("")];
-[assembly:AssemblyInformationalVersionAttribute("1.0.0.0")];
+[assembly:AssemblyInformationalVersionAttribute("1.1.0.0")];
 
 //
 // Version information for an assembly consists of the following four values:
@@ -32,7 +32,7 @@ using namespace System::Security::Permissions;
 // You can specify all the value or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly:AssemblyVersionAttribute("1.0.0.0")];
+[assembly:AssemblyVersionAttribute("1.1.0.0")];
 
 [assembly:ComVisible(false)];
 

BAPSController/BAPSController.cpp

@@ -19,6 +19,8 @@ BAPSController::BAPSController()
 
 	if (hDll == 0)
 	{
+		// Initialise empty array and get out
+		this->serialNumbers = gcnew array<System::String^>(0);
 		return;
 	}
 
@@ -186,7 +188,7 @@ void BAPSController::runHelper()
 				USBm_DirectionB(i, 0x00, 0xFF);
 				USBm_WriteB(i, 0xFF);
 			}
-		
+
 			/* Swap in the new names and offsets */
 			serialNumbers = newSerialNumbers;
 			deviceCount = newDeviceCount;
@@ -199,5 +201,6 @@ void BAPSController::runHelper()
 
 array<System::String^>^ BAPSController::getSerialNumbers()
 {
+	// Just returns empty array if no usb
 	return safe_cast<array<System::String^>^>(serialNumbers->Clone());
-}
+}

BAPSController/BAPSController.h

@@ -8,7 +8,7 @@ using namespace System;
 
 
 namespace BAPSControllerAssembly
-{	
+{
 	public delegate void SignalCallback(System::String^, int);
 
 	public ref class BAPSController
@@ -76,7 +76,7 @@ namespace BAPSControllerAssembly
 		USBm_Copyright_type         USBm_Copyright;
 		USBm_About_type             USBm_About;
 		USBm_Version_type           USBm_Version;
-		
+
 		int deviceCount;
 		array<System::String^>^ serialNumbers;
 		array<unsigned char>^ lastByteA;