Merge branch 'master' of github.com:altintx/chromadex

Author: Brian Bosh

README.md

@@ -1,27 +1,22 @@
 ##chromadex
-Download Dexcom data on almost any platform Chrome runs on. (Developed and tested on Mac OSX). A good deal of this data is corrupt. 
-
-###Changelog
-mongolabconfig.json has dropped "baseUri", "user" and "password" and added "collection" and "database." So If you're integrated against Nightscout be sure to update that file.
+Download Dexcom data on almost any platform Chrome runs on. (Developed and tested on Mac OSX). A good deal of this data is corrupt. It should work on Windows if [Dexcom Studio](http://dexcom.com/dexcom-studio) is installed, but other platforms should work more magically. 
 
 ##Don't use it for treatment. Seriously. A lot of this data is wrong. Not a little wrong. OMG WTF out of left field wrong.
 
 ###Install
 1. Get code in folder
 2. Open a terminal and CD to that folder
-3. Install bower if you haven't already (npm install bower)
-4. Install bower dependencies (bower install)
-5. You're done with your terminal. Give yourself a pat on the back.
-6. Go to chrome://extensions
-7. Check developer mode
-8. Load unpacked extension
-9. Pick your folder
-10. If you use NightScout- Dupe FOLDER/mongoconfig.sample.json to FOLDER/mongoconfig.json. Your API key is the important part. IF YOU DON'T USE NIGHTSCOUT YOU CAN SKIP THIS STEP.
-11. If you use DIYPS- Dupe FOLDER/diypsconfig.sample.json to /diypsconfig.json. Add chromeext.php into DIYPS directory and point diypsconfig.json's endpoint to that resulting URL. IF YOU DON'T USE DIYPS YOU CAN SKIP THIS STEP.
+3. Install dependencies (npm install)
+4. You're done with your terminal. Give yourself a pat on the back.
+5. Go to chrome://extensions
+6. Check developer mode
+7. Load unpacked extension
+8. Pick your folder
 
 ###Use
 1. Plug in your Dexcom
-2. Go to chrome://extensions
+2. Magic happens
+2. If magic did not happen, open chrome://extensions
 3. Click launch
 
 Lots of steps and right now. Some times you get no data back, usually preceded by completely inaccurate graphs- if that happens, press the Reset button. This'll wipe out all the data it's accumulated. Doesn't seem like you really need to unplug/replug anymore.

app/dexcom.js

@@ -54,36 +54,64 @@ define(function () {
 		port: null,
 		buffer: [],
 		connect: function(serialport) {
+			return new Promise(function(resolve, reject) {
+				chrome.serial.getDevices(function(ports) {
+					for (var i=0; i<ports.length; i++) {
+						var port = ports[i];
+						console.log("Checking port for dexcom device ID: %s", port.path);
+						if (port.vendorId == 8867 && port.productId == 71) {
+							console.debug("Found dexcom serial port at %s", port.path);
+							dexcom.oldConnect(port, true).then(resolve, reject);
+							return;
+						}
+					}
+					dexcom.oldConnect(serialport, false).then(resolve, reject);
+				});
+			});
+		},
+		oldConnect: function(serialport, foundActualDevice) {
+			console.log("getDevices in oldConnect with device: %o", serialport);
 			return new Promise(function(resolve, reject) {
 				if (dexcom.connected) {
 					return reject(new Error("Wait for existing process to finish"));
 				}
-				chrome.serial.getDevices(function(ports) {
-					var connected = function(conn) {
-						if (conn && "connectionId" in conn) {
-							dexcom.connection = conn;
-							dexcom.connected = true;
-							console.debug("[connecting] successfully connected to port %o", conn);
-							setTimeout(resolve, 100);
-							chrome.serial.onReceive.addListener(dexcom.serialOnReceiveListener);
-						} else {
-							reject(new Error(
-								"Couldn't open USB connection. Unplug your Dexcom, plug it back in, and try again."
-							));
+				var connected = function(conn) {
+					if (conn && "connectionId" in conn) {
+						dexcom.connection = conn;
+						dexcom.connected = true;
+						console.debug("[connecting] successfully connected to port %o", conn);
+						setTimeout(resolve, 100);
+						chrome.serial.onReceive.addListener(dexcom.serialOnReceiveListener);
+					} else {
+						console.error("Couldn't open USB connection to port %o", conn);
+						reject(new Error(
+							"Couldn't open USB connection. Unplug your Dexcom, plug it back in, and try again."
+						));
+					}
+				};
+				var tryPort = function(port) {
+						console.log("Trying port: " + port);
+						if (!foundActualDevice &&
+							 (port.path.substr(0,serialport.length).toLowerCase() != serialport.toLowerCase())) {
+							 return;
 						}
-					};
-					ports.forEach(function(port) {
-						if (port.path.substr(0,serialport.length).toLowerCase() != serialport.toLowerCase()) return;
 						dexcom.port = port;
 						console.debug("[connecting] Found dexcom at port %o", port);
 						chrome.serial.connect(dexcom.port.path, { bitrate: 115200 }, connected);
+				}
+				if (foundActualDevice) {
+					tryPort(serialport);
+				} else {
+					chrome.serial.getDevices(function(ports) {
+						console.log("getDevices returned ports: " + ports);
+						ports.forEach(tryPort);
+						if (dexcom.port === null) {
+							reject(new Error(
+								"Didn't find a Dexcom receiver plugged in"
+							));
+						}
 					});
-					if (dexcom.port === null) {
-						reject(new Error(
-							"Didn't find a Dexcom receiver plugged in"
-						));
-					}
-				});
+				}
 			});
 		},
 		serialOnReceiveListener: function(info) {