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/lpc | |
| parent | 8d0df64bbc5ed31188b4b4bea0be52a52dbece3b (diff) | |
| parent | cd920a0e5321166ef8b1d6afc3d63fc5de998a93 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/lpc')
| -rw-r--r-- | src/lpc/ao_arch.h | 5 | ||||
| -rw-r--r-- | src/lpc/ao_led_lpc.c | 2 | ||||
| -rw-r--r-- | src/lpc/ao_timer_lpc.c | 20 |
3 files changed, 20 insertions, 7 deletions
diff --git a/src/lpc/ao_arch.h b/src/lpc/ao_arch.h index 7821839e..93676b86 100644 --- a/src/lpc/ao_arch.h +++ b/src/lpc/ao_arch.h @@ -33,11 +33,6 @@ #define AO_LED_TYPE AO_PORT_TYPE -#ifndef AO_TICK_TYPE -#define AO_TICK_TYPE uint16_t -#define AO_TICK_SIGNED int16_t -#endif - /* Various definitions to make GCC look more like SDCC */ #define ao_arch_naked_declare __attribute__((naked)) diff --git a/src/lpc/ao_led_lpc.c b/src/lpc/ao_led_lpc.c index 3a2d4c98..46bf0495 100644 --- a/src/lpc/ao_led_lpc.c +++ b/src/lpc/ao_led_lpc.c @@ -49,7 +49,7 @@ ao_led_toggle(AO_PORT_TYPE colors) } void -ao_led_for(AO_PORT_TYPE colors, uint16_t ticks) +ao_led_for(AO_PORT_TYPE colors, AO_TICK_TYPE ticks) { ao_led_on(colors); ao_delay(ticks); diff --git a/src/lpc/ao_timer_lpc.c b/src/lpc/ao_timer_lpc.c index 8999c7ac..62b16318 100644 --- a/src/lpc/ao_timer_lpc.c +++ b/src/lpc/ao_timer_lpc.c @@ -18,14 +18,32 @@ #include <ao.h> +#define AO_SYSTICK (AO_LPC_SYSCLK / 2) + volatile AO_TICK_TYPE ao_tick_count; -uint16_t +AO_TICK_TYPE 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 = lpc_systick.cvr; + after = ao_tick_count; + } while (before != after); + + return (uint64_t) after * (1000000000ULL / AO_HERTZ) + + (uint64_t) cvr * (1000000000ULL / AO_SYSTICK); +} + #if AO_DATA_ALL volatile uint8_t ao_data_interval = 1; volatile uint8_t ao_data_count; |