Add heartbeat and system time

This commit is contained in:
Arti Zirk 2016-11-07 02:30:33 +02:00
parent 22461eaff4
commit 30bd26d471
2 changed files with 34 additions and 10 deletions

View File

@ -6,6 +6,7 @@
#define LIBC_VERSION "avr-libc version: %S\n" #define LIBC_VERSION "avr-libc version: %S\n"
#define STUD_NAME "Arti Zirk" #define STUD_NAME "Arti Zirk"
#define GET_MONTH_MSG "Enter Month name first letter >" #define GET_MONTH_MSG "Enter Month name first letter >"
#define UPTIME_MSG "Uptime: %lu s"
const char m1[] PROGMEM = "January"; const char m1[] PROGMEM = "January";
const char m2[] PROGMEM = "February"; const char m2[] PROGMEM = "February";

View File

@ -1,5 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h>
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
@ -11,13 +12,19 @@
#include "../lib/hd44780_111/hd44780.h" #include "../lib/hd44780_111/hd44780.h"
#define BAUDRATE 9600 #define BAUDRATE 9600
#define BLINK_DELAY_MS 100
// For configuring arduino mega pin 25 // For configuring arduino mega pin 25
#define LED_INIT DDRA |= _BV(DDA3); #define LED_INIT DDRA |= _BV(DDA3);
#define LED_ON PORTA |= _BV(PORTA3) #define LED_TOGGLE PORTA ^= _BV(PORTA3)
#define LED_OFF PORTA &= ~_BV(PORTA3)
#define LED_DELAY _delay_ms(BLINK_DELAY_MS) static inline void init_system_clock(void)
{
TCCR5A = 0; // Clear control register A
TCCR5B = 0; // Clear control register B
TCCR5B |= _BV(WGM52) | _BV(CS52); // CTC and fCPU/256
OCR5A = 62549; // 1 s
TIMSK5 |= _BV(OCIE5A); // Output Compare A Match Interrupt Enable
}
static inline void init_hw (void) static inline void init_hw (void)
{ {
@ -25,6 +32,9 @@ static inline void init_hw (void)
/// Set arduino pin 25 as output /// Set arduino pin 25 as output
LED_INIT; LED_INIT;
// System clock
init_system_clock();
// UART init // UART init
uart0_init(UART_BAUD_SELECT(BAUDRATE, F_CPU)); uart0_init(UART_BAUD_SELECT(BAUDRATE, F_CPU));
uart3_init(UART_BAUD_SELECT(BAUDRATE, F_CPU)); uart3_init(UART_BAUD_SELECT(BAUDRATE, F_CPU));
@ -59,6 +69,7 @@ static inline void start_ui (void)
} }
print_for_human(stdout, ascii, sizeof(ascii)); print_for_human(stdout, ascii, sizeof(ascii));
// Bootstrap search_month message
fprintf_P(stdout, PSTR(GET_MONTH_MSG)); fprintf_P(stdout, PSTR(GET_MONTH_MSG));
} }
@ -82,20 +93,32 @@ static inline void search_month (void)
fprintf_P(stdout, PSTR(GET_MONTH_MSG)); fprintf_P(stdout, PSTR(GET_MONTH_MSG));
} }
static inline void heartbeat (void) {
static time_t time_prev;
time_t time_cur = time(NULL);
if (time_cur <= time_prev) {
return;
}
time_prev = time_cur;
fprintf_P(stderr, PSTR(UPTIME_MSG "\n"), time_cur);
LED_TOGGLE;
}
int main (void) int main (void)
{ {
init_hw(); init_hw();
start_ui(); start_ui();
while (1) { while (1) {
LED_ON; heartbeat();
LED_DELAY;
if (uart0_available()) { if (uart0_available()) {
search_month(); search_month();
} }
}
}
LED_OFF; // System clock
LED_DELAY; ISR(TIMER5_COMPA_vect)
} {
system_tick();
} }