commit 58f627166147a9d7706b6098f38d8f2f7d5c1100 Author: Nis Börge Wechselberg Date: Tue Jan 14 02:49:19 2014 +0100 Initial commit: Adding Stuff from Rechnergestützter Entwurf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e18297b --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.o +*.hex +*.elf +*.eep diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0ba61d6 --- /dev/null +++ b/Makefile @@ -0,0 +1,225 @@ +# Hey Emacs, this is a -*- makefile -*- + +# AVR-GCC Makefile template, derived from the WinAVR template (which +# is public domain), believed to be neutral to any flavor of "make" +# (GNU make, BSD make, SysV make) + + +MCU = attiny84 +FORMAT = binary +TARGET = dimmer +SRC = $(TARGET).c +ASRC = +OPT = s + +# Name of this Makefile (used for "make depend"). +MAKEFILE = Makefile + +# Debugging format. +# Native formats for AVR-GCC's -g are stabs [default], or dwarf-2. +# AVR (extended) COFF requires stabs, plus an avr-objcopy run. +DEBUG = stabs + +# Compiler flag to set the C Standard level. +# c89 - "ANSI" C +# gnu89 - c89 plus GCC extensions +# c99 - ISO C99 standard (not yet fully implemented) +# gnu99 - c99 plus GCC extensions +CSTANDARD = -std=c99 + +# Place -D or -U options here +CDEFS = + +# Place -I options here +CINCS = + + +CDEBUG = -g$(DEBUG) +CWARN = -Wall -Wstrict-prototypes +CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums +#CEXTRA = -Wa,-adhlns=$(<:.c=.lst) +CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA) + + +#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs + + +#Additional libraries. + +# Minimalistic printf version +PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min + +# Floating point printf version (requires MATH_LIB = -lm below) +PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt + +PRINTF_LIB = + +# Minimalistic scanf version +SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min + +# Floating point + %[ scanf version (requires MATH_LIB = -lm below) +SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt + +SCANF_LIB = + +MATH_LIB = -lm + +# External memory options + +# 64 KB of external RAM, starting after internal RAM (ATmega128!), +# used for variables (.data/.bss) and heap (malloc()). +#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff + +# 64 KB of external RAM, starting after internal RAM (ATmega128!), +# only used for heap (malloc()). +#EXTMEMOPTS = -Wl,--defsym=__heap_start=0x801100,--defsym=__heap_end=0x80ffff + +EXTMEMOPTS = + +#LDMAP = $(LDFLAGS) -Wl,-Map=$(TARGET).map,--cref +LDFLAGS = $(EXTMEMOPTS) $(LDMAP) $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB) + + +# Programming support using avrdude. Settings and variables. + +AVRDUDE_PROGRAMMER = avrispv2 +AVRDUDE_PORT = /dev/ttyACM0 + +AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex +#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep + + +# Uncomment the following if you want avrdude's erase cycle counter. +# Note that this counter needs to be initialized first using -Yn, +# see avrdude manual. +#AVRDUDE_ERASE_COUNTER = -y + +# Uncomment the following if you do /not/ wish a verification to be +# performed after programming the device. +#AVRDUDE_NO_VERIFY = -V + +# Increase verbosity level. Please use this when submitting bug +# reports about avrdude. See +# to submit bug reports. +#AVRDUDE_VERBOSE = -v -v + +AVRDUDE_BASIC = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -B4 +AVRDUDE_FLAGS = $(AVRDUDE_BASIC) $(AVRDUDE_NO_VERIFY) $(AVRDUDE_VERBOSE) $(AVRDUDE_ERASE_COUNTER) + + +CC = avr-gcc +OBJCOPY = avr-objcopy +OBJDUMP = avr-objdump +SIZE = avr-size +NM = avr-nm +AVRDUDE = avrdude +REMOVE = rm -f +MV = mv -f + +# Define all object files. +OBJ = $(SRC:.c=.o) $(ASRC:.S=.o) + +# Define all listing files. +LST = $(ASRC:.S=.lst) $(SRC:.c=.lst) + +# Combine all necessary flags and optional flags. +# Add target processor to flags. +ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) +ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS) + + +# Default target. +all: build + +build: elf hex eep + +elf: $(TARGET).elf +hex: $(TARGET).hex +eep: $(TARGET).eep +lss: $(TARGET).lss +sym: $(TARGET).sym + + +# Program the device. +program: $(TARGET).hex $(TARGET).eep + $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) + + + + +# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB. +COFFCONVERT=$(OBJCOPY) --debugging \ +--change-section-address .data-0x800000 \ +--change-section-address .bss-0x800000 \ +--change-section-address .noinit-0x800000 \ +--change-section-address .eeprom-0x810000 + + +coff: $(TARGET).elf + $(COFFCONVERT) -O coff-avr $(TARGET).elf $(TARGET).cof + + +extcoff: $(TARGET).elf + $(COFFCONVERT) -O coff-ext-avr $(TARGET).elf $(TARGET).cof + + +.SUFFIXES: .elf .hex .eep .lss .sym + +.elf.hex: + $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@ + +.elf.eep: + -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ + --change-section-lma .eeprom=0 -O $(FORMAT) $< $@ + +# Create extended listing file from ELF output file. +.elf.lss: + $(OBJDUMP) -h -S $< > $@ + +# Create a symbol table from ELF output file. +.elf.sym: + $(NM) -n $< > $@ + + + +# Link: create ELF output file from object files. +$(TARGET).elf: $(OBJ) + $(CC) $(ALL_CFLAGS) $(OBJ) --output $@ $(LDFLAGS) + + +# Compile: create object files from C source files. +.c.o: + $(CC) -c $(ALL_CFLAGS) $< -o $@ + + +# Compile: create assembler files from C source files. +.c.s: + $(CC) -S $(ALL_CFLAGS) $< -o $@ + + +# Assemble: create object files from assembler source files. +.S.o: + $(CC) -c $(ALL_ASFLAGS) $< -o $@ + + + +# Target: clean project. +clean: + $(REMOVE) $(TARGET).hex $(TARGET).eep $(TARGET).cof $(TARGET).elf \ + $(TARGET).map $(TARGET).sym $(TARGET).lss \ + $(OBJ) $(LST) $(SRC:.c=.s) $(SRC:.c=.d) + +depend: + if grep '^# DO NOT DELETE' $(MAKEFILE) >/dev/null; \ + then \ + sed -e '/^# DO NOT DELETE/,$$d' $(MAKEFILE) > \ + $(MAKEFILE).$$$$ && \ + $(MV) $(MAKEFILE).$$$$ $(MAKEFILE); \ + fi + echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' \ + >> $(MAKEFILE); \ + $(CC) -M -mmcu=$(MCU) $(CDEFS) $(CINCS) $(SRC) $(ASRC) >> $(MAKEFILE) + +.PHONY: all build elf hex eep lss sym program coff extcoff clean depend + + diff --git a/dimmer.c b/dimmer.c new file mode 100755 index 0000000..1ff8b2f --- /dev/null +++ b/dimmer.c @@ -0,0 +1,95 @@ +#include +#include +#include + +uint8_t volatile pina; +uint8_t volatile pinb; + +ISR(PCINT1_vect, ISR_ALIASOF(PCINT0_vect)); +ISR(PCINT0_vect){ + uint8_t difa = (pina ^ PINA) & PINA; + uint8_t difb = (pinb ^ PINB) & PINB; + + if(difa == 1) { + // S1 gedrückt: blau heller + if (OCR0A >= 25) { + OCR0A = OCR0A - 25; + } + } else if (difa == 2) { + //S2 gedrückt: blau schwaecher + if (OCR0A <= 230) { + OCR0A = OCR0A + 25; + } + } else if (difa == 4) { + //S3 gedrückt: grün heller + if (OCR0B >= 25) { + OCR0B = OCR0B - 25; + } + } else if (difa == 8) { + //S4 gedrückt: grüner schwaecher + if (OCR0B <= 230) { + OCR0B = OCR0B + 25; + } + } else if (difb == 2) { + //S5 gedrückt: rot heller + if (OCR1A >= 25) { + OCR1A = OCR1A - 25; + } + } + else if (difb == 1) { + //S6 gedrückt: rot schwaecher + if (OCR1A <= 230) { + OCR1A = OCR1A + 25; + } + } + + pina = PINA; + pinb = PINB; +} + + + +// Set fuses for 8MHz internal clock with slow rising power +FUSES = +{ + .low = (FUSE_SUT0 & FUSE_CKSEL3 & FUSE_CKSEL2 & FUSE_CKSEL0), + .high = FUSE_SPIEN, + .extended = EFUSE_DEFAULT +}; + + + +int main() +{ + OCR0A = 255; + OCR0B = 255; + OCR1A = 255; + + TCCR0B = (1 << CS01) | (1 << CS00); + TCCR0A = (1 << WGM01) | (1 << WGM00) | (1 << COM0A1) | (1 << COM0A0) | (1 << COM0B1) | (1 << COM0B0); + + // 16 bit zähler + TCCR1B = (1 << CS11) | (1 << CS10) | (1 << WGM12); + TCCR1A = (1 << WGM10) | (1 << COM1A1) | (1 << COM1A0); + + + + // Set A7, A6 and B2 as output + DDRA = (1 << DDA7) | (1 << DDA6); + DDRB = (1 << DDB2); + + pina = PINA; + pinb = PINB; + + // Enable Pin Change Interrupts for switches + GIMSK = (1 << PCIE1) |(1 << PCIE0); + PCMSK0 = (1 << PCINT0) | (1 << PCINT1) | (1 << PCINT2) | (1 << PCINT3); + PCMSK1 = (1 << PCINT8) | (1 << PCINT9); + + sei(); + + while (1) { + // sleep_enable(); + } + return 0; +} diff --git a/led.c b/led.c new file mode 100755 index 0000000..eb1e589 --- /dev/null +++ b/led.c @@ -0,0 +1,74 @@ +/* ========================================================================== */ +/* */ +/* Filename.c */ +/* (c) 2001 Author */ +/* */ +/* Description */ +/* */ +/* ========================================================================== */ +#include +#include +#include + +uint8_t pina; +uint8_t pinb; + +ISR(PCINT0_vect){ + + uint8_t difa = (pina ^ PINA) & PINA; + uint8_t difb = (pinb ^ PINB) & PINB; + + if (difa == 1) { + // S1 gedrückt -> aktiviere Blau ? + PORTB = PORTB ^ 4; + } else if (difa == 2) { + // S2 gedrückt -> aktiviere ?? + PORTA = PORTA ^ 128; + } else if (difa == 4) { + // S3 gedrückt -> aktiviere ?? + PORTA = PORTA ^ 64; + } else if (difa == 8) { + // S4 gedrückt -> alle an + PORTA |= (1 << PORTA6) | (1 << PORTA7); + PORTB |= (1 << PORTB2); + } else if (difb == 1 || difb == 2) { + // S5 oder S6 gedrückt -> alle aus + PORTA = (1 << PORTA4) | (1 << PORTA5); + PORTB = (1 << PORTB3); + } + + pina = PINA; + pinb = PINB; + +} + +// Set fuses for 8MHz internal clock with slow rising power +FUSES = +{ + .low = (FUSE_SUT1 & FUSE_CKSEL3 & FUSE_CKSEL2 & FUSE_CKSEL0), + .high = FUSE_SPIEN, + .extended = EFUSE_DEFAULT +}; + +int main() { + // Set A7, A6 and B2 as output + DDRA = (1 << DDA7) | (1 << DDA6); + DDRB = (1 << DDB2); + + PORTB = 0; + PORTA = 0; + + pina = PINA; + pinb = PINB; + + // Enable Pin Change Interrupts for switches + GIMSK = (1 << PCIE1) | (1 << PCIE0); + PCMSK0 = (1 << PCINT0) | (1 << PCINT1) | (1 << PCINT2) | (1 << PCINT3); + PCMSK1 = (1 << PCINT8) | (1 << PCINT9); + sei(); + + while (1) { + sleep_enable(); + } +return 0; +}