Multi/Barometer/Thermometer: MPL115A2 requires conversion start command for all reads

Signed-off-by: Rick Waldron <[email protected]>

Author: rwaldron

lib/imu.js

@@ -624,6 +624,22 @@ var Drivers = {
 
         io.i2cConfig(opts);
 
+        var readCycle = function() {
+          io.i2cWrite(address, [this.REGISTER.STARTCONVERSION, 0x00]);
+
+          io.i2cReadOnce(address, this.REGISTER.READ, READLENGTH, function(data) {
+            var padc = uint16(data[0], data[1]) >> 6;
+            var tadc = uint16(data[2], data[3]) >> 6;
+
+            computed.pressure = cof.a0 + (cof.b1 + cof.c12 * tadc) * padc + cof.b2 * tadc;
+            computed.temperature = tadc;
+
+            this.emit("data", computed);
+
+            readCycle();
+          }.bind(this));
+        }.bind(this);
+
         var pCoefficients = new Promise(function(resolve) {
           io.i2cReadOnce(address, this.REGISTER.COEFFICIENTS, 8, function(data) {
             var A0 = int16(data[0], data[1]);
@@ -646,19 +662,7 @@ var Drivers = {
           }.bind(this));
         }.bind(this));
 
-        pCoefficients.then(function() {
-          io.i2cWrite(address, [this.REGISTER.STARTCONVERSION, 0x00]);
-
-          io.i2cRead(address, this.REGISTER.READ, READLENGTH, function(data) {
-            var padc = uint16(data[0], data[1]) >> 6;
-            var tadc = uint16(data[2], data[3]) >> 6;
-
-            computed.pressure = cof.a0 + (cof.b1 + cof.c12 * tadc) * padc + cof.b2 * tadc;
-            computed.temperature = tadc;
-
-            this.emit("data", computed);
-          }.bind(this));
-        }.bind(this));
+        pCoefficients.then(readCycle);
       }
     },
     identifier: {

test/barometer.js

@@ -5,7 +5,6 @@ exports["Barometer -- MPL115A2"] = {
     this.board = newBoard();
     this.i2cConfig = this.sandbox.spy(MockFirmata.prototype, "i2cConfig");
     this.i2cWrite = this.sandbox.spy(MockFirmata.prototype, "i2cWrite");
-    this.i2cRead = this.sandbox.spy(MockFirmata.prototype, "i2cRead");
     this.i2cReadOnce = this.sandbox.spy(MockFirmata.prototype, "i2cReadOnce");
 
     this.barometer = new Barometer({
@@ -69,10 +68,10 @@ exports["Barometer -- MPL115A2"] = {
       test.equals(this.i2cWrite.args[0][0], 0x60);
       test.deepEqual(this.i2cWrite.args[0][1], [0x12, 0x00]);
 
-      test.ok(this.i2cRead.calledOnce);
-      test.equals(this.i2cRead.args[0][0], 0x60);
-      test.deepEqual(this.i2cRead.args[0][1], 0x00);
-      test.equals(this.i2cRead.args[0][2], 4);
+      test.ok(this.i2cReadOnce.calledTwice);
+      test.equals(this.i2cReadOnce.lastCall.args[0], 0x60);
+      test.deepEqual(this.i2cReadOnce.lastCall.args[1], 0x00);
+      test.equals(this.i2cReadOnce.lastCall.args[2], 4);
 
       // In order to handle the Promise used for initialization,
       // there can be no fake timers in this test, which means we

test/thermometer.js

@@ -839,7 +839,6 @@ exports["Thermometer -- MPL115A2"] = {
   setUp: function(done) {
     this.i2cConfig = this.sandbox.spy(MockFirmata.prototype, "i2cConfig");
     this.i2cWrite = this.sandbox.spy(MockFirmata.prototype, "i2cWrite");
-    this.i2cRead = this.sandbox.spy(MockFirmata.prototype, "i2cRead");
     this.i2cReadOnce = this.sandbox.spy(MockFirmata.prototype, "i2cReadOnce");
 
     this.temperature = new Thermometer({
@@ -899,10 +898,10 @@ exports["Thermometer -- MPL115A2"] = {
       test.equals(this.i2cWrite.firstCall.args[0], 0x60);
       test.deepEqual(this.i2cWrite.firstCall.args[1], [0x12, 0x00]);
 
-      test.ok(this.i2cRead.calledOnce);
-      test.equals(this.i2cRead.firstCall.args[0], 0x60);
-      test.deepEqual(this.i2cRead.firstCall.args[1], 0x00);
-      test.equals(this.i2cRead.firstCall.args[2], 4);
+      test.ok(this.i2cReadOnce.calledTwice);
+      test.equals(this.i2cReadOnce.lastCall.args[0], 0x60);
+      test.deepEqual(this.i2cReadOnce.lastCall.args[1], 0x00);
+      test.equals(this.i2cReadOnce.lastCall.args[2], 4);
 
       // read = this.i2cRead.args[0][3];