diff options
| author | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:33:23 -0700 |
|---|---|---|
| committer | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:33:23 -0700 |
| commit | 6d879f58f5b56eda3330aa6e7f8382f441adecf4 (patch) | |
| tree | dad3f1f3b6ac3927484ee22002a947662a8a0173 /testhal/NRF51/NRF51822/I2C/main.c | |
| parent | 4e9f077fb10255dced1da4d5d2ad9f8ae41442a2 (diff) | |
| parent | d4d384557df0e8e7a8071553448b0c42849f98c0 (diff) | |
| download | ChibiOS-Contrib-6d879f58f5b56eda3330aa6e7f8382f441adecf4.tar.gz ChibiOS-Contrib-6d879f58f5b56eda3330aa6e7f8382f441adecf4.tar.bz2 ChibiOS-Contrib-6d879f58f5b56eda3330aa6e7f8382f441adecf4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'testhal/NRF51/NRF51822/I2C/main.c')
| -rw-r--r-- | testhal/NRF51/NRF51822/I2C/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testhal/NRF51/NRF51822/I2C/main.c b/testhal/NRF51/NRF51822/I2C/main.c index cd038b5..7523548 100644 --- a/testhal/NRF51/NRF51822/I2C/main.c +++ b/testhal/NRF51/NRF51822/I2C/main.c @@ -107,7 +107,7 @@ static THD_FUNCTION(PollFakeThread, arg) { i2cflags_t errors;
i2cAcquireBus(&I2CD1);
- status = i2cMasterReceiveTimeout(&I2CD1, I2C_FAKE_ADDR, rx_data, 2, MS2ST(4));
+ status = i2cMasterReceiveTimeout(&I2CD1, I2C_FAKE_ADDR, rx_data, 2, TIME_MS2I(4));
i2cReleaseBus(&I2CD1);
if (status == MSG_RESET){
|