Merge pull request firmata#156 from rwaldron/i2c-read-continuous-without-slave-configurable

Update I2C_READ_CONTINUOUSLY to match I2C_READ w/ no provided slaveRegister

Author: soundanalogous

examples/StandardFirmata/StandardFirmata.ino

@@ -70,7 +70,7 @@ unsigned int samplingInterval = 19;          // how often to run the main loop (
 /* i2c data */
 struct i2c_device_info {
   byte addr;
-  byte reg;
+  int reg;
   byte bytes;
 };
 
@@ -329,10 +329,10 @@ void sysexCallback(byte command, byte argc, byte *argv)
 {
   byte mode;
   byte slaveAddress;
-  byte slaveRegister;
   byte data;
-  unsigned int delayTime; 
-  
+  int slaveRegister;
+  unsigned int delayTime;
+
   switch(command) {
   case I2C_REQUEST:
     mode = argv[1] & I2C_READ_WRITE_MODE_MASK;
@@ -363,24 +363,34 @@ void sysexCallback(byte command, byte argc, byte *argv)
         // a slave register is specified
         slaveRegister = argv[2] + (argv[3] << 7);
         data = argv[4] + (argv[5] << 7);  // bytes to read
-        readAndReportData(slaveAddress, (int)slaveRegister, data);
       }
       else {
         // a slave register is NOT specified
+        slaveRegister = REGISTER_NOT_SPECIFIED;
         data = argv[2] + (argv[3] << 7);  // bytes to read
-        readAndReportData(slaveAddress, (int)REGISTER_NOT_SPECIFIED, data);
       }
+      readAndReportData(slaveAddress, (int)slaveRegister, data);
       break;
     case I2C_READ_CONTINUOUSLY:
       if ((queryIndex + 1) >= MAX_QUERIES) {
         // too many queries, just ignore
         Firmata.sendString("too many queries");
         break;
       }
+      if (argc == 6) {
+        // a slave register is specified
+        slaveRegister = argv[2] + (argv[3] << 7);
+        data = argv[4] + (argv[5] << 7);  // bytes to read
+      }
+      else {
+        // a slave register is NOT specified
+        slaveRegister = (int)REGISTER_NOT_SPECIFIED;
+        data = argv[2] + (argv[3] << 7);  // bytes to read
+      }
       queryIndex++;
       query[queryIndex].addr = slaveAddress;
-      query[queryIndex].reg = argv[2] + (argv[3] << 7);
-      query[queryIndex].bytes = argv[4] + (argv[5] << 7);
+      query[queryIndex].reg = slaveRegister;
+      query[queryIndex].bytes = data;
       break;
     case I2C_STOP_READING:
       byte queryIndexToSkip;      

utility/I2CFirmata.cpp

@@ -113,8 +113,8 @@ void I2CFirmata::handleI2CRequest(byte argc, byte *argv)
 {
   byte mode;
   byte slaveAddress;
-  byte slaveRegister;
   byte data;
+  int slaveRegister;
   mode = argv[1] & I2C_READ_WRITE_MODE_MASK;
   if (argv[1] & I2C_10BIT_ADDRESS_MODE_MASK) {
     Firmata.sendString("10-bit addressing not supported");
@@ -157,10 +157,20 @@ void I2CFirmata::handleI2CRequest(byte argc, byte *argv)
       Firmata.sendString("too many queries");
       break;
     }
+    if (argc == 6) {
+      // a slave register is specified
+      slaveRegister = argv[2] + (argv[3] << 7);
+      data = argv[4] + (argv[5] << 7);  // bytes to read
+    }
+    else {
+      // a slave register is NOT specified
+      slaveRegister = (int)REGISTER_NOT_SPECIFIED;
+      data = argv[2] + (argv[3] << 7);  // bytes to read
+    }
     queryIndex++;
     query[queryIndex].addr = slaveAddress;
-    query[queryIndex].reg = argv[2] + (argv[3] << 7);
-    query[queryIndex].bytes = argv[4] + (argv[5] << 7);
+    query[queryIndex].reg = slaveRegister;
+    query[queryIndex].bytes = data;
     break;
   case I2C_STOP_READING:
     byte queryIndexToSkip;

utility/I2CFirmata.h

@@ -36,7 +36,7 @@
 /* i2c data */
 struct i2c_device_info {
   byte addr;
-  byte reg;
+  int reg;
   byte bytes;
 };