aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/NRF51/NRF51822/I2C/main.c
diff options
context:
space:
mode:
authorFabien Poussin <fabien.poussin@gmail.com>2018-03-15 12:51:14 +0100
committerGitHub <noreply@github.com>2018-03-15 12:51:14 +0100
commit3add406135c78d44ebc38d810b22af5da19cd296 (patch)
treefd42297388ca04dc8ff202e40d491b73ff4c21d6 /testhal/NRF51/NRF51822/I2C/main.c
parent345e218afd4f8009729dddc6eb541d8ec6a91565 (diff)
parentdabdfca04e5f470d1eb83f72f18269bd294031b6 (diff)
downloadChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.gz
ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.bz2
ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.zip
Merge branch 'master' into update_tests
Diffstat (limited to 'testhal/NRF51/NRF51822/I2C/main.c')
-rw-r--r--testhal/NRF51/NRF51822/I2C/main.c2
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){