Changed API to match new rules for the system.

Development/Software/Client API/Client API.vcxproj

@@ -11,16 +11,20 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Communications.cpp" />
+    <ClCompile Include="Sources\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" />
+    <ClCompile Include="Sources\Message.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Communications.h" />
+    <ClInclude Include="Headers\Communications.h" />
     <ClInclude Include="Headers\Bluetooth.h" />
     <ClInclude Include="Headers\Listener.h" />
+    <ClInclude Include="Headers\Message.h" />
+    <ClInclude Include="Headers\ServiceIDs.h" />
+    <ClInclude Include="Headers\ServiceSet.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="README.txt" />

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

@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Communications.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Sources\Bluetooth\UnixBluetooth.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -30,6 +27,12 @@
     <ClCompile Include="Sources\Listener\UnixListener.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Sources\Communications.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sources\Message.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="README.txt">
@@ -37,14 +40,23 @@
     </Text>
   </ItemGroup>
   <ItemGroup>
-    <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>
+    <ClInclude Include="Headers\Communications.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Headers\ServiceSet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Headers\ServiceIDs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Headers\Message.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Development/Software/Client API/Communications.cpp

-#include "Communications.h"
-
-
-bool start()
-{
-	return true;
-}
-
-bool stop()
-{
-	return false;
-}
-
-bool connect()
-{
-	return true;
-}
-
-bool disconnect()
-{
-	return false;
-}
-
-bool sendMessage()
-{
-	return true;
-}
-
-bool receiveMessage()
-{
-	return false;
-}
\ No newline at end of file

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

+bool sendDataStub()
+{
+	return true;
+}
+
+bool receiveDataStub()
+{
+	return true;
+}
\ No newline at end of file

Development/Software/Client API/Communications.h → Development/Software/Client API/Headers/Communications.h

@@ -2,6 +2,7 @@
 
 #define ExternC extern "C"
 #define DLLExport __declspec(dllexport)
+#include "Message.h"
 
 #else
 
@@ -11,16 +12,15 @@
 
 #endif
 
-
-
-ExternC DLLExport bool start();
-ExternC DLLExport bool stop();
+#include "ServiceSet.h"
 
 ExternC DLLExport bool connect();
 ExternC DLLExport bool disconnect();
 
-ExternC DLLExport bool sendMessage();
-ExternC DLLExport bool receiveMessage();
+ExternC DLLExport double readSensor(int serviceID);
+ExternC DLLExport int readSensors(double buff[], int length, ServiceSet serviceIDs);
+ExternC DLLExport bool receiveAudio();
+ExternC DLLExport bool sendAudio();
 
 
 

Development/Software/Client API/Headers/Message.h

+#pragma once
+
+#include <iostream>
+#include <stdio.h>
+#include <list>
+
+using namespace std;
+
+template <class T>
+class Message
+{
+public:
+	Message(string sender, string destination, list<T> data);
+	~Message();
+
+	string getSender();
+	string getDestination();
+	type_info dataType;
+	list<T> getData();
+
+	ostream& operator>>(ostream& os);
+
+	istream& operator<<(istream& is);
+private:
+	string _sender;
+	string _destination;
+
+	list<T> _data;
+
+};
+

Development/Software/Client API/Headers/ServiceIDs.h

+#define GYRO_X 101
+#define GYRO_Y 102
+#define GYRO_Z 103
+
+#define ACCEL_X 111
+#define ACCEL_Y 112
+#define ACCEL_Z 113
+
+#define MAG_X 121
+#define MAG_Y 122
+#define MAG_Z 123

Development/Software/Client API/Headers/ServiceSet.h

+#include "ServiceIDs.h"
+
+typedef struct {
+	int numServices;
+	int serviceIDs[];
+} ServiceSet;
+
+const ServiceSet GyroSet = { 3, { GYRO_X, GYRO_Y, GYRO_Z } };
+const ServiceSet AccelSet = { 3, { ACCEL_X, ACCEL_Y, ACCEL_Z } };
+const ServiceSet MagSet = { 3, { MAG_X, MAG_Y, MAG_Z } };
+

Development/Software/Client API/Sources/Communications.cpp

+#include "../Headers/Communications.h"
+
+// Connects to a specified bluetooth address
+bool connect()
+{
+	return true;
+}
+
+// Disconnects from the current connection
+bool disconnect()
+{
+	return false;
+}
+
+// Reads from a single sensor
+double readSensor(int serviceID)
+{
+
+}
+
+// Read from a set of sensors specified
+int readSensors(double buff[], int length, ServiceSet serviceIDs)
+{
+
+}
+
+// Receive audio from the audio codec
+bool receiveAudio()
+{
+
+}
+
+// Sends a set of audio to be played by the audio codec
+bool sendAudio()
+{
+
+}
\ No newline at end of file

Development/Software/Client API/Sources/Message.cpp

+#include "../Headers/Message.h"
+
+template <class T>
+Message::Message(string sender, string destination, list<T> data)
+{
+	_sender = sender;
+	_destination = destination;
+	_data = data;
+}
+template <class T>
+string Message<T>::getSender()
+{
+	return _sender;
+}
+template <class T>
+string Message::getDestination()
+{
+	return _destination;
+}
+template <class T>
+list<T> Message::getData()
+{
+	return _data;
+}

Development/Software/Controller API/Controller API.vcxproj

@@ -25,13 +25,13 @@
     <ClCompile Include="Sources\System\Thread.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Headers\MessagePassing\Message.h" />
     <ClInclude Include="Headers\System\Bluetooth.h" />
     <ClInclude Include="Headers\Client.h" />
     <ClInclude Include="Headers\Communications.h" />
     <ClInclude Include="Headers\Service\GyroService.h" />
     <ClInclude Include="Headers\Sensor\Joystick.h" />
     <ClInclude Include="Headers\MessagePassing\Mailbox.h" />
-    <ClInclude Include="Headers\MessagePassing\Message.h" />
     <ClInclude Include="Headers\Sensor\MPU9250.h" />
     <ClInclude Include="Headers\Server.h" />
     <ClInclude Include="Headers\Service\Service.h" />

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

@@ -83,9 +83,6 @@
     <ClInclude Include="Headers\MessagePassing\Mailbox.h">
       <Filter>Header Files\MessagePassing</Filter>
     </ClInclude>
-    <ClInclude Include="Headers\MessagePassing\Message.h">
-      <Filter>Header Files\MessagePassing</Filter>
-    </ClInclude>
     <ClInclude Include="Headers\System\Bluetooth.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -104,6 +101,9 @@
     <ClInclude Include="Headers\Service\GyroService.h">
       <Filter>Header Files\Services</Filter>
     </ClInclude>
+    <ClInclude Include="Headers\MessagePassing\Message.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="Makefile.txt">