Merge branch 'master' of https://github.com/stm32duino/Arduino_Core_STM32 into no_enums

Author: ghent360

cores/arduino/stm32/twi.c

@@ -75,6 +75,8 @@
 
 #define SLAVE_MODE_TRANSMIT 0
 #define SLAVE_MODE_RECEIVE 1
+#define SLAVE_MODE_LISTEN 2
+
 
 /**
  * @}
@@ -261,7 +263,12 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
  handle->Init.Timing = timing;
 #else
  handle->Init.ClockSpeed = timing;
- handle->Init.DutyCycle = I2C_DUTYCYCLE_2;
+ /* Standard mode (sm) is up to 100kHz, then it's Fast mode (fm) */
+ /* In fast mode duty cyble bit must be set in CCR register */
+ if(timing > 100000)
+ handle->Init.DutyCycle = I2C_DUTYCYCLE_16_9;
+ else
+ handle->Init.DutyCycle = I2C_DUTYCYCLE_2;
 #endif
  handle->Init.OwnAddress1 = ownAddress;
  handle->Init.OwnAddress2 = 0xFF;
@@ -283,6 +290,9 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
  HAL_I2C_Init(handle);
 
  obj->isMaster = master;
+ /* Initialize default values */
+ obj->slaveRxNbData = 0;
+ obj->slaveMode = SLAVE_MODE_LISTEN;
 }
 
 /**
@@ -326,6 +336,12 @@ void i2c_setTiming(i2c_t *obj, uint32_t frequency)
  obj->handle.Init.Timing = f;
 #else
  obj->handle.Init.ClockSpeed = f;
+ /* Standard mode (sm) is up to 100kHz, then it's Fast mode (fm) */
+ /* In fast mode duty cyble bit must be set in CCR register */
+ if(frequency > 100000)
+ obj->handle.Init.DutyCycle = I2C_DUTYCYCLE_16_9;
+ else
+ obj->handle.Init.DutyCycle = I2C_DUTYCYCLE_2;
 #endif
 /*
  else if(frequency <= 600000)
@@ -355,6 +371,11 @@ i2c_status_e i2c_master_write(i2c_t *obj, uint8_t dev_address,
  uint32_t tickstart = HAL_GetTick();
  uint32_t delta = 0;
 
+ /* When size is 0, this is usually an I2C scan / ping to check if device is there and ready */
+ if (size == 0) {
+ return i2c_IsDeviceReady(obj, dev_address, 1);
+ }
+
  do{
  if(HAL_I2C_Master_Transmit_IT(&(obj->handle), dev_address, data, size) == HAL_OK){
  ret = I2C_OK;
@@ -395,9 +416,10 @@ i2c_status_e i2c_slave_write_IT(i2c_t *obj, uint8_t *data, uint16_t size)
  // Check the communication status
  for(i = 0; i < size; i++) {
  obj->i2cTxRxBuffer[i] = *(data+i);
- obj->i2cTxRxBufferSize++;
  }
 
+ obj->i2cTxRxBufferSize = size;
+
  return I2C_OK;
 }
 
@@ -447,8 +469,19 @@ i2c_status_e i2c_IsDeviceReady(i2c_t *obj, uint8_t devAddr, uint32_t trials)
 {
  i2c_status_e ret = HAL_OK;
 
- if(HAL_I2C_IsDeviceReady( &(obj->handle), devAddr, trials, I2C_TIMEOUT_TICK) != HAL_OK) {
- ret = I2C_BUSY;
+ switch (HAL_I2C_IsDeviceReady( &(obj->handle), devAddr, trials, I2C_TIMEOUT_TICK)) {
+ case HAL_OK:
+ ret = HAL_OK;
+ break;
+ case HAL_TIMEOUT:
+ ret = I2C_TIMEOUT;
+ break;
+ case HAL_BUSY:
+ ret = I2C_BUSY;
+ break;
+ default:
+ ret = I2C_TIMEOUT;
+ break;
  }
 
  return ret;
@@ -509,8 +542,6 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
 
  if(AddrMatchCode == hi2c->Init.OwnAddress1) {
  if(TransferDirection == I2C_DIRECTION_RECEIVE) {
-
- obj->i2cTxRxBufferSize = 0;
  obj->slaveMode = SLAVE_MODE_TRANSMIT;
 
  if(obj->i2c_onSlaveTransmit != NULL) {
@@ -519,9 +550,12 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
  HAL_I2C_Slave_Sequential_Transmit_IT(hi2c, obj->i2cTxRxBuffer,
  obj->i2cTxRxBufferSize, I2C_LAST_FRAME);
  } else {
+ obj->slaveRxNbData = 0;
  obj->slaveMode = SLAVE_MODE_RECEIVE;
- HAL_I2C_Slave_Sequential_Receive_IT(hi2c, obj->i2cTxRxBuffer,
- I2C_TXRX_BUFFER_SIZE, I2C_LAST_FRAME);
+ /* We don't know in advance how many bytes will be sent by master so
+ * we'll fetch one by one until master ends the sequence */
+ HAL_I2C_Slave_Sequential_Receive_IT(hi2c, &(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
+ 1, I2C_NEXT_FRAME);
  }
  }
 }
@@ -534,19 +568,56 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
  */
 void HAL_I2C_ListenCpltCallback(I2C_HandleTypeDef *hi2c)
 {
- uint8_t nbData = 0;
  i2c_t *obj = get_i2c_obj(hi2c);
 
+ /* Previous master transaction now ended, so inform upper layer if needed
+ * then prepare for listening to next request */
  if((obj->i2c_onSlaveReceive != NULL) &&
  (obj->slaveMode == SLAVE_MODE_RECEIVE)) {
- nbData = I2C_TXRX_BUFFER_SIZE - obj->handle.XferSize;
- if(nbData != 0) {
- obj->i2c_onSlaveReceive(obj->i2cTxRxBuffer, nbData);
+ if(obj->slaveRxNbData != 0) {
+ obj->i2c_onSlaveReceive(obj->i2cTxRxBuffer, obj->slaveRxNbData);
  }
  }
+ obj->slaveMode = SLAVE_MODE_LISTEN;
+ obj->slaveRxNbData = 0;
  HAL_I2C_EnableListen_IT(hi2c);
 }
 
+/**
+ * @brief Slave RX complete callback
+ * @param hi2c Pointer to a I2C_HandleTypeDef structure that contains
+ * the configuration information for the specified I2C.
+ * @retval None
+ */
+void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c)
+{
+ i2c_t *obj = get_i2c_obj(hi2c);
+ /* One more byte was received, store it then prepare next */
+ if(obj->slaveRxNbData < I2C_TXRX_BUFFER_SIZE) {
+ obj->slaveRxNbData++;
+ } else {
+ printf("ERROR: I2C Slave RX overflow\n");
+ }
+ /* Restart interrupt mode for next Byte */
+ if(obj->slaveMode == SLAVE_MODE_RECEIVE) {
+ HAL_I2C_Slave_Sequential_Receive_IT(hi2c, &(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
+ 1, I2C_NEXT_FRAME);
+ }
+}
+
+/**
+ * @brief Slave TX complete callback
+ * @param hi2c Pointer to a I2C_HandleTypeDef structure that contains
+ * the configuration information for the specified I2C.
+ * @retval None
+ */
+void HAL_I2C_SlaveTxCpltCallback(I2C_HandleTypeDef *hi2c)
+{
+ i2c_t *obj = get_i2c_obj(hi2c);
+ /* Reset transmit buffer size */
+ obj->i2cTxRxBufferSize = 0;
+}
+
 /**
  * @brief I2C error callback.
  * @note In master mode, the callback is not used because the error is reported

cores/arduino/stm32/twi.h

@@ -91,12 +91,13 @@ struct i2c_s {
 #if !defined(STM32F0xx) && !defined(STM32L0xx)
  IRQn_Type irqER;
 #endif //!defined(STM32F0xx) && !defined(STM32L0xx)
- uint8_t slaveMode;
+ volatile uint8_t slaveMode;
  uint8_t isMaster;
+ volatile int slaveRxNbData; // Number of accumulated bytes received in Slave mode
  void (*i2c_onSlaveReceive)(uint8_t *, int);
  void (*i2c_onSlaveTransmit)(void);
- uint8_t i2cTxRxBuffer[I2C_TXRX_BUFFER_SIZE];
- uint8_t i2cTxRxBufferSize;
+ volatile uint8_t i2cTxRxBuffer[I2C_TXRX_BUFFER_SIZE];
+ volatile uint8_t i2cTxRxBufferSize;
 };
 
 ///@brief I2C state

libraries/Wire/examples/i2c_scanner/i2c_scanner.ino

@@ -0,0 +1,96 @@
+// --------------------------------------
+// i2c_scanner
+//
+// Version 1
+// This program (or code that looks like it)
+// can be found in many places.
+// For example on the Arduino.cc forum.
+// The original author is not know.
+// Version 2, Juni 2012, Using Arduino 1.0.1
+// Adapted to be as simple as possible by Arduino.cc user Krodal
+// Version 3, Feb 26 2013
+// V3 by louarnold
+// Version 4, March 3, 2013, Using Arduino 1.0.3
+// by Arduino.cc user Krodal.
+// Changes by louarnold removed.
+// Scanning addresses changed from 0...127 to 1...119,
+// according to the i2c scanner by Nick Gammon
+// http://www.gammon.com.au/forum/?id=10896
+// Version 5, March 28, 2013
+// As version 4, but address scans now to 127.
+// A sensor seems to use address 120.
+//
+// This sketch tests the standard 7-bit addresses
+// Devices with higher bit address might not be seen properly.
+//
+
+
+
+// Example pinmap for Bluepill I2Cs (by Testato)
+//
+// I2C-1 standard pins: PB7(sda) PB6(scl)
+// Use it by "Wire" without pin declaration
+//
+// I2C-1 alternative pins: PB9(sda) PB8(scl)
+// Remap the first I2C before call begin()
+// Wire.setSDA(PB9);
+// Wire.setSCL(PB8);
+// Wire.begin();
+//
+// I2C-2: PB11(sda) PB10(scl)
+// Wire.setSDA(PB11);
+// Wire.setSCL(PB10);
+//
+// If you want to use the two I2Cs simultaneously, create a new instance for the second I2C
+// TwoWire Wire2(PB11,PB10);
+
+
+
+#include <Wire.h>
+
+
+void setup() {
+
+ Serial.begin(9600);
+ Wire.begin();
+ Serial.println("\nI2C Scanner");
+}
+
+
+void loop() {
+ byte error, address;
+ int nDevices;
+
+ Serial.println("Scanning...");
+
+ nDevices = 0;
+ for(address = 1; address < 127; address++) {
+ // The i2c_scanner uses the return value of
+ // the Write.endTransmisstion to see if
+ // a device did acknowledge to the address.
+
+ Wire.beginTransmission(address);
+ error = Wire.endTransmission();
+ 
+ if (error == 0) {
+ Serial.print("I2C device found at address 0x");
+ if (address < 16) 
+ Serial.print("0");
+ Serial.println(address, HEX);
+
+ nDevices++;
+ }
+ else if (error == 4) {
+ Serial.print("Unknown error at address 0x");
+ if (address < 16) 
+ Serial.print("0");
+ Serial.println(address, HEX);
+ } 
+ }
+ if (nDevices == 0)
+ Serial.println("No I2C devices found");
+ else
+ Serial.println("done");
+
+ delay(5000); // wait 5 seconds for next scan
+}