report time too;

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@8677 ddd99763-3ecb-0310-9145-efcb8ce7c51f

pc/calibrate.c

@@ -278,7 +278,7 @@ fail:
 
 void zero(int zoom)
 {
-	int r;
+	int r = 0;
 	int dac;
 
 	info("Initializing Zoom NILM\n");

pc/dactest.c

@@ -12,6 +12,7 @@
 #include <err.h>
 #include <linux/serial.h>
 #include <sys/signal.h>
+#include <sys/time.h>
 #include "serial-util.h"
 #include "gpib.h"
 #include "zoom.h"
@@ -103,6 +104,7 @@ void write_random(int zoom, int gpib)
 {
 	int dac;
 	double meas;
+	struct timeval now;
 
 	info("Initializing Zoom NILM\n");
 	if (zoom_init_nozero(zoom) < 0) goto fail;
@@ -118,10 +120,10 @@ void write_random(int zoom, int gpib)
 	info("Running\n");
 	while (!g_quit) {
 		dac = genrand_int32() & 0x3ff;
+		zoom_write_dac(zoom, dac);
+		gettimeofday(&now, NULL);
 		meas = keithley2002_read(gpib);
-		if (isnan(meas))
-			goto fail;
-		printf("%d %.12f\n", dac, meas);
+		printf("%ld.%06ld %d %.12f\n", now.tv_sec, now.tv_usec, dac, meas);
 	}
 
 safecleanup:

pc/zoom.c

@@ -21,8 +21,9 @@ static int verify_prompt(int fd)
 	chomp(s);
 	if (sscanf(s, "%x %d  %x %d", &dac1, &dac2, &adc1, &adc2) != 4)
 		return -1;
-	//	if (dac1 != dac2 || adc1 != adc2)
-	//		return -1;
+//	if (dac1 != dac2 || adc1 != adc2)
+	if (adc1 != adc2)
+		return -1;
 	last_dac = dac1;
 	last_adc = adc1;
 	return 0;