diff options
| author | Bdale Garbee <bdale@gag.com> | 2019-02-25 18:30:08 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2019-02-25 18:30:08 -0700 |
| commit | 338372b97d441c30d2a23df540163a66a7f8d8c0 (patch) | |
| tree | 65544591dbc34d449af0f7fd6c0c0eb4cb075f6b /src/stm | |
| parent | 8d0df64bbc5ed31188b4b4bea0be52a52dbece3b (diff) | |
| parent | cd920a0e5321166ef8b1d6afc3d63fc5de998a93 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/stm')
| -rw-r--r-- | src/stm/ao_arch.h | 5 | ||||
| -rw-r--r-- | src/stm/ao_led_stm.c | 2 | ||||
| -rw-r--r-- | src/stm/ao_timer.c | 17 |
3 files changed, 18 insertions, 6 deletions
diff --git a/src/stm/ao_arch.h b/src/stm/ao_arch.h index c95c7cd5..e83b6bd2 100644 --- a/src/stm/ao_arch.h +++ b/src/stm/ao_arch.h @@ -30,11 +30,6 @@ #define AO_STACK_SIZE 512 #endif -#ifndef AO_TICK_TYPE -#define AO_TICK_TYPE uint16_t -#define AO_TICK_SIGNED int16_t -#endif - #define AO_PORT_TYPE uint16_t /* Various definitions to make GCC look more like SDCC */ diff --git a/src/stm/ao_led_stm.c b/src/stm/ao_led_stm.c index 7dcbb661..ed4ec161 100644 --- a/src/stm/ao_led_stm.c +++ b/src/stm/ao_led_stm.c @@ -87,7 +87,7 @@ ao_led_toggle(AO_LED_TYPE colors) } void -ao_led_for(AO_LED_TYPE colors, AO_LED_TYPE ticks) +ao_led_for(AO_LED_TYPE colors, AO_TICK_TYPE ticks) { ao_led_on(colors); ao_delay(ticks); diff --git a/src/stm/ao_timer.c b/src/stm/ao_timer.c index 9e9436cf..d00deffa 100644 --- a/src/stm/ao_timer.c +++ b/src/stm/ao_timer.c @@ -36,6 +36,23 @@ ao_time(void) { return ao_tick_count; } + +uint64_t +ao_time_ns(void) +{ + AO_TICK_TYPE before, after; + uint32_t cvr; + + do { + before = ao_tick_count; + cvr = stm_systick.cvr; + after = ao_tick_count; + } while (before != after); + + return (uint64_t) after * (1000000000ULL / AO_HERTZ) + + (uint64_t) cvr * (1000000000ULL / AO_SYSTICK); +} + #endif #if AO_DATA_ALL |