let TwoWire() handle resetting the Hardware

stickbreaker · web-flow · commit f5b027c88a70 · 2018-03-11T19:12:14.000-06:00
The i2c data bus must be disconnected from the i2c peripheral before it is init'd. Else it will generate a glitch on both pins.  Since the Hal layer does not remember which pins are assigned, just return the error and let `TwoWire()` handle re-initing.
diff --git a/cores/esp32/esp32-hal-i2c.c b/cores/esp32/esp32-hal-i2c.c
@@ -974,11 +974,9 @@ i2c_err_t i2cProcQueue(i2c_t * i2c, uint32_t *readCount, uint16_t timeOutMillis)
 if(i2c == NULL){
   return I2C_ERROR_DEV;
   }
-if (i2c->dev->status_reg.bus_busy){
+if (i2c->dev->status_reg.bus_busy){ // return error, let TwoWire() handle resetting the hardware.
   log_i("Bus busy, reinit");
-  i2cInit(i2c->num);
-  if (i2c->dev->status_reg.bus_busy) return I2C_ERROR_BUSY;
-  else log_i("recovered");
+  return I2C_ERROR_BUSY;
   }
 I2C_MUTEX_LOCK();
 /* what about co-existance with SLAVE mode?

Original file line number	Diff line number	Diff line change
`@@ -974,11 +974,9 @@ i2c_err_t i2cProcQueue(i2c_t * i2c, uint32_t *readCount, uint16_t timeOutMillis)`
`974`	`974`	`if(i2c == NULL){`
`975`	`975`	`return I2C_ERROR_DEV;`
`976`	`976`	`}`
`977`		`-if (i2c->dev->status_reg.bus_busy){`
	`977`	`+if (i2c->dev->status_reg.bus_busy){ // return error, let TwoWire() handle resetting the hardware.`
`978`	`978`	`log_i("Bus busy, reinit");`
`979`		`- i2cInit(i2c->num);`
`980`		`- if (i2c->dev->status_reg.bus_busy) return I2C_ERROR_BUSY;`
`981`		`- else log_i("recovered");`
	`979`	`+ return I2C_ERROR_BUSY;`
`982`	`980`	`}`
`983`	`981`	`I2C_MUTEX_LOCK();`
`984`	`982`	`/* what about co-existance with SLAVE mode?`