[Wire] modifying to be able to do multiple .write() calls in i2cRequestEvent() as Slave

Daniel Liebler · Daniel Liebler · commit 8681386ab676 · 2020-10-29T10:10:06.000+01:00
diff --git a/libraries/Wire/src/utility/twi.c b/libraries/Wire/src/utility/twi.c
@@ -846,9 +846,10 @@ i2c_status_e i2c_slave_write_IT(i2c_t *obj, uint8_t *data, uint16_t size)
   } else {
     // Check the communication status
     for (i = 0; i < size; i++) {
-      obj->i2cTxRxBuffer[i] = *(data + i);
+      obj->i2cTxRxBuffer[obj->i2cTxRxBufferSize + i] = *(data + i);
     }
 
+    size = size + obj->i2cTxRxBufferSize;
     obj->i2cTxRxBufferSize = size;
   }
   return ret;
@@ -986,6 +987,7 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
       obj->slaveMode = SLAVE_MODE_TRANSMIT;
 
       if (obj->i2c_onSlaveTransmit != NULL) {
+        obj->i2cTxRxBufferSize = 0;
         obj->i2c_onSlaveTransmit(obj);
       }
 #if defined(STM32F0xx) || defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F3xx) ||\

Original file line number	Diff line number	Diff line change
`@@ -846,9 +846,10 @@ i2c_status_e i2c_slave_write_IT(i2c_t obj, uint8_t data, uint16_t size)`
`846`	`846`	`} else {`
`847`	`847`	`// Check the communication status`
`848`	`848`	`for (i = 0; i < size; i++) {`
`849`		`- obj->i2cTxRxBuffer[i] = *(data + i);`
	`849`	`+ obj->i2cTxRxBuffer[obj->i2cTxRxBufferSize + i] = *(data + i);`
`850`	`850`	`}`
`851`	`851`
	`852`	`+ size = size + obj->i2cTxRxBufferSize;`
`852`	`853`	`obj->i2cTxRxBufferSize = size;`
`853`	`854`	`}`
`854`	`855`	`return ret;`
`@@ -986,6 +987,7 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui`
`986`	`987`	`obj->slaveMode = SLAVE_MODE_TRANSMIT;`
`987`	`988`
`988`	`989`	`if (obj->i2c_onSlaveTransmit != NULL) {`
	`990`	`+ obj->i2cTxRxBufferSize = 0;`
`989`	`991`	`obj->i2c_onSlaveTransmit(obj);`
`990`	`992`	`}`
`991`	`993`	`#if defined(STM32F0xx) \|\| defined(STM32F1xx) \|\| defined(STM32F2xx) \|\| defined(STM32F3xx) \|\|\`