aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/STM32/I2C/lis3.c
diff options
context:
space:
mode:
authorbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-07-03 18:02:55 +0000
committerbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-07-03 18:02:55 +0000
commitccb28114da9485c5e3f950fd31dfb67be1b8a173 (patch)
treea9645e52236f59fb69d4995ee9c121acaeb50808 /testhal/STM32/I2C/lis3.c
parentaf0e40079ded13b8842e8d129fa6ed2f37fdf678 (diff)
downloadChibiOS-ccb28114da9485c5e3f950fd31dfb67be1b8a173.tar.gz
ChibiOS-ccb28114da9485c5e3f950fd31dfb67be1b8a173.tar.bz2
ChibiOS-ccb28114da9485c5e3f950fd31dfb67be1b8a173.zip
I2C. Driver looks working, but sometimes hangs up. I don't know, my big project cause troubles in it, or driver cause troubles in my project.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3116 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32/I2C/lis3.c')
-rw-r--r--testhal/STM32/I2C/lis3.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/testhal/STM32/I2C/lis3.c b/testhal/STM32/I2C/lis3.c
index c50d7e9a6..26a3292f5 100644
--- a/testhal/STM32/I2C/lis3.c
+++ b/testhal/STM32/I2C/lis3.c
@@ -54,9 +54,9 @@ static msg_t I2CAccelThread(void *arg) {
i2cscfg = (I2CSlaveConfig *)msg;
/* collect measured data */
- acceleration_x = i2cscfg->rxbuf[0] + (i2cscfg->rxbuf[1] << 8);
- acceleration_y = i2cscfg->rxbuf[2] + (i2cscfg->rxbuf[3] << 8);
- acceleration_z = i2cscfg->rxbuf[4] + (i2cscfg->rxbuf[5] << 8);
+ acceleration_x = accel_rx_data[0] + (accel_rx_data[1] << 8);
+ acceleration_y = accel_rx_data[2] + (accel_rx_data[3] << 8);
+ acceleration_z = accel_rx_data[4] + (accel_rx_data[5] << 8);
}
return 0;
}
@@ -77,8 +77,6 @@ static void i2c_lis3_cb(I2CDriver *i2cp, const I2CSlaveConfig *i2cscfg){
static const I2CSlaveConfig lis3 = {
i2c_lis3_cb,
i2c_lis3_error_cb,
- accel_rx_data,
- accel_tx_data,
};
@@ -106,13 +104,13 @@ int init_lis3(void){
#define RXBYTES 0 /* set to 0 because we need only transmit */
/* configure accelerometer */
- lis3.txbuf[0] = ACCEL_CTRL_REG1 | AUTO_INCREMENT_BIT; /* register address */
- lis3.txbuf[1] = 0b11100111;
- lis3.txbuf[2] = 0b01000001;
- lis3.txbuf[3] = 0b00000000;
+ accel_tx_data[0] = ACCEL_CTRL_REG1 | AUTO_INCREMENT_BIT; /* register address */
+ accel_tx_data[1] = 0b11100111;
+ accel_tx_data[2] = 0b01000001;
+ accel_tx_data[3] = 0b00000000;
/* sending */
- i2cMasterTransmit(&I2CD1, &lis3, lis3_addr, TXBYTES, RXBYTES);
+ i2cMasterTransmit(&I2CD1, &lis3, lis3_addr, accel_tx_data, TXBYTES, accel_rx_data, RXBYTES);
chThdSleepMilliseconds(1);
#undef RXBYTES
@@ -127,9 +125,9 @@ int init_lis3(void){
void request_acceleration_data(void){
#define RXBYTES 6
#define TXBYTES 1
- lis3.txbuf[0] = ACCEL_OUT_DATA | AUTO_INCREMENT_BIT; // register address
+ accel_tx_data[0] = ACCEL_OUT_DATA | AUTO_INCREMENT_BIT; // register address
i2cAcquireBus(&I2CD1);
- i2cMasterTransmit(&I2CD1, &lis3, lis3_addr, TXBYTES, RXBYTES);
+ i2cMasterTransmit(&I2CD1, &lis3, lis3_addr, accel_tx_data, TXBYTES, accel_rx_data, RXBYTES);
i2cReleaseBus(&I2CD1);
#undef RXBYTES
#undef TXBYTES