bla

Makefile

@@ -49,6 +49,7 @@ CFLAGS =	-Wall \
 			-mmcu=$(BOARD) \
 			-DF_CPU=16000000UL \
 			-DGIT_DESCR=\"$(shell git describe --abbrev=6 --dirty --always --tags --long)\" \
+			-ffreestanding \
 			-std=c11
 
 # Linker flags

README.md

@@ -1,41 +0,0 @@
-# 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

@@ -1,18 +1,26 @@
-#include <avr/pgmspace.h>
 #ifndef _HMI_MSG_H_
 #define _HMI_MSG_H_
 
-#define PROG_VERSION "Version: %S built on: %S %S\n"
+#define VER_FW "Version: %S built on: %S %S\n"
-#define LIBC_VERSION "avr-libc version: %S\n"
+#define VER_LIBC "avr-libc version: %S\n"
+#define UI_GET_MONTH_LETTER "Enter Month name first letter >"
+
 #define STUD_NAME "Arti Zirk"
-#define GET_MONTH_MSG "Enter Month name first letter >"
+const char string_1[] PROGMEM = "January";
+const char string_2[] PROGMEM = "February";
+const char string_3[] PROGMEM = "March";
+const char string_4[] PROGMEM = "April";
+const char string_5[] PROGMEM = "May";
+const char string_6[] PROGMEM = "June";
 
-const char m1[]  PROGMEM = "January";
+PGM_P const months_table[] PROGMEM = 
-const char m2[] PROGMEM = "February";
+{
-const char m3[]    PROGMEM = "March";
+    string_1,
-const char m4[]    PROGMEM = "April";
+    string_2,
-const char m5[]      PROGMEM = "May";
+    string_3,
-const char m6[]     PROGMEM = "June";
+    string_4,
+    string_5,
+    string_6
+};
 
-PGM_P const months[] PROGMEM = {m1,m2,m3,m4,m5,m6};
 #endif /* _HMI_MSG_H_ */

src/main.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <avr/io.h>
-#include <avr/pgmspace.h>
 #include <util/delay.h>
+#include <avr/pgmspace.h>
 #include "hmi_msg.h"
 #include "uart.h"
 #include "print_helper.h"
@@ -12,56 +12,53 @@
 
 int main (void)
 {
-    /* Init */
+    /* set pin 3 of PORTA for output*/
     DDRA |= _BV(DDA3);
+    /* Init stdio on UART0 and UART3 and print user code info */
     uart0_init();
     uart3_init();
-    stdout = stdin = &uart0_io;
-    stderr = &uart3_out;
     lcd_init();
     lcd_clrscr();
-    /* End init */
+    stdout = stdin = &uart0_io;
-
+    stderr = &uart3_out;
-    /* Print version info to stderr */
+    fprintf_P(stderr, PSTR(VER_FW),
-    fprintf_P(stderr, PSTR(PROG_VERSION),
               PSTR(GIT_DESCR), PSTR(__DATE__), PSTR(__TIME__));
-    fprintf_P(stderr, PSTR(LIBC_VERSION), PSTR(__AVR_LIBC_VERSION_STRING__));
+    fprintf_P(stderr, PSTR(VER_LIBC), PSTR(__AVR_LIBC_VERSION_STRING__));
-    /* End version print */
+    /* End stdio init and info print */
-
+    fprintf_P(stdout, PSTR(STUD_NAME "\n"));
-    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];
+    unsigned char ascii[128] = {0};
+
     for (unsigned char i = 0; i < sizeof(ascii); i++) {
         ascii[i] = i;
     }
+
     print_for_human(stdout, ascii, sizeof(ascii));
 
     while (1) {
-        /* set pin 3 high to turn led on */
+        char month_first_leter;
-        PORTA |= _BV(PORTA3);
+        fprintf_P(stdout, PSTR(UI_GET_MONTH_LETTER));
-        _delay_ms(BLINK_DELAY_MS);
+        fscanf(stdin, "%c", &month_first_leter);
+        fprintf(stdout, "%c\n", month_first_leter);
+        lcd_goto(0x40);
 
-        /* Month search and print */
-        char letter;
-        fprintf_P(stdout, PSTR(GET_MONTH_MSG));
-        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)) {
+            if (!strncmp_P(&month_first_leter, (PGM_P)pgm_read_word(&months_table[i]), 1)) {
-                fprintf_P(stdout, (PGM_P)pgm_read_word(&months[i]));
+                fprintf_P(stdout, PSTR("%S\n"), (PGM_P)pgm_read_word(&months_table[i]));
-                fputc('\n', stdout);
+                lcd_puts_P((PGM_P)pgm_read_word(&months_table[i]));
-                lcd_puts_P((PGM_P)pgm_read_word(&months[i]));
                 lcd_putc(' ');
             }
         }
 
-        lcd_puts_P(PSTR("                ")); /* Clear the end of the line */
+        for (int i = 0; i < 16; i++) {
+            lcd_putc(' ');
+        }
 
+        /* set pin 3 high to turn led on */
+        PORTA |= _BV(PORTA3);
+        _delay_ms(BLINK_DELAY_MS);
         /* set pin 3 low to turn led off */
         PORTA &= ~_BV(PORTA3);
         _delay_ms(BLINK_DELAY_MS);

src/print_helper.c

@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include <avr/pgmspace.h>
 #include "print_helper.h"
 
 int print_ascii_tbl (FILE *stream)
@@ -17,17 +16,16 @@ int print_ascii_tbl (FILE *stream)
 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 (array[i] >= ' ' && array[i] <= '~') {
-        if (c >= ' ' && c <= '~') {
+            if (!fprintf(stream, "%c", array[i])) {
-            if (!fprintf(stream, "%c", c)) {
                 return 0;
             }
         } else {
-            if (!fprintf(stream, "\"0x%02x\"", c)) {
+            if (!fprintf(stream, "\"0x%02x\"", array[i])) {
                 return 0;
             }
         }
     }
 
-    return fprintf(stream, "\n");
+    return fprintf(stream, "\n");;
 }

tooling/format-code.sh

@@ -13,13 +13,15 @@ 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 \