Now ethstream falls back from Labjack to Nerdjack

git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7140 ddd99763-3ecb-0310-9145-efcb8ce7c51f

ethstream.c

@@ -196,6 +196,8 @@ int main(int argc, char *argv[])
 			return (help == stdout) ? 0 : 1;
 			return (help == stdout) ? 0 : 1;
 		}
 		}
 	}
 	}
+
+    doneparse:
     
     
     if (nerdjack) {
     if (nerdjack) {
         if (channel_count > NERDJACK_CHANNELS) {
         if (channel_count > NERDJACK_CHANNELS) {
@@ -302,6 +304,12 @@ int main(int argc, char *argv[])
 		if (ret == 0)
 		if (ret == 0)
 		        break;
 		        break;
 
 
+        if (ret == -ENOTCONN && !nerdjack) {
+            info("Could not connect LabJack...Trying NerdJack\n");
+            nerdjack = 1;
+            goto doneparse;
+        }
+        
 		if (ret == -ENOTCONN && !forceretry) {
 		if (ret == -ENOTCONN && !forceretry) {
 			info("Initial connection failed, giving up\n");
 			info("Initial connection failed, giving up\n");
 			break;
 			break;