Add support for multiple sensors. Serials should probably come from the command line, but that seems like a lot of work.

motion/main.c

@@ -4,73 +4,56 @@
 
 #define DATA_DIR "plexMonitor/"
 #define OUT_FILE "MOTION"
-#define SERIAL "101128160542"
+#define NUM_DEVICES 1
+#define SERIALS { "101128160542" }
 #define SLEEP_DELAY 250000
 #define TIMEOUT 2
 
 //#define DEBUG
 
+// Typedef
+typedef unsigned char u8;
+
 // Prototypes
 void timeout(int sig);
 USBmX_DeviceRef init();
-unsigned char readDev(USBmX_DeviceRef dev);
+u8 readDev(USBmX_DeviceRef dev);
+char * initPaths();
 
 // Globals
 USBmX_ContextRef ctx;
 
 int main(int argc, const char * argv[])
 {
-	USBmX_DeviceRef device;
-	int fd;
-	size_t len;
-	char *datadir, *outfile;
-	struct stat statbuf;
+	char *outfile;
+	unsigned int i, motion;
+	USBmX_DeviceRef device[NUM_DEVICES];
+	const char *serials[NUM_DEVICES] = SERIALS;
 
-	// Construct the data directory and output file paths
-	len = confstr(_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
-	len += sizeof(DATA_DIR);
-	datadir = malloc(len);
-	outfile = malloc(len + sizeof(OUT_FILE));
-	if (datadir == NULL || outfile == NULL) {
-		fprintf(stderr, "Out of memory\n");
-		exit(1);
-	}
-	confstr(_CS_DARWIN_USER_TEMP_DIR, datadir, len);
-	strlcat(datadir, DATA_DIR, len);
-	strlcpy(outfile, datadir, len);
-	strlcat(outfile, OUT_FILE, len + sizeof(OUT_FILE));
-
-	// Create the datadir as needed
-	stat(datadir, &statbuf);
-	if (!S_ISDIR(statbuf.st_mode)) {
-		fprintf(stderr, "Creating data directory: %s\n", datadir);
-		if (mkdir(datadir, S_IRUSR | S_IWUSR | S_IXUSR) != 0) {
-			fprintf(stderr, "Error creating data directory (%s): %s\n", strerror(errno), outfile);
-			exit(1);
-		}
-	}
-
-	// Create the output file as needed
-	stat(outfile, &statbuf);
-	if(!S_ISREG(statbuf.st_mode)) {
-		fprintf(stderr, "Creating output file: %s\n", outfile);
-		fd = open(outfile, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-		if (fd <= 0 || close(fd) != 0) {
-			fprintf(stderr, "Error creating output file (%s): %s\n", strerror(errno), outfile);
-			exit(1);
-		}
-	}
+	// Setup the output file
+	outfile = initPaths();
 
 	// Monitor for alarms
 	signal(SIGALRM, timeout);
 
-	// Setup the USB device
-	device = init(SERIAL);
+	// Setup the USB devices
+	for (i = 0; i < NUM_DEVICES; i++) {
+		device[i] = init(serials[i]);
+	}
 	
 	// Read forever
 	while (1) {
+		// Check for motion in any device
+		motion = 0;
+		for (i = 0; i < NUM_DEVICES; i++) {
+			if (readDev(device[i])) {
+				motion = 1;
+				i = NUM_DEVICES;
+			}
+		}
+
 		// If we detected motion
-		if (readDev(device)) {
+		if (motion > 0) {
 			#ifdef DEBUG
 			printf("Motion detected\n");
 			#endif
@@ -119,12 +102,12 @@ USBmX_DeviceRef init(const char *serial) {
 		exit(1);
 	}
 
-	// Return device handles
+	// Return device handle
 	return device;
 }
 
 // Read the specified USBMicro device
-unsigned char readDev(USBmX_DeviceRef dev) {
+u8 readDev(USBmX_DeviceRef dev) {
 	unsigned char data = 0x00;
 
 	// Enable the timeout
@@ -142,3 +125,49 @@ unsigned char readDev(USBmX_DeviceRef dev) {
 	// Return pin A5
 	return (data & 0x20);
 }
+
+// Setup the data directory and output file
+char * initPaths() {
+	int fd;
+	size_t len;
+	char *datadir, *outfile;
+	struct stat statbuf;
+
+	// Construct the data directory and output file paths
+	len = confstr(_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
+	len += sizeof(DATA_DIR);
+	datadir = malloc(len);
+	outfile = malloc(len + sizeof(OUT_FILE));
+	if (datadir == NULL || outfile == NULL) {
+		fprintf(stderr, "Out of memory\n");
+		exit(1);
+	}
+	confstr(_CS_DARWIN_USER_TEMP_DIR, datadir, len);
+	strlcat(datadir, DATA_DIR, len);
+	strlcpy(outfile, datadir, len);
+	strlcat(outfile, OUT_FILE, len + sizeof(OUT_FILE));
+
+	// Create the datadir as needed
+	stat(datadir, &statbuf);
+	if (!S_ISDIR(statbuf.st_mode)) {
+		fprintf(stderr, "Creating data directory: %s\n", datadir);
+		if (mkdir(datadir, S_IRUSR | S_IWUSR | S_IXUSR) != 0) {
+			fprintf(stderr, "Error creating data directory (%s): %s\n", strerror(errno), outfile);
+			exit(1);
+		}
+	}
+
+	// Create the output file as needed
+	stat(outfile, &statbuf);
+	if(!S_ISREG(statbuf.st_mode)) {
+		fprintf(stderr, "Creating output file: %s\n", outfile);
+		fd = open(outfile, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+		if (fd <= 0 || close(fd) != 0) {
+			fprintf(stderr, "Error creating output file (%s): %s\n", strerror(errno), outfile);
+			exit(1);
+		}
+	}
+
+	// Return the output file path
+	return outfile;
+}