diff options
author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-12-08 19:28:55 +0000 |
---|---|---|
committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-12-08 19:28:55 +0000 |
commit | 8196de6aef7616f7df96d757dddc9cfa9eb661dc (patch) | |
tree | b8ad2a8049314384e30f414b146ee4a875fbc953 /testhal/STM32F1xx/I2C/lis3.c | |
parent | edfa9d2fae1d667b3f71a8e61aa954ac2233e493 (diff) | |
download | ChibiOS-8196de6aef7616f7df96d757dddc9cfa9eb661dc.tar.gz ChibiOS-8196de6aef7616f7df96d757dddc9cfa9eb661dc.tar.bz2 ChibiOS-8196de6aef7616f7df96d757dddc9cfa9eb661dc.zip |
I2C. Testhal update.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3584 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32F1xx/I2C/lis3.c')
-rw-r--r-- | testhal/STM32F1xx/I2C/lis3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/testhal/STM32F1xx/I2C/lis3.c b/testhal/STM32F1xx/I2C/lis3.c index d3369ac82..6f697f8f7 100644 --- a/testhal/STM32F1xx/I2C/lis3.c +++ b/testhal/STM32F1xx/I2C/lis3.c @@ -40,6 +40,8 @@ static uint8_t accel_rx_data[ACCEL_RX_DEPTH];
static uint8_t accel_tx_data[ACCEL_TX_DEPTH];
+static i2cflags_t errors = 0;
+
static int16_t acceleration_x = 0;
static int16_t acceleration_y = 0;
static int16_t acceleration_z = 0;
@@ -57,7 +59,7 @@ int init_lis3(void){ /* sending */
i2cAcquireBus(&I2CD1);
- i2cMasterTransmit(&I2CD1, lis3_addr, accel_tx_data, 4, accel_rx_data, 0);
+ i2cMasterTransmit(&I2CD1, lis3_addr, accel_tx_data, 4, accel_rx_data, 0, &errors, TIME_INFINITE);
i2cReleaseBus(&I2CD1);
return 0;
}
@@ -68,7 +70,7 @@ int init_lis3(void){ void request_acceleration_data(void){
accel_tx_data[0] = ACCEL_OUT_DATA | AUTO_INCREMENT_BIT; // register address
i2cAcquireBus(&I2CD1);
- i2cMasterTransmit(&I2CD1, lis3_addr, accel_tx_data, 1, accel_rx_data, 6);
+ i2cMasterTransmit(&I2CD1, lis3_addr, accel_tx_data, 1, accel_rx_data, 6, &errors, TIME_INFINITE);
i2cReleaseBus(&I2CD1);
acceleration_x = accel_rx_data[0] + (accel_rx_data[1] << 8);
|