From 04eaabf579f96cb43b3ecb591ca90f83360aaa23 Mon Sep 17 00:00:00 2001 From: Edmund Hsu Date: Sun, 1 Apr 2018 19:35:05 +1000 Subject: [PATCH] Fix EV_COG_AD3029LZ `us_ticker_fire_interrupt()` minimal time interval - ensure us_ticker_irq_handler() is called only when GP2 timer expires - set us_ticker_set_interrupt() time interval to be 9.846 us - set us_ticker_fire_interrupt() time interval to be 0.03846 us --- .../TARGET_ADUCM3029/api/us_ticker.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/us_ticker.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/us_ticker.c index 82ca488f5f..553c0237b0 100755 --- a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/us_ticker.c +++ b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/us_ticker.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010-2017 Analog Devices, Inc. + * Copyright (c) 2010-2018 Analog Devices, Inc. * * All rights reserved. * @@ -206,7 +206,10 @@ static void event_timer() adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, &tmr2Config); adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true); } else { - us_ticker_irq_handler(); + tmr2Config.nLoad = 65535u; + tmr2Config.nAsyncLoad = 65535u; + adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, &tmr2Config); + adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true); } } @@ -231,7 +234,11 @@ static void GP2CallbackFunction(void *pCBParam, uint32_t Event, void * pArg) if (largecnt < 65536u) { adi_tmr_Enable(ADI_TMR_DEVICE_GP2, false); - event_timer(); + if (largecnt) { + event_timer(); + } else { + us_ticker_irq_handler(); + } } } @@ -328,6 +335,7 @@ void us_ticker_set_interrupt(timestamp_t timestamp) * */ calc_event_counts(timestamp); // use timestamp to calculate largecnt to control number of timer interrupts + tmr2Config.ePrescaler = ADI_TMR_PRESCALER_256; // TMR2 at 26MHz/256 event_timer(); // uses largecnt to initiate timer interrupts } @@ -339,7 +347,9 @@ void us_ticker_set_interrupt(timestamp_t timestamp) */ void us_ticker_fire_interrupt(void) { - NVIC_SetPendingIRQ(TMR2_EVT_IRQn); + largecnt = 1; // set a minimal interval so interrupt fire immediately + tmr2Config.ePrescaler = ADI_TMR_PRESCALER_1; // TMR2 at 26MHz/1 + event_timer(); // enable the timer and interrupt }