diff options
| author | Diego Ismirlian <dismirlian (at) google's mail.com> | 2018-08-20 20:50:22 -0300 |
|---|---|---|
| committer | Diego Ismirlian <dismirlian (at) google's mail.com> | 2018-08-20 20:50:22 -0300 |
| commit | 0936be2541015b384b00e31ece7f42a510511aaa (patch) | |
| tree | b374d386e02aff0559457d11db61c96567a1fc50 /testhal/NRF51/NRF51822 | |
| parent | 03615f40dc3d1cbb5354035c326963b49759f440 (diff) | |
| parent | fe95e90b80a28dd2f40bfee1ad90822b99519c6a (diff) | |
| download | ChibiOS-Contrib-0936be2541015b384b00e31ece7f42a510511aaa.tar.gz ChibiOS-Contrib-0936be2541015b384b00e31ece7f42a510511aaa.tar.bz2 ChibiOS-Contrib-0936be2541015b384b00e31ece7f42a510511aaa.zip | |
Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib
Diffstat (limited to 'testhal/NRF51/NRF51822')
| -rw-r--r-- | testhal/NRF51/NRF51822/EXT/main.c | 4 | ||||
| -rw-r--r-- | testhal/NRF51/NRF51822/I2C/main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/testhal/NRF51/NRF51822/EXT/main.c b/testhal/NRF51/NRF51822/EXT/main.c index 8d24d021..f24eb5d 100644 --- a/testhal/NRF51/NRF51822/EXT/main.c +++ b/testhal/NRF51/NRF51822/EXT/main.c @@ -52,7 +52,7 @@ static void extcb1(EXTDriver *extp, expchannel_t channel) if (!debouncing1 && (pad1 == PAL_LOW)) { debouncing1 = true; chSysLockFromISR(); - chVTSetI(&vt1, MS2ST(DEBOUNCE_TIME), led1toggle, NULL); + chVTSetI(&vt1, TIME_MS2I(DEBOUNCE_TIME), led1toggle, NULL); chSysUnlockFromISR(); } else if (debouncing1 && (pad1 == PAL_HIGH)) { chSysLockFromISR(); @@ -73,7 +73,7 @@ static void extcb2(EXTDriver *extp, expchannel_t channel) if (!debouncing2 && (pad2 == PAL_LOW)) { debouncing2 = true; chSysLockFromISR(); - chVTSetI(&vt2, MS2ST(DEBOUNCE_TIME), led2toggle, NULL); + chVTSetI(&vt2, TIME_MS2I(DEBOUNCE_TIME), led2toggle, NULL); chSysUnlockFromISR(); } else if (debouncing2 && (pad2 == PAL_HIGH)) { chSysLockFromISR(); 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){
|