Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -1,2 +1,3 @@
 ./.DS_Store
-Cube Control/.DS_Store
+Cube Control/.DS_Store
+Cube Control/helper/.DS_Store

Cube Control/helper/unixSerial.c

@@ -0,0 +1,82 @@
+/*
+ *
+ * unixSerial.c
+ *
+ * POSIX compatible serial port library
+ * Uses 8 databits, no parity, 1 stop bit, no handshaking
+ *
+ * Copyright 2011 Thomas Buck <xythobuz@me.com>
+ * Copyright 2011 Max Nuding <max.nuding@gmail.com>
+ * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+ *
+ * This file is part of LED-Cube.
+ *
+ * LED-Cube is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LED-Cube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <termios.h>
+
+#define BAUD B19200
+
+int fd = -1;
+
+// Open the serial port
+int serialOpen(char *port) {
+	struct termios options;
+
+	if (fd != -1) {
+		close(fd);
+	}
+	fd = open(port, O_RDWR | O_NOCTTY | O_NDELAY);
+	if (fd == -1) {
+		return -1;
+	}
+	
+	fcntl(fd, F_SETFL, FNDELAY); // read() isn't blocking'
+	tcgetattr(fd, &options);
+	cfsetispeed(&options, BAUD); // Set speed
+	cfsetospeed(&options, BAUD);
+	options.c_cflag |= (CLOCAL | CREAD);
+	
+	options.c_cflag &= ~PARENB; // 8N1
+	options.c_cflag &= ~CSTOPB;
+	options.c_cflag &= ~CSIZE;
+	options.c_cflag |= CS8;
+	
+	options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); // Raw input
+	options.c_oflag &= ~OPOST; // Raw output
+	options.c_iflag &= ~(IXON | IXOFF | IXANY); // No flow control
+
+	tcsetattr(fd, TCSANOW, &options);
+
+	return 0;
+}
+
+// Write to port. Returns number of characters sent, -1 on error
+ssize_t serialWrite(char *data, size_t length) {
+	return write(fd, data, length);
+}
+
+// Read from port. Return number of characters read, 0 if none available, -1 on error
+ssize_t serialRead(char *data, size_t length) {
+	return read(fd, data, length);
+}
+
+// Close the serial Port
+void serialClose(void) {
+	close(fd);
+}

Cube Control/helper/winSerial.c

@@ -0,0 +1,101 @@
+/*
+ *
+ * winSerial.c
+ *
+ * Windows 16 (& 32 & 64?) compatible serial port library
+ * Uses 8 databits, no parity, 1 stop bit, no handshaking
+ *
+ * Copyright 2011 Thomas Buck <xythobuz@me.com>
+ * Copyright 2011 Max Nuding <max.nuding@gmail.com>
+ * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+ *
+ * This file is part of LED-Cube.
+ *
+ * LED-Cube is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LED-Cube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <windows.h>
+
+#define BAUD CBR_19200;
+
+HANDLE hSerial = INVALID_HANDLE_VALUE;
+
+// Open the serial port
+int serialOpen(char *port) {
+	DCB dcbSerialParams = {0};
+	COMMTIMEOUTS timeouts = {0};
+
+	hSerial = CreateFile(port GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+
+	if (hSerial == INVALID_HANDLE_VALUE) {
+		return -1;
+	}
+	
+
+	dcbSerial.DCBlength = sizeof(dcbSerialParams);
+	if (!GetCommState(hSerial, &dcbSerialParams)) {
+		CloseHandle(hSerial);
+		hSerial = INVALID_HANDLE_VALUE;
+		return -1;
+	}
+	dcbSerialParams.BaudRate = BAUD;
+	dcbSerialParams.ByteSize = 8;
+	dcbSerialParams.StopBits = ONESTOPBIT;
+	dcbSerialParams.Parity = NOPARITY;
+	if (!SetCommState(hSerial, &dcbSerialParams)) {
+		CloseHandle(hSerial);
+		hSerial = INVALID_HANDLE_VALUE;
+		return -1;
+	}
+	
+	timeouts.ReadIntervalTimeout = 50;
+	timeouts.ReadTotalTimeoutConstant = 50;
+	timeouts.ReadTotalTimeoutMultiplier = 10;
+	timeouts.WriteTotalTimeoutConstant = 50;
+	timeouts.WriteTotalTimeoutMultiplier = 10;
+
+	if (!SetCommTimeouts(hSerial, &timeouts)) {
+		CloseHandle(hSerial);
+		hSerial = INVALID_HANDLE_VALUE;
+		return -1;
+	}
+
+	return 0;
+}
+
+// Write to port. Returns number of characters sent, -1 on error
+ssize_t serialWrite(char *data, size_t length) {
+	DWORD dwBytesWritten = 0;
+	if (!WriteFile(hSerial, data, length, &dwBytesWritten, NULL)) {
+		return -1;
+	}
+	return dwBytesWritten;
+
+}
+
+// Read from port. Return number of characters read, 0 if none available, -1 on error
+ssize_t serialRead(char *data, size_t length) {
+	DWORD dwBytesRead = 0;
+	if (!ReadFile(hSerial, data, length, &dwBytesRead, NULL)) {
+		return -1;
+	}
+	return dwBytesRead;
+}
+
+// Close the serial Port
+void serialClose(void) {
+	CloseHandle(hSerial);
+	hSerial = INVALID_HANDLE_VALUE;
+}

Cube Control/makefile

@@ -0,0 +1,21 @@
+JAVAC = javac
+CC = gcc
+TARGET = unix
+#TARGET = win
+
+
+all: java
+
+java: serialHelper
+	$(JAVAC) *.java
+
+serialHelper:
+ifeq ($(TARGET),win)
+	$(CC) -o serialHelper.exe -D winHelper serialHelper.c
+else
+	$(CC) -o serialHelper serialHelper.c
+endif
+
+clean:
+	rm -f *.class
+	rm -f serialHelper

Cube Control/serialHelper.c

@@ -0,0 +1,125 @@
+/*
+ * unixHelper.c
+ *
+ * Copyright 2011 Thomas Buck <xythobuz@me.com>
+ * Copyright 2011 Max Nuding <max.nuding@gmail.com>
+ * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+ *
+ * This file is part of LED-Cube.
+ *
+ * LED-Cube is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LED-Cube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifdef winHelper
+#include "helper/winSerial.c"
+#else
+#include "helper/unixSerial.c"
+#endif
+
+char *fileData = NULL;
+
+void removeFromBeginning(size_t size, size_t remove);
+size_t readFile(char *path);
+size_t getFileSize(FILE *fp);
+
+/*
+Return values:
+0: Success
+1: Usage error
+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;
+		}
+
+		written = serialWrite(fileData, length);
+		while (written < length) {
+			removeFromBeginning(length, written);
+			length -= written;
+			written = serialWrite(fileData, length);
+		}
+
+		free(fileData);
+		fileData = NULL;
+		serialClose();
+		return 0;
+	}
+}
+
+void removeFromBeginning(size_t size, size_t remove) {
+	size_t i;
+	char *tmp = (char *)malloc((size - remove) * sizeof(char));
+
+	for (i = 0; i < (size - remove); i++) {
+		tmp[i] = fileData[i + remove];
+	}
+	free(fileData);
+	fileData = tmp;
+}
+
+size_t readFile(char *path) {
+	size_t size, i;
+	FILE *fp;
+
+	fp = fopen(path, "r");
+	if (!fp) {
+		return 0;
+	}
+
+	size = getFileSize(fp);
+	fileData = (char *)malloc(size * sizeof(char));
+	for (i = 0; i < size; i++) {
+		fileData[i] = fgetc(fp);
+	}
+
+	fclose(fp);
+	return size;
+}
+
+size_t getFileSize(FILE *fp) {
+	size_t size = 0;
+	int c;
+
+	fseek(fp, 0, 0); // Set file pointer to beginning
+	
+	do { // Calculate size
+		c = fgetc(fp);
+		size++;
+	} while (c != EOF);
+	
+	fseek(fp, 0, 0);
+
+	return size;
+}