diff options
| author | walkerstop <walkerstop@gmail.com> | 2018-05-01 01:00:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 01:00:33 -0700 |
| commit | 40db44f540436398e0840544044154d13eee63b6 (patch) | |
| tree | dad3f1f3b6ac3927484ee22002a947662a8a0173 /testhal/STM32/STM32F4xx/EICU/main.c | |
| parent | 4e9f077fb10255dced1da4d5d2ad9f8ae41442a2 (diff) | |
| parent | d4d384557df0e8e7a8071553448b0c42849f98c0 (diff) | |
| download | ChibiOS-Contrib-40db44f540436398e0840544044154d13eee63b6.tar.gz ChibiOS-Contrib-40db44f540436398e0840544044154d13eee63b6.tar.bz2 ChibiOS-Contrib-40db44f540436398e0840544044154d13eee63b6.zip | |
Merge branch 'master' into master
Diffstat (limited to 'testhal/STM32/STM32F4xx/EICU/main.c')
| -rw-r--r-- | testhal/STM32/STM32F4xx/EICU/main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/testhal/STM32/STM32F4xx/EICU/main.c b/testhal/STM32/STM32F4xx/EICU/main.c index 90f8eb1..a6dbf8a 100644 --- a/testhal/STM32/STM32F4xx/EICU/main.c +++ b/testhal/STM32/STM32F4xx/EICU/main.c @@ -35,10 +35,10 @@ typedef struct { /*
* Chose values suitable for measurement using 16-bit timer on 1MHz
*/
-static pulse_t pulse_led3 = {MS2ST(2), MS2ST(59), GPIOD_LED3};
-static pulse_t pulse_led4 = {MS2ST(3), MS2ST(53), GPIOD_LED4};
-static pulse_t pulse_led5 = {MS2ST(5), MS2ST(47), GPIOD_LED5};
-static pulse_t pulse_led6 = {MS2ST(7), MS2ST(43), GPIOD_LED6};
+static pulse_t pulse_led3 = {TIME_MS2I(2), TIME_MS2I(59), GPIOD_LED3};
+static pulse_t pulse_led4 = {TIME_MS2I(3), TIME_MS2I(53), GPIOD_LED4};
+static pulse_t pulse_led5 = {TIME_MS2I(5), TIME_MS2I(47), GPIOD_LED5};
+static pulse_t pulse_led6 = {TIME_MS2I(7), TIME_MS2I(43), GPIOD_LED6};
/*
*
@@ -72,19 +72,19 @@ void eicu_cb(EICUDriver *eicup, eicuchannel_t channel, uint32_t w, uint32_t p) { (void)p;
switch (channel) {
case EICU_CHANNEL_1:
- if (abs((int32_t)w - (int32_t)ST2US(pulse_led3.high)) > tolerance)
+ if (abs((int32_t)w - (int32_t)TIME_I2US(pulse_led3.high)) > tolerance)
osalSysHalt("ch1");
break;
case EICU_CHANNEL_2:
- if (abs((int32_t)w - (int32_t)ST2US(pulse_led4.high)) > tolerance)
+ if (abs((int32_t)w - (int32_t)TIME_I2US(pulse_led4.high)) > tolerance)
osalSysHalt("ch2");
break;
case EICU_CHANNEL_3:
- if (abs((int32_t)w - (int32_t)ST2US(pulse_led5.high)) > tolerance)
+ if (abs((int32_t)w - (int32_t)TIME_I2US(pulse_led5.high)) > tolerance)
osalSysHalt("ch3");
break;
case EICU_CHANNEL_4:
- if (abs((int32_t)w - (int32_t)ST2US(pulse_led6.high)) > tolerance)
+ if (abs((int32_t)w - (int32_t)TIME_I2US(pulse_led6.high)) > tolerance)
osalSysHalt("ch4");
break;
default:
|