Added i2cRead/WriteReg for simplified internal I2C code

            Bangle.js2: Support for new Bangles with MMC36X0 magnetometer (Bangle.dbg() now shows info)

Author: gfwilliams

ChangeLog

@@ -12,6 +12,8 @@
             nRF52 Central: Lower min connection interval from 20->7.5ms, max 200->1000ms (allows some extra devices to be connected to)
             Bangle.js2: Add optional long press button actions to `showPrompt` (#2656) 
             nRF52: Fix gatt.setRSSIHandler on the first active connection
+            Added i2cRead/WriteReg for simplified internal I2C code
+            Bangle.js2: Support for new Bangles with MMC36X0 magnetometer (Bangle.dbg() now shows info)
 
      2v27 : nRF5x: Ensure Bluetooth notifications work correctly when two separate connections use the same handle for their characteristics
             nRF5x: Remove handlers from our handlers array when a device is disconnected

libs/banglejs/jswrap_bangle.c

@@ -215,8 +215,7 @@ VC31AInfo vcaInfo;
 VC31BInfo vcbInfo;
 
 static void vc31_w(uint8_t reg, uint8_t data) {
-  uint8_t buf[2] = {reg, data};
-  jsi2cWrite(&i2cHRM, HEARTRATE_ADDR, 2, buf, true);
+  jsi2cWriteReg(&i2cHRM, HEARTRATE_ADDR, reg, data);
 }
 static void vc31_wx(uint8_t reg, uint8_t *data, int cnt) {
   uint8_t buf[32];
@@ -226,10 +225,9 @@ static void vc31_wx(uint8_t reg, uint8_t *data, int cnt) {
 }
 
 static uint8_t vc31_r(uint8_t reg) {
-  uint8_t buf[1] = {reg};
-  jsi2cWrite(&i2cHRM, HEARTRATE_ADDR, 1, buf, false);
-  jsi2cRead(&i2cHRM, HEARTRATE_ADDR, 1, buf, true);
-  return buf[0];
+  uint8_t v;
+  jsi2cReadReg(&i2cHRM, HEARTRATE_ADDR, reg, 1, &v);
+  return v;
 }
 static void vc31_rx(uint8_t reg, uint8_t *data, int cnt) {
   uint8_t buf[1] = {reg};

libs/misc/hrm_vc31.c

@@ -47,14 +47,12 @@ JshI2CInfo i2cInfo = {
 
 // Write to IO expander
 void sxWriteReg(unsigned reg, unsigned d) {
-  unsigned char data[2] = {reg,d};
-  jsi2cWrite(&i2cInfo, SX_I2C_ADDR, sizeof(data), data, true);
+  jsi2cWriteReg(&i2cInfo, SX_I2C_ADDR, reg, d);
 }
 // Read from IO expander
 unsigned char sxReadReg(unsigned reg) {
-  unsigned char data = reg;
-  jsi2cWrite(&i2cInfo, SX_I2C_ADDR, 1, &data, true);
-  jsi2cRead(&i2cInfo, SX_I2C_ADDR, 1, &data, true);
+  unsigned char data;
+  jsi2cReadReg(&i2cInfo, SX_I2C_ADDR, reg, 1, &data);
   return data;
 }
 

libs/nordic_thingy/jswrap_thingy.c

@@ -254,10 +254,7 @@ void mag_rd(int addr, unsigned char *data, int cnt) {
     wr(MAG_PIN_SDA, 1);
     wr(MAG_PIN_SCL, 1);
   } else {
-    unsigned char buf[1];
-    buf[0] = addr;
-    jsi2cWrite(&i2cMag, iaddr, 1, buf, false);
-    jsi2cRead(&i2cMag, iaddr, cnt, data, true);
+    jsi2cReadReg(&i2cMag, iaddr, addr, cnt, data);
   }
 }
 
@@ -559,9 +556,7 @@ bool accel_on(int milliHz) {
 void accel_read() {
   unsigned char buf[12];
   // FIXME: If just the accelerometer is on, we could avoid reading the gyro and read only 6 bytes
-  buf[0] = 0x22; // OUTX_L_G
-  jsi2cWrite(&i2cAccel, ACCEL_ADDR, 1, buf, false);
-  jsi2cRead(&i2cAccel, ACCEL_ADDR, 12, buf, true);
+  jsi2cReadReg(&i2cAccel, ACCEL_ADDR, 0x22, 12, buf); // OUTX_L_G
   gyro_reading[0] = (buf[1]<<8) | buf[0];
   gyro_reading[1] = (buf[3]<<8) | buf[2];
   gyro_reading[2] = (buf[5]<<8) | buf[4];
@@ -575,9 +570,7 @@ void accel_wait() {
   unsigned char buf[1];
   timeout = 400;
   do {
-    buf[0] = 0x1E; // STATUS_REG
-    jsi2cWrite(&i2cAccel, ACCEL_ADDR, 1, buf, false);
-    jsi2cRead(&i2cAccel, ACCEL_ADDR, 1, buf, true);
+    jsi2cReadReg(&i2cAccel, ACCEL_ADDR, 0x1E, 1, buf); // STATUS_REG
     //jsiConsolePrintf("M %d\n", buf[0]);
   } while (!(buf[0]&3) && --timeout); // ZYXDA
   if (!timeout) jsExceptionHere(JSET_INTERNALERROR, "Timeout (Accelerometer)");
@@ -950,9 +943,7 @@ JsVarFloat jswrap_puck_getTemperature() {
     //buf[1] = 1; // CONF
     //buf[0] = 0; // on
     //jsi2cWrite(&i2cTemp,TEMP_ADDR, 1, buf, false);
-    buf[0] = 0; // TEMP
-    jsi2cWrite(&i2cTemp,TEMP_ADDR, 1, buf, false);
-    jsi2cRead(&i2cTemp, TEMP_ADDR, 2, buf, true);
+    jsi2cReadReg(&i2cTemp, TEMP_ADDR, 0, 2, buf); // TEMP
     int t = (buf[0]<<3) | (buf[1]>>5);
     if (t&1024) t-=2048; // negative
     temp_off();
@@ -1153,9 +1144,7 @@ int jswrap_puck_accelRd(JsVarInt reg) {
     return -1;
   }
   unsigned char buf[1];
-  buf[0] = (unsigned char)reg;
-  jsi2cWrite(&i2cAccel, ACCEL_ADDR, 1, buf, false);
-  jsi2cRead(&i2cAccel, ACCEL_ADDR, 1, buf, true);
+  jsi2cReadReg(&i2cAccel, ACCEL_ADDR, reg, 1, buf);
   return buf[0];
 }
 
@@ -1555,9 +1544,7 @@ bool _jswrap_puck_selfTest(bool advertisePassOrFail) {
   if (PUCKJS_HAS_ACCEL) {
     accel_on(1660000);
     unsigned char buf[1];
-    buf[0] = 0x0F; // WHOAMI
-    jsi2cWrite(&i2cAccel, ACCEL_ADDR, 1, buf, false);
-    jsi2cRead(&i2cAccel, ACCEL_ADDR, 1, buf, true);
+    jsi2cReadReg(&i2cAccel, ACCEL_ADDR, 0x0F, 1, buf); // WHOAMI
     accel_off();
     if (buf[0]!=106) {
       if (!err[0]) strcpy(err,"ACC");

libs/puckjs/jswrap_puck.c

@@ -120,7 +120,7 @@ static void i2c_wr_bit(i2cInfo *inf, bool b) {
   if (inf->timeout && !timeout) err("Timeout (wr)");
   i2c_pin_wr0(inf->pinSCL);
   i2c_pin_wr1(inf->pinSDA); // stop forcing SDA (needed?)
-  dly(inf);  
+  dly(inf);
 }
 
 static bool i2c_rd_bit(i2cInfo *inf) {
@@ -218,4 +218,16 @@ bool jsi2cRead(JshI2CInfo *inf, unsigned char address, int nBytes, unsigned char
   return true;
 }
 
+bool jsi2cWriteReg(JshI2CInfo *inf, unsigned char address, unsigned char reg, unsigned char value) {
+  unsigned char buf[2];
+  buf[0] = reg;
+  buf[1] = value;
+  return jsi2cWrite(inf, address, 2, buf, true);
+}
+
+bool jsi2cReadReg(JshI2CInfo *inf, unsigned char address, unsigned char reg, int nBytes, unsigned char *data) {
+  jsi2cWrite(inf, address, 1, &reg, false);
+  return jsi2cRead(inf, address, nBytes, data, true);
+}
+
 #endif // ESPR_NO_SOFT_I2C

src/jsi2c.c

@@ -27,6 +27,8 @@ void jsi2cSetup(JshI2CInfo *inf);
 void jsi2cUnsetup(JshI2CInfo *inf); ///< turn off I2C (remove pullups/sense)
 bool jsi2cWrite(JshI2CInfo *inf, unsigned char address, int nBytes, const unsigned char *data, bool sendStop);
 bool jsi2cRead(JshI2CInfo *inf, unsigned char address, int nBytes, unsigned char *data, bool sendStop);
+bool jsi2cWriteReg(JshI2CInfo *inf, unsigned char address, unsigned char reg, unsigned char value);
+bool jsi2cReadReg(JshI2CInfo *inf, unsigned char address, unsigned char reg, int nBytes, unsigned char *data);
 #endif // ESPR_NO_SOFT_I2C
 
 #endif // JSI2C_H_