diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-04 17:46:32 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-04 17:46:32 +0000 |
| commit | 6a6160a99508770754d40621f606de610626bf29 (patch) | |
| tree | a249c7dde089d28d6fa45ed4f2fe8c2b9e0eeba3 /testhal | |
| parent | 09b8c8abe7fb09ef6eeb49df25f1b3acbea26752 (diff) | |
| download | ChibiOS-6a6160a99508770754d40621f606de610626bf29.tar.gz ChibiOS-6a6160a99508770754d40621f606de610626bf29.tar.bz2 ChibiOS-6a6160a99508770754d40621f606de610626bf29.zip | |
Fixed for time API changes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10943 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal')
| -rw-r--r-- | testhal/STM32/STM32F1xx/I2C/fake.c | 2 | ||||
| -rw-r--r-- | testhal/STM32/STM32F1xx/I2C/lis3.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/testhal/STM32/STM32F1xx/I2C/fake.c b/testhal/STM32/STM32F1xx/I2C/fake.c index 4da6d25e7..f3cca595a 100644 --- a/testhal/STM32/STM32F1xx/I2C/fake.c +++ b/testhal/STM32/STM32F1xx/I2C/fake.c @@ -28,7 +28,7 @@ static i2cflags_t errors = 0; /* This is main function. */
void request_fake(void){
msg_t status = MSG_OK;
- systime_t tmo = MS2ST(4);
+ sysinterval_t tmo = TIME_MS2I(4);
i2cAcquireBus(&I2CD1);
status = i2cMasterReceiveTimeout(&I2CD1, addr, rx_data, 2, tmo);
diff --git a/testhal/STM32/STM32F1xx/I2C/lis3.c b/testhal/STM32/STM32F1xx/I2C/lis3.c index 8217798d6..ab1ae1b90 100644 --- a/testhal/STM32/STM32F1xx/I2C/lis3.c +++ b/testhal/STM32/STM32F1xx/I2C/lis3.c @@ -54,7 +54,7 @@ static uint8_t accel_tx_data[8]; */
void lis3Start(void){
msg_t status = MSG_OK;
- systime_t tmo = MS2ST(4);
+ sysinterval_t tmo = TIME_MS2I(4);
/* configure accelerometer */
accel_tx_data[0] = ACCEL_CTRL_REG1 | AUTO_INCREMENT_BIT;
@@ -88,7 +88,7 @@ static void raw2g(uint8_t *raw, float *g) { */
void lis3GetAcc(float *result) {
msg_t status = MSG_OK;
- systime_t tmo = MS2ST(4);
+ sysinterval_t tmo = TIME_MS2I(4);
/* read in burst mode */
memset(accel_rx_data, 0x55, sizeof(accel_rx_data));
|