.gitignore → groundStation/.gitignore

@@ -34,8 +34,11 @@
 
 
 # vrpn/build files
-src/vrpn/build*
-src/vrpn/pc_linux64/*
+src/backend/vrpn/build*
+src/backend/vrpn/pc_linux64/*
 
 #Exacutables
-./BlueTooth
+BlueTooth
+logs
+client
+BackEnd

Makefile → groundStation/Makefile

 # Declaration of variables
 GCC=gcc
 GXX=g++
-CFLAGS= -Wall  -std=c99 -g
-CPPFLAGS= -Wall  -std=c++11 -g
+CFLAGS= -Wall -Wpedantic -Wextra -Werror -std=c99 -g -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-unused-but-set-variable
+CXXFLAGS= -Wall -Wpedantic -Wextra -Werror -Wno-reorder -Wno-unused-variable -std=c++0x -g
 INCLUDES = $(foreach dir, $(INCDIR), -I$(dir))
 
 # Directories
@@ -11,7 +11,7 @@ INCDIR=inc src src/vrpn src/vrpn/quat src/vrpn/build
 OBJDIR=obj
 
 # Final exacutable name
-EXE=BlueTooth
+EXE=BackEnd
 
 # File names
 CSOURCES := $(foreach dir, $(SRCDIR), $(wildcard $(dir)/*.c )) 
@@ -23,17 +23,19 @@ OBJECTS = $(CPPOBJECTS) $(COBJECTS)
 LIBS= -lpthread -lbluetooth -lvrpn -lquat -Lsrc/vrpn/build -Lsrc/vrpn/build/quat 
 
 # Default target
-all: logs vrpn/build $(EXE)
+all: logs $(EXE)
+
+vrpn: vrpn/build
 
 # Main target
 $(EXE): $(OBJECTS) 
-	$(GXX) $(CPPFLAGS) $^ -o $@  $(INCLUDES) $(LIBS)
+	$(GXX) $(CXXFLAGS) $^ -o $@  $(INCLUDES) $(LIBS)
 
 $(COBJECTS) : %.o : %.c
 	$(GCC)  $(CFLAGS) -c $< -o $@ $(INCLUDES) $(LIBS)
 
 $(CPPOBJECTS) : %.o : %.cpp
-	$(GCC)  $(CPPFLAGS) -c $< -o $@ $(INCLUDES) $(LIBS)
+	$(GXX)  $(CXXFLAGS) -c $< -o $@ $(INCLUDES) $(LIBS)
 
 vrpn/build:
 	mkdir -p src/vrpn/build

groundStation/README.md

+# groundStation
+
+## Make Process
+
+First, if submodules were not recursevly added through git. Run this command if you have made any attempt to make vrpn manually. 
+run
+	'git submodule update --init --recursive'
+
+Now that you have all of the files necissary.
+
+cd into the groundstation folder.
+	cd groundStation
+	make vrpn
+	make
+
+run the program with sudo privledges
+	sudo ./BackEnd
+
+If you wish to change the way the backend communicates to the quad and vice versa, modify src/config.h .

groundStation/src/backend/backend.c

+/* Author: Kris Burney & Jake Drahos
+ *
+ * BlueTooth socket program for passing vrpn data to quad.
+ */
+
+#define _GNU_SOURCE
+#define _BSD_SOURCE
+
+//system includes
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/select.h>
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/rfcomm.h>
+#include <pthread.h>
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <netinet/tcp.h>
+
+//user created includes
+#include "communication.h"
+#include "commands.h"
+#include "vrpn_tracker.hpp"
+#include "type_def.h"
+#include "logger.h"
+#include "config.h"
+
+#define QUAD_BT_ADDR  "00:06:66:64:61:D6"
+#define QUAD_BT_CHANNEL  0x01
+#define CMD_MAX_LENGTH 1024
+#define MAX_HASH_SIZE 50
+
+// function prototypes
+void readAndPrint(void);
+void sendVrpnPacket(struct ucart_vrpn_TrackerData *);
+void sendStartPacket(void);
+void getVRPNPacket(struct ucart_vrpn_TrackerData *);
+void printVrpnData(struct ucart_vrpn_TrackerData *);
+int connectToZybo();
+int safe_fd_set(int , fd_set* , int* );
+int safe_fd_clr(int , fd_set* , int* );
+static void safe_close_fd(int fd, pthread_mutex_t *mutexLock);
+
+static void cb(struct ucart_vrpn_TrackerData *);
+static int new_client(int fd);
+/* Return index of client, or -1 */
+static ssize_t get_client_index(int fd);
+/* Returns pointer to client buffer, or -1 */
+static char * get_client_buffer(int fd);
+/* Returns -1 on error */
+static int remove_client(int fd);
+/* Receive data from client */
+static void client_recv(int fd);
+/* Checks to see if socket has disconnected. Returns 1 on disconnect, else returns 0 */
+static int wasDisconnected(int fd);
+
+/* Thread-safe wrappers */
+pthread_mutex_t quadSocketMutex;
+static ssize_t writeQuad(const char * buf, size_t count);
+static ssize_t readQuad(char * buf, size_t count);
+
+/* Functions for recording Latencies */
+void findTimeDiff(int respID);
+int timeval_subtract (struct timeval *result, struct timeval *x, struct timeval *y);
+//time stamp checking
+static unsigned int currMessageID = 0;
+struct timeval timeArr[MAX_HASH_SIZE];
+
+// global variables
+static volatile int keepRunning = 1;
+const char *TRACKER_IP = "UAV@192.168.0.120:3883";
+static int zyboSocket;
+static int backendSocket;
+struct ucart_vrpn_tracker * tracker = NULL;
+const char *logHeader = "";//"#\n#\tDefault log header\n#\tEverything after '#'`s will be printed as is in the processed logs.\n#\n\0";
+
+#define MAX_CLIENTS 32
+#define CLIENT_BUFFER_SIZE 1024
+static char client_buffers[MAX_CLIENTS][CLIENT_BUFFER_SIZE];
+static int client_fds[MAX_CLIENTS];
+fd_set rfds_master;
+int max_fd = 0;
+
+pthread_mutex_t quadResponseMutex, cliInputMutex ;
+char *respBuf, *commandBuf;
+int newQuadResponse = 0, newCliInput = 0;
+
+// Structures to be used throughout
+modular_structs_t structs;
+
+// Callback to be ran whenever the tracker receives data.
+// Currently doing much more than it should. It will be slimmed down 
+// 		in the future.
+static void cb(struct ucart_vrpn_TrackerData * td)
+{
+	static int count = 0;
+
+	if(!(count % 10)) {
+		sendVrpnPacket(td);
+		//updateLogFile(td);
+	}
+	count++;
+}
+
+int main(int argc, char **argv)
+{
+	int activity;
+	FD_ZERO(&rfds_master);
+
+	/* 
+	 * Create backend listening socket
+	 */
+	/* Determine socket path */
+	char * backend_socket_path = DEFAULT_SOCKET;
+	if (getenv(SOCKET_ENV)) {
+		backend_socket_path = getenv(SOCKET_ENV);
+	}
+	/* Unlink if it exists */
+	unlink(backend_socket_path);
+
+	/* Create socket */
+	backendSocket = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0);
+	if (backendSocket < 0) {
+		err(-1, "socket");
+	}
+
+	/* Create sockaddr and bind */
+	struct sockaddr_un sa;
+	sa.sun_family = AF_UNIX;
+	strncpy(sa.sun_path, backend_socket_path, 107);
+	sa.sun_path[107] = '\0';
+	if (bind(backendSocket, (struct sockaddr *) &sa, sizeof(sa))) {
+		err(-1, "bind");
+	}
+
+	/* Listen */
+	if (listen(backendSocket, 16)) {
+		err(-1, "listen");
+	}
+
+	/* Add to socket set */
+	safe_fd_set(backendSocket, &rfds_master, &max_fd);
+	
+
+	/* Initialize client buffers */
+	for (int i = 0; i < MAX_CLIENTS; i++) {
+		client_fds[i] = -1;
+		client_buffers[i][0] = '\n';
+	}
+
+	if (pthread_mutex_lock(&quadSocketMutex)) {
+		err(-2, "pthrtead_mutex_lock (%s:%d):", __FILE__, __LINE__);
+	}
+
+	if ((zyboSocket = connectToZybo()) < 0)
+	{
+		perror("Error connecting to Quad...");
+		free(respBuf);
+		free(commandBuf);
+		exit(1);
+	}
+
+	if (pthread_mutex_unlock(&quadSocketMutex)) {
+		err(-2, "pthrtead_mutex_unlock (%s:%d):", __FILE__, __LINE__);
+	}
+	
+	// create vrpnTracker instance
+	tracker = ucart_vrpn_tracker_createInstance(TRACKER_IP);
+
+	// open the log file
+	if(createLogFile(argc, argv[1]))
+	{
+		perror("Error creating log file...");
+		exit(1);
+	}
+	// writeStringToLog(logHeader);
+
+	// watch for input from stdin (fd 0) to see when it has input
+	safe_fd_set(fileno(stdin), &rfds_master, &max_fd);
+	// watch for input from the zybo socket
+	safe_fd_set(zyboSocket, &rfds_master, &max_fd);
+
+	// Tell the quad we are ready to send it vrpn data
+	sendStartPacket();
+
+	// this function will be called whenever tracker receives data
+	ucart_vrpn_tracker_addCallback(tracker, cb);
+
+	struct timeval timeout = {
+		.tv_sec = 1,
+		.tv_usec = 0
+	};
+
+	respBuf = calloc(CMD_MAX_LENGTH, sizeof(unsigned char));
+	sleep(3);
+	while(keepRunning)
+	{
+		fd_set rfds;
+		rfds = rfds_master;
+		activity = select(max_fd+1, &rfds, NULL, NULL, NULL);
+		if(activity == -1) {
+			perror("select() ");
+		} else if (activity) {
+			for(int fd = 0; fd <= max_fd; ++fd) {
+				if (FD_ISSET(fd, &rfds)) {
+					if(wasDisconnected(fd)){
+						break;
+					}
+
+					if (fd == fileno(stdin)) {
+						// break;
+						// unsigned char userCommand[CMD_MAX_LENGTH];
+						// read(fileno(stdin), (char *)userCommand, sizeof(userCommand));
+						// unsigned int cmdLen = strlen((char*) userCommand);
+						// // if the user simply hit enter then let them try again
+						// if((userCommand[0] != '\n') && (userCommand[0] != '\r'))
+						// {
+						// 	// remove newline and return line chars
+						// 	if((userCommand[cmdLen - 1] == '\n') || (userCommand[cmdLen - 1] == '\r'))
+						// 	userCommand[cmdLen - 1] = '\0';
+
+						// 	unsigned char *packet;
+						// 	formatCommand(userCommand, &packet);
+
+						// 	printf("received input from cli: '%s'\n", userCommand);
+
+						// 	// Write the command to the control_loop socket
+						// 	// int n = writeQuad(packet, ((packet[6] << 8) | packet[5]) + 8);
+						// 	// if(n < 0) {
+						// 	// 	printf("CLI: ERROR writing to socket\n");
+						// 	// }
+						// }
+
+						// printf("$microcart> ");
+						// memset(userCommand, 0, cmdLen);
+					} else if (fd == zyboSocket) {
+						// Read the response from the control loop
+						int available;
+						ioctl(fd, FIONREAD, &available);
+						if (available < 12) {
+							continue;
+						}
+						int respLen = readQuad(respBuf, 12);
+						if(respLen <= 0) {
+							perror("ERROR reading from quad...\n");
+						}
+						int id = getInt((unsigned char *)respBuf, 7);
+						findTimeDiff(id);
+						// if(respLen == 11) {
+						// 	int id = getInt((unsigned char *)respBuf, 7);
+						// 	findTimeDiff(id);
+						// 	printf("respLen = %d : id = %d'\n", respLen, id);
+						// 	for(int i = 0; i <= respLen -1; ++i)
+						// 		printf("%x ", (unsigned char)respBuf[i]);
+						// 	printf("'\n");
+						// }
+						memset(respBuf, 0, respLen);
+					} else if (fd == backendSocket) {
+						int new_fd = 0;
+						new_fd = accept(backendSocket, NULL, NULL);
+						if (new_fd < 0) {
+							warn("accept");
+						} else {
+							printf("Connection\n");
+							if (new_client(new_fd)) {
+								printf("Added client\n");
+								safe_fd_set(new_fd, &rfds_master, &max_fd);
+							}
+						}
+					} else if (get_client_index(fd) > -1) {
+						client_recv(fd);
+					}
+				}
+			}
+		} else {
+			timeout.tv_sec = 1;
+			timeout.tv_usec = 0;
+		}
+	}
+
+	ucart_vrpn_tracker_freeInstance(tracker);
+	
+	safe_close_fd(zyboSocket, &quadSocketMutex);
+
+	closeLogFile();
+	return 0;
+}
+
+void sendStartPacket() {
+	unsigned char packet[8] = {0};
+	currMessageID++;
+	metadata_t metadata = 
+	{
+		(char) BEGIN_CHAR,
+		0x04,
+		0x01,
+		0x01,
+		0
+	};
+
+	packet[0] = metadata.begin_char; // BEGIN					//PACKET_START_BYTE;
+	packet[1] = metadata.msg_type;	// UPDATE				//'U'; // U for vrpn camera update, C for command
+	packet[2] = metadata.msg_subtype; // BEGIN UPDATE
+	packet[3] = (currMessageID & 0x000000ff); 			// MSG ID(1)
+	packet[4] =	((currMessageID >> 8) & 0x000000ff); // MSG ID(2)
+	packet[5] = 0; 			// DATALEN(1)
+	packet[6] = 0; 	// DATALEN(2)
+	
+	char checksum = 0;
+	int i;
+	for(i=0; i < metadata.data_len + 7; i++)
+		checksum ^= packet[i];
+
+	packet[metadata.data_len + 7] = checksum; //PACKET_END_BYTE;
+	int status = writeQuad((char * ) packet, metadata.data_len + 8);
+	if (status != 8)
+	{
+		perror("Error sending start packet...\n");
+		keepRunning = 0;
+	}else
+	{
+		printf("Start packet successfuly sent...\n");
+	}	
+}
+
+void sendVrpnPacket(struct ucart_vrpn_TrackerData *info) {
+	int pSize = sizeof(ucart_vrpn_TrackerData) + 8;
+	int n;
+	unsigned char packet[pSize];
+	currMessageID++;
+	packet[0] = 0xBE; // BEGIN					//PACKET_START_BYTE;
+	packet[1] = 0x04;	// UPDATE				//'U'; // U for vrpn camera update, C for command
+	packet[2] = 0x00; // N/A
+	//TODO Figure out Packet ID with this new ucar_vrpn_TrackerData struct
+	packet[3] = (currMessageID & 0x000000ff); 			// MSG ID(1)
+	packet[4] =	((currMessageID >> 8) & 0x000000ff); // MSG ID(2)
+	packet[5] = (sizeof(ucart_vrpn_TrackerData) & 0x000000ff); 			// DATALEN(1)
+	packet[6] = ((sizeof(ucart_vrpn_TrackerData) >> 8) & 0x00000ff); 	// DATALEN(2)
+	memcpy(&packet[7], &info, sizeof(ucart_vrpn_TrackerData));
+
+	char checksum = 0;
+	int i;
+	for(i=0; i < pSize - 1; i++)
+		checksum ^= packet[i];
+
+	packet[pSize - 1] = checksum; //PACKET_END_BYTE;
+
+	n = writeQuad((char *) packet, pSize);
+	if(n < 0) {	
+		perror("vrpnhandler: ERROR writing to socket");
+		keepRunning = 0;
+	}
+	struct timeval tstart;
+	gettimeofday(&tstart, NULL);
+	timeArr[currMessageID%MAX_HASH_SIZE] = tstart;
+}
+
+void getVRPNPacket(struct ucart_vrpn_TrackerData *td) {
+	int status;
+	if((status = ucart_vrpn_tracker_getData(tracker, td)) < 0)
+	{
+		perror("Error receiving VRPN data from tracker...");
+		keepRunning = 0;
+	}
+}
+
+void printVrpnData(struct ucart_vrpn_TrackerData * td) {
+	printf("FPS: %lf Pos (xyz): (%lf %lf %lf) Att (pry): (%lf %lf %lf)\n",
+		td->fps, td->x, td->y, td->z, td->pitch, td->roll, td->yaw);
+}
+
+int connectToZybo() {
+	int sock;
+	int status = 0;
+
+	/* Use bluetooth by default */
+	if (!getenv(QUAD_WIFI_ENV)) {
+		printf("Using BT Settings\n");
+		struct sockaddr_rc addr;
+
+		// allocate a socket	
+		sock = socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
+
+		//set the connection params ie. who to connect to	
+		addr.rc_family = AF_BLUETOOTH;
+		addr.rc_channel = (uint8_t) QUAD_BT_CHANNEL;
+		str2ba( QUAD_BT_ADDR, &addr.rc_bdaddr );
+		
+		printf("Attempting to connect to zybo. Please be patient...\n");
+		// blocking call to connect to socket sock ie. zybo board
+		status = connect(sock, (struct sockaddr *)&addr, sizeof(addr));
+	} else {
+		printf("Using WIFI settings\n");
+		struct sockaddr_in addr;
+
+		addr.sin_family = AF_INET;
+
+		/* Quick and Dirty */
+		if (getenv(QUAD_IP_ENV)) {
+			 if (!inet_aton(getenv(QUAD_IP_ENV), &addr.sin_addr)) {
+				printf("Env var %s invalid IP %s\n",
+					     	QUAD_IP_ENV, getenv(QUAD_IP_ENV));
+				return -1;
+			 }
+		} else {
+			if (!inet_aton(QUAD_IP_DEFAULT, &addr.sin_addr)) {
+				printf("Default IP %s is invalid\n",
+					     	QUAD_IP_DEFAULT);
+				return -1;
+			}
+		}
+
+		if (getenv(QUAD_PORT_ENV)) {
+			/* Quick 'n dirty, oh yeah! */
+			addr.sin_port = htons(atoi(getenv(QUAD_PORT_ENV)));		
+		} else {
+			addr.sin_port = htons(QUAD_PORT_DEFAULT);
+		}
+
+		sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+		if (sock < 0) {
+			perror("socket");
+			return -1;
+		}
+		printf("Connecting to Quad @ %s:%u\n", inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
+
+		status = connect(sock, (struct sockaddr *)&addr, sizeof(addr));
+	}
+
+	// connection failed
+	if(status < 0)
+	{
+		close(sock);
+		perror("connect");
+		return -1;
+	}
+	else
+	{
+		// int result = setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (int[]){1}, sizeof(int));
+		// printf("result = %d\n", result);
+		printf("connection successful!...\n");
+		return sock;
+	}
+}
+
+/* add a fd to fd_set, and update max_fd */
+int safe_fd_set(int fd, fd_set* fds, int* max_fd) {
+    assert(max_fd != NULL);
+
+    FD_SET(fd, fds);
+    if (fd > *max_fd) {
+        *max_fd = fd;
+    }
+    return 0;
+}
+
+/* clear fd from fds, update max fd if needed */
+int safe_fd_clr(int fd, fd_set* fds, int* max_fd) {
+    assert(max_fd != NULL);
+
+    FD_CLR(fd, fds);
+    if (fd == *max_fd) {
+        (*max_fd)--;
+    }
+    return 0;
+}
+
+static ssize_t writeQuad(const char * buf, size_t count) {
+	ssize_t retval;
+	if (getenv(NOQUAD_ENV)) {
+		return count;
+	}
+	if (pthread_mutex_lock(&quadSocketMutex)) {
+		err(-2, "pthrtead_mutex_lock (%s:%d):", __FILE__, __LINE__);
+	}
+	//setsockopt(zyboSocket, IPPROTO_TCP, TCP_QUICKACK, (int[]){1}, sizeof(int));
+	retval = write(zyboSocket, buf, count);
+	if (pthread_mutex_unlock(&quadSocketMutex)) {
+		err(-2, "pthrtead_mutex_unlock (%s:%d):", __FILE__, __LINE__);
+	}
+
+	return retval;
+}
+
+static ssize_t readQuad(char * buf, size_t count) {
+	ssize_t retval;
+	if (pthread_mutex_lock(&quadSocketMutex)) {
+		err(-2, "pthrtead_mutex_lock (%s:%d):", __FILE__, __LINE__);
+	}
+	retval = read(zyboSocket, buf, count);
+	//int result = setsockopt(zyboSocket, IPPROTO_TCP, TCP_QUICKACK, (int[]){1}, sizeof(int));
+	//printf("result = %d\n", result);
+		
+	if (pthread_mutex_unlock(&quadSocketMutex)) {
+		err(-2, "pthrtead_mutex_unlock (%s:%d):", __FILE__, __LINE__);
+	}
+	return retval;
+}
+
+static int new_client(int fd) {
+	ssize_t new_slot = -1;
+	for (ssize_t i = 0; i < MAX_CLIENTS; i++) {
+		if (client_fds[i] < 0) {
+			new_slot = i;
+			break;
+		}
+	}
+	if (new_slot == -1) {
+		warnx("Ran out of room! Consider increasing MAX_CLIENTS!");
+		return 0;
+	}
+
+	client_fds[new_slot] = fd;
+	client_buffers[new_slot][0] = '\0';
+
+	return 1;
+}
+
+static ssize_t get_client_index(int fd) {
+	for (ssize_t i = 0; i < MAX_CLIENTS; i++) {
+		if (client_fds[i] == fd) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+static char * get_client_buffer(int fd) {
+	ssize_t slot = get_client_index(fd);
+	if (slot == -1) {
+		return NULL;
+	} else {
+		return client_buffers[slot];
+	}
+}
+
+static int remove_client(int fd) {
+	ssize_t slot = get_client_index(fd);
+	if(slot == -1)
+		return -1;
+	char *clientBuffer = get_client_buffer(fd);
+	if(clientBuffer == NULL)
+		return -1;
+	clientBuffer[0] = '\0';
+	client_fds[slot] = -1;
+	return 0;
+}
+
+static void safe_close_fd(int fd, pthread_mutex_t *mutexLock) {
+	if (pthread_mutex_lock(mutexLock)) {
+		err(-2, "pthrtead_mutex_lock (%s:%d):", __FILE__, __LINE__);
+	}
+	close(fd);
+	if (pthread_mutex_unlock(mutexLock)) {
+		err(-2, "pthrtead_mutex_unlock (%s:%d):", __FILE__, __LINE__);
+	}
+}
+
+static void client_recv(int fd) {
+	char * buffer;
+	ssize_t len_pre;
+     	buffer = get_client_buffer(fd);
+	len_pre = strlen(buffer);
+
+	char * cursor;
+	cursor = buffer + len_pre;
+
+	ssize_t r;
+	r = read(fd, cursor, CLIENT_BUFFER_SIZE - len_pre - 1);
+	if (r < 0) {
+		warn("read (fd: %d)", fd);
+	}
+	buffer[len_pre + r] = '\0';
+
+	/* Parse buffer and handle commands */
+	while (1) {
+		/* not using strtok because reasons */
+		size_t len = strlen(buffer);
+		ssize_t newline = -1;
+		for (size_t i = 0; i < len; i++) {
+			if (buffer[i] == '\n') {
+				newline = i;
+				break;
+			}
+		}
+
+		/* No newline found. End parsing */
+		if (newline == -1) {
+			break;
+		}
+		buffer[newline] = '\0';
+
+		unsigned char * packet;
+		// printf("newline =%li, Client sent: '%s'\n", newline, buffer);
+		if(formatCommand(buffer, &packet) != -1) {
+			printf("Backend sees as: %f\n", getFloat(packet, 7));
+		} else {
+			printf("Could not recognize command '%s'\n", buffer);
+		}
+		writeQuad((char *) packet, len);
+		//free(packet);
+		
+		char * rest = &buffer[newline] + 1;
+		size_t restLen = (strlen(rest) == 0) ? 1 : strlen(rest);
+		/* Delete parsed data and move the rest to the left */
+		memmove(buffer, rest, restLen);
+	}
+}
+
+static int wasDisconnected(int fd) {
+	char buff;
+	if(recv(fd, &buff, 1, MSG_PEEK | MSG_DONTWAIT) == 0)
+	{
+		remove_client(fd);
+		safe_fd_clr(fd, &rfds_master, &max_fd);
+		printf("fd %d has disconnect and was removed\n", fd);
+		return 1;
+	}
+	return 0;
+}
+
+int timeval_subtract (struct timeval *result, struct timeval *x, struct timeval *y) {
+  /* Perform the carry for the later subtraction by updating y. */
+  if (x->tv_usec < y->tv_usec) {
+    int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
+    y->tv_usec -= 1000000 * nsec;
+    y->tv_sec += nsec;
+  }
+  if (x->tv_usec - y->tv_usec > 1000000) {
+    int nsec = (x->tv_usec - y->tv_usec) / 1000000;
+    y->tv_usec += 1000000 * nsec;
+    y->tv_sec -= nsec;
+  }
+  /* Compute the time remaining to wait.
+     tv_usec is certainly positive. */
+  result->tv_sec = x->tv_sec - y->tv_sec;
+  result->tv_usec = x->tv_usec - y->tv_usec;
+  /* Return 1 if result is negative. */
+  return x->tv_sec < y->tv_sec;
+}
+
+void findTimeDiff(int respID) {
+	struct timeval result, tend;
+	gettimeofday(&tend, NULL);
+	timeval_subtract(&result, &tend, &timeArr[respID%MAX_HASH_SIZE]);
+	printf("elapsed time = %ld ms\n", result.tv_usec/1000);
+	// char tmp[8];
+	// snprintf(tmp, 8, "%ld \tms\n", result.tv_usec/1000);
+	// writeStringToLog(tmp);
+}

groundStation/src/backend/commands.c

+#include "commands.h"
+
+// TAKE THESE OUT WHEN IMPLEMENTING ON THE QUAD SIDE
+float getFloat(unsigned char* str, int pos) {
+	union {
+		float f;
+		int i;
+	} x;
+	x.i = ((str[pos+3] << 24) | (str[pos+2] << 16) | (str[pos+1] << 8) | (str[pos]));
+	return x.f;
+}
+
+int getInt(unsigned char* str, int pos) {
+	int i = ((str[pos+3] << 24) | (str[pos+2] << 16) | (str[pos+1] << 8) | (str[pos]));
+	return i;
+}
+//------------------------------------------------
+
+struct MessageType MessageTypes[MAX_TYPE] = 
+{
+	// DEBUG
+	{
+		// Message Type ID
+		0x00,
+		
+		// Debug Subtypes
+		{
+			// NONE subtype
+			{
+				// ID
+				0x00,
+				// Command text
+				"debug",
+				// Type of the command data
+				stringType,
+				// Function pointer
+				&debug
+			}
+		}
+	},
+	
+	// CALIBRATION
+	{
+		// Message Type ID
+		0x01,
+		
+		// Calibration Subtypes
+		{
+			// yaw setpoint subtype
+			{
+				// ID
+				0x00,
+				// Command text
+				"setyaw",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&yawset
+			},
+			// yaw p constant subtype
+			{
+				// ID
+				0x01,
+				// Command text
+				"setyawp",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&yawp
+			},
+			// yaw d constant subtype
+			{
+				// ID
+				0x02,
+				// Command text
+				"setyawd",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&yawd
+			},
+			// roll setpoint subtype
+			{
+				// ID
+				0x03,
+				// Command text
+				"setroll",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&rollset
+			},
+			// roll p constant subtype
+			{
+				// ID
+				0x04,
+				// Command text
+				"setrollp",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&rollp
+			},
+			// roll d constant subtype
+			{
+				// ID
+				0x05,
+				// Command text
+				"setrolld",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&rolld
+			},
+			// pitch setpoint subtype
+			{
+				// ID
+				0x06,
+				// Command text
+				"setpitch",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&pitchset
+			},
+			// pitch p constant subtype
+			{
+				// ID
+				0x07,
+				// Command text
+				"setpitchp",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&pitchp
+			},
+			// pitch d constant subtype
+			{
+				// ID
+				0x08,
+				// Command text
+				"setpitchd",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&pitchd
+			},
+			// throttle setpoint subtype
+			{
+				// ID
+				0x09,
+				// Command text
+				"setthrottle",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&throttleset
+			},
+			// throttle p constant subtype
+			{
+				// ID
+				0x0A,
+				// Command text
+				"setthrottlep",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&throttlep
+			},
+			// throttle i constant subtype
+			{
+				// ID
+				0x0B,
+				// Command text
+				"setthrottlei",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&throttlei
+			},
+			// throttle d constant subtype
+			{
+				// ID
+				0x0C,
+				// Command text
+				"setthrottled",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&throttled
+			}
+		}
+	},
+	
+	// REQUEST
+	{
+		// Message Type ID
+		0x02,
+		
+		// Request Subtypes
+		{
+			// accelerometer subtype
+			{
+				// ID 
+				0x00,
+				// Command text
+				"accelreq",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&accelreq
+			},
+			// gyroscope subtype
+			{
+				// ID 
+				0x01,
+				// Command text
+				"gyroreq",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&gyroreq
+			},
+			// pitch angle subtype
+			{
+				// ID 
+				0x02,
+				// Command text
+				"reqpitchangle",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&pitchanglereq
+			},
+			// roll angle subtype
+			{
+				// ID 
+				0x03,
+				// Command text
+				"reqrollangle",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&rollanglereq
+			}
+		}
+	},
+	
+	// RESPONSE
+	{
+		// Message Type ID
+		0x03,
+		
+		// Response Subtypes
+		{
+			// accelerometer subtype
+			{
+				// ID
+				0x00,
+				// Command text
+				"respaccel",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&accelresp
+			},
+			// gyroscope subtype
+			{
+				// ID
+				0x01,
+				// Command text
+				"respgyro",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&gyroresp
+			},
+			// pitch angle subtype
+			{
+				// ID 
+				0x02,
+				// Command text
+				"resppitchangle",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&pitchangleresp
+			},
+			// roll angle subtype
+			{
+				// ID 
+				0x03,
+				// Command text
+				"resprollangle",
+				// Type of the command data
+				floatType,
+				// Function pointer
+				&rollangleresp
+			}
+		}
+	},
+	
+	// UPDATE
+	{
+		// Message Type ID
+		0x04,
+		
+		// Update Subtypes
+		{
+			// NONE subtype
+			{
+				// ID 
+				0x00,
+				// Command text
+				"update",
+				// Type of the command data
+				stringType,
+				// Function pointer
+				&update
+			}
+		}
+	},
+	
+	// LOG
+	{
+		// Message Type ID
+		0x05,
+		
+		// Log Subtypes
+		{
+			// NONE subtype
+			{
+				// ID
+				0x00,
+				// Command text
+				"log",
+				// Type of the command data
+				stringType,
+				// Function pointer
+				&logdata
+			},
+			// Response subtype
+			{
+				// ID
+				0x01,
+				// Command text
+				"response",
+				// Type of the command data
+				stringType,
+				// Function pointer
+				&response
+			}
+		}
+	},
+	
+};
+
+int debug(unsigned char *packet, int dataLen, modular_structs_t *structs)
+{
+	printf("function for debug\n");
+	return 0;
+}
+
+int update(unsigned char *packet, int dataLen,	modular_structs_t *structs)
+{
+	unsigned char update[28];
+	memcpy(update, ((float *)packet), 28);
+	
+	int packetId = getInt(update, 0);
+	float y_pos = getFloat(update, 4);
+	float x_pos = getFloat(update, 8);
+	float alt_pos = getFloat(update, 12);
+	float roll = getFloat(update, 16);
+	float pitch = getFloat(update, 20);
+	float yaw = getFloat(update, 24);
+
+	structs->log_struct.currentQuadPosition.packetId = packetId;
+	structs->log_struct.currentQuadPosition.y_pos = y_pos;
+	structs->log_struct.currentQuadPosition.x_pos = x_pos;
+	structs->log_struct.currentQuadPosition.alt_pos = alt_pos;
+	structs->log_struct.currentQuadPosition.roll = roll;
+	structs->log_struct.currentQuadPosition.pitch = pitch;
+	structs->log_struct.currentQuadPosition.yaw = yaw;
+	
+	printf("QUAD: VRPN Packet:");
+	printf("Packet ID: %d\n", packetId);
+	printf("Y Position: %f\n", y_pos);
+	printf("X Position: %f\n", x_pos);
+	printf("Altitude Position: %f\n", alt_pos);
+	printf("Roll: %f\n", roll);
+	printf("Pitch: %f\n", pitch);
+	printf("Yaw: %f\n", yaw);
+	
+	printf("function for update\n");
+	return 0;
+}
+
+// Why is this here?
+// This should be on the ground station side
+int logdata(unsigned char *packet, int dataLen, modular_structs_t *structs)
+{
+	printf("Logging: %s\n", packet);
+	return 0;
+}
+
+int response(unsigned char *packet, int dataLen, modular_structs_t *structs)
+{
+	printf("This is the response: %s\n", packet);
+	
+	return 0;
+}
+
+// ------------------------------------------------------------------
+
+int yawset(unsigned char *packet, int dataLen, modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	
+	printf("%f\n", value);
+	
+	structs->setpoint_struct.desiredQuadPosition.yaw = value;
+
+	printf("function for yawset: %f\n", structs->setpoint_struct.desiredQuadPosition.yaw);
+	
+	return 0;
+}
+
+int yawp(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->parameter_struct.yaw_angle_pid.Kp = value;
+	
+	printf("function for yawp: %f\n", structs->parameter_struct.yaw_angle_pid.Kp);
+	
+	return 0;
+}
+
+int yawd(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->parameter_struct.yaw_angle_pid.Kd = value;
+	
+	printf("function for yawd: %f\n", structs->parameter_struct.yaw_angle_pid.Kd);
+	
+	return 0;
+}
+
+int rollset(unsigned char *packet, int dataLen,	 modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->setpoint_struct.desiredQuadPosition.roll = value;
+	
+	printf("function for rollset: %f\n", structs->setpoint_struct.desiredQuadPosition.roll);
+	
+	return 0;
+}
+
+int rollp(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->parameter_struct.local_y_pid.Kp = value;
+	
+	printf("function for rollp: %f\n", structs->parameter_struct.local_y_pid.Kp);
+	
+	return 0;
+}
+
+int rolld(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->parameter_struct.local_y_pid.Kd = value;
+	
+	printf("function for rolld: %f\n", structs->parameter_struct.local_y_pid.Kd);
+	
+	return 0;
+}
+
+int pitchset(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->setpoint_struct.desiredQuadPosition.pitch = value;
+	
+	printf("function for pitchset: %f\n", structs->setpoint_struct.desiredQuadPosition.pitch);
+	
+	return 0;
+}
+
+int pitchp(unsigned char *packet, int dataLen,	modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->parameter_struct.local_x_pid.Kp = value;
+	
+	printf("function for pitchp: %f\n", structs->parameter_struct.local_x_pid.Kp);
+	
+	return 0;
+}
+
+int pitchd(unsigned char *packet, int dataLen,	modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->parameter_struct.local_x_pid.Kd = value;
+	
+	printf("function for pitchd: %f\n", structs->parameter_struct.local_x_pid.Kd);
+	
+	return 0;
+}
+
+// ------------------------------------------------------------
+// These should be renamed to altitude!
+int throttleset(unsigned char *packet, int dataLen,	 modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->setpoint_struct.desiredQuadPosition.alt_pos = value;
+	
+	printf("function for throttleset: %f\n", structs->setpoint_struct.desiredQuadPosition.alt_pos);
+	
+	return 0;
+}
+
+int throttlep(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->parameter_struct.alt_pid.Kp = value;
+	
+	printf("function for throttlep: %f\n", structs->parameter_struct.alt_pid.Kp);
+	
+	return 0;
+}
+
+int throttlei(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->parameter_struct.alt_pid.Ki = value;
+	
+	printf("function for throttlei: %f\n", structs->parameter_struct.alt_pid.Ki);
+	
+	return 0;
+}
+
+int throttled(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	float value;
+	
+	memcpy(&value, ((float *)packet), dataLen);
+	structs->parameter_struct.alt_pid.Kd = value;
+	
+	printf("function for throttled: %f\n", structs->parameter_struct.alt_pid.Kd);
+	
+	return 0;
+}
+// These should be renamed to altitude!
+// ------------------------------------------------------------
+
+int accelreq(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	printf("function for accelreq\n");
+	return 0;
+}
+
+int gyroresp(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	printf("function for accelreq\n");
+	return 0;
+}
+
+int pitchangleresp(unsigned char *packet, int dataLen,	modular_structs_t *structs)
+{
+	printf("function for accelreq\n");
+	return 0;
+}
+
+int rollangleresp(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	printf("function for accelreq\n");
+	return 0;
+}
+
+int gyroreq(unsigned char *packet, int dataLen,	 modular_structs_t *structs)
+{
+	printf("function for accelreq\n");
+	return 0;
+}
+
+int pitchanglereq(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	printf("function for accelreq\n");
+	return 0;
+}
+
+int rollanglereq(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	printf("function for accelreq\n");
+	return 0;
+}
+
+int accelresp(unsigned char *packet, int dataLen,  modular_structs_t *structs)
+{
+	printf("function for accelreq\n");
+	return 0;
+}
\ No newline at end of file

groundStation/src/backend/commands.h

+#ifndef _COMMANDS_H
+#define _COMMANDS_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "type_def.h"
+
+
+// ----------------------
+// Helper stuff
+
+#define MAX_TYPE 6
+#define MAX_SUBTYPE 100
+
+enum Message{
+	BEGIN_CHAR = 0xBE,
+	END_CHAR   = 0xED
+};
+
+// This should also have double to avoid confusion with float values.
+enum DataType
+{
+	floatType,
+	intType,
+	stringType
+};
+
+// MESSAGE SUBTYPES
+struct MessageSubtype{
+	char ID;
+	char cmdText[100];
+	char cmdDataType;
+	int (*functionPtr)(unsigned char *command, int dataLen, modular_structs_t *structs);
+};
+
+// MESSAGE TYPES
+struct MessageType{
+	char ID;
+	struct MessageSubtype subtypes[MAX_SUBTYPE];
+};
+
+int debug(unsigned char *c, int dataLen, modular_structs_t *structs);
+int update(unsigned char *c, int dataLen, modular_structs_t *structs);
+int logdata(unsigned char *c, int dataLen, modular_structs_t *structs);
+int response(unsigned char *packet, int dataLen, modular_structs_t *structs);
+int yawset(unsigned char *c, int dataLen, modular_structs_t *structs);
+int yawp(unsigned char *c, int dataLen, modular_structs_t *structs);
+int yawd(unsigned char *c, int dataLen, modular_structs_t *structs);
+int rollset(unsigned char *c, int dataLen, modular_structs_t *structs);
+int rollp(unsigned char *c, int dataLen, modular_structs_t *structs);
+int rolld(unsigned char *c, int dataLen, modular_structs_t *structs);
+int pitchset(unsigned char *c, int dataLen, modular_structs_t *structs);
+int pitchp(unsigned char *c, int dataLen, modular_structs_t *structs);
+int pitchd(unsigned char *c, int dataLen, modular_structs_t *structs);
+int throttleset(unsigned char *c, int dataLen, modular_structs_t *structs);
+int throttlep(unsigned char *c, int dataLen, modular_structs_t *structs);
+int throttlei(unsigned char *c, int dataLen, modular_structs_t *structs);
+int throttled(unsigned char *c, int dataLen, modular_structs_t *structs);
+int accelreq(unsigned char *c, int dataLen, modular_structs_t *structs);
+int gyroresp(unsigned char *c, int dataLen, modular_structs_t *structs);
+int pitchangleresp(unsigned char *c, int dataLen, modular_structs_t *structs);
+int rollangleresp(unsigned char *c, int dataLen, modular_structs_t *structs);
+int gyroreq(unsigned char *c, int dataLen, modular_structs_t *structs);
+int pitchanglereq(unsigned char *c, int dataLen, modular_structs_t *structs);
+int rollanglereq(unsigned char *c, int dataLen, modular_structs_t *structs);
+int accelresp(unsigned char *c, int dataLen, modular_structs_t *structs);
+
+float getFloat(unsigned char* str, int pos);
+int getInt(unsigned char* str, int pos);
+
+// TODO add in string to be read from the command line when sending a subtype of message
+extern struct MessageType MessageTypes[MAX_TYPE];
+
+#endif
\ No newline at end of file

src/communication.c → groundStation/src/backend/communication.c

@@ -52,84 +52,90 @@ int checkInt(char *intString, int *value) {
 //--------------------------------
 
 // Formatting commands from ground station CLI
-int formatCommand(unsigned char *command, unsigned char **formattedCommand) {
-	//command[strlen((char *)command) - 1] = 0;
-	
-	tokenList_t tokens = tokenize((char *)command);
+int formatCommand(char *command, unsigned char **formattedCommand) {
+	fprintf(stderr, "length = %li , received '%s'\n", strlen(command), command);
+	char cmd[strlen(command)];
+	strncpy(cmd, command, strlen(command));
+	cmd[strlen(command)] = '\0';
+
+	tokenList_t tokens = tokenize(cmd);
 	float floatValue = 0.0;
 	int intValue = 0;
 	int valid;
-	metadata_t metadata = {};
+	metadata_t metadata;
 	
 	// ----------------------------------------------
 	if(tokens.numTokens > 1) {
-		for(int cmdIndex = 0; cmdIndex < NUM_COMMANDS; ++cmdIndex)
+		for(int type = 0; type < MAX_TYPE; type++)
 		{
-			if(strcmp(tokens.tokens[0], registeredCommands[cmdIndex].commandText) == 0)
+			for(int subtype = 0; subtype < MAX_SUBTYPE; subtype++)
 			{
-
-				switch (registeredCommands[cmdIndex].dataType)
+				if(strcmp(tokens.tokens[0], MessageTypes[type].subtypes[subtype].cmdText) == 0)
 				{
-					// Validate the float input
-					case floatType:
-						valid = checkFloat(tokens.tokens[1], &floatValue);
-						if(!valid) {
-							return -1;
-						}
-						
-						printf("%f, %s\n", floatValue, tokens.tokens[1]);
-						
-						metadata.begin_char  = BEGIN_CHAR;
-						metadata.msg_type    = registeredCommands[cmdIndex].ID;
-						metadata.msg_subtype = registeredCommands[cmdIndex].subID;
-						metadata.msg_id      = msgNum++;
-						metadata.data_len    = sizeof(floatValue);
-						
-						formatPacket(&metadata, &floatValue, formattedCommand);
-						
-						break;
+					printf("Sending\n\ttype: %d, \n\tsubtype: %d\n\tcommand: %s\n", type, subtype, MessageTypes[type].subtypes[subtype].cmdText);
 					
-					// Validate the integer input
-					case intType:
-						valid = checkInt(tokens.tokens[1], &intValue);
-						if(!valid) {
-							return -1;
-						}
-						
-						metadata.begin_char  = BEGIN_CHAR;
-						metadata.msg_type    = registeredCommands[cmdIndex].ID;
-						metadata.msg_subtype = registeredCommands[cmdIndex].subID;
-						metadata.msg_id      = msgNum++;
-						metadata.data_len    = sizeof(intValue);
+					// Make sure the second token is the right type
+					switch (MessageTypes[type].subtypes[subtype].cmdDataType)
+					{
+						// Validate the float input
+						case floatType:
+							valid = checkFloat(tokens.tokens[1], &floatValue);
+							if(!valid) {
+								return -1;
+							}
+							
+							printf("%f, %s\n", floatValue, tokens.tokens[1]);
+							
+							metadata.begin_char = (char) BEGIN_CHAR;
+							metadata.msg_type = MessageTypes[type].ID;
+							metadata.msg_subtype = MessageTypes[type].subtypes[subtype].ID;
+							metadata.msg_id = msgNum++;
+							metadata.data_len = sizeof(floatValue);
+							
+							formatPacket(&metadata, &floatValue, formattedCommand);
+							
+							break;
 						
-						formatPacket(&metadata, &intValue, formattedCommand);
+						// Validate the integer input
+						case intType:
+							valid = checkInt(tokens.tokens[1], &intValue);
+							if(!valid) {
+								return -1;
+							}
+							
+							metadata.begin_char = (char) BEGIN_CHAR;
+							metadata.msg_type = MessageTypes[type].ID;
+							metadata.msg_subtype = MessageTypes[type].subtypes[subtype].ID;
+							metadata.msg_id = msgNum++;
+							metadata.data_len = sizeof(intValue);
+							
+							formatPacket(&metadata, &intValue, formattedCommand);
+							
+							break;
 						
-						break;
-					
-					// Validate the string input (doesn't need to happen)
-					case stringType:
-						metadata.begin_char  = BEGIN_CHAR;
-						metadata.msg_type    = registeredCommands[cmdIndex].ID;
-						metadata.msg_subtype = registeredCommands[cmdIndex].subID;
-						metadata.msg_id      = msgNum++;
-						metadata.data_len    = strlen(tokens.tokens[1]);
-						
-						formatPacket(&metadata, &tokens.tokens[1], formattedCommand);
-						
-						break;
-					default:
-						return -1;
+						// Validate the string input (doesn't need to happen)
+						case stringType:
+							metadata.begin_char = (char) BEGIN_CHAR;
+							metadata.msg_type = MessageTypes[type].ID;
+							metadata.msg_subtype = MessageTypes[type].subtypes[subtype].ID;
+							metadata.msg_id = msgNum++;
+							metadata.data_len = strlen(tokens.tokens[1]);
+							
+							formatPacket(&metadata, &tokens.tokens[1], formattedCommand);
+							
+							break;
+						default:
+							return -1;
+					}
+					return 0;
 				}
-
-				return 0;
 			}
 		}
 	}
-	
+
 	// Only gets here if the command does not exist
-	return -1;
+	return -1;	
 }
-
 // QUAD & Ground Station
 // Format the log data from log_message
 //int formatData(unsigned char *log_msg, unsigned char *formattedCommand)
@@ -232,7 +238,7 @@ int parse_packet(unsigned char * packet, unsigned char ** data, metadata_t * met
 
 // QUAD & Ground Station
 // Process the command received
-int processCommand(unsigned char *packet, unsigned int cmdIndex) {
+int processCommand(unsigned char *packet, modular_structs_t *structs) {
 	int validPacket;
 	unsigned char *data;
 	metadata_t metadata;
@@ -245,11 +251,11 @@ int processCommand(unsigned char *packet, unsigned int cmdIndex) {
 	
 	if(metadata.data_len >= 0) {
 		// Call the appropriate subtype function
-		(* (registeredCommands[cmdIndex].functionPtr))(data, metadata.data_len);
+		(* (MessageTypes[(unsigned char)metadata.msg_type].subtypes[(unsigned char)metadata.msg_subtype].functionPtr))(data, metadata.data_len, structs);
 		
 		return 0;
 	}
 	
 	// Only gets here if there is an error
 	return -1;
-}
+}
\ No newline at end of file

src/communication.h → groundStation/src/backend/communication.h

@@ -10,12 +10,10 @@
 tokenList_t tokenize(char* cmd);
 int checkFloat(char *floatString, float *value);
 int checkInt(char *intString, int *value);
-int formatCommand(unsigned char *command, unsigned char **formattedCommand);
+int formatCommand(char *command, unsigned char **formattedCommand);
 int formatPacket(metadata_t *metadata, void *data, unsigned char **formattedCommand);
 int parse_packet(unsigned char * packet, unsigned char ** data, metadata_t * meta_data);
-int processCommand(unsigned char *command, unsigned int cmdIndex);
+int processCommand(unsigned char *command, modular_structs_t *structs);
 int logData(unsigned char *log_msg, unsigned char *formattedCommand);
-float getFloat(unsigned char* str, int pos);
-int getInt(unsigned char* str, int pos);
 
-#endif
+#endif
\ No newline at end of file

groundStation/src/backend/config.h

+#ifndef __BACKEND_H
+#define __BACKEND_H
+
+
+#define DEFAULT_SOCKET "/var/run/ucart.socket"
+#define SOCKET_ENV "UCART_SOCKET"
+#define NOQUAD_ENV "UCART_NO_QUAD"
+
+
+// If you are planning on using any of these env vars and you have
+// 	exported them with normal user rights. You will need to run the 
+// 	backend with sudo elevation and with the --preserve-env flag or -E
+#define QUAD_WIFI_ENV "UCART_USE_WIFI"
+#define QUAD_IP_ENV "UCART_QUAD_IP"
+#define QUAD_IP_DEFAULT "192.168.4.1"
+#define QUAD_PORT_ENV "UCART_QUAD_PORT"
+#define QUAD_PORT_DEFAULT 8080
+
+#endif

src/logger.c → groundStation/src/backend/logger.c

@@ -4,21 +4,30 @@
  */
 #include "logger.h"
 #include <stdio.h>
+#include <err.h>
+#include <pthread.h>
 
-int quadlog_file;
+static FILE * quadlog_file = NULL;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 int createLogFile(int argc, char* argv)
 {
-	char log_file[300] = {'l', 'o', 'g','s', '/'};
+	if (quadlog_file != NULL) {
+		return -1;
+	}
+
+	if (pthread_mutex_lock(&mutex)) {
+		err(-2, "pthrtead_mutex_lock (%s:%d):", __FILE__, __LINE__);
+	}
+
+	char log_file[300];
+	strcpy(log_file, "logs/");
 	if(argc >= 2)
 	{
-		strcat(log_file, argv);
+		strncat(log_file, argv, 294);
 		printf("Creating log file '%s'...\n",log_file);
-		quadlog_file = open(log_file, O_WRONLY | O_CREAT, 0666);
-		return quadlog_file;
-	}
-	else
-	{
+		quadlog_file = fopen(log_file, "a");
+	} else {
 		time_t rawtime;
 		char timestr [30];
 		time(&rawtime);
@@ -26,7 +35,7 @@ int createLogFile(int argc, char* argv)
 
 		// Lets convert space to _ in
 		char *p = timestr;
-		int i = 0;
+		size_t i = 0;
 		while(i < strlen(timestr))
 		{ 
 		    if (*p == ' ')
@@ -40,18 +49,60 @@ int createLogFile(int argc, char* argv)
 		strncat(log_file, timestr, strlen(timestr) -1 );
 		strcat(log_file, ".txt");
 		printf("Creating log file '%s'...\n",log_file);
-		quadlog_file = open(log_file, O_WRONLY | O_CREAT, 0666);
-		return quadlog_file;
+		quadlog_file = fopen(log_file, "a");
+	}
+	if (pthread_mutex_unlock(&mutex)) {
+		err(-2, "pthrtead_mutex_unlock (%s:%d):", __FILE__, __LINE__);
 	}
+	return 0;
 }
 
 int updateLogFile(const struct ucart_vrpn_TrackerData * td)
 {
-	return dprintf(quadlog_file, "FPS: %lf Pos (xyz): (%lf %lf %lf) Att (pry): (%lf %lf %lf)\n",
+	int retval;
+
+	if (pthread_mutex_lock(&mutex)) {
+		err(-2, "pthrtead_mutex_lock (%s:%d):", __FILE__, __LINE__);
+	}
+     
+	retval = fprintf(quadlog_file, 
+			"FPS: %lf Pos (xyz): (%lf %lf %lf) Att (pry): (%lf %lf %lf)\n",
 		td->fps, td->x, td->y, td->z, td->pitch, td->roll, td->yaw);
+
+	if (pthread_mutex_unlock(&mutex)) {
+		err(-2, "pthrtead_mutex_unlock (%s:%d):", __FILE__, __LINE__);
+	}
+	
+	return retval;
 }
 
 int writeStringToLog(const char * string)
 {
-	return dprintf(quadlog_file, "%s", string);
+	int retval;
+
+	if (pthread_mutex_lock(&mutex)) {
+		err(-2, "pthrtead_mutex_lock (%s:%d):", __FILE__, __LINE__);
+	}
+
+	retval = fprintf(quadlog_file, "%s", string);
+
+	if (pthread_mutex_unlock(&mutex)) {
+		err(-2, "pthrtead_mutex_unlock (%s:%d):", __FILE__, __LINE__);
+	}
+
+	return retval;
+}
+
+void closeLogFile(void)
+{
+	if (pthread_mutex_lock(&mutex)) {
+		err(-2, "pthrtead_mutex_lock (%s:%d):", __FILE__, __LINE__);
+	}
+
+	fclose(quadlog_file);
+
+	if (pthread_mutex_unlock(&mutex)) {
+		err(-2, "pthrtead_mutex_unlock (%s:%d):", __FILE__, __LINE__);
+	}
+
 }

src/logger.h → groundStation/src/backend/logger.h

@@ -15,6 +15,7 @@
 int createLogFile(int, char*);
 int writeStringToLog(const char*);
 int updateLogFile(const struct ucart_vrpn_TrackerData* );
+void closeLogFile();
 
 
-#endif
\ No newline at end of file
+#endif

src/vrpn_tracker.cpp → groundStation/src/backend/vrpn_tracker.cpp

 #include <iostream>
 #include <algorithm>
+#include <functional>
 
 #include "vrpn_Tracker.h"
 #include "quat.h"
@@ -9,28 +10,25 @@
 namespace microcart
 {
 	static void VRPN_CALLBACK vrpn_cb(void * param, const vrpn_TRACKERCB t);
+	
+	TrackerData::TrackerData() :
+		x(0.0), y(0.0), z(0.0),
+		pitch(0.0), roll(0.0), yaw(0.0),
+		fps(0.0), timestamp()
+	{
+	}
 
-	Tracker::Tracker(std::string server) : Tracker(server.c_str())
+	Tracker::Tracker(std::string server) : 
+		remote(server.c_str()),
+		stop_flag(0),
+		trackerData()
 	{
 	}
 
 	Tracker::Tracker(const char * server) :
 		remote(server),
 		stop_flag(0),
-		trackerData({
-			.x = 0.0,
-			.y = 0.0,
-			.z = 0.0,
-			.pitch = 0.0,
-			.roll = 0.0,
-			.yaw = 0.0,
-			.fps = 0.0,
-			.timestamp = {
-				.tv_sec = 0,
-				.tv_usec = 0
-			}
-		})
-
+		trackerData()
 	{
 		remote.register_change_handler(this, vrpn_cb);
 
@@ -92,10 +90,9 @@ namespace microcart
 		trackerData.fps = 1.0 / elapsed_time_usec;
 
 		auto td = trackerData;
-		std::for_each(cb_vector.begin(), cb_vector.end(),
-			[td](std::function<void(const TrackerData &)> &fn){
-				fn(td);
-		});
+		for(auto i = cb_vector.begin(); i != cb_vector.end(); ++i) {
+			(*i)(td);
+		}
 	}
 
 	void Tracker::addCallback(std::function<void(const TrackerData&)> cb) 
@@ -115,6 +112,20 @@ struct ucart_vrpn_tracker {
 	microcart::Tracker * t;
 };
 
+void cb_wrapper(void (*cb)(struct ucart_vrpn_TrackerData *),
+		const microcart::TrackerData &td)
+{
+						struct ucart_vrpn_TrackerData data;
+						data.x = td.x;
+						data.y = td.y;
+						data.z = td.z;
+						data.pitch = td.pitch;
+						data.roll = td.roll;
+						data.yaw = td.yaw;
+						data.fps = td.fps;
+						(*cb)(&data);
+}
+
 extern "C"
 {
 	struct ucart_vrpn_tracker * ucart_vrpn_tracker_createInstance(
@@ -123,6 +134,7 @@ extern "C"
 		try {
 			auto inst = new struct ucart_vrpn_tracker;
 			inst->t = new microcart::Tracker(server);
+			return inst;
 		} catch(...) {
 			return NULL;
 		}
@@ -138,16 +150,8 @@ extern "C"
 			void (*cb)(struct ucart_vrpn_TrackerData *))
 	{
 		try {
-			inst->t->addCallback([cb](const microcart::TrackerData & td) {
-						struct ucart_vrpn_TrackerData data;
-						data.x = td.x;
-						data.y = td.y;
-						data.z = td.z;
-						data.pitch = td.pitch;
-						data.roll = td.roll;
-						data.yaw = td.yaw;
-						(*cb)(&data);
-					});
+			auto new_cb = bind(cb_wrapper, cb, std::placeholders::_1);
+			inst->t->addCallback(new_cb);
 		} catch(...) {
 			return -1;
 		}

src/vrpn_tracker.hpp → groundStation/src/backend/vrpn_tracker.hpp

@@ -54,6 +54,7 @@ extern "C"
 namespace microcart
 {
 	struct TrackerData {
+	public:
 		double x;
 		double y;
 		double z;
@@ -64,6 +65,8 @@ namespace microcart
 
 		double fps;
 		timeval timestamp;
+
+		TrackerData();
 	};
 
 	class Tracker {

vrpn @ 99c54dbe

+Subproject commit 99c54dbefe04897cc7c146101a126f62c0e65f97

src/commands.c

-#include "commands.h"
-
-static command_t registeredCommands[NUM_COMMANDS] = {
-	{ 0x00, 0x00, stringType, "debug", 			&debug },				//DEBUG
-	{ 0x01, 0x00, stringType, "setyaw", 		&setyaw },				//CALIBRATION
-	{ 0x01, 0x01, stringType, "setyawp", 		&setyawp },
-	{ 0x01, 0x02, stringType, "setyawd", 		&setyawd },
-	{ 0x01, 0x03, stringType, "setroll", 		&setroll },
-	{ 0x01, 0x04, stringType, "setrollp", 		&setrollp },
-	{ 0x01, 0x05, stringType, "setrolld", 		&setrolld },
-	{ 0x01, 0x06, stringType, "setpitch", 		&setpitch },
-	{ 0x01, 0x07, stringType, "setpitchp",		&setpitchp },
-	{ 0x01, 0x08, stringType, "setpitchd", 		&setpitchd },
-	{ 0x01, 0x09, stringType, "setthrottle", 	&setthrottle },
-	{ 0x01, 0x0A, stringType, "setthrottlep", 	&setthrottlep },
-	{ 0x01, 0x0B, stringType, "setthrottlei", 	&setthrottlei },
-	{ 0x01, 0x0C, stringType, "setthrottled", 	&setthrottled },
-	{ 0x02, 0x00, stringType, "getaccel", 		&getaccel },			//REQUEST
-	{ 0x02, 0x01, stringType, "getgyro", 		&getgyro },
-	{ 0x02, 0x02, stringType, "getpitchangle", 	&getpitchangle },
-	{ 0x02, 0x03, stringType, "getrollangle", 	&getrollangle },
-	{ 0x03, 0x00, stringType, "accelresp",		accelresp },			//RESPONSE
-	{ 0x03, 0x01, stringType, "gyroresp",   	&gyroresp },
-	{ 0x03, 0x02, stringType, "pitchangleresp", &pitchangleresp },
-	{ 0x03, 0x03, stringType, "rollangleresp", 	&rollangleresp },
-	{ 0x04, 0x00, stringType, "update", 		&update },				//UPDATE
-	{ 0x04, 0x01, stringType, "beginupdate", 	&beginupdate },
-	{ 0x05, 0x00, stringType, "log", 			&logdata },				//LOG
-	{ 0x05, 0x01, stringType, "response", 		&response },
-};
-
-int debug(unsigned char *c, int dataLen){
-	return 0;
-}
-int setyaw(unsigned char *c, int dataLen){
-	return 0;
-}
-int setyawp(unsigned char *c, int dataLen){
-	return 0;
-}
-int setyawd(unsigned char *c, int dataLen){
-	return 0;
-}
-int setroll(unsigned char *c, int dataLen){
-	return 0;
-}
-int setrollp(unsigned char *c, int dataLen){
-	return 0;
-}
-int setrolld(unsigned char *c, int dataLen){
-	return 0;
-}
-int setpitch(unsigned char *c, int dataLen){
-	return 0;
-}
-int setpitchp(unsigned char *c, int dataLen){
-	return 0;
-}
-int setpitchd(unsigned char *c, int dataLen){
-	return 0;
-}
-int setthrottle(unsigned char *c, int dataLen){
-	return 0;
-}
-int setthrottlep(unsigned char *c, int dataLen){
-	return 0;
-}
-int setthrottlei(unsigned char *c, int dataLen){
-	return 0;
-}
-int setthrottled(unsigned char *c, int dataLen){
-	return 0;
-}
-int getaccel(unsigned char *c, int dataLen){
-	return 0;
-}
-int getgyro(unsigned char *c, int dataLen){
-	return 0;
-}
-int getpitchangle(unsigned char *c, int dataLen){
-	return 0;
-}
-int getrollangle(unsigned char *c, int dataLen){
-	return 0;
-}
-int accelresp(unsigned char *c, int dataLen){
-	return 0;
-}
-int gyroresp(unsigned char *c, int dataLen){
-	return 0;
-}
-int pitchangleresp(unsigned char *c, int dataLen){
-	return 0;
-}
-int rollangleresp(unsigned char *c, int dataLen){
-	return 0;
-}
-int update(unsigned char *c, int dataLen){
-	return 0;
-}
-int beginupdate(unsigned char *c, int dataLen){
-	return 0;
-}
-int logdata(unsigned char *c, int dataLen){
-	return 0;
-}
-int response(unsigned char *packet, int dataLen){
-	return 0;
-}
\ No newline at end of file

src/commands.h

-#ifndef _COMMANDS_H
-#define _COMMANDS_H
-
-#define NUM_COMMANDS 26
-
-//TODO handle with enums
-#define MAX_TYPE 6
-#define MAX_SUBTYPE 100
-
-int debug(unsigned char *c, int dataLen);
-int setyaw(unsigned char *c, int dataLen);
-int setyawp(unsigned char *c, int dataLen);
-int setyawd(unsigned char *c, int dataLen);
-int setroll(unsigned char *c, int dataLen);
-int setrollp(unsigned char *c, int dataLen);
-int setrolld(unsigned char *c, int dataLen);
-int setpitch(unsigned char *c, int dataLen);
-int setpitchp(unsigned char *c, int dataLen);
-int setpitchd(unsigned char *c, int dataLen);
-int setthrottle(unsigned char *c, int dataLen);
-int setthrottlep(unsigned char *c, int dataLen);
-int setthrottlei(unsigned char *c, int dataLen);
-int setthrottled(unsigned char *c, int dataLen);
-int getaccel(unsigned char *c, int dataLen);
-int getgyro(unsigned char *c, int dataLen);
-int getpitchangle(unsigned char *c, int dataLen);
-int getrollangle(unsigned char *c, int dataLen);
-int accelresp(unsigned char *c, int dataLen);
-int gyroresp(unsigned char *c, int dataLen);
-int pitchangleresp(unsigned char *c, int dataLen);
-int rollangleresp(unsigned char *c, int dataLen);
-int update(unsigned char *c, int dataLen);
-int beginupdate(unsigned char *c, int dataLen);
-int logdata(unsigned char *c, int dataLen);
-int response(unsigned char *packet, int dataLen);
-
-enum Message{
-	BEGIN_CHAR = 0xBE,
-	END_CHAR   = 0xED
-};
-
-enum DataType
-{
-	floatType,
-	intType,
-	stringType
-};
-
-typedef struct command {
-	char ID;
-	char subID;
-	char dataType;
-	char commandText[100];
-	int (*functionPtr)(unsigned char *command, int dataLen);
-}command_t;
-
-enum CommandIDs{
-	DEBUG,
-	CALIBRATION,
-	REQUEST,
-	RESPONSE,
-	UPDATE,
-	LOG,
-	MAX_COMMAND_IDS
-};
-
-static command_t registeredCommands[NUM_COMMANDS];
-
-#endif
\ No newline at end of file