Fix lab04 based on feedback

README.md

@@ -0,0 +1,41 @@
+# I237 Hardware Programming
+
+This here is my repository for hardware programming course at
+Estonian IT College that is based around a
+[Arduino Mega 2560](https://www.arduino.cc/en/Main/ArduinoBoardMega2560).
+
+This code us usualy updated once every two weeks when a new excersice is put up
+by Silver Kits.
+
+# How to install
+
+Currently to test this code you have to clone the repository
+
+```bash
+git clone https://git.wut.ee/arti/i237.git hardware
+cd hardware
+```
+
+And export a enviroment variable that points to a Arduino Mega board. The
+real path will depend on the OS and Computer that you are using. For me it is
+usualy `/dev/ttyACM0`.
+
+```bash
+export ARDUINO=/dev/ttyACM0
+```
+
+After that you can `make` the project.
+
+```bash
+make clean
+make
+make install
+```
+
+You can also chekcout previous labs using `git checkout <lab name>`. For example
+
+```bash
+git checkout lab02
+```
+
+Don't forget to `make clean` after each checkout!

src/hmi_msg.h

@@ -0,0 +1,19 @@
+#include <avr/pgmspace.h>
+#ifndef _HMI_MSG_H_
+#define _HMI_MSG_H_
+
+#define PROG_VERSION "Version: %S built on: %S %S\n"
+#define LIBC_VERSION "avr-libc version: %S\n"
+#define STUD_NAME "Arti Zirk"
+#define GET_MONTH_MSG "Enter Month name first letter >"
+#define UPTIME "Uptime: %lu s"
+
+const char m1[] PROGMEM = "January";
+const char m2[] PROGMEM = "February";
+const char m3[] PROGMEM = "March";
+const char m4[] PROGMEM = "April";
+const char m5[] PROGMEM = "May";
+const char m6[] PROGMEM = "June";
+
+PGM_P const months[] PROGMEM = {m1,m2,m3,m4,m5,m6};
+#endif /* _HMI_MSG_H_ */

src/main.c

@@ -0,0 +1,116 @@
+#include <stdio.h>
+#include <string.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <avr/interrupt.h>
+#include <util/atomic.h>
+#include <util/delay.h>
+#include "hmi_msg.h"
+#include "uart-wrapper.h"
+#include "print_helper.h"
+#include "../lib/hd44780_111/hd44780.h"
+#include "../lib/andygock_avr-uart/uart.h"
+
+#define BAUD 9600
+#define BLINK_DELAY_MS 100
+
+volatile uint32_t time;
+
+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 hw_init() {
+    DDRA |= _BV(DDA3); // setup Arduino pin 25 as output
+    uart0_init(UART_BAUD_SELECT(BAUD, F_CPU));
+    uart3_init(UART_BAUD_SELECT(BAUD, F_CPU));
+    init_system_clock();
+    sei(); // Enable interupts
+    stdout = stdin = &uart0_io;
+    stderr = &uart3_out;
+    lcd_init();
+    lcd_clrscr();
+}
+
+static inline void print_prog_version() {
+    fprintf_P(stderr, PSTR(PROG_VERSION),
+              PSTR(GIT_DESCR), PSTR(__DATE__), PSTR(__TIME__));
+    fprintf_P(stderr, PSTR(LIBC_VERSION), PSTR(__AVR_LIBC_VERSION_STRING__));
+}
+
+
+static inline void print_program_startup() {
+    fprintf_P(stdout, PSTR(STUD_NAME));
+    fputc('\n', stdout); /* Add a new line to the uart printout */
+    lcd_puts_P(PSTR(STUD_NAME));
+
+    /* ASCII table print */
+    print_ascii_tbl(stdout);
+    unsigned char ascii[128];
+    for (unsigned char i = 0; i < sizeof(ascii); i++) {
+        ascii[i] = i;
+    }
+    print_for_human(stdout, ascii, sizeof(ascii));
+
+    fprintf_P(stdout, PSTR(GET_MONTH_MSG));
+}
+
+
+static inline void search_month() {
+    /* Month search and print */
+    char letter;
+    fscanf(stdin, "%c", &letter);
+    fprintf(stdout, "%c\n", letter);
+    lcd_goto(0x40); /* Got to the beginning of the next line */
+    for (int i = 0; i < 6; i++) {
+        if (!strncmp_P(&letter, (PGM_P)pgm_read_word(&months[i]), 1)) {
+            fprintf_P(stdout, (PGM_P)pgm_read_word(&months[i]));
+            fputc('\n', stdout);
+            lcd_puts_P((PGM_P)pgm_read_word(&months[i]));
+            lcd_putc(' ');
+        }
+    }
+    fprintf_P(stdout, PSTR(GET_MONTH_MSG));
+    lcd_puts_P(PSTR("                ")); /* Clear the end of the line */
+}
+
+static inline void heartbeat() {
+    static uint32_t last_time;
+    uint32_t cur_time;
+    ATOMIC_BLOCK(ATOMIC_FORCEON) {
+        cur_time = time;
+    }
+    if ((last_time - cur_time) > 0) {
+        // Toggle led on arduino pin 25
+        PORTA ^= _BV(PORTA3);
+        fprintf_P(stderr, PSTR(UPTIME "\n"), cur_time);
+    }
+    last_time = cur_time;
+}
+
+int main (void)
+{
+
+    hw_init();
+    print_prog_version();
+    print_program_startup();
+
+
+    while (1) {
+        heartbeat();
+        if(uart0_available()) {
+            search_month();
+        }
+    }
+}
+
+/* System clock ISR */
+ISR(TIMER5_COMPA_vect)
+{
+    time++;
+}

src/print_helper.c

@@ -0,0 +1,33 @@
+#include <stdio.h>
+#include <avr/pgmspace.h>
+#include "print_helper.h"
+
+int print_ascii_tbl (FILE *stream)
+{
+    for (char c = ' '; c <= '~'; c++) {
+        if (!fprintf(stream, "%c ", c)) {
+            return 0;
+        }
+    }
+
+    return fprintf(stream, "\n");
+}
+
+
+int print_for_human (FILE *stream, const unsigned char *array, const int len)
+{
+    for (int i = 0; i < len; i++) {
+        unsigned char c = array[i];
+        if (c >= ' ' && c <= '~') {
+            if (!fprintf(stream, "%c", c)) {
+                return 0;
+            }
+        } else {
+            if (!fprintf(stream, "\"0x%02x\"", c)) {
+                return 0;
+            }
+        }
+    }
+
+    return fprintf(stream, "\n");
+}

src/print_helper.h

@@ -0,0 +1,7 @@
+#ifndef _PRINT_HELPER_H_
+#define _PRINT_HELPER_H_
+
+int print_ascii_tbl (FILE *stream);
+int print_for_human (FILE *stream, const unsigned char *array, const int len);
+
+#endif /* _PRINT_HELPER_H_ */

src/uart-wrapper.c

@@ -0,0 +1,33 @@
+#include <avr/io.h>
+#include <stdio.h>
+#include "../lib/andygock_avr-uart/uart.h"
+
+int uart0_putchar(char c, FILE *stream)
+{
+    (void) stream;
+
+    if (c == '\n') {
+        uart0_putchar('\r', stream);
+    }
+
+    uart0_putc(c);
+    return 0;
+}
+
+int uart3_putchar(char c, FILE *stream)
+{
+    (void) stream;
+
+    if (c == '\n') {
+        uart3_putchar('\r', stream);
+    }
+
+    uart3_putc(c);
+    return 0;
+}
+
+int uart0_getchar(FILE *stream)
+{
+    (void) stream;
+    return uart0_getc() & 0xff;
+}

src/uart-wrapper.h

@@ -0,0 +1,15 @@
+#ifndef _UART_WRAPPER_H_
+#define _UART_WRAPPER_H_
+
+int uart0_putchar(char c, FILE *stream);
+int uart0_getchar(FILE *stream);
+
+int uart3_putchar(char c, FILE *stream);
+
+
+/* http://www.ermicro.com/blog/?p=325 */
+
+FILE uart0_io = FDEV_SETUP_STREAM(uart0_putchar, uart0_getchar, _FDEV_SETUP_RW);
+FILE uart3_out = FDEV_SETUP_STREAM(uart3_putchar, NULL, _FDEV_SETUP_WRITE);
+
+#endif /* _UART_WRAPPER_H_ */

tooling/format-code.sh

@@ -13,15 +13,13 @@ then
     exit 1
 fi
 
-# 
+#
 for FILE in "$@"
 do
     RESULT="$(astyle    --style=1tbs \
                         --indent-col1-comments \
-                        --break-blocks \
                         --pad-oper \
                         --pad-header \
-                        --delete-empty-lines \
                         --add-brackets \
                         --convert-tabs \
                         --max-code-length=80 \