Merge pull request #1 from ABOSTM/PR_590

update on PR Added the repeated-start feature in I2C driver stm32duino#590

Author: jmchiappa

cores/arduino/stm32/twi.c

@@ -716,8 +716,16 @@ i2c_status_e i2c_master_write(i2c_t *obj, uint8_t dev_address,
     return i2c_IsDeviceReady(obj, dev_address, 1);
   }
 
+#if defined(I2C_OTHER_FRAME)
+  uint32_t XferOptions = obj->handle.XferOptions; // save XferOptions value, because handle can be modified by HAL, which cause issue in case of NACK from slave
+#endif
+
   do {
-    if (HAL_I2C_Master_Seq_Transmit_IT(&(obj->handle), dev_address, data, size, obj->handle.XferOptions) == HAL_OK) {
+#if defined(I2C_OTHER_FRAME)
+    if (HAL_I2C_Master_Seq_Transmit_IT(&(obj->handle), dev_address, data, size, XferOptions) == HAL_OK) {
+#else
+    if (HAL_I2C_Master_Transmit_IT(&(obj->handle), dev_address, data, size) == HAL_OK) {
+#endif
       ret = I2C_OK;
       // wait for transfer completion
       while ((HAL_I2C_GetState(&(obj->handle)) != HAL_I2C_STATE_READY)
@@ -777,8 +785,16 @@ i2c_status_e i2c_master_read(i2c_t *obj, uint8_t dev_address, uint8_t *data, uin
   uint32_t tickstart = HAL_GetTick();
   uint32_t delta = 0;
 
+#if defined(I2C_OTHER_FRAME)
+  uint32_t XferOptions = obj->handle.XferOptions; // save XferOptions value, because handle can be modified by HAL, which cause issue in case of NACK from slave
+#endif
+
   do {
-    if (HAL_I2C_Master_Seq_Receive_IT(&(obj->handle), dev_address, data, size, obj->handle.XferOptions) == HAL_OK) {
+#if defined(I2C_OTHER_FRAME)
+    if (HAL_I2C_Master_Seq_Receive_IT(&(obj->handle), dev_address, data, size, XferOptions) == HAL_OK) {
+#else
+    if (HAL_I2C_Master_Receive_IT(&(obj->handle), dev_address, data, size) == HAL_OK) {
+#endif
       ret = I2C_OK;
       // wait for transfer completion
       while ((HAL_I2C_GetState(&(obj->handle)) != HAL_I2C_STATE_READY)

libraries/Wire/src/Wire.cpp

@@ -27,7 +27,6 @@ extern "C" {
 
 #include "Wire.h"
 
-#define I2C_NO_OPTION_FRAME       0xFFFF0000U /*!< XferOptions default value */
 // Initialize Class Variables //////////////////////////////////////////////////
 uint8_t *TwoWire::rxBuffer = nullptr;
 uint8_t TwoWire::rxBufferAllocated = 0;
@@ -117,6 +116,10 @@ void TwoWire::setClock(uint32_t frequency)
 
 uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddress, uint8_t isize, uint8_t sendStop)
 {
+#if !defined(I2C_OTHER_FRAME)
+  UNUSED(sendStop);
+#endif
+
   if (_i2c.isMaster == 1) {
     allocateRxBuffer(quantity);
     // error if no memory block available to allocate the buffer
@@ -146,11 +149,15 @@ uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddres
 
     // perform blocking read into buffer
     uint8_t read = 0;
-    if (sendStop != 0) {
-      _i2c.handle.XferOptions = I2C_LAST_FRAME;
+
+#if defined(I2C_OTHER_FRAME)
+    if (sendStop == 0) {
+      _i2c.handle.XferOptions = I2C_OTHER_FRAME ;
     } else {
-      _i2c.handle.XferOptions = I2C_NO_OPTION_FRAME;
+      _i2c.handle.XferOptions = I2C_OTHER_AND_LAST_FRAME;
     }
+#endif
+
     if (I2C_OK == i2c_master_read(&_i2c, address << 1, rxBuffer, quantity)) {
       read = quantity;
     }
@@ -216,13 +223,18 @@ void TwoWire::beginTransmission(int address)
 //
 uint8_t TwoWire::endTransmission(uint8_t sendStop)
 {
+#if !defined(I2C_OTHER_FRAME)
+  UNUSED(sendStop);
+#endif
   int8_t ret = 4;
   // check transfer options and store it in the I2C handle
+#if defined(I2C_OTHER_FRAME)
   if (sendStop == 0) {
-    _i2c.handle.XferOptions = I2C_FIRST_FRAME;
+    _i2c.handle.XferOptions = I2C_OTHER_FRAME ;
   } else {
-    _i2c.handle.XferOptions = I2C_FIRST_AND_LAST_FRAME;
+    _i2c.handle.XferOptions = I2C_OTHER_AND_LAST_FRAME;
   }
+#endif
 
   if (_i2c.isMaster == 1) {
     // transmit buffer (blocking)