From 9f7eb043eae1b5b0196354c373c6aae987695b86 Mon Sep 17 00:00:00 2001 From: fishsoupisgood Date: Sun, 14 Jun 2020 10:57:41 +0100 Subject: tidy --- app/tacho.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'app/tacho.c') diff --git a/app/tacho.c b/app/tacho.c index 35331da..96a4d1b 100644 --- a/app/tacho.c +++ b/app/tacho.c @@ -1,6 +1,6 @@ #include "project.h" -#define SPURIOUS MS(10) /*Anything faster than 6000rpm is a false trigger */ +#define SPURIOUS MS(10) /*Anything faster than 6000rpm is a false trigger */ @@ -14,44 +14,49 @@ cycle_diff (uint32_t a, uint32_t b) -void exti3_isr (void) +void +exti3_isr (void) { -uint32_t now, diff; -static uint32_t last_edge; + uint32_t now, diff; + static uint32_t last_edge; -if (!( EXTI_PR & TACHO)) return; + if (!(EXTI_PR & TACHO)) + return; -EXTI_PR=TACHO; + EXTI_PR = TACHO; -now=dwt_read_cycle_counter(); + now = dwt_read_cycle_counter (); -diff= cycle_diff(last_edge,now); + diff = cycle_diff (last_edge, now); -if (diff < SPURIOUS) return; + if (diff < SPURIOUS) + return; -last_edge=now; + last_edge = now; /* Want RPM, diff is in units of 1/72 us */ -if (!diff) return; + if (!diff) + return; /* uint32_t is able to express 60s in clock ticks, so divide everything by 2 */ -diff >>=1; + diff >>= 1; - -raw_tacho =(US ((60*1000000)/2))/diff; + + raw_tacho = (US ((60 * 1000000) / 2)) / diff; } -void tacho_init (void) +void +tacho_init (void) { MAP_INPUT_PU (TACHO); - exti_select_source (TACHO,TACHO_PORT); + exti_select_source (TACHO, TACHO_PORT); exti_set_trigger (TACHO, EXTI_TRIGGER_FALLING); exti_enable_request (TACHO); exti_reset_request (TACHO); @@ -59,6 +64,3 @@ void tacho_init (void) nvic_enable_irq (TACHO_IRQ); } - - - -- cgit v1.2.3