From 48dfd906e229fbddaa2950c5e27550164c66aad7 Mon Sep 17 00:00:00 2001 From: Richard Meadows Date: Thu, 4 Aug 2016 12:31:49 +0100 Subject: [PATCH] [rtc] external getter for ticks --- firmware/inc/rtc.h | 2 ++ firmware/src/rtc.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/firmware/inc/rtc.h b/firmware/inc/rtc.h index 89927b6..52b1f2f 100644 --- a/firmware/inc/rtc.h +++ b/firmware/inc/rtc.h @@ -29,6 +29,8 @@ uint32_t get_since_aprs_s(void); void clear_since_aprs_s(void); +uint32_t rtc_get_ticks(void); + /* Initialises RTC to provide 1Hz event and interrupt */ void rtc_init(void); /* Sets the hibernate time */ diff --git a/firmware/src/rtc.c b/firmware/src/rtc.c index 0658869..f1e51d5 100644 --- a/firmware/src/rtc.c +++ b/firmware/src/rtc.c @@ -67,7 +67,7 @@ void rtc_init(void) */ /* Seconds since APRS transmission */ -uint32_t since_aprs_s = 0; +volatile uint32_t since_aprs_s = 0; uint32_t get_since_aprs_s(void) { return since_aprs_s; } @@ -80,7 +80,15 @@ void clear_since_aprs_s(void) { volatile uint32_t hibernate_time_s = 0; void run_kick(void); -uint32_t tick = 0; +volatile uint32_t tick = 0; + +/** + * Getter for ticks + */ +uint32_t rtc_get_ticks(void) +{ + return tick; +} /** * Set hibernate time. Must be called on every iteration of the timer