Updated file structure to organize relevant files, added in operating specific source files.

Development/Software/Client API/Client API.vcxproj

@@ -11,11 +11,16 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\Communications\Bluetooth.cpp" />
     <ClCompile Include="Communications.cpp" />
+    <ClCompile Include="Sources\Bluetooth\UnixBluetooth.cpp" />
+    <ClCompile Include="Sources\Bluetooth\WindowsBluetooth.cpp" />
+    <ClCompile Include="Sources\Listener\UnixListener.cpp" />
+    <ClCompile Include="Sources\Listener\WindowsListener.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Communications.h" />
+    <ClInclude Include="Headers\Bluetooth.h" />
+    <ClInclude Include="Headers\Listener.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="README.txt" />

Development/Software/Client API/Client API.vcxproj.filters

@@ -18,7 +18,16 @@
     <ClCompile Include="Communications.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Communications\Bluetooth.cpp">
+    <ClCompile Include="Sources\Bluetooth\UnixBluetooth.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sources\Bluetooth\WindowsBluetooth.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sources\Listener\WindowsListener.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sources\Listener\UnixListener.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -31,5 +40,11 @@
     <ClInclude Include="Communications.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Headers\Listener.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Headers\Bluetooth.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Development/Software/Client API/Sources/Bluetooth/UnixBluetooth.cpp

+#ifdef unix
+
+#include "Bluetooth.h"
+
+// Code goes here for unix based systems
+
+#endif
\ No newline at end of file

Development/Software/Client API/Sources/Bluetooth/WindowsBluetooth.cpp

+#ifdef _WIN32
+
+#include "../../Headers/Bluetooth.h"
+
+// Code goes here
+
+#endif
\ No newline at end of file

Development/Software/Client API/Sources/Listener/UnixListener.cpp

+#ifdef unix
+
+#include "../../Headers/Listener.h"
+
+// Code goes here for unix based systems
+
+#endif
\ No newline at end of file

Development/Software/Client API/Sources/Listener/WindowsListener.cpp

+#ifdef _WIN32
+
+#include "../../Headers/Listener.h"
+
+// Code goes here
+
+#endif
\ No newline at end of file

Development/Software/Communications/Bluetooth.cpp

-///*
+//*
 // * Bluetooth.cpp
 // *
 // *  Created on: Nov 15, 2015

Development/Software/Controller API/Bluetooth.h

-#pragma once
-namespace Bluetooth
-{
-	extern int myNum;
-
-	int Scan();
-}
-

Development/Software/Controller API/Controller API.vcxproj

@@ -11,31 +11,29 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Bluetooth.cpp" />
-    <ClCompile Include="Client.cpp" />
-    <ClCompile Include="Communications.cpp" />
-    <ClCompile Include="GyroService.cpp" />
-    <ClCompile Include="Joystick.cpp" />
-    <ClCompile Include="LSM9DS0.cpp" />
-    <ClCompile Include="Mailbox.cpp" />
-    <ClCompile Include="Message.cpp" />
-    <ClCompile Include="MPU9250.cpp" />
-    <ClCompile Include="Server.cpp" />
-    <ClCompile Include="Service.cpp" />
-    <ClCompile Include="Source.cpp" />
+    <ClCompile Include="Sources\Bluetooth\Bluetooth.cpp" />
+    <ClCompile Include="Sources\Client.cpp" />
+    <ClCompile Include="Sources\Communications.cpp" />
+    <ClCompile Include="Sources\GyroService.cpp" />
+    <ClCompile Include="Sources\Sensors\Joystick.cpp" />
+    <ClCompile Include="Sources\Mailbox.cpp" />
+    <ClCompile Include="Sources\Message.cpp" />
+    <ClCompile Include="Sources\Sensors\MPU9250.cpp" />
+    <ClCompile Include="Sources\Server.cpp" />
+    <ClCompile Include="Sources\Service.cpp" />
+    <ClCompile Include="Sources\Source.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Bluetooth.h" />
-    <ClInclude Include="Client.h" />
-    <ClInclude Include="Communications.h" />
-    <ClInclude Include="GyroService.h" />
-    <ClInclude Include="Joystick.h" />
-    <ClInclude Include="LSM9DS0.h" />
-    <ClInclude Include="Mailbox.h" />
-    <ClInclude Include="Message.h" />
-    <ClInclude Include="MPU9250.h" />
-    <ClInclude Include="Server.h" />
-    <ClInclude Include="Service.h" />
+    <ClInclude Include="Headers\Bluetooth\Bluetooth.h" />
+    <ClInclude Include="Headers\Client.h" />
+    <ClInclude Include="Headers\Communications.h" />
+    <ClInclude Include="Headers\GyroService.h" />
+    <ClInclude Include="Headers\Sensors\Joystick.h" />
+    <ClInclude Include="Headers\Mailbox.h" />
+    <ClInclude Include="Headers\Message.h" />
+    <ClInclude Include="Headers\Sensors\MPU9250.h" />
+    <ClInclude Include="Headers\Server.h" />
+    <ClInclude Include="Headers\Service.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="Makefile.txt" />

Development/Software/Controller API/Controller API.vcxproj.filters

@@ -33,77 +33,71 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Communications.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Sources\Sensors\MPU9250.cpp">
+      <Filter>Source Files\Sensors</Filter>
     </ClCompile>
-    <ClCompile Include="Bluetooth.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Sources\Sensors\Joystick.cpp">
+      <Filter>Source Files\Sensors</Filter>
     </ClCompile>
-    <ClCompile Include="Server.cpp">
+    <ClCompile Include="Sources\Bluetooth\Bluetooth.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Client.cpp">
+    <ClCompile Include="Sources\Client.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source.cpp">
+    <ClCompile Include="Sources\Source.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="LSM9DS0.cpp">
-      <Filter>Source Files\Sensors</Filter>
-    </ClCompile>
-    <ClCompile Include="Joystick.cpp">
-      <Filter>Source Files\Sensors</Filter>
-    </ClCompile>
-    <ClCompile Include="MPU9250.cpp">
-      <Filter>Source Files\Sensors</Filter>
-    </ClCompile>
-    <ClCompile Include="Service.cpp">
-      <Filter>Source Files\Services</Filter>
+    <ClCompile Include="Sources\Server.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GyroService.cpp">
+    <ClCompile Include="Sources\Service.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="Mailbox.cpp">
+    <ClCompile Include="Sources\Message.cpp">
       <Filter>Source Files\MessagePassing</Filter>
     </ClCompile>
-    <ClCompile Include="Message.cpp">
+    <ClCompile Include="Sources\Mailbox.cpp">
       <Filter>Source Files\MessagePassing</Filter>
     </ClCompile>
+    <ClCompile Include="Sources\GyroService.cpp">
+      <Filter>Source Files\Services</Filter>
+    </ClCompile>
+    <ClCompile Include="Sources\Communications.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Communications.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="Headers\Sensors\Joystick.h">
+      <Filter>Header Files\Sensors</Filter>
     </ClInclude>
-    <ClInclude Include="Bluetooth.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="Headers\Sensors\MPU9250.h">
+      <Filter>Header Files\Sensors</Filter>
     </ClInclude>
-    <ClInclude Include="Server.h">
+    <ClInclude Include="Headers\Bluetooth\Bluetooth.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Client.h">
+    <ClInclude Include="Headers\Client.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="LSM9DS0.h">
-      <Filter>Header Files\Sensors</Filter>
-    </ClInclude>
-    <ClInclude Include="Joystick.h">
-      <Filter>Header Files\Sensors</Filter>
-    </ClInclude>
-    <ClInclude Include="MPU9250.h">
-      <Filter>Header Files\Sensors</Filter>
-    </ClInclude>
-    <ClInclude Include="GyroService.h">
-      <Filter>Header Files\Services</Filter>
+    <ClInclude Include="Headers\Communications.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Service.h">
+    <ClInclude Include="Headers\GyroService.h">
       <Filter>Header Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="Mailbox.h">
+    <ClInclude Include="Headers\Mailbox.h">
       <Filter>Header Files\MessagePassing</Filter>
     </ClInclude>
-    <ClInclude Include="Message.h">
+    <ClInclude Include="Headers\Message.h">
       <Filter>Header Files\MessagePassing</Filter>
     </ClInclude>
+    <ClInclude Include="Headers\Server.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Headers\Service.h">
+      <Filter>Header Files\Services</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="Makefile.txt">

Development/Software/Controller API/Headers/Bluetooth/Bluetooth.h

+#pragma once
+class Bluetooth
+{
+public:
+	Bluetooth();
+	~Bluetooth();
+};
+