Merge pull request #55 from Air-duino/fix/wire

fix: 修复IIC的主从机轮询卡死的问题

Author: HalfSweet

libraries/Wire/src/Wire.cpp

@@ -128,7 +128,7 @@ 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)
+#if !defined(I2C_OTHER_FRAME) && !defined(AIR001xx)
   UNUSED(sendStop);
 #endif
   uint8_t read = 0;
@@ -156,7 +156,7 @@ uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddres
     }
 
     // perform blocking read into buffer
-#if defined(I2C_OTHER_FRAME)
+#if defined(I2C_OTHER_FRAME) && !defined(AIR001xx)
     if (sendStop == 0) {
       _i2c.handle.XferOptions = I2C_OTHER_FRAME ;
     } else {
@@ -231,12 +231,12 @@ void TwoWire::beginTransmission(int address)
 //
 uint8_t TwoWire::endTransmission(uint8_t sendStop)
 {
-#if !defined(I2C_OTHER_FRAME)
+#if !defined(I2C_OTHER_FRAME) && !defined(AIR001xx)
   UNUSED(sendStop);
 #endif
   int8_t ret = 4;
   // check transfer options and store it in the I2C handle
-#if defined(I2C_OTHER_FRAME)
+#if defined(I2C_OTHER_FRAME) && !defined(AIR001xx)
   if (sendStop == 0) {
     _i2c.handle.XferOptions = I2C_OTHER_FRAME ;
   } else {

libraries/Wire/src/utility/twi.c

@@ -867,11 +867,11 @@ i2c_status_e i2c_master_write(i2c_t *obj, uint8_t dev_address,
   if (size == 0) {
     ret = i2c_IsDeviceReady(obj, dev_address, 1);
   } else {
-#if defined(I2C_OTHER_FRAME)
+#if defined(I2C_OTHER_FRAME) && !defined(AIR001xx)
     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 defined(I2C_OTHER_FRAME)
+#if defined(I2C_OTHER_FRAME) && !defined(AIR001xx)
       status = HAL_I2C_Master_Seq_Transmit_IT(&(obj->handle), dev_address, data, size, XferOptions);
 #else
       status = HAL_I2C_Master_Transmit_IT(&(obj->handle), dev_address, data, size);
@@ -956,11 +956,11 @@ i2c_status_e i2c_master_read(i2c_t *obj, uint8_t dev_address, uint8_t *data, uin
   uint32_t err = 0;
   HAL_StatusTypeDef status = HAL_OK;
 
-#if defined(I2C_OTHER_FRAME)
+#if defined(I2C_OTHER_FRAME) && !defined(AIR001xx)
   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 defined(I2C_OTHER_FRAME)
+#if defined(I2C_OTHER_FRAME) && !defined(AIR001xx)
     status = HAL_I2C_Master_Seq_Receive_IT(&(obj->handle), dev_address, data, size, XferOptions);
 #else
     status = HAL_I2C_Master_Receive_IT(&(obj->handle), dev_address, data, size);
@@ -1181,7 +1181,7 @@ void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c)
   }
 }
 
-#if defined(I2C1_BASE) || (defined(AIR001xx) && defined(I2C_BASE))
+#if defined(I2C1_BASE)
 /**
 * @brief  This function handles I2C1 interrupt.
 * @param  None