7 Commits

Author SHA1 Message Date
39720c676e Looks like working lab03.2 code 2016-10-10 22:24:33 +03:00
a836b3a624 Remove executable bit from lcd library 2016-10-10 20:33:24 +03:00
51fc127b48 Merge https://gitlab.com/I237-2016/skeleton 2016-10-10 20:29:47 +03:00
be366ed50e Apparently ignoring letter case is a bug 2016-10-10 20:25:13 +03:00
8b64aca736 Fix 2016-10-02 21:28:15 +03:00
aa4e954f76 Add language to code snippets in readme 2016-10-02 21:27:32 +03:00
275cf9fa28 Add readme 2016-10-02 21:23:35 +03:00
9 changed files with 96 additions and 77 deletions

View File

@ -8,7 +8,6 @@ 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
@ -43,19 +42,13 @@ 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
@ -69,9 +62,6 @@ AVRDUDEARGS = -p $(BOARD) \
-V \ -V \
-D -D
AVRSIZEARGS = -C \
--mcu=$(BOARD)
all: $(ELF) $(TARGET) all: $(ELF) $(TARGET)
%.o : %.c %.o : %.c
@ -93,9 +83,6 @@ install:
$(AVRDUDE) $(AVRDUDEARGS) -U flash:w:$(TARGET) $(AVRDUDE) $(AVRDUDEARGS) -U flash:w:$(TARGET)
format: format:
$(CODE_FORMATTER) $(SRCDIR)/*.c $(CODE_FORMATTER) $(SRC)
size: .PHONY: clean install format
$(AVRSIZE) $(AVRSIZEARGS) $(ELF)
.PHONY: clean install format size

41
README.md Normal file
View File

@ -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!

0
lib/hd44780_111/hd44780.h Executable file → Normal file
View File

0
lib/hd44780_111/hd44780.txt Executable file → Normal file
View File

0
lib/hd44780_111/hd44780_settings.h Executable file → Normal file
View File

0
lib/hd44780_111/hd44780_settings_example.h Executable file → Normal file
View File

View File

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

View File

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

View File

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