Helper reads and lists ports

Cube Control/helper/unixSerial.c

@@ -26,9 +26,13 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <termios.h>
+#include <dirent.h>
+
+#define SEARCH "tty."
 
 #define BAUD B19200
 
@@ -38,6 +42,10 @@ int fd = -1;
 int serialOpen(char *port) {
 	struct termios options;
 
+	if ((strcmp(ttyname(fileno(stdin)), port) == 0) || (strcmp(ttyname(fileno(stdout)), port) == 0)) {
+		return -1;
+	}
+
 	if (fd != -1) {
 		close(fd);
 	}
@@ -46,10 +54,22 @@ int serialOpen(char *port) {
 		return -1;
 	}
 	
-	fcntl(fd, F_SETFL, FNDELAY); // read() isn't blocking'
-	tcgetattr(fd, &options);
-	cfsetispeed(&options, BAUD); // Set speed
-	cfsetospeed(&options, BAUD);
+	if (fcntl(fd, F_SETFL, FNDELAY) == -1) { // read() isn't blocking'
+		close(fd);
+		return -1;
+	}
+	if (tcgetattr(fd, &options) == -1) {
+		close(fd);
+		return -1;
+	}
+	if (cfsetispeed(&options, BAUD) == -1) { // Set speed
+		close(fd);
+		return -1;
+	}
+	if (cfsetospeed(&options, BAUD) == -1) {
+		close(fd);
+		return -1;
+	}
 	options.c_cflag |= (CLOCAL | CREAD);
 	
 	options.c_cflag &= ~PARENB; // 8N1
@@ -61,7 +81,10 @@ int serialOpen(char *port) {
 	options.c_oflag &= ~OPOST; // Raw output
 	options.c_iflag &= ~(IXON | IXOFF | IXANY); // No flow control
 
-	tcsetattr(fd, TCSANOW, &options);
+	if (tcsetattr(fd, TCSANOW, &options) == -1) {
+		close(fd);
+		return -1;
+	}
 
 	return 0;
 }
@@ -80,3 +103,68 @@ ssize_t serialRead(char *data, size_t length) {
 void serialClose(void) {
 	close(fd);
 }
+
+char** namesInDev(int *siz) {
+	DIR *dir;
+	struct dirent *ent;
+	int i = 0, size = 0;
+	char **files = NULL;
+	dir = opendir("/dev/");
+	while ((ent = readdir(dir)) != NULL) {
+		size++;
+	}
+	files = (char **)malloc((size + 1) * sizeof(char *));
+	files[size] = NULL;
+	closedir(dir);
+	dir = opendir("/dev/");
+	while ((ent = readdir(dir)) != NULL) {
+		files[i] = (char *)malloc((strlen(ent->d_name) + 1) * sizeof(char));
+		files[i] = strcpy(files[i], ent->d_name);
+		i++;
+	}
+	closedir(dir);
+
+	char *tmp = NULL;
+	// Fix every string, addin /dev/ in front of it...
+	for (i = 0; i < size; i++) {
+		tmp = (char *)malloc((strlen(files[i]) + 6) * sizeof(char));
+		tmp[0] = '/';
+		tmp[1] = 'd';
+		tmp[2] = 'e';
+		tmp[3] = 'v';
+		tmp[4] = '/';
+		files[i] = strncat(tmp, files[i], strlen(files[i]));
+	}
+
+	*siz = size;
+	return files;
+}
+
+char** getSerialPorts(void) {
+	int size;
+	char** files = namesInDev(&size);
+	char** fin = NULL;
+	int i = 0, j = 0, f, g;
+
+	fin = (char **)malloc((size + 1) * sizeof(char *));
+	fin[size] = NULL;
+	while (files[i] != NULL) {
+		if (strstr(files[i], SEARCH) != NULL) {
+			f = serialOpen(files[i]);
+			if (fd != -1) {
+				fin[j++] = files[i];
+				serialClose();
+			}
+		}
+		i++;
+	}
+	free(files);
+
+	char** finish = (char **)malloc((j + 1) * sizeof(char *));
+	for (i = 0; i < (j + 1); i++) {
+		finish[i] = fin[i];
+	}
+	free(fin);
+
+	return finish;
+}

Cube Control/helper/winSerial.c

@@ -99,3 +99,35 @@ void serialClose(void) {
 	CloseHandle(hSerial);
 	hSerial = INVALID_HANDLE_VALUE;
 }
+
+// Last element has to be NULL
+char** getSerialPorts(void) {
+	LPTSTR ports;
+	DWORD num;
+	char **files;
+	int i, j = 0, start, k;
+
+#ifdef UNICODE
+	ports = (LPTSTR)malloc(100 * sizeof(WCHAR));
+#else
+	 ports = (LPTSTR)malloc(100 * sizeof(CHAR));
+#endif
+
+	num = QueryDosDevice(ports, 100);	
+	files = (char **)malloc(num * sizeof(char *));
+	
+	for (i = 0; i < num; i++) {
+		start = j;
+		j = 0;
+		while (ports[start + j] != '\0') {
+			j++;
+		}
+		j++; // \0
+		files[i] = (char *)malloc(j * sizeof(char));
+		for (k = 0; k < j; k++) {
+			files[i] = ports[start + k];
+		}
+	}
+
+	return files;
+}

Cube Control/makefile

@@ -1,7 +1,7 @@
 JAVAC = javac
 CC = gcc
-#TARGET = unix
-TARGET = win
+TARGET = unix
+#TARGET = win
 
 JAVAFILES = cubeWorker.java layerEditFrame.java frame.java
 
@@ -27,10 +27,10 @@ frame.class: serialHelper
 endif
 	$(JAVAC) $(JAVAFILES)
 
-serialHelper.exe:
+serialHelper.exe: serialHelper.c helper/winSerial.c
 	$(CC) -o serialHelper.exe -D winHelper serialHelper.c
 
-serialHelper:
+serialHelper: serialHelper.c helper/unixSerial.c
 	$(CC) -o serialHelper serialHelper.c
 
 clean:

Cube Control/serialHelper.c

@@ -34,6 +34,11 @@ char *fileData = NULL;
 void removeFromBeginning(size_t size, size_t remove);
 size_t readFile(char *path);
 size_t getFileSize(FILE *fp);
+void usage(char *name);
+int parseNumber(char *s);
+int power(int num, int pow);
+void printFileData(size_t size);
+void printSerialPorts(char ** ports);
 
 /*
 Return values:
@@ -42,40 +47,84 @@ Return values:
 2: Serial Port Error
 3: Data File Error
 */
+
 int main(int argc, char *argv[]) {
 	size_t length, written;
-	
-	if (argc < 3) {
-#ifdef winHelper
-		printf("Usage:\n%s COM1 C:\\file\\to\\send.txt\n", argv[0]);
-#else
-		printf("Usage:\n%s /dev/SerialPort /file/to/send\n", argv[0]);
-#endif
-		return 1;
-	} else {
-		if (serialOpen(argv[1]) != 0) {
-			printf("Error: Could not open %s\n", argv[1]);
-			return 2;
-		}
 
-		length = readFile(argv[2]);
-		if (length == 0) {
-			printf("Error while reading %s\n", argv[2]);
-			return 3;
+		if (argc < 2) {
+			usage(argv[0]);
+			return 1;
 		}
 
-		written = serialWrite(fileData, length);
-		while (written < length) {
-			removeFromBeginning(length, written);
-			length -= written;
+		if (argv[1][0] == 'p') {
+
+			if (argc != 2) {
+				usage(argv[0]);
+				return 1;
+			}
+			char** ports = getSerialPorts();
+			printSerialPorts(ports);
+			free(ports);
+			return 0;
+
+		} else if (argv[1][0] == 'w') {
+
+			if (argc != 4) {
+				usage(argv[0]);
+				return 1;
+			}
+			if (serialOpen(argv[2]) != 0) {
+				printf("Error: Could not open %s\n", argv[1]);
+				return 2;
+			}
+			// write file to com port
+			length = readFile(argv[3]);
+			if (length == 0) {
+				printf("Error while reading %s\n", argv[2]);
+				return 3;
+			}
+	
 			written = serialWrite(fileData, length);
+			while (written < length) {
+				removeFromBeginning(length, written);
+				length -= written;
+				written = serialWrite(fileData, length);
+			}
+
+		} else {
+
+			if (argc != 4) {
+				usage(argv[0]);
+				return 1;
+			}
+			if (serialOpen(argv[2]) != 0) {
+				printf("Error: Could not open %s\n", argv[1]);
+				return 2;
+			}
+			// Read from com port to file
+			if (argc < 5) {
+				printf("No size given. ");
+				usage(argv[0]);
+				return 1;
+			}
+			
+			length = parseNumber(argv[3]);
+			fileData = (char *)malloc(length * sizeof(char));
+			// fill fileData with serial Port data
+			written = 0;
+			while (written < length) {
+				written = serialRead(fileData + written, length - written);
+			}
+
+			printFileData(length);
+
 		}
 
 		free(fileData);
 		fileData = NULL;
 		serialClose();
 		return 0;
-	}
+	// }
 }
 
 void removeFromBeginning(size_t size, size_t remove) {
@@ -124,3 +173,50 @@ size_t getFileSize(FILE *fp) {
 
 	return size;
 }
+
+void usage(char *name) {
+#ifdef winHelper
+	printf("Usage:\n%s r|w|p [COM1 [C:\\file\\to\\send.txt] [sizeToRead]]\n", name);
+#else
+	printf("Usage:\n%s r|w|p [/dev/SerialPort [/file/to/send] [sizeToRead]]\n", name);
+#endif
+}
+
+int parseNumber(char *s) {
+	int i, size = 0, result = 0;
+	while (*(s++) != '\0') {
+		size++;
+	}
+	for (i = 0; i < size; i++) {
+		result += (s[i] - '0') * power(10, (size - i));
+	}
+	return result;
+}
+
+int power(int num, int pow) {
+	int result = 1;
+	while (pow > 0) {
+		result *= num;
+		pow--;
+	}
+	return result;
+}
+
+void printFileData(size_t size) {
+	int i;
+	for (i = 0; i < size; i++) {
+		printf("%x", fileData[i]);
+		if (i % 8 == 0) {
+			printf("\n");
+		}
+	}
+}
+
+void printSerialPorts(char ** ports) {
+	int i = 0;
+	while (ports[i] != NULL) {
+		printf("%s\n", ports[i]);
+		i++;
+	}
+}
+