diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-12-30 20:45:56 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-12-30 20:45:56 +0000 |
| commit | 2234fd3e31d4ce6e2b3990340b52719951e65731 (patch) | |
| tree | 3d8dadab8ab98a46ab2f98ed0b94d648e86ce837 /testhal/STM32F1xx/I2C/fake.c | |
| parent | 08feb80580ca82cfebd77a43d14d1197ec7c4f99 (diff) | |
| download | ChibiOS-2234fd3e31d4ce6e2b3990340b52719951e65731.tar.gz ChibiOS-2234fd3e31d4ce6e2b3990340b52719951e65731.tar.bz2 ChibiOS-2234fd3e31d4ce6e2b3990340b52719951e65731.zip | |
I2C. API changes mostly done.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3692 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32F1xx/I2C/fake.c')
| -rw-r--r-- | testhal/STM32F1xx/I2C/fake.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/testhal/STM32F1xx/I2C/fake.c b/testhal/STM32F1xx/I2C/fake.c index b06ffbdfd..9d46f448d 100644 --- a/testhal/STM32F1xx/I2C/fake.c +++ b/testhal/STM32F1xx/I2C/fake.c @@ -42,14 +42,17 @@ static i2cflags_t errors = 0; /* This is main function. */
void request_fake(void){
+ msg_t status = RDY_OK;
+ systime_t tmo = MS2ST(4);
i2cAcquireBus(&I2CD1);
- i2cMasterReceive(&I2CD1, addr, rx_data, 2, &errors, TIME_INFINITE);
+ status = i2cMasterReceiveTimeout(&I2CD1, addr, rx_data, 2, tmo);
i2cReleaseBus(&I2CD1);
- if (errors == I2CD_ACK_FAILURE){
- __NOP();
+ if (status != RDY_OK){
+ errors = i2cGetErrors(&I2CD1);
}
+
else{
temperature = (rx_data[0] << 8) + rx_data[1];
}
|