24 Commits

Author SHA1 Message Date
22968ef6a4 bla 2016-11-02 15:18:43 +02:00
09f82d5258 bla 2016-11-02 15:15:45 +02:00
a61348e1c7 lab03.2 2016-11-02 15:14:51 +02:00
5d4b4a1e6d Merge https://gitlab.com/I237-2016/skeleton into HEAD 2016-11-02 14:13:58 +02:00
8b7377dff3 Add interrupt driven UART library from https://github.com/andygock/avr-uart 2016-10-31 20:13:51 +02:00
51e4a8bc9b Enable to use main() without return value 2016-10-31 19:52:30 +02:00
2ea46d4402 Format only .c files in source directory with make format 2016-10-21 13:48:22 +03:00
e6888bd251 Add LTO and unused data/functions optimisations suggested by Arti 2016-10-21 13:40:53 +03:00
de62693b6d Add make size target. This target can be used to print firmware memory usage in AVR format 2016-10-11 12:08:53 +03:00
bdd27a6bea Add 0 to 127 ascii print out and month lookup 2016-09-26 19:57:14 +03:00
a882534979 Fix bug in print_for_human 2016-09-26 19:56:46 +03:00
a7a915faf4 Remove assert code and add ascii table print 2016-09-26 17:33:47 +03:00
f1f06f056a Add humaninterface messages header 2016-09-26 17:33:21 +03:00
5b78b7da02 Add print helper functions 2016-09-26 17:33:02 +03:00
713cc80417 Add header guard to uart.h 2016-09-26 16:39:07 +03:00
7d422c5494 Merge gitlab.com:artizirk/skeleton into HEAD 2016-09-26 16:31:33 +03:00
8436ba76b0 Remove unnecessary build.sh script 2016-09-19 18:01:25 +03:00
d827bbe427 Fix uart3_init comment 2016-09-10 01:09:54 +03:00
85dca87ff3 Added assert test to main.c with stderr debug console output 2016-09-10 00:57:01 +03:00
ae55fbac04 Renamed uart functions and added support for stderr via uart3 2016-09-10 00:56:05 +03:00
8c5f723619 Add uart functions from https://github.com/tuupola/avr_demo 2016-09-10 00:23:43 +03:00
90a1b412df Formated the code with astyle 2016-09-10 00:23:14 +03:00
dca26ac547 Merge branch 'master' of https://gitlab.com/I237-2016/skeleton 2016-09-09 23:54:45 +03:00
cc4321ae40 Add a led blinking code and a build script 2016-09-05 19:00:01 +03:00
7 changed files with 235 additions and 3 deletions

View File

@ -8,6 +8,7 @@ CC = avr-gcc
OBJCOPY = avr-objcopy OBJCOPY = avr-objcopy
AVRDUDE = avrdude AVRDUDE = avrdude
CODE_FORMATTER = tooling/format-code.sh CODE_FORMATTER = tooling/format-code.sh
AVRSIZE = avr-size
BOARD = atmega2560 BOARD = atmega2560
@ -42,13 +43,19 @@ CFLAGS = -Wall \
-Werror \ -Werror \
-Wfatal-errors \ -Wfatal-errors \
-Os \ -Os \
-flto \
-fdata-sections \
-ffunction-sections \
-mmcu=$(BOARD) \ -mmcu=$(BOARD) \
-DF_CPU=16000000UL \ -DF_CPU=16000000UL \
-DGIT_DESCR=\"$(shell git describe --abbrev=6 --dirty --always --tags --long)\" \ -DGIT_DESCR=\"$(shell git describe --abbrev=6 --dirty --always --tags --long)\" \
-ffreestanding \
-std=c11 -std=c11
# Linker flags # Linker flags
LDFLAGS = -mmcu=$(BOARD) LDFLAGS = -mmcu=$(BOARD) \
-flto \
-Wl,-gc-sections
OBJCOPYARGS = -O ihex \ OBJCOPYARGS = -O ihex \
-R .eeprom -R .eeprom
@ -62,6 +69,9 @@ AVRDUDEARGS = -p $(BOARD) \
-V \ -V \
-D -D
AVRSIZEARGS = -C \
--mcu=$(BOARD)
all: $(ELF) $(TARGET) all: $(ELF) $(TARGET)
%.o : %.c %.o : %.c
@ -83,6 +93,9 @@ install:
$(AVRDUDE) $(AVRDUDEARGS) -U flash:w:$(TARGET) $(AVRDUDE) $(AVRDUDEARGS) -U flash:w:$(TARGET)
format: format:
$(CODE_FORMATTER) $(SRC) $(CODE_FORMATTER) $(SRCDIR)/*.c
.PHONY: clean install format size:
$(AVRSIZE) $(AVRSIZEARGS) $(ELF)
.PHONY: clean install format size

26
src/hmi_msg.h Normal file
View File

@ -0,0 +1,26 @@
#ifndef _HMI_MSG_H_
#define _HMI_MSG_H_
#define VER_FW "Version: %S built on: %S %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"
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";
PGM_P const months_table[] PROGMEM =
{
string_1,
string_2,
string_3,
string_4,
string_5,
string_6
};
#endif /* _HMI_MSG_H_ */

View File

@ -0,0 +1,66 @@
#include <stdio.h>
#include <string.h>
#include <avr/io.h>
#include <util/delay.h>
#include <avr/pgmspace.h>
#include "hmi_msg.h"
#include "uart.h"
#include "print_helper.h"
#include "../lib/hd44780_111/hd44780.h"
#define BLINK_DELAY_MS 100
int main (void)
{
/* 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();
lcd_init();
lcd_clrscr();
stdout = stdin = &uart0_io;
stderr = &uart3_out;
fprintf_P(stderr, PSTR(VER_FW),
PSTR(GIT_DESCR), PSTR(__DATE__), PSTR(__TIME__));
fprintf_P(stderr, PSTR(VER_LIBC), PSTR(__AVR_LIBC_VERSION_STRING__));
/* End stdio init and info print */
fprintf_P(stdout, PSTR(STUD_NAME "\n"));
lcd_puts_P(PSTR(STUD_NAME));
/* ASCII table print */
print_ascii_tbl(stdout);
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) {
char month_first_leter;
fprintf_P(stdout, PSTR(UI_GET_MONTH_LETTER));
fscanf(stdin, "%c", &month_first_leter);
fprintf(stdout, "%c\n", month_first_leter);
lcd_goto(0x40);
for (int i = 0; i < 6; i++) {
if (!strncmp_P(&month_first_leter, (PGM_P)pgm_read_word(&months_table[i]), 1)) {
fprintf_P(stdout, PSTR("%S\n"), (PGM_P)pgm_read_word(&months_table[i]));
lcd_puts_P((PGM_P)pgm_read_word(&months_table[i]));
lcd_putc(' ');
}
}
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);
}
}

31
src/print_helper.c Normal file
View File

@ -0,0 +1,31 @@
#include <stdio.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++) {
if (array[i] >= ' ' && array[i] <= '~') {
if (!fprintf(stream, "%c", array[i])) {
return 0;
}
} else {
if (!fprintf(stream, "\"0x%02x\"", array[i])) {
return 0;
}
}
}
return fprintf(stream, "\n");;
}

7
src/print_helper.h Normal file
View File

@ -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_ */

72
src/uart.c Normal file
View File

@ -0,0 +1,72 @@
#include <avr/io.h>
#include <stdio.h>
#ifndef F_CPU
#define F_CPU 16000000UL
#endif
#ifndef BAUD
#define BAUD 9600
#endif
#include <util/setbaud.h>
/* http://www.cs.mun.ca/~rod/Winter2007/4723/notes/serial/serial.html */
void uart0_init(void)
{
UBRR0H = UBRRH_VALUE;
UBRR0L = UBRRL_VALUE;
#if USE_2X
UCSR0A |= _BV(U2X0);
#else
UCSR0A &= ~(_BV(U2X0));
#endif
UCSR0C = _BV(UCSZ01) | _BV(UCSZ00); /* 8-bit data */
UCSR0B = _BV(RXEN0) | _BV(TXEN0); /* Enable RX and TX */
}
void uart3_init(void)
{
UBRR3H = UBRRH_VALUE;
UBRR3L = UBRRL_VALUE;
#if USE_2X
UCSR3A |= _BV(U2X3);
#else
UCSR3A &= ~(_BV(U2X3));
#endif
UCSR3C = _BV(UCSZ31) | _BV(UCSZ30); /* 8-bit data */
UCSR3B = _BV(TXEN3); /* Enable TX */
}
int uart0_putchar(char c, FILE *stream)
{
(void) stream;
if (c == '\n') {
uart0_putchar('\r', stream);
}
loop_until_bit_is_set(UCSR0A, UDRE0);
UDR0 = c;
return 0;
}
int uart3_putchar(char c, FILE *stream)
{
(void) stream;
if (c == '\n') {
uart3_putchar('\r', stream);
}
loop_until_bit_is_set(UCSR3A, UDRE3);
UDR3 = c;
return 0;
}
int uart0_getchar(FILE *stream)
{
(void) stream;
loop_until_bit_is_set(UCSR0A, RXC0);
return UDR0;
}

17
src/uart.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef _UART_H_
#define _UART_H_
int uart0_putchar(char c, FILE *stream);
int uart0_getchar(FILE *stream);
int uart3_putchar(char c, FILE *stream);
void uart0_init(void);
void uart3_init(void);
/* 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_H_ */