commit bfb78be42520b56ca208a7c540e98f793578c945 Author: Collin J. Doering Date: Tue Sep 29 02:48:09 2015 -0400 Initial commit Signed-off-by: Collin J. Doering diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..db96e23 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.elf +*.map +*.o +*.hex +*~ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..490d03a --- /dev/null +++ b/Makefile @@ -0,0 +1,197 @@ + +##########------------------------------------------------------########## +########## Project-specific Details ########## +########## Check these every time you start a new project ########## +##########------------------------------------------------------########## + +MCU = atmega328p +F_CPU = 8000000UL +BAUD = 19200UL +## Also try BAUD = 19200 or 38400 if you're feeling lucky. + +## A directory for common include files and the simple USART library. +## If you move either the current folder or the Library folder, you'll +## need to change this path to match. +#LIBDIR = ../../AVR-Programming-Library + +##########------------------------------------------------------########## +########## Programmer Defaults ########## +########## Set up once, then forget about it ########## +########## (Can override. See bottom of file.) ########## +##########------------------------------------------------------########## + +PROGRAMMER_TYPE = avrisp +# extra arguments to avrdude: baud rate, chip type, -F flag, etc. +PROGRAMMER_ARGS = -b 19200 -P /dev/ttyUSB0 + +##########------------------------------------------------------########## +########## Program Locations ########## +########## Won't need to change if they're in your PATH ########## +##########------------------------------------------------------########## + +CC = avr-gcc +OBJCOPY = avr-objcopy +OBJDUMP = avr-objdump +AVRSIZE = avr-size +AVRDUDE = avrdude + +##########------------------------------------------------------########## +########## Makefile Magic! ########## +########## Summary: ########## +########## We want a .hex file ########## +########## Compile source files into .elf ########## +########## Convert .elf file into .hex ########## +########## You shouldn't need to edit below. ########## +##########------------------------------------------------------########## + +## The name of your project (without the .c) +# TARGET = blinkLED +## Or name it automatically after the enclosing directory +TARGET = $(lastword $(subst /, ,$(CURDIR))) + +# Object files: will find all .c/.h files in current directory +# and in LIBDIR. If you have any other (sub-)directories with code, +# you can add them in to SOURCES below in the wildcard statement. +SOURCES=$(wildcard *.c $(LIBDIR)/*.c) +OBJECTS=$(SOURCES:.c=.o) +HEADERS=$(SOURCES:.c=.h) + +## Compilation options, type man avr-gcc if you're curious. +# Removed "-I$(LIBDIR)" from end of CPPFLAGS +CPPFLAGS = -DF_CPU=$(F_CPU) -DBAUD=$(BAUD) -I. +CFLAGS = -Os -g -std=gnu99 -Wall +## Use short (8-bit) data types +CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums +## Splits up object files per function +CFLAGS += -ffunction-sections -fdata-sections +LDFLAGS = -Wl,-Map,$(TARGET).map +## Optional, but often ends up with smaller code +LDFLAGS += -Wl,--gc-sections +## Relax shrinks code even more, but makes disassembly messy +## LDFLAGS += -Wl,--relax +## LDFLAGS += -Wl,-u,vfprintf -lprintf_flt -lm ## for floating-point printf +## LDFLAGS += -Wl,-u,vfprintf -lprintf_min ## for smaller printf +TARGET_ARCH = -mmcu=$(MCU) + +## Explicit pattern rules: +## To make .o files from .c files +%.o: %.c $(HEADERS) Makefile + $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<; + +$(TARGET).elf: $(OBJECTS) + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ + +%.hex: %.elf + $(OBJCOPY) -j .text -j .data -O ihex $< $@ + +%.eeprom: %.elf + $(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@ + +%.lst: %.elf + $(OBJDUMP) -S $< > $@ + +## These targets don't have files named after them +.PHONY: all disassemble disasm eeprom size clean squeaky_clean flash fuses + +all: $(TARGET).hex + +debug: + @echo + @echo "Source files:" $(SOURCES) + @echo "MCU, F_CPU, BAUD:" $(MCU), $(F_CPU), $(BAUD) + @echo + +# Optionally create listing file from .elf +# This creates approximate assembly-language equivalent of your code. +# Useful for debugging time-sensitive bits, +# or making sure the compiler does what you want. +disassemble: $(TARGET).lst + +disasm: disassemble + +# Optionally show how big the resulting program is +size: $(TARGET).elf + $(AVRSIZE) -C --mcu=$(MCU) $(TARGET).elf + +clean: + rm -f $(TARGET).elf $(TARGET).hex $(TARGET).obj \ + $(TARGET).o $(TARGET).d $(TARGET).eep $(TARGET).lst \ + $(TARGET).lss $(TARGET).sym $(TARGET).map $(TARGET)~ \ + $(TARGET).eeprom + +squeaky_clean: + rm -f *.elf *.hex *.obj *.o *.d *.eep *.lst *.lss *.sym *.map *~ *.eeprom + +##########------------------------------------------------------########## +########## Programmer-specific details ########## +########## Flashing code to AVR using avrdude ########## +##########------------------------------------------------------########## + +flash: $(TARGET).hex + $(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) $(PROGRAMMER_ARGS) -U flash:w:$< + +## An alias +program: flash + +flash_eeprom: $(TARGET).eeprom + $(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) $(PROGRAMMER_ARGS) -U eeprom:w:$< + +avrdude_terminal: + $(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) $(PROGRAMMER_ARGS) -nt + +## If you've got multiple programmers that you use, +## you can define them here so that it's easy to switch. +## To invoke, use something like `make flash_arduinoISP` +flash_usbtiny: PROGRAMMER_TYPE = usbtiny +flash_usbtiny: PROGRAMMER_ARGS = # USBTiny works with no further arguments +flash_usbtiny: flash + +flash_usbasp: PROGRAMMER_TYPE = usbasp +flash_usbasp: PROGRAMMER_ARGS = # USBasp works with no further arguments +flash_usbasp: flash + +flash_arduinoISP: PROGRAMMER_TYPE = avrisp +flash_arduinoISP: PROGRAMMER_ARGS = -b 19200 -P /dev/ttyACM0 +## (for windows) flash_arduinoISP: PROGRAMMER_ARGS = -b 19200 -P com5 +flash_arduinoISP: flash + +flash_109: PROGRAMMER_TYPE = avr109 +flash_109: PROGRAMMER_ARGS = -b 9600 -P /dev/ttyUSB0 +flash_109: flash + +##########------------------------------------------------------########## +########## Fuse settings and suitable defaults ########## +##########------------------------------------------------------########## + +## Mega 48, 88, 168, 328 default values +LFUSE = 0x62 +HFUSE = 0xdf +EFUSE = 0x00 + +## Generic +FUSE_STRING = -U lfuse:w:$(LFUSE):m -U hfuse:w:$(HFUSE):m -U efuse:w:$(EFUSE):m + +fuses: + $(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) \ + $(PROGRAMMER_ARGS) $(FUSE_STRING) +show_fuses: + $(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) $(PROGRAMMER_ARGS) -nv + +## Called with no extra definitions, sets to defaults +set_default_fuses: FUSE_STRING = -U lfuse:w:$(LFUSE):m -U hfuse:w:$(HFUSE):m -U efuse:w:$(EFUSE):m +set_default_fuses: fuses + +## Set the fuse byte for full-speed mode +## Note: can also be set in firmware for modern chips +set_fast_fuse: LFUSE = 0xE2 +set_fast_fuse: FUSE_STRING = -U lfuse:w:$(LFUSE):m +set_fast_fuse: fuses + +## Set the EESAVE fuse byte to preserve EEPROM across flashes +set_eeprom_save_fuse: HFUSE = 0xD7 +set_eeprom_save_fuse: FUSE_STRING = -U hfuse:w:$(HFUSE):m +set_eeprom_save_fuse: fuses + +## Clear the EESAVE fuse byte +clear_eeprom_save_fuse: FUSE_STRING = -U hfuse:w:$(HFUSE):m +clear_eeprom_save_fuse: fuses diff --git a/lcdLib.c b/lcdLib.c new file mode 100644 index 0000000..90c1afb --- /dev/null +++ b/lcdLib.c @@ -0,0 +1,179 @@ +/** + * (C) Copyright Collin J. Doering 2015 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ + +/** + * File: lcdLib.c + * Author: Collin J. Doering + * Date: Sep 29, 2015 + */ + +//#include +//#include +#include + +// Include header +#include "lcdLib.h" + +// Function definitions +void flashLED(uint8_t times) { + while (times > 0) { + STATUS_LED_PORT |= 1 << STATUS_LED; // turn on status LED + _delay_ms(100); + STATUS_LED_PORT &= ~(1 << STATUS_LED); // turn status LED off + _delay_ms(100); + times--; + } +} + +//------------------------------------ + +void clkLCD(void) { + LCD_CTRL_PORT |= 1 << LCD_ENABLE; + _delay_us(LCD_DELAY); + LCD_CTRL_PORT &= ~(1 << LCD_ENABLE); + _delay_us(LCD_DELAY); +} + +void loop_until_LCD_BF_clear(void) { + LCD_CTRL_PORT = (LCD_CTRL_PORT & ~(1 << LCD_RS)) | (1 << LCD_RW); // RS=0, RW=1 + LCD_DBUS_DDR &= ~(1 << LCD_BF); // Set LCD_BF as input + clkLCD(); + + STATUS_LED_PORT |= 1 << STATUS_LED; // DEBUG + while (bit_is_clear(LCD_DBUS_PIN, LCD_BF)) { + clkLCD(); + } + + /* loop_until_bit_is_clear(LCD_DBUS_PIN, LCD_BF); */ + STATUS_LED_PORT &= ~(1 << STATUS_LED); // DEBUG + + + LCD_DBUS_DDR = 0xff; // Reset all LCD_DBUS_PORT pins as outputs +} + +void writeLCDInstr_(uint8_t instr) { + LCD_CTRL_PORT &= ~((1 << LCD_RS) | (1 << LCD_RW)); // RS=RW=0 + LCD_DBUS_PORT = instr; + clkLCD(); +} + +void writeLCDInstr(uint8_t instr) { + loop_until_LCD_BF_clear(); // Wait until LCD is ready for new instructions + + writeLCDInstr_(instr); +} + +void writeCharToLCD_(char c) { + LCD_CTRL_PORT |= (1 << LCD_RS); // RS=1 + LCD_CTRL_PORT &= ~(1 << LCD_RW); // RW=0 + LCD_DBUS_PORT = c; + clkLCD(); +} + +void writeCharToLCD(char c) { + loop_until_LCD_BF_clear(); // Wait until LCD is ready for new instructions + + writeCharToLCD_(c); +} + +char readCharFromLCD(void) { + loop_until_LCD_BF_clear(); // Wait until LCD is ready for new instructions + + LCD_CTRL_PORT |= (1 << LCD_RW) | (1 << LCD_RW); // RS=RW=1 + LCD_DBUS_DDR = 0; // Set all LCD_DBUS_PORT pins as inputs + clkLCD(); + + char c = LCD_DBUS_PIN; + LCD_DBUS_DDR = 0xff; // Reset all LCD_DBUS_PORT pins to outputs + return c; +} + +/* + Set all pins of LCD_DBUS_PORT, as well as pins LCD_RS, and LCD_RW, on + LCD_CTRL_PORT as outputs +*/ +static inline void enableLCDOutput(void) { + LCD_CTRL_DDR |= (1 << LCD_RS) | (1 << LCD_RW) | (1 << LCD_ENABLE); + LCD_DBUS_DDR = 0xff; +} + +/* + Set all pins of LCD_DBUS_PORT as well as LCD_RS, and LCD_RW on LCD_CTRL_PORT as + inputs (disabling their output) +*/ +static inline void disableLCDOutput(void) { + LCD_CTRL_DDR &= ~((1 << LCD_RS) | (1 << LCD_RW) | (1 << LCD_ENABLE)); + LCD_DBUS_DDR = 0; +} + +static inline void softwareLCDInitPulse(void) { + enableLCDOutput(); + LCD_CTRL_PORT &= ~((1 << LCD_RS) | (1 << LCD_RW)); // RS=RW=0 + LCD_DBUS_PORT = 0x30; + clkLCD(); +} + +/* + Do software initialization as specified by the datasheet +*/ +void initLCD (void) { + _delay_ms(30); // Wait 15ms as per datasheet + + softwareLCDInitPulse(); + + // Disable transmission and wait minimum 4.1ms as per datasheet + //disableLCDOutput(); + _delay_us(8200); + + softwareLCDInitPulse(); + + // Disable transmission and wait minimum 100us as per datasheet + //disableLCDOutput(); + _delay_us(200); + + softwareLCDInitPulse(); + + // Function set (2 lines with 5x7 dot character font) + writeLCDInstr_(0x38); // RS=RW=0, 0b00111000 + + /* BF now has to be checked */ + + // Set functions of LCD + writeLCDInstr_(0x08); // Display off + _delay_ms(1); + writeLCDInstr_(0x01); // Clear display + _delay_ms(16); + //_delay_us(15200 - LCD_DELAY); // Extra delay for clear display + writeLCDInstr_(0x06); // Increment mode, no shift + _delay_ms(1); + writeLCDInstr_(0x0E); // Display on, cursor on, blink off + + flashLED(5); // DEBUG +} + +void quickInitLCD(void) { + enableLCDOutput(); + writeLCDInstr_(0x38); + writeLCDInstr_(0x0F); + writeLCDInstr_(0x06); + + /* writeLCDInstr_(0x01); // Clear display */ + /* writeLCDInstr_(0x30); // RS=RW=0, 0b00110000 */ + /* writeLCDInstr_(0x08); // Display off, cursor off, blink off */ + /* writeLCDInstr_(0x06); // Increment mode, no shift */ + /* writeLCDInstr_(0x0E); // Display on, cursor on, blink off */ +} diff --git a/lcdLib.h b/lcdLib.h new file mode 100644 index 0000000..02e365d --- /dev/null +++ b/lcdLib.h @@ -0,0 +1,74 @@ +/** + * (C) Copyright Collin J. Doering 2015 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ + +/** + * File: lcdLib.h + * Author: Collin J. Doering + * Date: Sep 29, 2015 + */ + +// Includes +#include + +// Constants +#define LCD_DBUS_PORT PORTB +#define LCD_DBUS_DDR DDRB +#define LCD_DBUS_PIN PINB + +#define LCD_CTRL_PORT PORTD +#define LCD_CTRL_DDR DDRD + +#define LCD_RS PD2 +#define LCD_RW PD3 +#define LCD_ENABLE PD4 + +#define LCD_BF PB7 + +#define LCD_DELAY 50 + +#define STATUS_LED_PORT PORTC +#define STATUS_LED_DDR DDRC +#define STATUS_LED PC5 + +//------------------------------------ + +// Function definitions +void flashLED(uint8_t times); + +//------------------------------------ + +void clkLCD(void); + +void loop_until_LCD_BF_clear(void); + +void writeLCDInstr_(uint8_t instr); + +void writeLCDInstr(uint8_t instr); + +void writeCharToLCD_(char c); + +void writeCharToLCD(char c); + +char readCharFromLCD(void); + +/* + Do software initialization as specified by the datasheet +*/ +void initLCD (void); + +void quickInitLCD(void); + diff --git a/lcdOutput.c b/lcdOutput.c new file mode 100644 index 0000000..ecd4964 --- /dev/null +++ b/lcdOutput.c @@ -0,0 +1,69 @@ +/** + * (C) Copyright Collin J. Doering 2015 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * File: lcdOutput.c + * Author: Collin J. Doering + * Date: Sep 17, 2015 + */ + +/*---------. +| Includes | +`---------*/ + +#include +#include +#include +#include + +#include "lcdLib.h" + +int main(void) { + clock_prescale_set(clock_div_1); + + STATUS_LED_DDR |= 1 << STATUS_LED; // DEBUG + + initLCD(); + //quickInitLCD(); + + while (1) { + writeCharToLCD('H'); + writeCharToLCD('e'); + writeCharToLCD('l'); + writeCharToLCD('l'); + writeCharToLCD('o'); + writeCharToLCD(' '); + writeCharToLCD('t'); + writeCharToLCD('h'); + writeCharToLCD('e'); + writeCharToLCD('r'); + writeCharToLCD('e'); + writeCharToLCD(' '); + writeCharToLCD('f'); + writeCharToLCD('r'); + writeCharToLCD('i'); + writeCharToLCD('e'); + writeCharToLCD('n'); + writeCharToLCD('d'); + writeCharToLCD('!'); + + //flashLED(5); // DEBUG + _delay_ms(5000); + } + + return 0; +}