aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/STM32F1xx/I2C/lis3.c
diff options
context:
space:
mode:
authorbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-12-06 09:09:53 +0000
committerbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-12-06 09:09:53 +0000
commit1253ee88be70e16fe9057b5e1727f8664fa0c4ae (patch)
tree4e33cffba973a4ffcfa826f6a29966a4959bef67 /testhal/STM32F1xx/I2C/lis3.c
parentdbee267868ee52517dd465aee0078619dc68f584 (diff)
downloadChibiOS-1253ee88be70e16fe9057b5e1727f8664fa0c4ae.tar.gz
ChibiOS-1253ee88be70e16fe9057b5e1727f8664fa0c4ae.tar.bz2
ChibiOS-1253ee88be70e16fe9057b5e1727f8664fa0c4ae.zip
I2C. Testhal changed.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3558 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32F1xx/I2C/lis3.c')
-rw-r--r--testhal/STM32F1xx/I2C/lis3.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/testhal/STM32F1xx/I2C/lis3.c b/testhal/STM32F1xx/I2C/lis3.c
index 401f56199..2300ea5cb 100644
--- a/testhal/STM32F1xx/I2C/lis3.c
+++ b/testhal/STM32F1xx/I2C/lis3.c
@@ -18,8 +18,8 @@
/* buffers */
-static i2cblock_t accel_rx_data[ACCEL_RX_DEPTH];
-static i2cblock_t accel_tx_data[ACCEL_TX_DEPTH];
+static uint8_t accel_rx_data[ACCEL_RX_DEPTH];
+static uint8_t accel_tx_data[ACCEL_TX_DEPTH];
static int16_t acceleration_x = 0;
static int16_t acceleration_y = 0;
@@ -42,8 +42,8 @@ static void i2c_lis3_cb(I2CDriver *i2cp, const I2CSlaveConfig *i2cscfg){
/* Accelerometer lis3lv02dq config */
static const I2CSlaveConfig lis3 = {
- i2c_lis3_cb,
- i2c_lis3_error_cb,
+ i2c_lis3_cb,
+ i2c_lis3_error_cb,
};
@@ -67,9 +67,9 @@ int init_lis3(void){
*/
void request_acceleration_data(void){
accel_tx_data[0] = ACCEL_OUT_DATA | AUTO_INCREMENT_BIT; // register address
- //i2cAcquireBus(&I2CD1);
+ i2cAcquireBus(&I2CD1);
i2cMasterTransmit(&I2CD1, &lis3, lis3_addr, accel_tx_data, 1, accel_rx_data, 6);
- //i2cReleaseBus(&I2CD1);
+ i2cReleaseBus(&I2CD1);
acceleration_x = accel_rx_data[0] + (accel_rx_data[1] << 8);
acceleration_y = accel_rx_data[2] + (accel_rx_data[3] << 8);