Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/timer_group_example' into 'master'

Browse source 
bugfix(timer group): remove floating-point in timer isr in example.

See merge request !1080
This commit is contained in:
Angus Gratton 2017-08-31 06:49:26 +08:00
commit a88f4126c6
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/peripherals/timer_group/main/timer_group_example_main.c
View file

@ -31,7 +31,6 @@ typedef struct {
int group; /*!< timer group */ int group; /*!< timer group */
int idx; /*!< timer number */ int idx; /*!< timer number */
uint64_t counter_val; /*!< timer counter value */ uint64_t counter_val; /*!< timer counter value */
double time_sec; /*!< calculated time from counter value */
} timer_event_t; } timer_event_t;
xQueueHandle timer_queue; xQueueHandle timer_queue;
@ -60,12 +59,13 @@ static void timer_example_evt_task(void *arg)
printf("TG[%d] timer[%d] alarm evt\n", evt.group, evt.idx); printf("TG[%d] timer[%d] alarm evt\n", evt.group, evt.idx);
printf("reg: "); printf("reg: ");
print_u64(evt.counter_val); print_u64(evt.counter_val);
printf("time: %.8f S\n", evt.time_sec);
double time = (double) evt.counter_val / (TIMER_BASE_CLK / TIMERG0.hw_timer[evt.idx].config.divider);
printf("time: %.8f S\n", time);
/*Read timer value from task*/ /*Read timer value from task*/
printf("======TASK TIME======\n"); printf("======TASK TIME======\n");
uint64_t timer_val; uint64_t timer_val;
timer_get_counter_value(evt.group, evt.idx, &timer_val); timer_get_counter_value(evt.group, evt.idx, &timer_val);
double time;
timer_get_counter_time_sec(evt.group, evt.idx, &time); timer_get_counter_time_sec(evt.group, evt.idx, &time);
printf("TG[%d] timer[%d] alarm evt\n", evt.group, evt.idx); printf("TG[%d] timer[%d] alarm evt\n", evt.group, evt.idx);
printf("reg: "); printf("reg: ");
@ -92,14 +92,12 @@ void IRAM_ATTR timer_group0_isr(void *para)
TIMERG0.int_clr_timers.t0 = 1; TIMERG0.int_clr_timers.t0 = 1;
uint64_t timer_val = ((uint64_t) TIMERG0.hw_timer[timer_idx].cnt_high) << 32 uint64_t timer_val = ((uint64_t) TIMERG0.hw_timer[timer_idx].cnt_high) << 32
| TIMERG0.hw_timer[timer_idx].cnt_low; | TIMERG0.hw_timer[timer_idx].cnt_low;
double time = (double) timer_val / (TIMER_BASE_CLK / TIMERG0.hw_timer[timer_idx].config.divider);
/*Post an event to out example task*/ /*Post an event to out example task*/
evt.type = TEST_WITHOUT_RELOAD; evt.type = TEST_WITHOUT_RELOAD;
evt.group = 0; evt.group = 0;
evt.idx = timer_idx; evt.idx = timer_idx;
evt.counter_val = timer_val; evt.counter_val = timer_val;
evt.time_sec = time;
xQueueSendFromISR(timer_queue, &evt, NULL); xQueueSendFromISR(timer_queue, &evt, NULL);
/*For a timer that will not reload, we need to set the next alarm value each time. */ /*For a timer that will not reload, we need to set the next alarm value each time. */
@ -119,13 +117,11 @@ void IRAM_ATTR timer_group0_isr(void *para)
TIMERG0.int_clr_timers.t1 = 1; TIMERG0.int_clr_timers.t1 = 1;
uint64_t timer_val = ((uint64_t) TIMERG0.hw_timer[timer_idx].cnt_high) << 32 uint64_t timer_val = ((uint64_t) TIMERG0.hw_timer[timer_idx].cnt_high) << 32
| TIMERG0.hw_timer[timer_idx].cnt_low; | TIMERG0.hw_timer[timer_idx].cnt_low;
double time = (double) timer_val / (TIMER_BASE_CLK / TIMERG0.hw_timer[timer_idx].config.divider);
/*Post an event to out example task*/ /*Post an event to out example task*/
evt.type = TEST_WITH_RELOAD; evt.type = TEST_WITH_RELOAD;
evt.group = 0; evt.group = 0;
evt.idx = timer_idx; evt.idx = timer_idx;
evt.counter_val = timer_val; evt.counter_val = timer_val;
evt.time_sec = time;
xQueueSendFromISR(timer_queue, &evt, NULL); xQueueSendFromISR(timer_queue, &evt, NULL);
/*For a auto-reload timer, we still need to set alarm_en bit if we want to enable alarm again.*/ /*For a auto-reload timer, we still need to set alarm_en bit if we want to enable alarm again.*/
TIMERG0.hw_timer[timer_idx].config.alarm_en = 1; TIMERG0.hw_timer[timer_idx].config.alarm_en = 1;