.gitignore

@@ -1,10 +0,0 @@
-ethstream
-ethstream.1
-ethstream.txt
-ethstream.exe
-*.obj
-*.d
-*.dobj
-*.o
-
-

Makefile

@@ -14,17 +14,14 @@
 # Build options
 
 CFLAGS += -Wall -g #-pg
-LDFLAGS += #-pg
+LDFLAGS += -lm #-pg
-LDLIBS += -lm
-
 PREFIX = /usr/local
-MANPATH = ${PREFIX}/man/man1/
+MANPATH = ${PREFIX}/man/man1
 BINPATH = ${PREFIX}/bin
 
-#WINCC = i386-mingw32-gcc
+WINCC = i386-mingw32-gcc
-WINCC = i586-mingw32msvc-gcc
 WINCFLAGS += $(CFLAGS)
-WINLDFLAGS += $(LDFLAGS) -lws2_32 -liphlpapi -s
+WINLDFLAGS += $(LDFLAGS) -lws2_32 -s
 
 # Targets
 
@@ -35,10 +32,11 @@ default: lin
 all: lin win
 
 .PHONY: lin
-lin: ethstream ethstream.1 ethstream.txt
+lin: ljtest ethstream ljconfig \
+	ethstream.1 ljconfig.1
 
 .PHONY: win
-win: ethstream.exe
+win: ljtest.exe ethstream.exe ljconfig.exe
 
 
 version.h: VERSION
@@ -48,12 +46,17 @@ version.h: VERSION
 # Object files for each executable
 
 obj-common = opt.o ue9.o ue9error.o netutil.o debug.o nerdjack.o
+obj-ljconfig = ljconfig.o $(obj-common)
 obj-ethstream = ethstream.o $(obj-common)
+obj-ljtest = ljtest.o $(obj-common)
 
+ljconfig: $(obj-ljconfig)
 ethstream: $(obj-ethstream)
-	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ljtest: $(obj-ljtest)
 
+ljconfig.exe: $(obj-ljconfig:.o=.obj) compat-win32.obj
 ethstream.exe: $(obj-ethstream:.o=.obj) compat-win32.obj
+ljtest.exe: $(obj-ljtest:.o=.obj) compat-win32.obj
 
 # Manpages
 
@@ -68,7 +71,6 @@ ethstream.exe: $(obj-ethstream:.o=.obj) compat-win32.obj
 
 .PHONY: install
 install: ethstream.1 ethstream
-	mkdir -p ${BINPATH} ${MANPATH}
 	install -m 0755 ethstream ${BINPATH}
 	install -m 0644 ethstream.1 ${MANPATH}
 
@@ -90,19 +92,16 @@ dist: version.h
 
 .PHONY: clean distclean
 clean distclean:
-	rm -f *.o *.obj *.exe ethstream core *.d *.dobj *.1 *.txt
+	rm -f *.o *.obj *.exe ethstream ljtest ljconfig core *.d *.1 *.txt
 
 # Dependency tracking:
 
 allsources = $(wildcard *.c)
-
 -include $(allsources:.c=.d)
 %.o : %.c
-	$(COMPILE.c) -MP -MMD -MT '$*.o' -MF '$*.d' -o $@ $<
+	$(COMPILE.c) -MP -MMD -MT '$*.obj' -o $@ $<
-
--include $(allsources:.c=.dobj)
 %.obj : %.c
-	$(WINCC) $(WINCFLAGS) -MP -MMD -MT '$*.obj' -MF '$*.dobj' -c -o $@ $<
+	$(WINCC) $(WINCFLAGS) -MP -MMD -MT '$*.o' -c -o $@ $<
 
 # Win32 executable
 

README

@@ -1,13 +1,6 @@
 Labjack/Nerdjack Tools
 by Jim Paris <jim@jtan.com>
-with modifications by 
+with modifications by Zach Clifford <zacharyc@mit.edu>
-     Zach Clifford <zacharyc@mit.edu>
-     John Donnal <jdonnal@mit.edu>
 
-These tools are for interacting with the LabJack UE9 or the NerdJack
+These tools are for interacting with the LabJack UE9 or the NerdJack over the Ethernet interface.  More information about the UE9 device:
-over the Ethernet interface.  More information about the UE9 device:
   http://www.labjack.com/labjack_ue9.php
-
-The NerdJack device is a custom board made in LEES by Zach Clifford.
-
-Use ethstream -h or ethstream -X for usage instructions and examples.

VERSION

@@ -1 +1 @@
-1.3.2
+1.0

compat-win32.c

@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include "compat.h"
 #include <windows.h>
-#include "errno.h"
 
 unsigned int sleep(unsigned int seconds)
 {
@@ -40,7 +39,6 @@ static struct {
 	{ ENOTCONN, "Not connected" },
 	{ -1, NULL },
 };
-
 char *compat_strerror(int errnum)
 {
 	int i;
@@ -82,3 +80,4 @@ char *compat_strerror(int errnum)
 }
 */
 #endif
+

compat.h

@@ -5,6 +5,9 @@
 unsigned int sleep(unsigned int seconds);
 char *compat_strerror(int errnum);
 //const char *inet_ntop(int af, void *src, const char *dst, socklen_t cnt);
+#define INET_ADDRSTRLEN 16
+#define ETIMEDOUT 110
+#define ENOTCONN 107
 #else
 #define compat_strerror strerror
 #endif

debug.c

@@ -1,7 +1,6 @@
 #include "debug.h"
 #include <stdio.h>
 #include <stdarg.h>
-#include <sys/time.h>
 
 int verb_count = 0;
 
@@ -9,10 +8,7 @@ int func_fprintf(const char *func, FILE * stream, const char *format, ...)
 {
 	va_list ap;
 	int ret;
-	struct timeval tv;
 
-	gettimeofday(&tv, NULL);
-	fprintf(stream, "%ld.%06ld: ", (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec);
 	fprintf(stream, "%s: ", func);
 	va_start(ap, format);
 	ret = vfprintf(stream, format, ap);
@@ -20,16 +16,3 @@ int func_fprintf(const char *func, FILE * stream, const char *format, ...)
 	return ret;
 }
 
-int my_fprintf(FILE * stream, const char *format, ...)
-{
-	va_list ap;
-	int ret;
-	struct timeval tv;
-
-	gettimeofday(&tv, NULL);
-	fprintf(stream, "%ld.%06ld: ", (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec);
-	va_start(ap, format);
-	ret = vfprintf(stream, format, ap);
-	va_end(ap);
-	return ret;
-}

debug.h

@@ -16,8 +16,6 @@ extern int verb_count;
 
 int func_fprintf(const char *func, FILE *stream, const char *format, 
 		 ...) __attribute__ ((format (printf, 3, 4)));
-int my_fprintf(FILE * stream, const char *format,
-	       ...) __attribute__ ((format(printf, 2, 3)));
 
 #define debug(x...) ({ \
 	if(verb_count >= 2) \
@@ -30,11 +28,6 @@ int my_fprintf(FILE * stream, const char *format,
 })
 
 #define info(x...) ({ \
-	if(verb_count >= 0) \
-		my_fprintf(stderr,x); \
-})
-
-#define info_no_timestamp(x...) ({ \
 	if(verb_count >= 0) \
 		fprintf(stderr,x); \
 })

ethstream.c

@@ -7,6 +7,11 @@
  * License as published by the Free Software Foundation; see COPYING.
  */
 
+/* ljstream: Stream data from the first N (1-14) analog inputs.
+   Resolution is set to 12-bit and all channels are in bipolar (-5 to
+   +5V) mode.
+*/
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,16 +29,11 @@
 #include "opt.h"
 #include "version.h"
 #include "compat.h"
-#include "ethstream.h"
-
-#include "example.inc"
 
 #define DEFAULT_HOST "192.168.1.209"
 #define UE9_COMMAND_PORT 52360
 #define UE9_DATA_PORT 52361
 
-#define MAX_CHANNELS 256
-
 struct callbackInfo { 
 	struct ue9Calibration calib;
 	int convert;
@@ -41,74 +41,35 @@ struct callbackInfo {
 };
 
 struct options opt[] = {
-	{'a', "address", "string", "host/address of device (192.168.1.209)"},
+	{ 'a', "address", "string", "host/address of UE9 (192.168.1.209)" },
 	{ 'n', "numchannels", "n", "sample the first N ADC channels (2)" },
+    { 'N', "nerdjack", NULL, "Use NerdJack device instead" },
+    { 'd', "detect", NULL, "Detect NerdJack IP address" },
+    { 'p', "precision", "0-3", "Set precision on NerdJack (0 - max range, 1 - max precision)"}, 
 	{ 'C', "channels", "a,b,c", "sample channels a, b, and c" },
 	{ 'r', "rate", "hz", "sample each channel at this rate (8000.0)" },
-
-	{'L', "labjack", NULL, "Force LabJack device"},
-	{'t', "timers", "a[:A],b[:B]", "set LabJack timer modes a,b and optional values A,B"},
-	{'T', "timerdivisor", "n", "set LabJack timer divisor to n"},
-
-	{'N', "nerdjack", NULL, "Force NerdJack device"},
-	{'d', "detect", NULL, "Detect NerdJack IP address"},
-	{'R', "range", "a,b",
-	 "Set range on NerdJack for channels 0-5,6-11 to either 5 or 10 (10,10)"},
-	{'g', "gain", "a,b,c", "Set Labjack AIN channel gains: 0,1,2,4,8 in -C channel order"},
 	{ 'o', "oneshot", NULL, "don't retry in case of errors" },
 	{ 'f', "forceretry", NULL, "retry no matter what happens" },
-	{'c', "convert", NULL, "convert output to volts/temperature"},
+	{ 'c', "convert", NULL, "display output in volts" },
-	{'H', "converthex", NULL, "convert output to hex"},
-	{'m', "showmem", NULL, "output memory stats with data (NJ only)"},
 	{ 'l', "lines", "num", "if set, output this many lines and quit" },
 	{ 'h', "help", NULL, "this help" },
 	{ 'v', "verbose", NULL, "be verbose" },
 	{ 'V', "version", NULL, "show version number and exit" },
-	{'i', "info", NULL, "get info from device (NJ only)"},
-	{'X', "examples", NULL, "show ethstream examples and exit"},
 	{ 0, NULL, NULL, NULL }
 };
 
 int doStream(const char *address, uint8_t scanconfig, uint16_t scaninterval,
-	     int *channel_list, int channel_count, 
+	     int *channel_list, int channel_count, int convert, int maxlines);
-	     int *timer_mode_list, int *timer_value_list,
+int nerdDoStream(const char *address, int *channel_list, int channel_count, int precision, 
-	     int timer_mode_count, int timer_divisor,
+            unsigned short period, int convert, int lines);
-	     int *gain_list, int gain_count,  
+int data_callback(int channels, uint16_t *data, void *context);
-	     int convert, int maxlines);
-int nerdDoStream(const char *address, int *channel_list, int channel_count,
-		 int precision, unsigned long period, int convert, int lines,
-		 int showmem);
-int data_callback(int channels,  int *channel_list, int gain_count, int *gain_list, 
-		uint16_t * data, void *context);
 
 int columns_left = 0;
-
-////////EXTRA GLOBAL VARS///////////
-//  for clean shutdown            //
-//  added by John Donnal 2015     //
-////////////////////////////////////
-int fd_cmd, fd_data;
-int ue9_running = 0; //flag if labjack is currently streaming data
-
 void handle_sig(int sig)
 {
 	while (columns_left--) {
 		printf(" 0");
 	}
-
-	/******************************************************
-	 *         added by John Donnal 2015                  *
-	 * Close out connection to LabJack, firmware glitches *
-	 * if the stream is not closed correctly              *
-	 ******************************************************/
-	if(ue9_running==1){
-	  printf("Performing clean shutdown of LabJack\n");
-	  ue9_stream_stop(fd_cmd);
-	  ue9_buffer_flush(fd_cmd);
-	  ue9_close(fd_data);
-	  ue9_close(fd_cmd);
-	}
-	/******************************************************/
 	fflush(stdout);
 	exit(0);
 }
@@ -126,26 +87,19 @@ int main(int argc, char *argv[])
 	double actual_rate;
 	int oneshot = 0;
 	int forceretry = 0;
-	int convert = CONVERT_DEC;
+	int convert = 0;
-	int showmem = 0;
-	int inform = 0;
 	uint8_t scanconfig;
 	uint16_t scaninterval;
-	int timer_mode_list[UE9_TIMERS];
+#if UE9_CHANNELS > NERDJACK_CHANNELS
-	int timer_value_list[UE9_TIMERS];
+	int channel_list[UE9_CHANNELS];
-	int timer_mode_count = 0;
+#else
-	int timer_divisor = 1;
+    int channel_list[NERDJACK_CHANNELS];
-	int gain_list[MAX_CHANNELS];
+#endif
-	int gain_count = 0;
-	int channel_list[MAX_CHANNELS];
 	int channel_count = 0;
     int nerdjack = 0;
-	int labjack = 0;
     int detect = 0;
     int precision = 0;
-	int addressSpecified = 0;
+    int period = NERDJACK_CLOCK_RATE / desired_rate;
-	int donerdjack = 0;
-	unsigned long period = NERDJACK_CLOCK_RATE / desired_rate;
 
 	/* Parse arguments */
 	opt_init(&optind);
@@ -154,12 +108,11 @@ int main(int argc, char *argv[])
 		case 'a':
 			free(address);
 			address = strdup(optarg);
-			addressSpecified = 1;
 			break;
 		case 'n':
 			channel_count = 0;
 			tmp = strtol(optarg, &endp, 0);
-			if (*endp || tmp < 1 || tmp > MAX_CHANNELS) {
+			if (*endp || tmp < 1 || tmp > UE9_CHANNELS) {
 				info("bad number of channels: %s\n", optarg);
 				goto printhelp;
 			}
@@ -171,85 +124,24 @@ int main(int argc, char *argv[])
 			do {
 				tmp = strtol(optarg, &endp, 0);
 				if (*endp != '\0' && *endp != ',')  {
-					info("bad channel number: %s\n",
+                //|| tmp < 0 || tmp >= UE9_CHANNELS) {
-					     optarg);
+					info("bad channel number: %s\n", optarg);
 					goto printhelp;
 				}
                 //We do not want to overflow channel_list, so we need the check here
-				//The rest of the sanity checking can come later after we know
+                //The rest of the sanity checking can come later after we know whether this is a 
-				//whether this is a 
                 //LabJack or a NerdJack
-				if (channel_count >= MAX_CHANNELS) {
+#if UE9_CHANNELS > NERDJACK_CHANNELS
+				if (channel_count >= UE9_CHANNELS) {
+#else
+                if (channel_count >= NERDJACK_CHANNELS) {
+#endif
                 	info("error: too many channels specified\n");
 					goto printhelp;
 				}
 				channel_list[channel_count++] = tmp;
 				optarg = endp + 1;
-			}
+			} while (*endp);
-			while (*endp);
-			break;
-		case 'g':	/* labjack only */
-			gain_count = 0;
-			do {
-				tmp = strtol(optarg, &endp, 0);
-				if (*endp != '\0' && *endp != ',') {
-					info("bad gain number: %s\n",
-					     optarg);
-					goto printhelp;
-				}
-				if (gain_count >= MAX_CHANNELS) {
-					info("error: too many gains specified\n");
-					goto printhelp;
-				}
-				if (!(tmp == 0 || tmp == 1 || tmp == 2 || tmp == 3 || tmp == 8)) {
-				info("error: invalid gain specified\n");
-					goto printhelp;
-				}
-								
-				gain_list[gain_count++] = tmp;
-				optarg = endp + 1;
-			}
-			while (*endp);
-			break;
-		case 't':	/* labjack only */
-			timer_mode_count = 0;
-			do {
-				/* get mode */
-				tmp = strtol(optarg, &endp, 0);
-				if (*endp != '\0' && *endp != ',' && *endp != ':') {
-					info("bad timer mode: %s\n", optarg);
-					goto printhelp;
-				}
-				if (timer_mode_count >= UE9_TIMERS) {
-					info("error: too many timers specified\n");
-					goto printhelp;
-				}
-				timer_mode_list[timer_mode_count] = tmp;
-
-				/* get optional value */
-				if (*endp == ':') {
-					optarg = endp + 1;
-					tmp = strtol(optarg, &endp, 0);
-					if (*endp != '\0' && *endp != ',') {
-						info("bad timer value: %s\n", optarg);
-						goto printhelp;
-					}
-					timer_value_list[timer_mode_count] = tmp;
-				} else {
-					timer_value_list[timer_mode_count] = 0;
-				}
-
-				timer_mode_count++;					
-				optarg = endp + 1;
-			}
-			while (*endp);
-			break;
-		case 'T':	/* labjack only */
-			timer_divisor = strtod(optarg, &endp);
-			if (*endp || timer_divisor < 0 || timer_divisor > 255) {
-				info("bad timer divisor: %s\n", optarg);
-				goto printhelp;
-			}
 			break;			
 		case 'r':
 			desired_rate = strtod(optarg, &endp);
@@ -265,42 +157,12 @@ int main(int argc, char *argv[])
 				goto printhelp;
 			}
 			break;
-		case 'R':
+        case 'p':
-			tmp = strtol(optarg, &endp, 0);
+            precision++;
-			if (*endp != ',') {
-				info("bad range number: %s\n", optarg);
-				goto printhelp;
-			}
-			if (tmp != 5 && tmp != 10) {
-				info("valid choices for range are 5 or 10\n");
-				goto printhelp;
-			}
-			if (tmp == 5)
-				precision = precision + 1;
-
-			optarg = endp + 1;
-			if (*endp == '\0') {
-				info("Range needs two numbers, one for channels 0-5 and another for 6-11\n");
-				goto printhelp;
-			}
-			tmp = strtol(optarg, &endp, 0);
-			if (*endp != '\0') {
-				info("Range needs only two numbers, one for channels 0-5 and another for 6-11\n");
-				goto printhelp;
-			}
-			if (tmp != 5 && tmp != 10) {
-				info("valid choices for range are 5 or 10\n");
-				goto printhelp;
-			}
-			if (tmp == 5)
-				precision = precision + 2;
             break;
         case 'N':
             nerdjack++;
             break;
-		case 'L':
-			labjack++;
-			break;
         case 'd':
             detect++;
             break;
@@ -311,40 +173,18 @@ int main(int argc, char *argv[])
 		  	forceretry++;
 			break;
 		case 'c':
-			if (convert != 0) {
+			convert++;
-				info("specify only one conversion type\n");
-				goto printhelp;
-			}
-			convert = CONVERT_VOLTS;
 			break;
-		case 'H':
-			if (convert != 0) {
-				info("specify only one conversion type\n");
-				goto printhelp;
-			}
-			convert = CONVERT_HEX;
-			break;
-		case 'm':
-			showmem++;
 		case 'v':
 			verb_count++;
 			break;
-		case 'X':
-			printf("%s", examplestring);
-			return 0;
-			break;
 		case 'V':
-			printf("ethstream " VERSION "\n");
+			printf("ljstream " VERSION "\n");
 			printf("Written by Jim Paris <jim@jtan.com>\n");
-			printf("and John Donnal <jdonnal@mit.edu>\n");
-			printf("and Zachary Clifford <zacharyc@mit.edu>.\n");
 			printf("This program comes with no warranty and is "
 			       "provided under the GPLv2.\n");
 			return 0;
 			break;
-		case 'i':
-			inform++;
-			break;
 		case 'h':
 			help = stdout;
 		default:
@@ -357,98 +197,31 @@ int main(int argc, char *argv[])
 		}
 	}
     
-	if (detect && labjack) {
+    if (nerdjack) {
-		info("The LabJack does not support autodetection\n");
-		goto printhelp;
-	}
-
-	if (detect && !nerdjack) {
-		info("Only the NerdJack supports autodetection - assuming -N option\n");
-		nerdjack = 1;
-	}
-
-	if (detect && addressSpecified) {
-		info("Autodetection and specifying address are mutually exclusive\n");
-		goto printhelp;
-	}
-
-	if (nerdjack && labjack) {
-		info("Nerdjack and Labjack options are mutually exclusive\n");
-		goto printhelp;
-	}
-
-	donerdjack = nerdjack;
-
-	//First if no options were supplied try the Nerdjack
-	//The second time through, donerdjack will be true and this will not fire
-	if (!nerdjack && !labjack) {
-		info("No device specified...Defaulting to Nerdjack\n");
-		donerdjack = 1;
-	}
-
- doneparse:
-
-	if (inform) {
-		//We just want information from NerdJack
-		if (!detect) {
-			if (nerd_get_version(address) < 0) {
-				info("Could not find NerdJack at specified address\n");
-			} else {
-				return 0;
-			}
-		}
-		info("Autodetecting NerdJack address\n");
-		free(address);
-		if (nerdjack_detect(address) < 0) {
-			info("Error with autodetection\n");
-			goto printhelp;
-		} else {
-			info("Found NerdJack at address: %s\n", address);
-			if (nerd_get_version(address) < 0) {
-				info("Error getting NerdJack version\n");
-				goto printhelp;
-			}
-			return 0;
-		}
-	}
-
-	if (donerdjack) {
         if (channel_count > NERDJACK_CHANNELS) {
             info("Too many channels for NerdJack\n");
             goto printhelp;
         }
         for (i = 0; i < channel_count; i++) {
             if (channel_list[i] >= NERDJACK_CHANNELS) {
-				info("Channel is out of NerdJack range: %d\n",
+                info("Channel is out of NerdJack range: %d\n",channel_list[i]);
-				     channel_list[i]);
                 goto printhelp;
             }
         }
     } else {
-		if (channel_count > UE9_MAX_CHANNEL_COUNT) {
+        if (channel_count > UE9_CHANNELS) {
             info("Too many channels for LabJack\n");
             goto printhelp;
         }
         for (i = 0; i < channel_count; i++) {
-			if (channel_list[i] > UE9_MAX_CHANNEL) {
+            if (channel_list[i] >= UE9_CHANNELS) {
-				info("Channel is out of LabJack range: %d\n",
+                info("Channel is out of LabJack range: %d\n",channel_list[i]);
-				     channel_list[i]);
                 goto printhelp;
             }
         }
     }
         
-	/* Timer requires Labjack */
-	if (timer_mode_count && !labjack) {
-		info("Can't use timers on NerdJack\n");
-		goto printhelp;
-	}
         
-	/* Individual Analog Channel Gain Set requires Labjack*/
-	if (gain_count && !labjack) {
-		info("Can't use Individual Gain Set on NerdJack\n");
-		goto printhelp;
-	}
 
 	if (optind < argc) {
 		info("error: too many arguments (%s)\n\n", argv[optind]);
@@ -469,27 +242,29 @@ int main(int argc, char *argv[])
 	if (verb_count) {
 		info("Scanning channels:");
 		for (i = 0; i < channel_count; i++)
-			info_no_timestamp(" AIN%d", channel_list[i]);
+			info(" AIN%d", channel_list[i]);
-		info_no_timestamp("\n");
+		info("\n");
 	}
 
 	/* Figure out actual rate. */
-	if (donerdjack) {
+    if (nerdjack) {
-		if (nerdjack_choose_scan(desired_rate, &actual_rate, &period) <
+        if (nerdjack_choose_scan(desired_rate, &actual_rate, &period) < 0) {
-		    0) {
+            info("error: can't achieve requested scan rate (%lf Hz)\n",
-			info("error: can't achieve requested scan rate (%lf Hz)\n", desired_rate);
+                desired_rate);
+            return 1;
         }
     } else {
         if (ue9_choose_scan(desired_rate, &actual_rate, 
                     &scanconfig, &scaninterval) < 0) {
-			info("error: can't achieve requested scan rate (%lf Hz)\n", desired_rate);
+            info("error: can't achieve requested scan rate (%lf Hz)\n",
+                desired_rate);
+            return 1;
         }
     }
     
-	if ((desired_rate != actual_rate) || verb_count) {
+
+	if ((desired_rate != actual_rate) || verb_count)
 		info("Actual scanrate is %lf Hz\n", actual_rate);
-		info("Period is %ld\n", period);
-	}
 
 	if (verb_count && lines) {
 		info("Stopping capture after %d lines\n", lines);
@@ -498,38 +273,27 @@ int main(int argc, char *argv[])
 	signal(SIGINT, handle_sig);
 	signal(SIGTERM, handle_sig);
     
-#ifdef SIGPIPE /* not on Windows */
-	/* Ignore SIGPIPE so I/O errors to the network device won't kill the process */
-	signal(SIGPIPE, SIG_IGN);
-#endif
-
     if (detect) {
         info("Autodetecting NerdJack address\n");
         free(address);
         if(nerdjack_detect(address) < 0) {
             info("Error with autodetection\n");
-			goto printhelp;
         } else {
             info("Found NerdJack at address: %s\n",address);
         }
     }
         
+
 	for (;;) {
 		int ret;
-		if (donerdjack) {
+        if(nerdjack) {
-			ret =
+            ret = nerdDoStream(address, channel_list, channel_count, precision, period, convert, lines);
-			    nerdDoStream(address, channel_list, channel_count,
-					 precision, period, convert, lines,
-					 showmem);
             verb("nerdDoStream returned %d\n", ret);
         
         } else {
             ret = doStream(address, scanconfig, scaninterval,
-				       channel_list, channel_count,
+                    channel_list, channel_count, convert,
-				       timer_mode_list, timer_value_list, 
+                    lines);
-				       timer_mode_count, timer_divisor,
-				       gain_list, gain_count,
-				       convert, lines);
             verb("doStream returned %d\n", ret);
         }
 		if (oneshot)
@@ -538,30 +302,6 @@ int main(int argc, char *argv[])
 		if (ret == 0)
 		        break;
 
-		//Neither options specified at command line and first time through.
-		//Try LabJack
-		if (ret == -ENOTCONN && donerdjack && !labjack && !nerdjack) {
-			info("Could not connect NerdJack...Trying LabJack\n");
-			donerdjack = 0;
-			goto doneparse;
-		}
-		//Neither option supplied, no address, and second time through.
-		//Try autodetection
-		if (ret == -ENOTCONN && !donerdjack && !labjack && !nerdjack
-		    && !addressSpecified) {
-			info("Could not connect LabJack...Trying to autodetect Nerdjack\n");
-			detect = 1;
-			donerdjack = 1;
-			goto doneparse;
-		}
-
-		if (ret == -ENOTCONN && nerdjack && !detect
-		    && !addressSpecified) {
-			info("Could not reach NerdJack...Trying to autodetect\n");
-			detect = 1;
-			goto doneparse;
-		}
-
 		if (ret == -ENOTCONN && !forceretry) {
 			info("Initial connection failed, giving up\n");
 			break;
@@ -581,84 +321,31 @@ int main(int argc, char *argv[])
 	return 0;
 }
 
-int
+int nerdDoStream(const char *address, int *channel_list, int channel_count, int precision, 
-nerdDoStream(const char *address, int *channel_list, int channel_count,
+            unsigned short period, int convert, int lines)
-	     int precision, unsigned long period, int convert, int lines,
-	     int showmem)
 {
 	int retval = -EAGAIN;
 	int fd_data;
 	static int first_call = 1;
-	static int started = 0;
+    char command[13];
-	static int wasreset = 0;
-	getPacket command;
-	static unsigned short currentcount = 0;
- tryagain:
 
-	//If this is the first time, set up acquisition
+	/* Open connection.  If this fails, and this is the
-	//Otherwise try to resume the previous one
+  	   first attempt, return a different error code so we give up. */
-	if (started == 0) {
-		if (nerd_generate_command
-		    (&command, channel_list, channel_count, precision,
-		     period) < 0) {
-			info("Failed to create configuration command\n");
-			goto out;
-		}
-
-		if (nerd_send_command(address, "STOP", 4) < 0) {
-			if (first_call) {
-				retval = -ENOTCONN;
-				if (verb_count)
-					info("Failed to send STOP command\n");
-			} else {
-				info("Failed to send STOP command\n");
-			}
-			goto out;
-		}
-
-		if (nerd_send_command(address, &command, sizeof(command)) < 0) {
-			info("Failed to send GET command\n");
-			goto out;
-		}
-
-	} else {
-		//If we had a transmission in progress, send a command to resume from there
-		char cmdbuf[10];
-		sprintf(cmdbuf, "SETC%05hd", currentcount);
-		retval = nerd_send_command(address, cmdbuf, strlen(cmdbuf));
-		if (retval == -4) {
-			info("NerdJack was reset\n");
-			//Assume we have not started yet, reset on this side.
-			//If this routine is retried, start over
-			printf("# NerdJack was reset here\n");
-			currentcount = 0;
-			started = 0;
-			wasreset = 1;
-			goto tryagain;
-		} else if (retval < 0) {
-			info("Failed to send SETC command\n");
-			goto out;
-		}
-	}
-
-	//The transmission has begun
-	started = 1;
-
-	/* Open connection */
 	fd_data = nerd_open(address, NERDJACK_DATA_PORT);
 	if (fd_data < 0) {
 		info("Connect failed: %s:%d\n", address, NERDJACK_DATA_PORT);
+		if (first_call)
+			retval = -ENOTCONN;
 		goto out;
 	}
+	first_call = 0;
     
-	retval = nerd_data_stream
+    if (nerd_generate_command(command, channel_list, channel_count, precision, period) < 0) {
-	    (fd_data, channel_count, channel_list, precision, convert, lines,
+        info("Failed to create configuration command\n");
-	     showmem, &currentcount, period, wasreset);
+        goto out1;
-	wasreset = 0;
-	if (retval == -3) {
-		retval = 0;
     }
-	if (retval < 0) {
+    
+    if (nerd_data_stream(fd_data, command, channel_count, channel_list, precision, convert, lines) < 0) {
         info("Failed to open data stream\n");
         goto out1;
     }
@@ -669,21 +356,14 @@ nerdDoStream(const char *address, int *channel_list, int channel_count,
  out1:
 	nerd_close_conn(fd_data);
  out:
-	//We've tried communicating, so this is not the first call anymore
-	first_call = 0;
 	return retval;
 }
 
-int
+int doStream(const char *address, uint8_t scanconfig, uint16_t scaninterval,
-doStream(const char *address, uint8_t scanconfig, uint16_t scaninterval,
+	     int *channel_list, int channel_count, int convert, int lines)
-	 int *channel_list, int channel_count, 
-	 int *timer_mode_list, int *timer_value_list,
-	 int timer_mode_count, int timer_divisor,
-	 int *gain_list, int gain_count,
-	 int convert, int lines)
 {
 	int retval = -EAGAIN;
-	//	int fd_cmd, fd_data; *these are now globals so sighandler can use them*
+	int fd_cmd, fd_data;
     int ret;
 	static int first_call = 1;
 	struct callbackInfo ci = {
@@ -720,23 +400,6 @@ doStream(const char *address, uint8_t scanconfig, uint16_t scaninterval,
 		goto out2;
 	}
 
-	/* Set timer configuration */
-	if (timer_mode_count &&
-	    ue9_timer_config(fd_cmd, timer_mode_list, timer_value_list,
-			     timer_mode_count, timer_divisor) < 0) {
-		info("Failed to set timer configuration\n");
-		goto out2;
-	}		
-
-	if (gain_count) {
-		/* Set stream configuration */
-		if (ue9_streamconfig(fd_cmd, channel_list, channel_count,
-						scanconfig, scaninterval,
-						gain_list, gain_count) < 0) {
-			info("Failed to set stream configuration\n");
-			goto out2;
-		}
-	} else 	{
 	/* Set stream configuration */
 	if (ue9_streamconfig_simple(fd_cmd, channel_list, channel_count,
 				    scanconfig, scaninterval,
@@ -744,7 +407,6 @@ doStream(const char *address, uint8_t scanconfig, uint16_t scaninterval,
 		info("Failed to set stream configuration\n");
 		goto out2;
 	}
-	}
 
 	/* Start stream */
 	if (ue9_stream_start(fd_cmd) < 0) {
@@ -753,9 +415,7 @@ doStream(const char *address, uint8_t scanconfig, uint16_t scaninterval,
 	}
 
 	/* Stream data */
-	ue9_running = 1;
+	ret = ue9_stream_data(fd_data, channel_count, data_callback, (void *)&ci);
-	ret =
-	    ue9_stream_data(fd_data, channel_count, channel_list, gain_count, gain_list, data_callback, (void *)&ci);
 	if (ret < 0) {
 		info("Data stream failed with error %d\n", ret);
 		goto out3;
@@ -773,11 +433,10 @@ doStream(const char *address, uint8_t scanconfig, uint16_t scaninterval,
  out1:
 	ue9_close(fd_cmd);
  out:
-	ue9_running = 0;
 	return retval;
 }
 
-int data_callback(int channels, int *channel_list, int gain_count, int *gain_list, uint16_t * data, void *context)
+int data_callback(int channels, uint16_t *data, void *context)
 {
 	int i;
 	struct callbackInfo *ci = (struct callbackInfo *)context;
@@ -785,43 +444,17 @@ int data_callback(int channels, int *channel_list, int gain_count, int *gain_lis
 
 	columns_left = channels;
 	for (i = 0; i < channels; i++) {
-		if (ci->convert == CONVERT_VOLTS &&
+		if (ci->convert)
-		    channel_list[i] <= UE9_MAX_ANALOG_CHANNEL) {
+			printf("%lf", ue9_binary_to_analog(
-			/* CONVERT_VOLTS */
+				       &ci->calib, UE9_BIPOLAR_GAIN1, 12, 
-			if (i < gain_count)
+				       data[i]));
-			{
+		else
-				if (printf("%lf", ue9_binary_to_analog(
+			printf("%d", data[i]);
-						   &ci->calib, gain_list[i],
-						   12, data[i])) < 0)
-					goto bad;
-			} else {
-				if (printf("%lf", ue9_binary_to_analog(
-						   &ci->calib, 0,
-						   12, data[i])) < 0)
-					goto bad;
-			}
-		} else if (ci->convert == CONVERT_VOLTS &&
-			   (channel_list[i] == 141 || channel_list[i] == 133)) {
-			/* CONVERT_VOLTS but output temperature */
-			if (printf("%lf", ue9_binary_to_temperature(
-					   &ci->calib, data[i])) < 0)
-				goto bad;
-		} else if (ci->convert == CONVERT_HEX) {
-			/* CONVERT_HEX */
-			if (printf("%04X", data[i]) < 0)
-				goto bad;
-		} else {
-			/* CONVERT_DEC */
-			if (printf("%d", data[i]) < 0)
-				goto bad;
-		}
 		columns_left--;
 		if (i < (channels - 1)) {
-			if (ci->convert != CONVERT_HEX && putchar(' ') < 0)
+			putchar(' ');
-				goto bad;
 		} else {
-			if (putchar('\n') < 0)
+			putchar('\n');
-				goto bad;
 			lines++;
 			if (ci->maxlines && lines >= ci->maxlines)
 				return -1;
@@ -829,8 +462,4 @@ int data_callback(int channels, int *channel_list, int gain_count, int *gain_lis
 	}
 	
 	return 0;
-
- bad:
-	info("Output error (disk full?)\n");
-	return -3;
 }

ethstream.h

@@ -1,10 +0,0 @@
-#ifndef ETHSTREAM_H
-#define ETHSTREAM_H
-
-#define CONVERT_DEC 0
-#define CONVERT_VOLTS 1
-#define CONVERT_HEX 2
-
-#define TIMEOUT 5		/* Timeout for connect/send/recv, in seconds */
-
-#endif

example.inc

@@ -1,106 +0,0 @@
-
-char examplestring[] = "\n\
-\n\
-    Welcome to the NILM Ethstream examples.\n\
-\n\
-For the most part, typing \"ethstream\" by itself will sample the first\n\
-two channels at 8 kHz on 10V range.  Press CTRL-C to terminate sampling.\n\
-\n\
-If you want current measurements on the first two phases of NILM\n\
-with default sample rate of 8 kHz and 10V range:\n\
-\n\
-   ethstream -C 0,3\n\
-\n\
-The device is configured so that channels 0 through 2 are currents for\n\
-the three phases and channels 3-5 are for voltages of the three phases.\n\
-The current channels sample voltages that will depend on the DIP switch\n\
-settings in the NILM box.  The DIP switch positions allow you to convert\n\
-ethstream's readings to true current readings.\n\
-\n\
-If you want only currents at 16 kHz and 10V range:\n\
-\n\
-    ethstream -n 3 -r 16000\n\
-\n\
-The -n option samples a number of channels starting at 0. The rate can be\n\
-at least 16000 if 12 channels are sampled , but it can do more if\n\
-fewer channels are sampled.  The limiting factor is the highest channel\n\
-sampled.  Sampling just the top channel (11) is as bad as sampling\n\
-all 12 at once.\n\
-Ethstream will warn if you approach the limits of the NerdJack with the\n\
-given sampled channels.  Sampling outside the range of the NerdJack might\n\
-result in corrupt data or crashing of the device.  There will be no\n\
-permanent damage to NILM or NerdJack, but be aware of the possibility of\n\
-data corruption.\n\
-\n\
-If you need a higher accuracy but lower range measurement on the voltages:\n\
-\n\
-    ethstream -R 5,10 -C 3,4,5\n\
-\n\
-The two numbers to the R command set the range to either 5V or 10V. Above,\n\
-we are setting channels 0-5 to 5 V range and channels 6-11 to 10 V range.\n\
-Channels 6-11 are unconnected, but they can have range set independently.\n\
-\n\
-All of the above examples output a digital number from 0 to 65535 with\n\
-65535 representing the highest range (5V or 10V).  0 represents the most\n\
-negative range (-5V or -10V).  If you want conversion\n\
-to volts for all six voltages and currents:\n\
-\n\
-    ethstream -c -C 0,3,1,4,2,5\n\
-\n\
-The channels will be output in the order given in the C command.  This\n\
-command will group the current and voltage data by phase.\n\
-\n\
-If you are supplying data from ethstream to another program, you might\n\
-want to dump its output to a file and terminate after a certain number of\n\
-samples:\n\
-\n\
-    ethstream -n 6 -r 8000 - l 16000 > outfile.dat\n\
-\n\
-This will take 16000 samples at 8 kHz (2 seconds of acquisition) of all\n\
-channels and write the data to outfile.dat.  This can be directly read\n\
-by a package like MATLAB.\n\
-\n\
-If there are multiple NerdJacks or you have changed the TCP/IP settings\n\
-from default, you might have to specify which one you want to talk to:\n\
-\n\
-    ethstream -a 192.168.1.210\n\
-\n\
-This will sample two channels at 8 kHz from the NerdJack at 192.168.1.210.\n\
-This is the default \"1\" setting on the NerdJack.  If no address is\n\
-specified, ethstream connects first to 192.168.1.209.  It then tries\n\
-to autodetect the NerdJack.  This should find the device if you are on\n\
-the same network, but it will get confused if there are multiple NerdJacks\n\
-on the network.\n\
-\n\
-Labjack only Timer modes are also avaliable.  Read the Labjack UE9 Users Guide\n\
-for more information.  Upto 6 timers of various modes can be specified,\n\
-they occur on FIO0-FIO5 which are on channels 200-205 respectively in order\n\
-of specification.  For 32 bit timer modes, the MSW should be read from\n\
-channel 224 imeadiately after the LSW is read from one the timer channel.\n\
-A clock frequency divisor is specified on a per device basis.  For example:\n\
-\n\
-    ethstream -t 4,12 -T 1 -C 200,224,201\n\
-\n\
-This will enable two timers with the fastest system clock divisor (48 MhZ/1)\n\
-and read the two 16 bit words for timer mode 4 and the single 16 bit word of\n\
-timer mode 12.  These three words will occupy their own columns in the output\n\
-stream.  Digital timer mode channels can be interspersed with analog inouts.\n\
-\n\
-Labjack only individual analog input channel gain set is also avaliable.\n\
-Gain 0 is default on labjack and corresponds to -5.18v to +5.07v.  Gain 1 is\n\
-is -0.01 to +5.07v.  Gain 2 is -0.01 to +2.53v.  Gain 4 is -0.01 to +1.26v.\n\
-Gain 8 is -0.01 to +0.62v.  Gains on the -g flag should be put in the desired\n\
-order corresponding to the channels as specified by the -C flag.  If there are\n\
-less gains specified than channels the remainder default to gain 0.  Extra gains\n\
-are ignored.  Gains can be specified for digital inputs or timer modes but they\n\
-are irrelevant.  A case where one should do this is if there are dital input\n\
-channels intersperced within analog input channels; this keeps the order matched\n\
-up so later analog input channels have the expected gain.\n\
-\n\
-    ethstream -t 4 -T 1 -C 0,1,200,224,2,3 -g 2,2,0,0,4,4 -c\n\
-\n\
-This will set channles 0,1 and 2,3 to gain 2,2 and 4,4, respectively and convert\n\
-the data to volts using the firmware stored factory calibrated data on the\n\
-labjack. The digital channels 200 and 224 will remain undisturbed as integers.\n\
-\n\
-";

ljconfig.c

@@ -0,0 +1,98 @@
+/*
+ * Labjack Tools
+ * Copyright (c) 2003-2007 Jim Paris <jim@jtan.com>
+ *
+ * This is free software; you can redistribute it and/or modify it and
+ * it is provided under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation; see COPYING.
+ */
+
+/* ljconfig: display/change comm/control processor configuration */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include "debug.h"
+#include "ue9.h"
+#include "ue9error.h"
+#include "opt.h"
+#include "version.h"
+
+#define DEFAULT_HOST "192.168.1.209"
+#define UE9_COMMAND_PORT 52360
+
+struct options opt[] = {
+	{ 'a', "address", "string", "host/address of UE9 (192.168.1.209)" },
+	{ 'h', "help", NULL, "this help" },
+	{ 'v', "verbose", NULL, "be verbose" },
+	{ 'V', "version", NULL, "show version number and exit" },
+	{ 0, NULL, NULL, NULL }
+};
+
+int main(int argc, char *argv[])
+{
+	int optind;
+	char *optarg;
+	char c;
+	FILE *help = stderr;
+	char *address = strdup(DEFAULT_HOST);
+	int fd;
+	int ret;
+
+	/* Parse arguments */
+	opt_init(&optind);
+	while ((c = opt_parse(argc, argv, &optind, &optarg, opt)) != 0) {
+		switch (c) {
+		case 'a':
+			free(address);
+			address = strdup(optarg);
+			break;
+		case 'v':
+			verb_count++;
+			break;
+		case 'V':
+			printf("ljconfig " VERSION "\n");
+			printf("Written by Jim Paris <jim@jtan.com>\n");
+			printf("This program comes with no warranty and is "
+			       "provided under the GPLv2.\n");
+			return 0;
+			break;
+		case 'h':
+			help = stdout;
+		default:
+		printhelp:
+			fprintf(help, "Usage: %s [options]\n", *argv);
+			opt_help(opt, help);
+			fprintf(help, "Displays/changes Labjack UE9 config.\n");
+			return (help == stdout) ? 0 : 1;
+		}
+	}
+
+	if(optind<argc) {
+		info("Error: too many arguments (%s)\n\n", argv[optind]);
+		goto printhelp;
+	}
+	
+	ret = 1;
+
+	/* Open */
+	fd = ue9_open(address, UE9_COMMAND_PORT);
+	if (fd < 0) {
+		info("Connect failed: %s:%d\n", address, UE9_COMMAND_PORT);
+		goto out0;
+	}
+
+	goto out1;
+	
+	
+	ret = 0;
+ out1:
+	/* Close */
+	ue9_close(fd);
+ out0:
+	return ret;
+}
+

ljtest.c

@@ -0,0 +1,67 @@
+/*
+ * Labjack Tools
+ * Copyright (c) 2003-2007 Jim Paris <jim@jtan.com>
+ *
+ * This is free software; you can redistribute it and/or modify it and
+ * it is provided under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation; see COPYING.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include "debug.h"
+#include "ue9.h"
+#include "compat.h"
+
+int main(int argc, char *argv[])
+{
+	int fd_cmd;
+	struct ue9Calibration calib;
+
+	verb_count = 2;
+
+	fd_cmd = ue9_open("192.168.1.209", 52360);
+	if (fd_cmd < 0) {
+		fprintf(stderr, "ue9_open: %s\n",
+			compat_strerror(errno));
+		return 1;
+	}
+
+	if (ue9_get_calibration(fd_cmd, &calib) < 0) {
+		fprintf(stderr, "ue9_get_calibration: %s\n", 
+			compat_strerror(errno));
+		return 1;
+	}
+
+	printf("double unipolarSlope[0] = %lf\n", calib.unipolarSlope[0]);
+	printf("double unipolarSlope[1] = %lf\n", calib.unipolarSlope[1]);
+	printf("double unipolarSlope[2] = %lf\n", calib.unipolarSlope[2]);
+	printf("double unipolarSlope[3] = %lf\n", calib.unipolarSlope[3]);
+	printf("double unipolarOffset[0] = %lf\n", calib.unipolarOffset[0]);
+	printf("double unipolarOffset[1] = %lf\n", calib.unipolarOffset[1]);
+	printf("double unipolarOffset[2] = %lf\n", calib.unipolarOffset[2]);
+	printf("double unipolarOffset[3] = %lf\n", calib.unipolarOffset[3]);
+	printf("double bipolarSlope = %lf\n", calib.bipolarSlope);
+	printf("double bipolarOffset = %lf\n", calib.bipolarOffset);
+	printf("double DACSlope[0] = %lf\n", calib.DACSlope[0]);
+	printf("double DACSlope[1] = %lf\n", calib.DACSlope[1]);
+	printf("double DACOffset[0] = %lf\n", calib.DACOffset[0]);
+	printf("double DACOffset[1] = %lf\n", calib.DACOffset[1]);
+	printf("double tempSlope = %lf\n", calib.tempSlope);
+	printf("double tempSlopeLow = %lf\n", calib.tempSlopeLow);
+	printf("double calTemp = %lf\n", calib.calTemp);
+	printf("double Vref = %lf\n", calib.Vref);
+	printf("double VrefDiv2 = %lf\n", calib.VrefDiv2);
+	printf("double VsSlope = %lf\n", calib.VsSlope);
+	printf("double hiResUnipolarSlope = %lf\n", calib.hiResUnipolarSlope);
+	printf("double hiResUnipolarOffset = %lf\n", calib.hiResUnipolarOffset);
+	printf("double hiResBipolarSlope = %lf\n", calib.hiResBipolarSlope);
+	printf("double hiResBipolarOffset = %lf\n", calib.hiResBipolarOffset);
+
+	ue9_close(fd_cmd);
+
+	return 0;
+}

nerdjack.c

@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
-
+#include <sys/types.h>
 #include <math.h>
 
 #include "netutil.h"
@@ -23,48 +23,15 @@
 #include "nerdjack.h"
 #include "util.h"
 #include "netutil.h"
-#include "ethstream.h"
 
-#define NERD_HEADER_SIZE 8
+#define NERDJACK_TIMEOUT 5   /* Timeout for connect/send/recv, in seconds */
-#define MAX_SOCKETS 32
-
-typedef struct __attribute__ ((__packed__)) {
-	unsigned char headerone;
-	unsigned char headertwo;
-	unsigned short packetNumber;
-	unsigned short adcused;
-	unsigned short packetsready;
-	signed short data[NERDJACK_NUM_SAMPLES];
-} dataPacket;
-
-struct discovered_socket {
-	int sock;
-	uint32_t local_ip;
-	uint32_t subnet_mask;
-};
-
-struct discover_t {
-	struct discovered_socket socks[MAX_SOCKETS];
-	unsigned int sock_count;
-};
 
 /* Choose the best ScanConfig and ScanInterval parameters for the
    desired scanrate.  Returns -1 if no valid config found */
-int
+int nerdjack_choose_scan(double desired_rate, double *actual_rate, int *period)
-nerdjack_choose_scan(double desired_rate, double *actual_rate,
-		     unsigned long *period)
 {
-	//The ffffe is because of a silicon bug.  The last bit is unusable in all
+    
-	//devices so far.  It is worked around on the chip, but giving it exactly
+	*period = round((double) NERDJACK_CLOCK_RATE / desired_rate);
-	//0xfffff would cause the workaround code to roll over.
-	*period = floor((double)NERDJACK_CLOCK_RATE / desired_rate);
-	if (*period > 0x0ffffe) {
-		info("Cannot sample that slowly\n");
-		*actual_rate = (double)NERDJACK_CLOCK_RATE / (double)0x0ffffe;
-		*period = 0x0ffffe;
-		return -1;
-	}
-	//Period holds the period register for the NerdJack, so it needs to be right
     * actual_rate = (double) NERDJACK_CLOCK_RATE / (double) *period;
 	if(*actual_rate != desired_rate) {
 		return -1;
@@ -72,195 +39,44 @@ nerdjack_choose_scan(double desired_rate, double *actual_rate,
     return 0;
 }
 
-/**
+int nerdjack_detect(char * ipAddress) {
-* Create a discovered socket and add it to the socket list structure.
+   int32_t sock, receivesock;
-* All sockets in the structure should be created, bound, and ready for broadcasting
-*/
-static int discovered_sock_create(struct discover_t *ds, uint32_t local_ip,
-				  uint32_t subnet_mask)
-{
-	if (ds->sock_count >= MAX_SOCKETS) {
-		return 0;
-	}
-
-	/* Create socket. */
-	int sock = (int)socket(AF_INET, SOCK_DGRAM, 0);
-	if (sock == -1) {
-		return 0;
-	}
-
-	/* Allow broadcast. */
-	int sock_opt = 1;
-	setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (char *)&sock_opt,
-		   sizeof(sock_opt));
-
-	/* Set nonblocking */
-	if (soblock(sock, 0) < 0) {
-		verb("can't set nonblocking\n");
-		close(sock);
-		return 0;
-	}
-
-	/* Bind socket. */
-	struct sockaddr_in sock_addr;
-	memset(&sock_addr, 0, sizeof(sock_addr));
-	sock_addr.sin_family = AF_INET;
-	sock_addr.sin_addr.s_addr = htonl(local_ip);
-	sock_addr.sin_port = htons(0);
-	if (bind(sock, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) != 0) {
-		close(sock);
-		return 0;
-	}
-
-	/* Write sock entry. */
-	struct discovered_socket *dss = &ds->socks[ds->sock_count++];
-	dss->sock = sock;
-	dss->local_ip = local_ip;
-	dss->subnet_mask = subnet_mask;
-
-	return 1;
-}
-
-/**
- * Enumerate all interfaces we can find and open sockets on each
- */
-#if defined(USE_IPHLPAPI)
-static void enumerate_interfaces(struct discover_t *ds)
-{
-	PIP_ADAPTER_INFO pAdapterInfo =
-	    (IP_ADAPTER_INFO *) malloc(sizeof(IP_ADAPTER_INFO));
-	ULONG ulOutBufLen = sizeof(IP_ADAPTER_INFO);
-
-	DWORD Ret = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen);
-	if (Ret != NO_ERROR) {
-		free(pAdapterInfo);
-		if (Ret != ERROR_BUFFER_OVERFLOW) {
-			return;
-		}
-		pAdapterInfo = (IP_ADAPTER_INFO *) malloc(ulOutBufLen);
-		Ret = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen);
-		if (Ret != NO_ERROR) {
-			free(pAdapterInfo);
-			return;
-		}
-	}
-
-	PIP_ADAPTER_INFO pAdapter = pAdapterInfo;
-	while (pAdapter) {
-		IP_ADDR_STRING *pIPAddr = &pAdapter->IpAddressList;
-		while (pIPAddr) {
-			uint32_t local_ip =
-			    ntohl(inet_addr(pIPAddr->IpAddress.String));
-			uint32_t mask =
-			    ntohl(inet_addr(pIPAddr->IpMask.String));
-
-			if (local_ip == 0) {
-				pIPAddr = pIPAddr->Next;
-				continue;
-			}
-
-			discovered_sock_create(ds, local_ip, mask);
-			pIPAddr = pIPAddr->Next;
-		}
-
-		pAdapter = pAdapter->Next;
-	}
-
-	free(pAdapterInfo);
-}
-
-#else
-static void enumerate_interfaces(struct discover_t *ds)
-{
-	int fd = socket(AF_INET, SOCK_DGRAM, 0);
-	if (fd == -1) {
-		return;
-	}
-
-	struct ifconf ifc;
-	uint8_t buf[8192];
-	ifc.ifc_len = sizeof(buf);
-	ifc.ifc_buf = (char *)buf;
-
-	memset(buf, 0, sizeof(buf));
-
-	if (ioctl(fd, SIOCGIFCONF, &ifc) != 0) {
-		close(fd);
-		return;
-	}
-
-	uint8_t *ptr = (uint8_t *) ifc.ifc_req;
-	uint8_t *end = (uint8_t *) & ifc.ifc_buf[ifc.ifc_len];
-
-	while (ptr <= end) {
-		struct ifreq *ifr = (struct ifreq *)ptr;
-		ptr += _SIZEOF_ADDR_IFREQ(*ifr);
-
-		if (ioctl(fd, SIOCGIFADDR, ifr) != 0) {
-			continue;
-		}
-		struct sockaddr_in *addr_in =
-		    (struct sockaddr_in *)&(ifr->ifr_addr);
-		uint32_t local_ip = ntohl(addr_in->sin_addr.s_addr);
-		if (local_ip == 0) {
-			continue;
-		}
-
-		if (ioctl(fd, SIOCGIFNETMASK, ifr) != 0) {
-			continue;
-		}
-
-		struct sockaddr_in *mask_in =
-		    (struct sockaddr_in *)&(ifr->ifr_addr);
-		uint32_t mask = ntohl(mask_in->sin_addr.s_addr);
-
-		discovered_sock_create(ds, local_ip, mask);
-	}
-}
-#endif
-/**
- * Close all sockets previously enumerated and free the struct
- */
-static void destroy_socks(struct discover_t *ds)
-{
-	unsigned int i;
-	for (i = 0; i < ds->sock_count; i++) {
-		struct discovered_socket *dss = &ds->socks[i];
-		close(dss->sock);
-	}
-
-	free(ds);
-}
-
-/* Perform autodetection.  Returns 0 on success, -1 on error
- * Sets ipAddress to the detected address
- */
-int nerdjack_detect(char *ipAddress)
-{
-	int32_t receivesock;
    struct sockaddr_in sa, receiveaddr, sFromAddr;
-	int buffer_length;
+   int bytes_sent, buffer_length;
    char buffer[200];
    char incomingData[10];
-	socklen_t lFromLen;
+   unsigned int lFromLen;
 
    sprintf(buffer, "TEST");
    buffer_length = strlen(buffer) + 1;
    
    net_init();
 
+   sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
    receivesock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
    
+   	/* Set nonblocking */
+   if (soblock(sock, 0) < 0) {
+      verb("can't set nonblocking\n");
+      return -1;
+   }
+   
     /* Set nonblocking */
    if (soblock(receivesock, 0) < 0) {
       verb("can't set nonblocking\n");
       return -1;
    }
 
-	if (-1 == receivesock) {	/* if socket failed to initialize, exit */
+
-		verb("Error Creating Socket\n");
+   int opt = 1;
+   setsockopt(sock,SOL_SOCKET,SO_BROADCAST,(void *) &opt,sizeof(int));
+   
+   if((-1 == sock) || (-1 == receivesock)) /* if socket failed to initialize, exit */
+   {
+      printf("Error Creating Socket\n");
       return -1;
    }
+
    //Setup family for both sockets
    sa.sin_family = PF_INET;
    receiveaddr.sin_family = PF_INET;
@@ -269,50 +85,23 @@ int nerdjack_detect(char *ipAddress)
    receiveaddr.sin_port = htons(NERDJACK_UDP_RECEIVE_PORT);
    sa.sin_port = htons(NERDJACK_DATA_PORT);
    
-	//Receive from any IP address
+   //Receive from any IP address, Will send to broadcast
    receiveaddr.sin_addr.s_addr = INADDR_ANY;
+   sa.sin_addr.s_addr = INADDR_BROADCAST;
 
-	bind(receivesock, (struct sockaddr *)&receiveaddr,
+   bind(receivesock,(struct sockaddr*) &receiveaddr, sizeof(struct sockaddr_in));
-	     sizeof(struct sockaddr_in));
 
-	struct discover_t *ds =
+   bytes_sent = sendto(sock, buffer, buffer_length, 0,(struct sockaddr*) &sa, sizeof(struct sockaddr_in) );
-	    (struct discover_t *)calloc(1, sizeof(struct discover_t));
+   if(bytes_sent < 0) {
-	if (!ds) {
+     printf("Error sending packet: %s\n", strerror(errno) );
 	 return -1;
 	}
 
-	/* Create a routable broadcast socket. */
-	if (!discovered_sock_create(ds, 0, 0)) {
-		free(ds);
-		return -1;
-	}
-
-	/* Detect & create local sockets. */
-	enumerate_interfaces(ds);
-
-	/*
-	 * Send subnet broadcast using each local ip socket.
-	 * This will work with multiple separate 169.254.x.x interfaces.
-	 */
-	unsigned int i;
-	for (i = 0; i < ds->sock_count; i++) {
-		struct discovered_socket *dss = &ds->socks[i];
-		uint32_t target_ip = dss->local_ip | ~dss->subnet_mask;
-		sa.sin_addr.s_addr = htonl(target_ip);
-		sendto(dss->sock, buffer, buffer_length, 0,
-		       (struct sockaddr *)&sa, sizeof(struct sockaddr_in));
-	}
-
-	destroy_socks(ds);
-
    lFromLen = sizeof(sFromAddr);
    
-	if (0 >
+   if(0 > recvfrom_timeout(receivesock, incomingData, sizeof(incomingData),0,(struct sockaddr *) &sFromAddr, &lFromLen,
-	    recvfrom_timeout(receivesock, incomingData, sizeof(incomingData), 0,
+                    & (struct timeval) { .tv_sec = NERDJACK_TIMEOUT })) {
-			     (struct sockaddr *)&sFromAddr, &lFromLen,
+    
-			     &(struct timeval) {
-			     .tv_sec = TIMEOUT})) {
-		close(receivesock);
         return -1;
     }
    
@@ -321,293 +110,190 @@ int nerdjack_detect(char *ipAddress)
    //It isn't ipv6 friendly, but inet_ntop isn't on Windows...
    strcpy(ipAddress, inet_ntoa(sFromAddr.sin_addr));
 
+   close(sock); /* close the socket */
    close(receivesock);
    return 0;
 }
 
- /*
+typedef struct {
-  * Get the NerdJack version string and print it
+int numCopies;
-  */
+int * destlist;
-int nerd_get_version(const char *address)
+} deststruct;
+
+int nerd_data_stream(int data_fd, char * command, int numChannels, int *channel_list, int precision, int convert, int lines)
 {
-	int ret, fd_command;
+	unsigned char buf[NERDJACK_PACKET_SIZE];
-	char buf[200];
-	fd_command = nerd_open(address, NERDJACK_COMMAND_PORT);
-	if (fd_command < 0) {
-		info("Connect failed: %s:%d\n", address, NERDJACK_COMMAND_PORT);
-		return -2;
-	}
 
-	/* Send request */
+	//int numGroups = NERDJACK_NUM_SAMPLES / numChannels;
-	ret = send_all_timeout(fd_command, "VERS", 4, 0, &(struct timeval) {
-			       .tv_sec = TIMEOUT});
-	if (ret < 0) {
-		verb("short send %d\n", (int)ret);
-		return -1;
-	}
 
-	ret = recv_all_timeout(fd_command, buf, 200, 0, &(struct timeval) {
+    int index = 0;
-			       .tv_sec = TIMEOUT});
+    //int totalread = 0;
-
+    int ret = 0;
-	nerd_close_conn(fd_command);
+    int alignment = 0;
-
-	if (ret < 0) {
-		verb("Error receiving command\n");
-		return -1;
-	}
-	//Slice off the "OK" from the string
-	buf[strlen(buf) - 2] = '\0';
-
-	printf("%s\n", buf);
-
-	return 0;
-}
-
-/* Send the given command to address.  The command should be something
- * of the specified length.  This expects the NerdJack to reply with OK
- * or NO
- */
-int nerd_send_command(const char *address, void *command, int length)
-{
-	int ret, fd_command;
-	char buf[3];
-	fd_command = nerd_open(address, NERDJACK_COMMAND_PORT);
-	if (fd_command < 0) {
-		info("Connect failed: %s:%d\n", address, NERDJACK_COMMAND_PORT);
-		return -2;
-	}
-
-	/* Send request */
-	ret = send_all_timeout(fd_command, command, length, 0, &(struct timeval) {
-			       .tv_sec = TIMEOUT});
-	if (ret < 0 || ret != length) {
-		verb("short send %d\n", (int)ret);
-		return -1;
-	}
-
-	ret = recv_all_timeout(fd_command, buf, 3, 0, &(struct timeval) {
-			       .tv_sec = TIMEOUT});
-
-	nerd_close_conn(fd_command);
-
-	if (ret < 0 || ret != 3) {
-		verb("Error receiving OK for command\n");
-		return -1;
-	}
-
-	if (0 != strcmp("OK", buf)) {
-		verb("Did not receive OK.  Received %s\n", buf);
-		return -4;
-	}
-
-	return 0;
-}
-
-int
-nerd_data_stream(int data_fd, int numChannels, int *channel_list,
-		 int precision, int convert, int lines, int showmem,
-		 unsigned short *currentcount, unsigned int period,
-		 int wasreset)
-{
-	//Variables that should persist across retries
-	static dataPacket buf;
-	static int linesleft = 0;
-	static int linesdumped = 0;
-
-	//Variables essential to packet processing
     signed short datapoint = 0;
-	int i;
+    signed short dataline[NERDJACK_CHANNELS];
-
+    long double voltline[NERDJACK_CHANNELS];
-	int numChannelsSampled = channel_list[0] + 1;
+    deststruct destination[NERDJACK_CHANNELS];
-
+    int tempdestlist[NERDJACK_CHANNELS];
-	//The number sampled will be the highest channel requested plus 1
+    unsigned short currentcount = 0;
-	//(i.e. channel 0 requested means 1 sampled)
+    unsigned long memused = 0;
-	for (i = 0; i < numChannels; i++) {
-		if (channel_list[i] + 1 > numChannelsSampled)
-			numChannelsSampled = channel_list[i] + 1;
-	}
-
-	double voltline[numChannels];
-
-	unsigned short dataline[numChannels];
-
 	unsigned short packetsready = 0;
 	unsigned short adcused = 0;
 	unsigned short tempshort = 0;
     int charsread = 0;
+    int charsleft = 0;
+    int additionalread = 0;
+    int linesleft = lines;
 
-	int numgroupsProcessed = 0;
+	int numgroups = 0;
-	double volts;
+	long double volts;
     
-	//The timeout should be the expected time plus 60 seconds
+    int channels_left = numChannels;
-	//This permits slower speeds to work properly
+    int channelprocessing = 0;
-	unsigned int expectedtimeout =
+    int currentalign = 0; //Index into sampled channels
-	    (period * NERDJACK_NUM_SAMPLES / NERDJACK_CLOCK_RATE) + 60;
+    int i;
+    int numDuplicates = 0;
     
-	//Check to see if we're trying to resume
+    //Loop through channel_list until all channels recognized
-	//Don't blow away linesleft in that case
+    //start with channelprocessing = 0 and increment through channels.
-	if (lines != 0 && linesleft == 0) {
+    //If a channel is found in the list set it up appropriately.
-		linesleft = lines;
+    do {
+        //numduplicates = 0;
+        destination[currentalign].numCopies = 0;
+        for(i = 0; i < numChannels; i++) {
+            if(channelprocessing == channel_list[i]) {
+                //destination[currentalign] = i;
+                tempdestlist[destination[currentalign].numCopies] = i;
+                if(destination[currentalign].numCopies > 0) {
+                    numDuplicates++;
                 }
-	//If there was a reset, we still need to dump a line because of faulty PDCA start
+                destination[currentalign].numCopies++;
-	if (wasreset) {
+                //currentalign++;
-		linesdumped = 0;
+                channels_left--;
-	}
+                //break;
-	//If this is the first time called, warn the user if we're too fast
-	if (linesdumped == 0) {
-		if (period < (numChannelsSampled * 200 + 600)) {
-			info("You are sampling close to the limit of NerdJack\n");
-			info("Sample fewer channels or sample slower\n");
             }
         }
-	//Now destination structure array is set as well as numDuplicates.
         
-	int totalGroups = NERDJACK_NUM_SAMPLES / numChannelsSampled;
+        if(destination[currentalign].numCopies > 0) {
+            destination[currentalign].destlist = malloc( destination[currentalign].numCopies * sizeof(int) );
+            memcpy(destination[currentalign].destlist, tempdestlist, destination[currentalign].numCopies * sizeof(int));
+            currentalign++;
+        }
+        channelprocessing++;
+    } while(channels_left > 0);
+    
+    
+    int numChannelsSampled = numChannels - numDuplicates;
+    int numGroups = NERDJACK_NUM_SAMPLES / numChannelsSampled;
+
+    /* Send request */
+	ret = send_all_timeout(data_fd, command, strlen(command), 0, 
+			       & (struct timeval) { .tv_sec = NERDJACK_TIMEOUT });
+	if (ret < 0 || ret != strlen(command)) {
+		verb("short send %d\n", (int)ret);
+		return -1;
+	}
 
 	//Loop forever to grab data
-	while ((charsread =
+    while((charsread = recv_all_timeout(data_fd,buf,NERDJACK_PACKET_SIZE,0,
-		recv_all_timeout(data_fd, &buf, NERDJACK_PACKET_SIZE, 0,
+           & (struct timeval) { .tv_sec = NERDJACK_TIMEOUT }))){
-				 &(struct timeval) {
-				 .tv_sec = expectedtimeout}))) {
 
+		//We want a complete packet, so take the chars so far and keep waiting
 		if(charsread != NERDJACK_PACKET_SIZE) {
-			//There was a problem getting data.  Probably a closed
+			charsleft = NERDJACK_PACKET_SIZE - charsread;
-			//connection.
+			while(charsleft != 0){
-			info("Packet timed out or was too short\n");
+				additionalread = recv_all_timeout(data_fd,buf+charsread,charsleft,0,
-			return -2;
+                     & (struct timeval) { .tv_sec = NERDJACK_TIMEOUT });
+				charsread = charsread + additionalread;
+				charsleft = NERDJACK_PACKET_SIZE - charsread;
 			}
+		}
+
 		//First check the header info
-		if (buf.headerone != 0xF0 || buf.headertwo != 0xAA) {
+		if(buf[0] != 0xF0 || buf[1] != 0xAA) {
-			info("No Header info\n");
+			printf("No Header info\n");
 			return -1;
 		}
+
 		//Check counter info to make sure not out of order
-		tempshort = ntohs(buf.packetNumber);
+		tempshort = (buf[2] << 8) | buf[3];
-		if (tempshort != *currentcount) {
+		if(tempshort != currentcount ){
-			info("Count wrong. Expected %hd but got %hd\n",
+			printf("Count wrong. Expected %hd but got %hd\n", currentcount, tempshort);
-			     *currentcount, tempshort);
 			return -1;
 		}
+        
         //Increment number of packets received
-		*currentcount = *currentcount + 1;
+		currentcount++;
         
-		adcused = ntohs(buf.adcused);
+        //Process the rest of the header and update the index value to be pointing after it
-		packetsready = ntohs(buf.packetsready);
+		index = 12;
-		numgroupsProcessed = 0;
+		memused = (buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | (buf[7]);
+		adcused = (buf[8] << 8) | (buf[9]);
+		packetsready = (buf[10] << 8) | (buf[11]);
+		alignment = 0;
+		numgroups = 0;
         
-		if (showmem) {
-			printf("%hd %hd\n", adcused, packetsready);
-			continue;
-		}
         //While there is still more data in the packet, process it
-		while (numgroupsProcessed < totalGroups) {
+		while(charsread > index) {
-			//Poison the data structure
+			datapoint = (buf[index] << 8 | buf[index+1]);
-			switch (convert) {
+            if(convert) {
-			case CONVERT_VOLTS:
+				if(alignment <= 5) {
-				memset(voltline, 0,
+					volts = (long double) ( datapoint / 32767.0 ) * ((precision & 0x01) ? 5.0 : 10.0);
-				       numChannels * sizeof(double));
-				break;
-			default:
-			case CONVERT_HEX:
-			case CONVERT_DEC:
-				memset(dataline, 0,
-				       numChannels * sizeof(unsigned char));
-			}
-
-			//Read in each group
-			for (i = 0; i < numChannels; i++) {
-				//Get the datapoint associated with the desired channel
-				datapoint =
-				    ntohs(buf.data[channel_list[i] +
-						   numgroupsProcessed *
-						   numChannelsSampled]);
-
-				//Place it into the line
-				switch (convert) {
-				case CONVERT_VOLTS:
-					if (channel_list[i] <= 5) {
-						volts =
-						    (double)(datapoint /
-							     32767.0) *
-						    ((precision & 0x01) ? 5.0 :
-						     10.0);
 				} else {
-						volts =
+					volts = (long double) (datapoint / 32767.0 ) * ((precision & 0x02) ? 5.0 : 10.0);
-						    (double)(datapoint /
-							     32767.0) *
-						    ((precision & 0x02) ? 5.0 :
-						     10.0);
 				}
-					voltline[i] = volts;
+                for(i = 0; i < destination[alignment].numCopies; i++) {
-					break;
+                    voltline[destination[alignment].destlist[i]] = volts;
-				default:
+                }
-				case CONVERT_HEX:
+			} else {
-				case CONVERT_DEC:
+                for(i = 0; i < destination[alignment].numCopies; i++) {
-					dataline[i] =
+                    dataline[destination[alignment].destlist[i]] = datapoint;
-					    (unsigned short)(datapoint -
-							     INT16_MIN);
-					break;
                 }
 			}
-			//We want to dump the first line because it's usually spurious
-			if (linesdumped != 0) {
-				//Now print the group
-				switch (convert) {
-				case CONVERT_VOLTS:
-					for (i = 0; i < numChannels; i++) {
-						if (printf("%lf ", voltline[i])
-						    < 0)
-							goto bad;
-					}
-					break;
-				case CONVERT_HEX:
-					for (i = 0; i < numChannels; i++) {
-						if (printf("%04hX", dataline[i])
-						    < 0)
-							goto bad;
-					}
-					break;
-				default:
-				case CONVERT_DEC:
-					for (i = 0; i < numChannels; i++) {
-						if (printf("%hu ", dataline[i])
-						    < 0)
-							goto bad;
-					}
-					break;
-				}
-				if (printf("\n") < 0)
-					goto bad;
             
-				//If we're counting lines, decrement them
+            //Each point is two bytes, so increment index and total bytes read
+			index++;
+			index++;
+            alignment++;
+			//totalread++;
+            
+            
+			
+            
+            //Since channel data is packed, we need to know when to insert a newline
+			if(alignment == numChannelsSampled){
+                if(convert) {
+                    for(i = 0; i < numChannels; i++) {
+                        printf("%Lf ",voltline[i]);
+                    }
+                } else {
+                    for(i = 0; i < numChannels; i++) {
+                        printf("%hd ",dataline[i]);
+                    }
+                }
+				printf("\n");
+				alignment = 0;
+				numgroups++;
                 if(lines != 0) {
                     linesleft--;
                     if(linesleft == 0) {
                         return 0;
                     }
                 }
-
+                //If numgroups so far is equal to the numGroups in a packet, this packet is done
-			} else {
+				if(numgroups == numGroups) {
-				linesdumped = linesdumped + 1;
+					break;
 				}
-
-			//We've processed this group, so advance the counter
-			numgroupsProcessed++;
-
 			}
 		}
+		index = 0;
+	}
 
 	return 0;
 
- bad:
-	info("Output error (disk full?)\n");
-	return -3;
-
 }
 
-/* Open a connection to the NerdJack */
+int nerd_open(const char *address,int port) {
-int nerd_open(const char *address, int port)
-{
     
     struct hostent *he;
     
@@ -615,8 +301,9 @@ int nerd_open(const char *address, int port)
     
     int32_t i32SocketFD = socket(PF_INET, SOCK_STREAM, 0);
 
-	if (-1 == i32SocketFD) {
+    if(-1 == i32SocketFD)
-		verb("cannot create socket");
+    {
+      printf("cannot create socket");
       return -1;
     }
     
@@ -642,48 +329,27 @@ int nerd_open(const char *address, int port)
 	debug("Resolved %s -> %s\n", address, inet_ntoa(stSockAddr.sin_addr));
     
     /* Connect */
-	if (connect_timeout
+	if (connect_timeout(i32SocketFD, (struct sockaddr *) &stSockAddr, sizeof(stSockAddr),
-	    (i32SocketFD, (struct sockaddr *)&stSockAddr, sizeof(stSockAddr),
+			    & (struct timeval) { .tv_sec = NERDJACK_TIMEOUT }) < 0) {
-	     &(struct timeval) {
-	     .tv_sec = 3}) < 0) {
 		verb("connection to %s:%d failed: %s\n",
-		     inet_ntoa(stSockAddr.sin_addr), port,
+		     inet_ntoa(stSockAddr.sin_addr), port, compat_strerror(errno));
-		     compat_strerror(errno));
 		return -1;
 	}
     
 	return i32SocketFD;
 }
 
-//Generate an appropriate sample initiation command
+int nerd_generate_command(char * command, int * channel_list, int channel_count, int precision,
-int
+    unsigned short period) {
-nerd_generate_command(getPacket * command, int *channel_list,
-		      int channel_count, int precision, unsigned long period)
-{
     
-	short channelbit = 0;
+    int channelbit = 0;
     int i;
-	int highestchannel = 0;
     
     for( i = 0; i < channel_count; i++) {
-		if (channel_list[i] > highestchannel) {
+        channelbit = channelbit | (0x1 << channel_list[i]);
-			highestchannel = channel_list[i];
-		}
-		//channelbit = channelbit | (0x1 << channel_list[i]);
     }
 
-	for (i = 0; i <= highestchannel; i++) {
+    sprintf(command,"GET%3.3X%d%5.5d", channelbit,precision,period);
-		channelbit = channelbit | (0x01 << i);
-	}
-
-	command->word[0] = 'G';
-	command->word[1] = 'E';
-	command->word[2] = 'T';
-	command->word[3] = 'D';
-	command->channelbit = htons(channelbit);
-	command->precision = precision;
-	command->period = htonl(period);
-	command->prescaler = 0;
     
     return 0;
     

nerdjack.h

@@ -16,51 +16,29 @@
 #include "netutil.h"
 
 #define NERDJACK_CHANNELS 12
-#define NERDJACK_CLOCK_RATE 66000000
+#define NERDJACK_CLOCK_RATE 54000000
 #define NERDJACK_DATA_PORT 49155
 #define NERDJACK_UDP_RECEIVE_PORT 49156
-#define NERDJACK_COMMAND_PORT 49157
 
 #define NERDJACK_PACKET_SIZE 1460
-#define NERDJACK_NUM_SAMPLES 726
+#define NERDJACK_NUM_SAMPLES 724
-
-/* Packet structure used in message to start sampling on NerdJack */
-typedef struct __attribute__ ((__packed__)) {
-	char word[4];
-	unsigned int period; //CHANGED FROM TYPE LONG. With 64 bit compilers longs are 8 bytes and nerdjack expects a 4 byte value
-	//since the int type is 4 bytes this works but should be changed to use defined datatypes rather than rely on compiler data types
-	unsigned short channelbit;
-	unsigned char precision;
-	unsigned char prescaler;
-} getPacket;
 
 /* Open/close TCP/IP connection to the NerdJack */
 int nerd_open(const char *address,int port);
 int nerd_close_conn(int data_fd);
 
 /* Generate the command word for the NerdJack */
-int nerd_generate_command(getPacket * command, int *channel_list,
+int nerd_generate_command(char * command, int * channel_list, int channel_count, int precision,
-			  int channel_count, int precision,
+    unsigned short period);
-			  unsigned long period);
-
-/* Send given command to NerdJack */
-int nerd_send_command(const char *address, void *command, int length);
-
-/* Get the version string from NerdJack */
-int nerd_get_version(const char *address);
 
 /* Stream data out of the NerdJack */
-int nerd_data_stream(int data_fd, int numChannels, int *channel_list,
+int nerd_data_stream(int data_fd, char * command, int numChannels, int * channel_list, int precision, int convert, int lines);
-		     int precision, int convert, int lines, int showmem,
-		     unsigned short *currentcount, unsigned int period,
-		     int wasreset);
 
 /* Detect the IP Address of the NerdJack and return in ipAddress */
 int nerdjack_detect(char * ipAddress);
 
 /* Choose the best ScanConfig and ScanInterval parameters for the
    desired scanrate.  Returns -1 if no valid config found */
-int nerdjack_choose_scan(double desired_rate, double *actual_rate,
+int nerdjack_choose_scan(double desired_rate, double *actual_rate, int *period);
-			 unsigned long *period);
 
 #endif

netutil.c

@@ -44,9 +44,9 @@ int soblock(int socket, int blocking)
 #endif
 }
 
+
 /* Like connect(2), but with a timeout.  Socket must be non-blocking. */
-int
+int connect_timeout(int s, const struct sockaddr *serv_addr, socklen_t addrlen,
-connect_timeout(int s, const struct sockaddr *serv_addr, socklen_t addrlen,
 		    struct timeval *timeout)
 {
 	int ret;
@@ -114,8 +114,7 @@ connect_timeout(int s, const struct sockaddr *serv_addr, socklen_t addrlen,
 /* Like send(2), but with a timeout.  Socket must be non-blocking.
    The timeout only applies if no data at all is sent -- this function
    may still send less than requested. */
-ssize_t
+ssize_t send_timeout(int s, const void *buf, size_t len, int flags, 
-send_timeout(int s, const void *buf, size_t len, int flags,
 		     struct timeval *timeout)
 {
 	fd_set writefds;
@@ -140,8 +139,8 @@ send_timeout(int s, const void *buf, size_t len, int flags,
 /* Like recv(2), but with a timeout.  Socket must be non-blocking. 
    The timeout only applies if no data at all is received -- this
    function may still return less than requested. */
-ssize_t
+ssize_t recv_timeout(int s, void *buf, size_t len, int flags, 
-recv_timeout(int s, void *buf, size_t len, int flags, struct timeval * timeout)
+		     struct timeval *timeout)
 {
 	fd_set readfds;
 	int ret;
@@ -165,9 +164,7 @@ recv_timeout(int s, void *buf, size_t len, int flags, struct timeval * timeout)
 /* Like recvfrom(2), but with a timeout.  Socket must be non-blocking. 
    The timeout only applies if no data at all is received -- this
    function may still return less than requested. */
-ssize_t
+ssize_t recvfrom_timeout(int s, void *buf, size_t len, int flags, struct sockaddr *address, socklen_t *address_len,
-recvfrom_timeout(int s, void *buf, size_t len, int flags,
-		 struct sockaddr * address, socklen_t * address_len,
 		     struct timeval *timeout)
 {
 	fd_set readfds;
@@ -192,8 +189,7 @@ recvfrom_timeout(int s, void *buf, size_t len, int flags,
 /* Like send_timeout, but retries (with the same timeout) in case of
    partial transfers.  This is a stronger attempt to send all
    requested data. */
-ssize_t
+ssize_t send_all_timeout(int s, const void *buf, size_t len, int flags, 
-send_all_timeout(int s, const void *buf, size_t len, int flags,
 			 struct timeval *timeout)
 {
 	struct timeval tv;
@@ -221,8 +217,7 @@ send_all_timeout(int s, const void *buf, size_t len, int flags,
 /* Like recv_timeout, but retries (with the same timeout) in case of
    partial transfers.  This is a stronger attempt to recv all
    requested data. */
-ssize_t
+ssize_t recv_all_timeout(int s, void *buf, size_t len, int flags, 
-recv_all_timeout(int s, void *buf, size_t len, int flags,
 			 struct timeval *timeout)
 {
 	struct timeval tv;

netutil.h

@@ -11,19 +11,11 @@
 #  define socklen_t int
 #  define in_addr_t uint32_t
 #  define in_port_t uint16_t
-#  include <windows.h>
-#  include <iphlpapi.h>
-#  define USE_IPHLPAPI 1
 #else
 #  include <sys/socket.h>
 #  include <netinet/in.h>
 #  include <arpa/inet.h>
 #  include <netdb.h>
-#  include <net/if.h>
-#  include <sys/ioctl.h>
-#ifndef _SIZEOF_ADDR_IFREQ
-#define _SIZEOF_ADDR_IFREQ(x) sizeof(x)
-#endif
 #endif
 
 /* Initialize networking */
@@ -34,14 +26,13 @@ int soblock(int socket, int blocking);
 
 /* Like send(2), recv(2), connect(2), but with timeouts.  
    Socket must be O_NONBLOCK. */
-int connect_timeout(int s, const struct sockaddr *serv_addr,
+int connect_timeout(int s, const struct sockaddr *serv_addr, socklen_t addrlen,
-		    socklen_t addrlen, struct timeval *timeout);
+		    struct timeval *timeout);
 ssize_t send_timeout(int s, const void *buf, size_t len, int flags, 
 		     struct timeval *timeout);
 ssize_t recv_timeout(int s, void *buf, size_t len, int flags, 
 		     struct timeval *timeout);
-ssize_t recvfrom_timeout(int s, void *buf, size_t len, int flags,
+ssize_t recvfrom_timeout(int s, void *buf, size_t len, int flags, struct sockaddr *address, socklen_t *address_len,
-			 struct sockaddr *address, socklen_t * address_len,
 		     struct timeval *timeout);
 
 /* Like send_timeout and recv_timeout, but they retry (with the same timeout)

opt.c

@@ -11,15 +11,12 @@
 #include <string.h>
 #include "opt.h"
 
-void opt_init(int *optind)
+void opt_init(int *optind) {
-{
 	*optind=0;
 }
 
-char
+char opt_parse(int argc, char **argv, int *optind, char **optarg,
-opt_parse(int argc, char **argv, int *optind, char **optarg,
+	       struct options *opt) {
-	  struct options *opt)
-{
 	char c;
 	int i;
 	(*optind)++;
@@ -27,7 +24,8 @@ opt_parse(int argc, char **argv, int *optind, char **optarg,
 		return 0;
 	
 	if(argv[*optind][0]=='-' && 
-	    argv[*optind][1] != '-' && argv[*optind][1] != 0) {
+	   argv[*optind][1]!='-' &&
+	   argv[*optind][1]!=0) {
 		/* Short option (or a bunch of 'em) */
 		/* Save this and shift others over */
 		c=argv[*optind][1];
@@ -56,7 +54,8 @@ opt_parse(int argc, char **argv, int *optind, char **optarg,
 		(*optarg)=argv[*optind];
 		return c;
 	} else if(argv[*optind][0]=='-' &&
-		   argv[*optind][1] == '-' && argv[*optind][2] != 0) {
+		  argv[*optind][1]=='-' &&
+		  argv[*optind][2]!=0) {
 		/* Long option */
 		for(i=0;(c=opt[i].shortopt)!=0;i++)
 			if(strcmp(opt[i].longopt,argv[*optind]+2)==0)
@@ -83,8 +82,7 @@ opt_parse(int argc, char **argv, int *optind, char **optarg,
 	}
 }
 
-void opt_help(struct options *opt, FILE * out)
+void opt_help(struct options *opt, FILE *out) {
-{
 	int i;
 	int printed;
 

ue9.c

@@ -24,7 +24,8 @@
 #include "ue9error.h"
 #include "util.h"
 #include "netutil.h"
-#include "ethstream.h"
+
+#define UE9_TIMEOUT 5   /* Timeout for connect/send/recv, in seconds */
 
 /* Fill checksums in data buffers, with "normal" checksum format */
 void ue9_checksum_normal(uint8_t *buffer, size_t len)
@@ -79,7 +80,8 @@ int ue9_verify_normal(uint8_t * buffer, size_t len)
 	buffer[0] = saved;
 
 	if (new != saved) {
-		verb("got %02x, expected %02x\n", saved, new);
+		verb("got %02x, expected %02x\n", 
+		     saved, new);
 		return 0;
 	}
 
@@ -107,7 +109,9 @@ int ue9_verify_extended(uint8_t * buffer, size_t len)
 	buffer[4] = saved[1];
 	buffer[5] = saved[2];
 
-	if (saved[0] != new[0] || saved[1] != new[1] || saved[2] != new[2]) {
+	if (saved[0] != new[0] || 
+	    saved[1] != new[1] ||
+	    saved[2] != new[2]) {
 		verb("got %02x %02x %02x, expected %02x %02x %02x\n",
 		     saved[0], saved[1], saved[2], new[0], new[1], new[2]);
 		return 0;
@@ -116,24 +120,9 @@ int ue9_verify_extended(uint8_t * buffer, size_t len)
 	return 1;
 }		
 
-/* Temperature conversion.  If calib is NULL, use uncalibrated conversions. */
-double ue9_binary_to_temperature(struct ue9Calibration *calib, uint16_t data)
-{
-	double slope;
-
-	if (calib == NULL) {
-		slope = 0.012683;
-	} else {
-		slope = calib->tempSlope;
-	}
-
-	return data * slope; /* output is in Kelvin */
-}
-
 /* Data conversion.  If calib is NULL, use uncalibrated conversions. */
-double
+double ue9_binary_to_analog(struct ue9Calibration *calib, 
-ue9_binary_to_analog(struct ue9Calibration *calib,
+			    uint8_t gain, uint8_t resolution, uint16_t data)
-		     int gain, uint8_t resolution, uint16_t data)
 {
 	double slope = 0, offset;
 
@@ -147,24 +136,10 @@ ue9_binary_to_analog(struct ue9Calibration *calib,
 	}
 
 	if (resolution < 18) {
-		switch (gain) {
+		if (gain <= 3) {
-			case 1:
+			slope = calib->unipolarSlope[gain];
-				slope = calib->unipolarSlope[0];
+			offset = calib->unipolarOffset[gain];
-				offset = calib->unipolarOffset[0];
+		} else if (gain == 8) {
-				break;
-			case 2:
-				slope = calib->unipolarSlope[1];
-				offset = calib->unipolarOffset[1];
-				break;
-			case 4:
-				slope = calib->unipolarSlope[2];
-				offset = calib->unipolarOffset[2];
-				break;
-			case 8:
-				slope = calib->unipolarSlope[3];
-				offset = calib->unipolarOffset[3];
-				break;
-			default:
 			slope = calib->bipolarSlope;
 			offset = calib->bipolarOffset;
 		}
@@ -209,8 +184,8 @@ int ue9_command(int fd, uint8_t * out, uint8_t * in, int inlen)
 	}
 
 	/* Send request */
-	ret = send_all_timeout(fd, out, outlen, 0, &(struct timeval) {
+	ret = send_all_timeout(fd, out, outlen, 0, 
-			       .tv_sec = TIMEOUT});
+			       & (struct timeval) { .tv_sec = UE9_TIMEOUT });
 	if (ret < 0 || ret != outlen) {
 		verb("short send %d\n", (int)ret);
 		return -1;
@@ -223,8 +198,8 @@ int ue9_command(int fd, uint8_t * out, uint8_t * in, int inlen)
 		saved_3 = out[3];
 
 	/* Receive result */
-	ret = recv_all_timeout(fd, in, inlen, 0, &(struct timeval) {
+	ret = recv_all_timeout(fd, in, inlen, 0,
-			       .tv_sec = TIMEOUT});
+			       & (struct timeval) { .tv_sec = UE9_TIMEOUT });
 	if (ret < 0 || ret != inlen) {
 		verb("short recv %d\n", (int)ret);
 		return -1;
@@ -249,6 +224,7 @@ int ue9_command(int fd, uint8_t * out, uint8_t * in, int inlen)
 	return -1;
 }
 
+
 /* Read a memory block from the device.  Returns -1 on error. */
 int ue9_memory_read(int fd, int blocknum, uint8_t *buffer, int len) 
 {
@@ -295,8 +271,7 @@ int ue9_get_calibration(int fd, struct ue9Calibration *calib)
 	uint8_t buf[128];
 
 	/* Block 0 */
-	if (ue9_memory_read(fd, 0, buf, 128) < 0)
+	if (ue9_memory_read(fd, 0, buf, 128) < 0) return -1;
-		return -1;
 	calib->unipolarSlope[0]    = ue9_fp64_to_double(buf + 0);
 	calib->unipolarOffset[0]   = ue9_fp64_to_double(buf + 8);
 	calib->unipolarSlope[1]    = ue9_fp64_to_double(buf + 16);
@@ -307,14 +282,12 @@ int ue9_get_calibration(int fd, struct ue9Calibration *calib)
 	calib->unipolarOffset[3]   = ue9_fp64_to_double(buf + 56);
 
 	/* Block 1 */
-	if (ue9_memory_read(fd, 1, buf, 128) < 0)
+	if (ue9_memory_read(fd, 1, buf, 128) < 0) return -1;
-		return -1;
 	calib->bipolarSlope        = ue9_fp64_to_double(buf + 0);
 	calib->bipolarOffset       = ue9_fp64_to_double(buf + 8);
 
 	/* Block 2 */
-	if (ue9_memory_read(fd, 2, buf, 128) < 0)
+	if (ue9_memory_read(fd, 2, buf, 128) < 0) return -1;
-		return -1;
 	calib->DACSlope[0]         = ue9_fp64_to_double(buf + 0);
 	calib->DACOffset[0]        = ue9_fp64_to_double(buf + 8);
 	calib->DACSlope[1]         = ue9_fp64_to_double(buf + 16);
@@ -327,14 +300,12 @@ int ue9_get_calibration(int fd, struct ue9Calibration *calib)
 	calib->VsSlope             = ue9_fp64_to_double(buf + 96);
 
 	/* Block 3 */
-	if (ue9_memory_read(fd, 3, buf, 128) < 0)
+	if (ue9_memory_read(fd, 3, buf, 128) < 0) return -1;
-		return -1;
 	calib->hiResUnipolarSlope  = ue9_fp64_to_double(buf + 0);
 	calib->hiResUnipolarOffset = ue9_fp64_to_double(buf + 8);
 
 	/* Block 4 */
-	if (ue9_memory_read(fd, 4, buf, 128) < 0)
+	if (ue9_memory_read(fd, 4, buf, 128) < 0) return -1;
-		return -1;
 	calib->hiResBipolarSlope   = ue9_fp64_to_double(buf + 0);
 	calib->hiResBipolarOffset  = ue9_fp64_to_double(buf + 8);
 
@@ -402,7 +373,6 @@ int ue9_open(const char *host, int port)
 	/* Set nonblocking */
 	if (soblock(fd, 0) < 0) {
 		verb("can't set nonblocking\n");
-		close(fd);
 		return -1;
 	}
 
@@ -418,7 +388,6 @@ int ue9_open(const char *host, int port)
 	he = gethostbyname(host);
 	if (he == NULL) {
 		verb("gethostbyname(\"%s\") failed\n", host);
-		close(fd);
 		return -1;
 	}
 	address.sin_addr = *((struct in_addr *) he->h_addr);
@@ -427,16 +396,12 @@ int ue9_open(const char *host, int port)
 
 	/* Connect */
 	if (connect_timeout(fd, (struct sockaddr *) &address, sizeof(address),
-			    &(struct timeval) {
+			    & (struct timeval) { .tv_sec = UE9_TIMEOUT }) < 0) {
-			    .tv_sec = TIMEOUT}) < 0) {
 		verb("connection to %s:%d failed: %s\n",
 		     inet_ntoa(address.sin_addr), port, compat_strerror(errno));
-		close(fd);
 		return -1;
 	}
 
-	debug("Connected to port %d\n", port);
-
 	return fd;
 }
 
@@ -458,18 +423,10 @@ double ue9_compute_rate(uint8_t scanconfig, uint16_t scaninterval)
 	   Channels are scanned as quickly as possible. */
 
 	switch ((scanconfig >> 3) & 3) {
-	case 0:
+	case 0: clock = 4e6; break;
-		clock = 4e6;
+	case 1: clock = 48e6; break;
-		break;
+	case 2: clock = 750e3; break;
-	case 1:
+	case 3: clock = 24e6; break;
-		clock = 48e6;
-		break;
-	case 2:
-		clock = 750e3;
-		break;
-	case 3:
-		clock = 24e6;
-		break;
 	}
 	
 	if (scanconfig & 0x2)
@@ -483,25 +440,20 @@ double ue9_compute_rate(uint8_t scanconfig, uint16_t scaninterval)
 
 /* Choose the best ScanConfig and ScanInterval parameters for the
    desired scanrate.  Returns -1 if no valid config found */
-int
+int ue9_choose_scan(double desired_rate, double *actual_rate,
-ue9_choose_scan(double desired_rate, double *actual_rate,
 		    uint8_t *scanconfig, uint16_t *scaninterval)
 {
 	int i;
-	struct {
+	struct { double clock; uint8_t config; } valid[] = {
-		double clock;
+		{ 48e6,        0x08 },
-		uint8_t config;
+		{ 24e6,        0x18 },
-	} valid[] = {
+		{ 4e6,         0x00 },
-		{
+		{ 750e3,       0x10 },
-		48e6, 0x08}, {
+		{ 48e6 / 256,  0x0a },
-		24e6, 0x18}, {
+		{ 24e6 / 256,  0x1a },
-		4e6, 0x00}, {
+		{ 4e6 / 256,   0x02 },
-		750e3, 0x10}, {
+		{ 750e3 / 256, 0x12 },
-		48e6 / 256, 0x0a}, {
+		{ 0, 0 } };
-		24e6 / 256, 0x1a}, {
-		4e6 / 256, 0x02}, {
-		750e3 / 256, 0x12}, {
-	0, 0}};
 
 	/* Start with the fastest clock frequency.  If the
 	   scaninterval would be too large, knock it down until it
@@ -517,8 +469,8 @@ ue9_choose_scan(double desired_rate, double *actual_rate,
 			*scaninterval = floor(interval + 0.5);
 
 			*scanconfig = valid[i].config;
-			*actual_rate =
+			*actual_rate = ue9_compute_rate(
-			    ue9_compute_rate(*scanconfig, *scaninterval);
+				*scanconfig, *scaninterval);
 
 			debug("Config 0x%02x, desired %lf, actual %lf\n", 
 			      *scanconfig, desired_rate, *actual_rate);
@@ -582,9 +534,9 @@ int ue9_stream_start(int fd)
 
 /* "Simple" stream configuration, assumes the channels are all 
    configured with the same gain. */
-int
+int ue9_streamconfig_simple(int fd, int *channel_list, int channel_count,
-ue9_streamconfig_simple(int fd, int *channel_list, int channel_count,
+			    uint8_t scanconfig, uint16_t scaninterval,
-			uint8_t scanconfig, uint16_t scaninterval, uint8_t gain)
+			    uint8_t gain)
 {
 	int i;
 	uint8_t buf[256];
@@ -619,130 +571,10 @@ ue9_streamconfig_simple(int fd, int *channel_list, int channel_count,
 	return 0;
 }
 
-/* Stream configuration, each Analog Input channel can have its own gain. */
-int
-ue9_streamconfig(int fd, int *channel_list, int channel_count,
-			uint8_t scanconfig, uint16_t scaninterval, int *gain_list, int gain_count)
-{
-	int i;
-	uint8_t buf[256];
-
-	/* Set up StreamConfig command with channels and scan options */
-	buf[1] = 0xF8;		/* Extended command */
-	buf[2] = channel_count + 3;	/* Command data words */
-	buf[3] = 0x11;		/* StreamConfig */
-	buf[6] = channel_count;	/* Number of channels */
-	buf[7] = 12;		/* Bit resolution */
-	buf[8] = 0;		/* Extra settling time */
-	buf[9] = scanconfig;
-	buf[10] = scaninterval & 0xff;
-	buf[11] = scaninterval >> 8;
-
-	for (i = 0; i < channel_count; i++) {
-		buf[12 + 2 * i] = channel_list[i];	/* Channel number */
-		if (i < gain_count) {
-			switch (gain_list[i]) {
-				case 0:
-					buf[13 + 2 * i] = UE9_BIPOLAR_GAIN1;
-				break;
-					
-				case 1:
-					buf[13 + 2 * i] = UE9_UNIPOLAR_GAIN1;
-				break;
-			
-				case 2:
-					buf[13 + 2 * i] = UE9_UNIPOLAR_GAIN2;
-				break;
-				
-				case 4:
-					buf[13 + 2 * i] = UE9_UNIPOLAR_GAIN4;
-				break;
-			
-				case 8:
-					buf[13 + 2 * i] = UE9_UNIPOLAR_GAIN8;
-				break;
-				
-				default:
-					buf[13 + 2 * i] = UE9_BIPOLAR_GAIN1;
-			}
-		}
-		else
-		{
-			buf[13 + 2 * i] = UE9_BIPOLAR_GAIN1;
-		}
-	}
-
-	/* Send StreamConfig */
-	if (ue9_command(fd, buf, buf, 8) < 0) {
-		debug("command failed\n");
-		return -1;
-	}
-
-	if (buf[6] != 0) {
-		verb("returned error %s\n", ue9_error(buf[6]));
-		return -1;
-	}
-
-	return 0;
-}
-
-
-/* Timer configuration */
-int ue9_timer_config(int fd, int *mode_list, int *value_list, int count, int divisor)
-{
-	int i;
-	uint8_t buf[256];
-
-	if (count < 0 || count > 6) {
-		verb("invalid count\n");
-		return -1;
-	}
-
-	/* Set up TimerConfig command */
-	buf[1] = 0xF8;		/* Extended command */
-	buf[2] = 0x0C;		/* Command data words */
-	buf[3] = 0x18;		/* TimerConfig */
-	buf[6] = divisor;	/* TimerClockDivisor */
-	buf[7] = 0x80 | count;	/* Number of timers enabled, UpdateConfig=1 */
-	buf[8] = 0x01;		/* TimerClockBase = System 48MHz */
-	buf[9] = 0x00;		/* Don't reset */
-
-	for (i = 0; i < 6; i++) {
-		if (i < count) {
-			buf[10 + 3 * i] = mode_list[i];
-			buf[11 + 3 * i] = value_list[i] & 0xff;
-			buf[12 + 3 * i] = value_list[i] >> 8;
-		}
-		else {
-			buf[10 + 3 * i] = 0;
-			buf[11 + 3 * i] = 0;
-			buf[12 + 3 * i] = 0;
-		}
-	}
-
-	buf[28] = 0;
-	buf[29] = 0;
-
-	/* Send StreamConfig */
-	if (ue9_command(fd, buf, buf, 40) < 0) {
-		debug("command failed\n");
-		return -1;
-	}
-
-	if (buf[6] != 0) {
-		verb("returned error %s\n", ue9_error(buf[6]));
-		return -1;
-	}
-
-	debug("timer EnableStatus=0x%02x\n", buf[7]);
-
-	return 0;
-}
-
 /* Stream data and pass it to the data callback.  If callback returns
    negative, stops reading and returns 0.  Returns < 0 on error. */
-int
+int ue9_stream_data(int fd, int channels, 
-ue9_stream_data(int fd, int channels, int *channel_list, int gain_count, int *gain_list, ue9_stream_cb_t callback, void *context)
+		    ue9_stream_cb_t callback, void *context)
 {
 	int ret;
 	uint8_t buf[46];
@@ -753,8 +585,8 @@ ue9_stream_data(int fd, int channels, int *channel_list, int gain_count, int *ga
 	
 	for (;;) {
 		/* Receive data */
-		ret = recv_all_timeout(fd, buf, 46, 0, &(struct timeval) {
+		ret = recv_all_timeout(fd, buf, 46, 0, & (struct timeval) 
-				       .tv_sec = TIMEOUT});
+			{ .tv_sec = UE9_TIMEOUT });
 
 		/* Verify packet format */
 		if (ret != 46) {
@@ -762,7 +594,8 @@ ue9_stream_data(int fd, int channels, int *channel_list, int gain_count, int *ga
 			return -1;
 		}
 
-		if (!ue9_verify_extended(buf, 46) || !ue9_verify_normal(buf, 6)) {
+		if (!ue9_verify_extended(buf, 46) || 
+		    !ue9_verify_normal(buf, 6)) {
 			verb("bad checksum\n");
 			return -2;
 		}
@@ -811,16 +644,10 @@ ue9_stream_data(int fd, int channels, int *channel_list, int gain_count, int *ga
 
 			/* Received a full scan, send to callback */
 			channel = 0;
-			if ((*callback) (channels, channel_list, gain_count, gain_list, data, context) < 0) {
+			if ((*callback)(channels, data, context) < 0) {
 				/* We're done */
 				return 0;
 			}
 		}
 	}
 }
-
-/*
-Local variables:
-c-basic-offset: 8
-End:
-*/

ue9.h

@@ -68,17 +68,13 @@ struct ue9ControlConfig {
 	uint16_t dac1;
 };
 
-/* These are correct! 0, 1, 2, 3, 8 */
 #define UE9_UNIPOLAR_GAIN1 0x00
 #define UE9_UNIPOLAR_GAIN2 0x01
 #define UE9_UNIPOLAR_GAIN4 0x02
 #define UE9_UNIPOLAR_GAIN8 0x03
 #define UE9_BIPOLAR_GAIN1 0x08
 
-#define UE9_MAX_CHANNEL_COUNT 128
+#define UE9_CHANNELS 14
-#define UE9_MAX_CHANNEL 255
-#define UE9_MAX_ANALOG_CHANNEL 13
-#define UE9_TIMERS 6
 
 /* Fill checksums in data buffers */
 void ue9_checksum_normal(uint8_t *buffer, size_t len);
@@ -105,10 +101,7 @@ int ue9_get_control_config(int fd, struct ue9ControlConfig *config);
 
 /* Data conversion.  If calib is NULL, use uncalibrated conversions. */
 double ue9_binary_to_analog(struct ue9Calibration *calib, 
-			    int gain, uint8_t resolution, uint16_t data);
+			    uint8_t gain, uint8_t resolution, uint16_t data);
-
-/* Temperature conversion.  If calib is NULL, use uncalibrated conversions. */
-double ue9_binary_to_temperature(struct ue9Calibration *calib, uint16_t data);
 
 /* Compute scanrate based on the provided values. */
 double ue9_compute_rate(uint8_t scanconfig, uint16_t scaninterval);
@@ -139,18 +132,10 @@ int ue9_streamconfig_simple(int fd, int *channel_list, int channel_count,
 			    uint8_t scanconfig, uint16_t scaninterval,
 			    uint8_t gain);
 
-/* Stream configuration, each Analog Input channel can have its own gain. */
-int ue9_streamconfig(int fd, int *channel_list, int channel_count,
-			    uint8_t scanconfig, uint16_t scaninterval,
-			    int *gain_list, int gain_count);
-
-/* Timer configuration */
-int ue9_timer_config(int fd, int *mode_list, int *value_list, int count, int divisor);
-
 /* Stream data and pass it to the data callback.  If callback returns
    negative, stops reading and returns 0.  Returns < 0 on error. */
-typedef int (*ue9_stream_cb_t) (int channels, int *channel_list, int gain_count, int *gain_list, uint16_t * data, void *context);
+typedef int (*ue9_stream_cb_t)(int channels, uint16_t *data, void *context);
-int ue9_stream_data(int fd, int channels, int *channel_list, int gain_count, int *gain_list,
+int ue9_stream_data(int fd, int channels,
 		    ue9_stream_cb_t callback, void *context);
 
 #endif

version.h

@@ -1,2 +1,2 @@
 /* This file was automatically generated. */
-#define VERSION "1.3.2 (2016-07-13)"
+#define VERSION "1.0 (2009-01-21)"