From 166baecfec39673df66da7d628ddc30f5d755471 Mon Sep 17 00:00:00 2001 From: neingeist Date: Sat, 3 Apr 2010 16:10:14 +0200 Subject: [PATCH 01/14] move protothread lib --- projekte/protothreads/Makefile | 2 +- projekte/protothreads/{ => pt}/lc-switch.h | 0 projekte/protothreads/{ => pt}/lc.h | 0 projekte/protothreads/{ => pt}/pt.h | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename projekte/protothreads/{ => pt}/lc-switch.h (100%) rename projekte/protothreads/{ => pt}/lc.h (100%) rename projekte/protothreads/{ => pt}/pt.h (100%) diff --git a/projekte/protothreads/Makefile b/projekte/protothreads/Makefile index 40d24db..93f55b3 100644 --- a/projekte/protothreads/Makefile +++ b/projekte/protothreads/Makefile @@ -112,7 +112,7 @@ DEBUG = dwarf-2 # Each directory must be seperated by a space. # Use forward slashes for directory separators. # For a directory that has spaces, enclose it in quotes. -EXTRAINCDIRS = +EXTRAINCDIRS = pt # Compiler flag to set the C Standard level. diff --git a/projekte/protothreads/lc-switch.h b/projekte/protothreads/pt/lc-switch.h similarity index 100% rename from projekte/protothreads/lc-switch.h rename to projekte/protothreads/pt/lc-switch.h diff --git a/projekte/protothreads/lc.h b/projekte/protothreads/pt/lc.h similarity index 100% rename from projekte/protothreads/lc.h rename to projekte/protothreads/pt/lc.h diff --git a/projekte/protothreads/pt.h b/projekte/protothreads/pt/pt.h similarity index 100% rename from projekte/protothreads/pt.h rename to projekte/protothreads/pt/pt.h From ef664f18c00cafceb4c51453c5277061ecc5c473 Mon Sep 17 00:00:00 2001 From: neingeist Date: Sat, 3 Apr 2010 16:15:49 +0200 Subject: [PATCH 02/14] add .gitignore --- projekte/protothreads/.gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 projekte/protothreads/.gitignore diff --git a/projekte/protothreads/.gitignore b/projekte/protothreads/.gitignore new file mode 100644 index 0000000..2562945 --- /dev/null +++ b/projekte/protothreads/.gitignore @@ -0,0 +1,8 @@ +*.eep +*.elf +*.hex +*.lss +*.map +*.sym +obj/ +.dep/ From d7f3a34cfabde311dd994ef428d85cdde6d7243a Mon Sep 17 00:00:00 2001 From: neingeist Date: Sat, 3 Apr 2010 18:29:20 +0200 Subject: [PATCH 03/14] add simpler Makefile --- projekte/protothreads/Makefile | 832 +++++++++------------------------ 1 file changed, 226 insertions(+), 606 deletions(-) diff --git a/projekte/protothreads/Makefile b/projekte/protothreads/Makefile index 93f55b3..16434eb 100644 --- a/projekte/protothreads/Makefile +++ b/projekte/protothreads/Makefile @@ -1,606 +1,226 @@ -# Hey Emacs, this is a -*- makefile -*- -#---------------------------------------------------------------------------- -# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al. -# -# Released to the Public Domain -# -# Additional material for this makefile was written by: -# Peter Fleury -# Tim Henigan -# Colin O'Flynn -# Reiner Patommel -# Markus Pfaff -# Sander Pool -# Frederik Rouleau -# Carlos Lamas -# -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device, using avrdude. -# Please customize the avrdude settings below first! -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - - -# MCU name -MCU = atmega168 - - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# Typical values are: -# F_CPU = 1000000 -# F_CPU = 1843200 -# F_CPU = 2000000 -# F_CPU = 3686400 -# F_CPU = 4000000 -# F_CPU = 7372800 -# F_CPU = 8000000 -# F_CPU = 11059200 -# F_CPU = 14745600 -# F_CPU = 16000000 -# F_CPU = 18432000 -# F_CPU = 20000000 -F_CPU = 16000000 - - -# Output format. (can be srec, ihex, binary) -FORMAT = ihex - - -# Target file name (without extension). -TARGET = example - - -# Object files directory -OBJDIR = obj - - -# List C source files here. (C dependencies are automatically generated.) -SRC = example.c - - -# List C++ source files here. (C dependencies are automatically generated.) -CPPSRC = - - -# List Assembler source files here. -# Make them always end in a capital .S. Files ending in a lowercase .s -# will not be considered source files but generated files (assembler -# output from the compiler), and will be deleted upon "make clean"! -# Even though the DOS/Win* filesystem matches both .s and .S the same, -# it will preserve the spelling of the filenames, and gcc itself does -# care about how the name is spelled on its command-line. -ASRC = - - -# Optimization level, can be [0, 1, 2, 3, s]. -# 0 = turn off optimization. s = optimize for size. -# (Note: 3 is not always the best optimization level. See avr-libc FAQ.) -OPT = s - - -# Debugging format. -# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs. -# AVR Studio 4.10 requires dwarf-2. -# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run. -DEBUG = dwarf-2 - - -# List any extra directories to look for include files here. -# Each directory must be seperated by a space. -# Use forward slashes for directory separators. -# For a directory that has spaces, enclose it in quotes. -EXTRAINCDIRS = pt - - -# 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=gnu99 - - -# Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL - - -# Place -D or -U options here for C++ sources -CPPDEFS = -DF_CPU=$(F_CPU)UL -#CPPDEFS += -D__STDC_LIMIT_MACROS -#CPPDEFS += -D__STDC_CONSTANT_MACROS - - - -#---------------- Compiler Options C ---------------- -# -g*: generate debugging information -# -O*: optimization level -# -f...: tuning, see GCC manual and avr-libc documentation -# -Wall...: warning level -# -Wa,...: tell GCC to pass this to the assembler. -# -adhlns...: create assembler listing -CFLAGS = -g$(DEBUG) -CFLAGS += $(CDEFS) -CFLAGS += -O$(OPT) -#CFLAGS += -mint8 -#CFLAGS += -mshort-calls -CFLAGS += -funsigned-char -CFLAGS += -funsigned-bitfields -CFLAGS += -fpack-struct -CFLAGS += -fshort-enums -#CFLAGS += -fno-unit-at-a-time -CFLAGS += -Wall -CFLAGS += -Wstrict-prototypes -CFLAGS += -Wundef -#CFLAGS += -Wunreachable-code -#CFLAGS += -Wsign-compare -CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst) -CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) -CFLAGS += $(CSTANDARD) - - -#---------------- Compiler Options C++ ---------------- -# -g*: generate debugging information -# -O*: optimization level -# -f...: tuning, see GCC manual and avr-libc documentation -# -Wall...: warning level -# -Wa,...: tell GCC to pass this to the assembler. -# -adhlns...: create assembler listing -CPPFLAGS = -g$(DEBUG) -CPPFLAGS += $(CPPDEFS) -CPPFLAGS += -O$(OPT) -#CPPFLAGS += -mint8 -#CPPFLAGS += -mshort-calls -CPPFLAGS += -funsigned-char -CPPFLAGS += -funsigned-bitfields -CPPFLAGS += -fpack-struct -CPPFLAGS += -fshort-enums -CPPFLAGS += -fno-exceptions -#CPPFLAGS += -fno-unit-at-a-time -CPPFLAGS += -Wall -#CPPFLAGS += -Wstrict-prototypes -CFLAGS += -Wundef -#CPPFLAGS += -Wunreachable-code -#CPPFLAGS += -Wsign-compare -CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst) -CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) -#CPPFLAGS += $(CSTANDARD) - - -#---------------- Assembler Options ---------------- -# -Wa,...: tell GCC to pass this to the assembler. -# -ahlms: create listing -# -gstabs: have the assembler create line number information; note that -# for use in COFF files, additional information about filenames -# and function names needs to be present in the assembler source -# files -- see avr-libc docs [FIXME: not yet described there] -ASFLAGS = -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs - - -#---------------- Library Options ---------------- -# 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 - -# If this is left blank, then it will use the Standard printf version. -PRINTF_LIB = -#PRINTF_LIB = $(PRINTF_LIB_MIN) -#PRINTF_LIB = $(PRINTF_LIB_FLOAT) - - -# 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 - -# If this is left blank, then it will use the Standard scanf version. -SCANF_LIB = -#SCANF_LIB = $(SCANF_LIB_MIN) -#SCANF_LIB = $(SCANF_LIB_FLOAT) - - -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,-Tdata=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 = - - - -#---------------- Linker Options ---------------- -# -Wl,...: tell GCC to pass this to linker. -# -Map: create map file -# --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref -LDFLAGS += $(EXTMEMOPTS) -LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB) -#LDFLAGS += -T linker_script.x - - - -#---------------- Programming Options (avrdude) ---------------- - -# Programming hardware: alf avr910 avrisp bascom bsd -# dt006 pavr picoweb pony-stk200 sp12 stk200 stk500 -# -# Type: avrdude -c ? -# to get a full listing. -# -AVRDUDE_PROGRAMMER = stk500v1 - -# com1 = serial port. Use lpt1 to connect to parallel port. -AVRDUDE_PORT = /dev/ttyUSB0# programmer connected to serial device - -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_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -b19200 -D -AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY) -AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE) -AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) - - - -#---------------- Debugging Options ---------------- - -# For simulavr only - target MCU frequency. -DEBUG_MFREQ = $(F_CPU) - -# Set the DEBUG_UI to either gdb or insight. -# DEBUG_UI = gdb -DEBUG_UI = insight - -# Set the debugging back-end to either avarice, simulavr. -DEBUG_BACKEND = avarice -#DEBUG_BACKEND = simulavr - -# GDB Init Filename. -GDBINIT_FILE = __avr_gdbinit - -# When using avarice settings for the JTAG -JTAG_DEV = /dev/com1 - -# Debugging port used to communicate between GDB / avarice / simulavr. -DEBUG_PORT = 4242 - -# Debugging host used to communicate between GDB / avarice / simulavr, normally -# just set to localhost unless doing some sort of crazy debugging when -# avarice is running on a different computer. -DEBUG_HOST = localhost - - - -#============================================================================ - - -# Define programs and commands. -SHELL = sh -CC = avr-gcc -OBJCOPY = avr-objcopy -OBJDUMP = avr-objdump -SIZE = avr-size -NM = avr-nm -AVRDUDE = /home/entropia/Desktop/arduinisten/arduino-0018-linux-x64/hardware/tools/avrdude -C/home/entropia/Desktop/arduinisten/arduino-0018-linux-x64/hardware/tools/avrdude.conf -REMOVE = rm -f -REMOVEDIR = rm -rf -COPY = cp -WINSHELL = cmd - - -# Define Messages -# English -MSG_ERRORS_NONE = Errors: none -MSG_BEGIN = -------- begin -------- -MSG_END = -------- end -------- -MSG_SIZE_BEFORE = Size before: -MSG_SIZE_AFTER = Size after: -MSG_COFF = Converting to AVR COFF: -MSG_EXTENDED_COFF = Converting to AVR Extended COFF: -MSG_FLASH = Creating load file for Flash: -MSG_EEPROM = Creating load file for EEPROM: -MSG_EXTENDED_LISTING = Creating Extended Listing: -MSG_SYMBOL_TABLE = Creating Symbol Table: -MSG_LINKING = Linking: -MSG_COMPILING = Compiling C: -MSG_COMPILING_CPP = Compiling C++: -MSG_ASSEMBLING = Assembling: -MSG_CLEANING = Cleaning project: -MSG_CREATING_LIBRARY = Creating library: - - - - -# Define all object files. -OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o) - -# Define all listing files. -LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst) - - -# Compiler flags to generate dependency files. -GENDEPFLAGS = -MD -MP -MF .dep/$(@F).d - - -# Combine all necessary flags and optional flags. -# Add target processor to flags. -ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS) -ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS) -ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS) - - - - - -# Default target. -all: begin gccversion sizebefore build sizeafter end - -# Change the build target to build a HEX file or a library. -build: elf hex eep lss sym -#build: lib - - -elf: $(TARGET).elf -hex: $(TARGET).hex -eep: $(TARGET).eep -lss: $(TARGET).lss -sym: $(TARGET).sym -LIBNAME=lib$(TARGET).a -lib: $(LIBNAME) - - - -# Eye candy. -# AVR Studio 3.x does not check make's exit code but relies on -# the following magic strings to be generated by the compile job. -begin: - @echo - @echo $(MSG_BEGIN) - -end: - @echo $(MSG_END) - @echo - - -# Display size of file. -HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex -ELFSIZE = $(SIZE) -A $(TARGET).elf -AVRMEM = avr-mem.sh $(TARGET).elf $(MCU) - -sizebefore: - @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \ - $(AVRMEM) 2>/dev/null; echo; fi - -sizeafter: - @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \ - $(AVRMEM) 2>/dev/null; echo; fi - - - -# Display compiler version information. -gccversion : - @$(CC) --version - - - -# Program the device. -program: $(TARGET).hex $(TARGET).eep - perl -MDevice::SerialPort -e "Device::SerialPort->new('$(AVRDUDE_PORT)')->pulse_dtr_on(100);" - $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) - - -# Generate avr-gdb config/init file which does the following: -# define the reset signal, load the target file, connect to target, and set -# a breakpoint at main(). -gdb-config: - @$(REMOVE) $(GDBINIT_FILE) - @echo define reset >> $(GDBINIT_FILE) - @echo SIGNAL SIGHUP >> $(GDBINIT_FILE) - @echo end >> $(GDBINIT_FILE) - @echo file $(TARGET).elf >> $(GDBINIT_FILE) - @echo target remote $(DEBUG_HOST):$(DEBUG_PORT) >> $(GDBINIT_FILE) -ifeq ($(DEBUG_BACKEND),simulavr) - @echo load >> $(GDBINIT_FILE) -endif - @echo break main >> $(GDBINIT_FILE) - -debug: gdb-config $(TARGET).elf -ifeq ($(DEBUG_BACKEND), avarice) - @echo Starting AVaRICE - Press enter when "waiting to connect" message displays. - @$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \ - $(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT) - @$(WINSHELL) /c pause - -else - @$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \ - $(DEBUG_MFREQ) --port $(DEBUG_PORT) -endif - @$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE) - - - - -# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB. -COFFCONVERT = $(OBJCOPY) --debugging -COFFCONVERT += --change-section-address .data-0x800000 -COFFCONVERT += --change-section-address .bss-0x800000 -COFFCONVERT += --change-section-address .noinit-0x800000 -COFFCONVERT += --change-section-address .eeprom-0x810000 - - - -coff: $(TARGET).elf - @echo - @echo $(MSG_COFF) $(TARGET).cof - $(COFFCONVERT) -O coff-avr $< $(TARGET).cof - - -extcoff: $(TARGET).elf - @echo - @echo $(MSG_EXTENDED_COFF) $(TARGET).cof - $(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof - - - -# Create final output files (.hex, .eep) from ELF output file. -%.hex: %.elf - @echo - @echo $(MSG_FLASH) $@ - $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@ - -%.eep: %.elf - @echo - @echo $(MSG_EEPROM) $@ - -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ - --change-section-lma .eeprom=0 -O $(FORMAT) $< $@ - -# Create extended listing file from ELF output file. -%.lss: %.elf - @echo - @echo $(MSG_EXTENDED_LISTING) $@ - $(OBJDUMP) -h -S $< > $@ - -# Create a symbol table from ELF output file. -%.sym: %.elf - @echo - @echo $(MSG_SYMBOL_TABLE) $@ - $(NM) -n $< > $@ - - - -# Create library from object files. -.SECONDARY : $(TARGET).a -.PRECIOUS : $(OBJ) -%.a: $(OBJ) - @echo - @echo $(MSG_CREATING_LIBRARY) $@ - $(AR) $@ $(OBJ) - - -# Link: create ELF output file from object files. -.SECONDARY : $(TARGET).elf -.PRECIOUS : $(OBJ) -%.elf: $(OBJ) - @echo - @echo $(MSG_LINKING) $@ - $(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS) - - -# Compile: create object files from C source files. -$(OBJDIR)/%.o : %.c - @echo - @echo $(MSG_COMPILING) $< - $(CC) -c $(ALL_CFLAGS) $< -o $@ - - -# Compile: create object files from C++ source files. -$(OBJDIR)/%.o : %.cpp - @echo - @echo $(MSG_COMPILING_CPP) $< - $(CC) -c $(ALL_CPPFLAGS) $< -o $@ - - -# Compile: create assembler files from C source files. -%.s : %.c - $(CC) -S $(ALL_CFLAGS) $< -o $@ - - -# Compile: create assembler files from C++ source files. -%.s : %.cpp - $(CC) -S $(ALL_CPPFLAGS) $< -o $@ - - -# Assemble: create object files from assembler source files. -$(OBJDIR)/%.o : %.S - @echo - @echo $(MSG_ASSEMBLING) $< - $(CC) -c $(ALL_ASFLAGS) $< -o $@ - - -# Create preprocessed source for use in sending a bug report. -%.i : %.c - $(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@ - - -# Target: clean project. -clean: begin clean_list end - -clean_list : - @echo - @echo $(MSG_CLEANING) - $(REMOVE) $(TARGET).hex - $(REMOVE) $(TARGET).eep - $(REMOVE) $(TARGET).cof - $(REMOVE) $(TARGET).elf - $(REMOVE) $(TARGET).map - $(REMOVE) $(TARGET).sym - $(REMOVE) $(TARGET).lss - $(REMOVEDIR) $(OBJDIR) - $(REMOVE) $(SRC:.c=.s) - $(REMOVE) $(SRC:.c=.d) - $(REMOVEDIR) .dep - - -# Create object files directory -$(shell mkdir $(OBJDIR) 2>/dev/null) - - -# Include the dependency files. --include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*) - - -# Listing of phony targets. -.PHONY : all begin finish end sizebefore sizeafter gccversion \ -build elf hex eep lss sym coff extcoff \ -clean clean_list program debug gdb-config - - +# 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 = atmega168 +F_CPU = 16000000 +FORMAT = ihex +TARGET = example +SRC = example.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=gnu99 + +# Place -D or -U options here +CDEFS = -DF_CPU=$(F_CPU)UL + +# Place -I options here +CINCS = -Ipt + + +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 = stk500 +AVRDUDE_PORT = usb + +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) +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 + + From aef40f1c351b28cc6fe76573cf47b26499259c44 Mon Sep 17 00:00:00 2001 From: neingeist Date: Sat, 3 Apr 2010 18:29:50 +0200 Subject: [PATCH 04/14] update .gitignore --- projekte/protothreads/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/projekte/protothreads/.gitignore b/projekte/protothreads/.gitignore index 2562945..494fc64 100644 --- a/projekte/protothreads/.gitignore +++ b/projekte/protothreads/.gitignore @@ -3,6 +3,7 @@ *.hex *.lss *.map +*.o *.sym obj/ .dep/ From 427eb62ac4411f1332781357c960460efa994c8f Mon Sep 17 00:00:00 2001 From: neingeist Date: Sat, 3 Apr 2010 18:38:55 +0200 Subject: [PATCH 05/14] declare main correctly --- projekte/protothreads/example.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projekte/protothreads/example.c b/projekte/protothreads/example.c index 816bb68..1fe70d5 100644 --- a/projekte/protothreads/example.c +++ b/projekte/protothreads/example.c @@ -73,7 +73,7 @@ protothread2(struct pt *pt) static struct pt pt1, pt2; -int main() { +int main(void) { // pin 11 = PB3 DDRB |= _BV(PB3); // pin 10 = PB2 From 0de9d4db1e6c126c5b44e0d6491def651a49078f Mon Sep 17 00:00:00 2001 From: neingeist Date: Sat, 3 Apr 2010 20:51:54 +0200 Subject: [PATCH 06/14] untested protothread timer stuff --- projekte/protothreads/Makefile | 4 +- projekte/protothreads/example.c | 21 +++- projekte/protothreads/timer/clock-arch.c | 43 ++++++++ projekte/protothreads/timer/clock-arch.h | 14 +++ projekte/protothreads/timer/clock.h | 88 ++++++++++++++++ projekte/protothreads/timer/timer.c | 127 +++++++++++++++++++++++ projekte/protothreads/timer/timer.h | 86 +++++++++++++++ 7 files changed, 376 insertions(+), 7 deletions(-) create mode 100644 projekte/protothreads/timer/clock-arch.c create mode 100644 projekte/protothreads/timer/clock-arch.h create mode 100644 projekte/protothreads/timer/clock.h create mode 100644 projekte/protothreads/timer/timer.c create mode 100644 projekte/protothreads/timer/timer.h diff --git a/projekte/protothreads/Makefile b/projekte/protothreads/Makefile index 16434eb..ad3107b 100644 --- a/projekte/protothreads/Makefile +++ b/projekte/protothreads/Makefile @@ -9,7 +9,7 @@ MCU = atmega168 F_CPU = 16000000 FORMAT = ihex TARGET = example -SRC = example.c +SRC = example.c timer/clock-arch.c timer/timer.c ASRC = OPT = s @@ -32,7 +32,7 @@ CSTANDARD = -std=gnu99 CDEFS = -DF_CPU=$(F_CPU)UL # Place -I options here -CINCS = -Ipt +CINCS = -Ipt CDEBUG = -g$(DEBUG) diff --git a/projekte/protothreads/example.c b/projekte/protothreads/example.c index 1fe70d5..6c61b9c 100644 --- a/projekte/protothreads/example.c +++ b/projekte/protothreads/example.c @@ -2,10 +2,15 @@ #include "util/delay.h" #include "pt.h" +#include "timer/clock.h" +#include "timer/timer.h" /* Two flags that the two protothread functions use. */ static int protothread1_flag, protothread2_flag; +/* Two timers for the two protothreads. */ +static struct timer timer1, timer2; + static int protothread1(struct pt *pt) { @@ -19,10 +24,11 @@ protothread1(struct pt *pt) PT_WAIT_UNTIL(pt, protothread2_flag != 0); PORTB |= _BV(PB3); - _delay_ms(200); + timer_set(&timer1, CLOCK_SECOND/2); + PT_WAIT_UNTIL(pt, timer_expired(&timer1)); PORTB &= ~_BV(PB3); - _delay_ms(200); - + timer_set(&timer1, CLOCK_SECOND/2); + PT_WAIT_UNTIL(pt, timer_expired(&timer1)); /* We then reset the other protothread's flag, and set our own flag so that the other protothread can run. */ @@ -53,9 +59,11 @@ protothread2(struct pt *pt) PT_WAIT_UNTIL(pt, protothread1_flag != 0); PORTB |= _BV(PB2); - _delay_ms(100); + timer_set(&timer2, CLOCK_SECOND/2); + PT_WAIT_UNTIL(pt, timer_expired(&timer2)); PORTB &= ~_BV(PB2); - _delay_ms(100); + timer_set(&timer2, CLOCK_SECOND/2); + PT_WAIT_UNTIL(pt, timer_expired(&timer2)); /* We then reset the other protothread's flag, and set our own @@ -79,6 +87,9 @@ int main(void) { // pin 10 = PB2 DDRB |= _BV(PB2); + /* Initialize clock */ + clock_init(); + /* Initialize the protothread state variables with PT_INIT(). */ PT_INIT(&pt1); PT_INIT(&pt2); diff --git a/projekte/protothreads/timer/clock-arch.c b/projekte/protothreads/timer/clock-arch.c new file mode 100644 index 0000000..4f77195 --- /dev/null +++ b/projekte/protothreads/timer/clock-arch.c @@ -0,0 +1,43 @@ +// from avr-uip + +#include +#include +#include +#include +#include +#include + +#include "clock-arch.h" + +//Counted time +clock_time_t clock_datetime = 0; + +//Overflow itnerrupt +ISR(TIMER0_OVF_vect) +{ + clock_datetime += 1; + TIFR0 |= (1< + +typedef uint16_t clock_time_t; +#define CLOCK_CONF_SECOND (F_CPU / (1024*255)) + //Freqency divided prescaler and counter register size +void clock_init(void); +clock_time_t clock_time(void); + +#endif /* __CLOCK_ARCH_H__ */ diff --git a/projekte/protothreads/timer/clock.h b/projekte/protothreads/timer/clock.h new file mode 100644 index 0000000..f34d78f --- /dev/null +++ b/projekte/protothreads/timer/clock.h @@ -0,0 +1,88 @@ +/** + * \defgroup clock Clock interface + * + * The clock interface is the interface between the \ref timer "timer library" + * and the platform specific clock functionality. The clock + * interface must be implemented for each platform that uses the \ref + * timer "timer library". + * + * The clock interface does only one this: it measures time. The clock + * interface provides a macro, CLOCK_SECOND, which corresponds to one + * second of system time. + * + * \sa \ref timer "Timer library" + * + * @{ + */ + +/* + * Copyright (c) 2004, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the uIP TCP/IP stack + * + * Author: Adam Dunkels + * + * $Id: clock.h,v 1.3 2006/06/11 21:46:39 adam Exp $ + */ +#ifndef __CLOCK_H__ +#define __CLOCK_H__ + +#include "clock-arch.h" + +/** + * Initialize the clock library. + * + * This function initializes the clock library and should be called + * from the main() function of the system. + * + */ +void clock_init(void); + +/** + * Get the current clock time. + * + * This function returns the current system clock time. + * + * \return The current clock time, measured in system ticks. + */ +clock_time_t clock_time(void); + +/** + * A second, measured in system clock time. + * + * \hideinitializer + */ +#ifdef CLOCK_CONF_SECOND +#define CLOCK_SECOND CLOCK_CONF_SECOND +#else +#define CLOCK_SECOND (clock_time_t)32 +#endif + +#endif /* __CLOCK_H__ */ + +/** @} */ diff --git a/projekte/protothreads/timer/timer.c b/projekte/protothreads/timer/timer.c new file mode 100644 index 0000000..44ab3f1 --- /dev/null +++ b/projekte/protothreads/timer/timer.c @@ -0,0 +1,127 @@ +/** + * \addtogroup timer + * @{ + */ + +/** + * \file + * Timer library implementation. + * \author + * Adam Dunkels + */ + +/* + * Copyright (c) 2004, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the uIP TCP/IP stack + * + * Author: Adam Dunkels + * + * $Id: timer.c,v 1.2 2006/06/12 08:00:30 adam Exp $ + */ + +#include "timer/clock.h" +#include "timer/timer.h" + +/*---------------------------------------------------------------------------*/ +/** + * Set a timer. + * + * This function is used to set a timer for a time sometime in the + * future. The function timer_expired() will evaluate to true after + * the timer has expired. + * + * \param t A pointer to the timer + * \param interval The interval before the timer expires. + * + */ +void +timer_set(struct timer *t, clock_time_t interval) +{ + t->interval = interval; + t->start = clock_time(); +} +/*---------------------------------------------------------------------------*/ +/** + * Reset the timer with the same interval. + * + * This function resets the timer with the same interval that was + * given to the timer_set() function. The start point of the interval + * is the exact time that the timer last expired. Therefore, this + * function will cause the timer to be stable over time, unlike the + * timer_rester() function. + * + * \param t A pointer to the timer. + * + * \sa timer_restart() + */ +void +timer_reset(struct timer *t) +{ + t->start += t->interval; +} +/*---------------------------------------------------------------------------*/ +/** + * Restart the timer from the current point in time + * + * This function restarts a timer with the same interval that was + * given to the timer_set() function. The timer will start at the + * current time. + * + * \note A periodic timer will drift if this function is used to reset + * it. For preioric timers, use the timer_reset() function instead. + * + * \param t A pointer to the timer. + * + * \sa timer_reset() + */ +void +timer_restart(struct timer *t) +{ + t->start = clock_time(); +} +/*---------------------------------------------------------------------------*/ +/** + * Check if a timer has expired. + * + * This function tests if a timer has expired and returns true or + * false depending on its status. + * + * \param t A pointer to the timer + * + * \return Non-zero if the timer has expired, zero otherwise. + * + */ +int +timer_expired(struct timer *t) +{ + return (clock_time_t)(clock_time() - t->start) >= (clock_time_t)t->interval; +} +/*---------------------------------------------------------------------------*/ + +/** @} */ diff --git a/projekte/protothreads/timer/timer.h b/projekte/protothreads/timer/timer.h new file mode 100644 index 0000000..40a734f --- /dev/null +++ b/projekte/protothreads/timer/timer.h @@ -0,0 +1,86 @@ +/** + * \defgroup timer Timer library + * + * The timer library provides functions for setting, resetting and + * restarting timers, and for checking if a timer has expired. An + * application must "manually" check if its timers have expired; this + * is not done automatically. + * + * A timer is declared as a \c struct \c timer and all access to the + * timer is made by a pointer to the declared timer. + * + * \note The timer library uses the \ref clock "Clock library" to + * measure time. Intervals should be specified in the format used by + * the clock library. + * + * @{ + */ + + +/** + * \file + * Timer library header file. + * \author + * Adam Dunkels + */ + +/* + * Copyright (c) 2004, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the uIP TCP/IP stack + * + * Author: Adam Dunkels + * + * $Id: timer.h,v 1.3 2006/06/11 21:46:39 adam Exp $ + */ +#ifndef __TIMER_H__ +#define __TIMER_H__ + +#include "timer.h" + +/** + * A timer. + * + * This structure is used for declaring a timer. The timer must be set + * with timer_set() before it can be used. + * + * \hideinitializer + */ +struct timer { + clock_time_t start; + clock_time_t interval; +}; + +void timer_set(struct timer *t, clock_time_t interval); +void timer_reset(struct timer *t); +void timer_restart(struct timer *t); +int timer_expired(struct timer *t); + +#endif /* __TIMER_H__ */ + +/** @} */ From e3a6a82b57464723cd65ef7a4e3b693c855f82a7 Mon Sep 17 00:00:00 2001 From: Eve Entropia Date: Sat, 3 Apr 2010 22:03:52 +0200 Subject: [PATCH 07/14] use arduino's avrdue and -b19200 for now --- projekte/protothreads/Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/projekte/protothreads/Makefile b/projekte/protothreads/Makefile index ad3107b..0bef228 100644 --- a/projekte/protothreads/Makefile +++ b/projekte/protothreads/Makefile @@ -83,8 +83,8 @@ LDFLAGS = $(EXTMEMOPTS) $(LDMAP) $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB) # Programming support using avrdude. Settings and variables. -AVRDUDE_PROGRAMMER = stk500 -AVRDUDE_PORT = usb +AVRDUDE_PROGRAMMER = stk500v1 +AVRDUDE_PORT = /dev/ttyUSB0 AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex #AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep @@ -105,7 +105,7 @@ AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex #AVRDUDE_VERBOSE = -v -v AVRDUDE_BASIC = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -AVRDUDE_FLAGS = $(AVRDUDE_BASIC) $(AVRDUDE_NO_VERIFY) $(AVRDUDE_VERBOSE) $(AVRDUDE_ERASE_COUNTER) +AVRDUDE_FLAGS = $(AVRDUDE_BASIC) $(AVRDUDE_NO_VERIFY) $(AVRDUDE_VERBOSE) $(AVRDUDE_ERASE_COUNTER) -b19200 CC = avr-gcc @@ -113,7 +113,8 @@ OBJCOPY = avr-objcopy OBJDUMP = avr-objdump SIZE = avr-size NM = avr-nm -AVRDUDE = avrdude +#AVRDUDE = avrdude +AVRDUDE = /home/entropia/Desktop/arduinisten/arduino-0018-linux-x64/hardware/tools/avrdude -C/home/entropia/Desktop/arduinisten/arduino-0018-linux-x64/hardware/tools/avrdude.conf REMOVE = rm -f MV = mv -f @@ -140,9 +141,12 @@ eep: $(TARGET).eep lss: $(TARGET).lss sym: $(TARGET).sym +# Reset Arduino +program-reset: + perl -MDevice::SerialPort -e "Device::SerialPort->new('$(AVRDUDE_PORT)')->pulse_dtr_on(100);" # Program the device. -program: $(TARGET).hex $(TARGET).eep +program: $(TARGET).hex $(TARGET).eep program-reset $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) From e64fd212f08b28c25ceb4791b086c4512b489a70 Mon Sep 17 00:00:00 2001 From: Eve Entropia Date: Sat, 3 Apr 2010 22:05:54 +0200 Subject: [PATCH 08/14] no verify after flash --- projekte/protothreads/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projekte/protothreads/Makefile b/projekte/protothreads/Makefile index 0bef228..272ec82 100644 --- a/projekte/protothreads/Makefile +++ b/projekte/protothreads/Makefile @@ -97,7 +97,7 @@ AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex # Uncomment the following if you do /not/ wish a verification to be # performed after programming the device. -#AVRDUDE_NO_VERIFY = -V +AVRDUDE_NO_VERIFY = -V # Increase verbosity level. Please use this when submitting bug # reports about avrdude. See From 9a9003c496929412e9bdee42848014aff1038e51 Mon Sep 17 00:00:00 2001 From: Eve Entropia Date: Sat, 3 Apr 2010 22:39:13 +0200 Subject: [PATCH 09/14] blinken --- projekte/protothreads/example.c | 40 +++++++++------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/projekte/protothreads/example.c b/projekte/protothreads/example.c index 6c61b9c..6972328 100644 --- a/projekte/protothreads/example.c +++ b/projekte/protothreads/example.c @@ -5,8 +5,12 @@ #include "timer/clock.h" #include "timer/timer.h" -/* Two flags that the two protothread functions use. */ -static int protothread1_flag, protothread2_flag; +/* TIME_DELAY macro for convenience */ +#define TIMER_DELAY(pt, timer, t) \ + do { \ + timer_set(&timer, t); \ + PT_WAIT_UNTIL(pt, timer_expired(&timer)); \ + } while(0); /* Two timers for the two protothreads. */ static struct timer timer1, timer2; @@ -20,20 +24,10 @@ protothread1(struct pt *pt) /* We loop forever here. */ while(1) { - /* Wait until the other protothread has set its flag. */ - PT_WAIT_UNTIL(pt, protothread2_flag != 0); - PORTB |= _BV(PB3); - timer_set(&timer1, CLOCK_SECOND/2); - PT_WAIT_UNTIL(pt, timer_expired(&timer1)); + TIMER_DELAY(pt, timer1, 20); PORTB &= ~_BV(PB3); - timer_set(&timer1, CLOCK_SECOND/2); - PT_WAIT_UNTIL(pt, timer_expired(&timer1)); - - /* We then reset the other protothread's flag, and set our own - flag so that the other protothread can run. */ - protothread2_flag = 0; - protothread1_flag = 1; + TIMER_DELAY(pt, timer1, 20); /* And we loop. */ } @@ -52,24 +46,10 @@ protothread2(struct pt *pt) /* We loop forever here. */ while(1) { - /* Let the other protothread run. */ - protothread2_flag = 1; - - /* Wait until the other protothread has set its flag. */ - PT_WAIT_UNTIL(pt, protothread1_flag != 0); - PORTB |= _BV(PB2); - timer_set(&timer2, CLOCK_SECOND/2); - PT_WAIT_UNTIL(pt, timer_expired(&timer2)); + TIMER_DELAY(pt, timer2, 60); PORTB &= ~_BV(PB2); - timer_set(&timer2, CLOCK_SECOND/2); - PT_WAIT_UNTIL(pt, timer_expired(&timer2)); - - - /* We then reset the other protothread's flag, and set our own - flag so that the other protothread can run. */ - protothread1_flag = 0; - protothread2_flag = 1; + TIMER_DELAY(pt, timer2, 60); /* And we loop. */ } From d3460460c2f1dd2018047d0d8cd2900d31c92b5c Mon Sep 17 00:00:00 2001 From: Eve Entropia Date: Sat, 3 Apr 2010 22:40:24 +0200 Subject: [PATCH 10/14] fix comments --- projekte/protothreads/example.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projekte/protothreads/example.c b/projekte/protothreads/example.c index 6972328..a31115d 100644 --- a/projekte/protothreads/example.c +++ b/projekte/protothreads/example.c @@ -19,7 +19,7 @@ static int protothread1(struct pt *pt) { /* A protothread function must begin with PT_BEGIN() which takes a - * pointer to a struct pt. */ + pointer to a struct pt. */ PT_BEGIN(pt); /* We loop forever here. */ @@ -33,7 +33,7 @@ protothread1(struct pt *pt) } /* All protothread functions must end with PT_END() which takes a - * pointer to a struct pt. */ + pointer to a struct pt. */ PT_END(pt); } @@ -55,7 +55,7 @@ protothread2(struct pt *pt) } /* All protothread functions must end with PT_END() which takes a - * pointer to a struct pt. */ + pointer to a struct pt. */ PT_END(pt); } From e7ef8d4950d13389c446bede8b7732ac9adcf8b0 Mon Sep 17 00:00:00 2001 From: Eve Entropia Date: Sat, 3 Apr 2010 22:47:06 +0200 Subject: [PATCH 11/14] fix typo --- projekte/protothreads/example.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projekte/protothreads/example.c b/projekte/protothreads/example.c index a31115d..6334bb3 100644 --- a/projekte/protothreads/example.c +++ b/projekte/protothreads/example.c @@ -5,7 +5,7 @@ #include "timer/clock.h" #include "timer/timer.h" -/* TIME_DELAY macro for convenience */ +/* TIMER_DELAY macro for convenience */ #define TIMER_DELAY(pt, timer, t) \ do { \ timer_set(&timer, t); \ From 0f8cd797d6fbcb44c5cb88d409796ea0a8a9655f Mon Sep 17 00:00:00 2001 From: Eve Entropia Date: Sat, 3 Apr 2010 22:50:45 +0200 Subject: [PATCH 12/14] Add credit --- projekte/protothreads/example.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projekte/protothreads/example.c b/projekte/protothreads/example.c index 6334bb3..82844a4 100644 --- a/projekte/protothreads/example.c +++ b/projekte/protothreads/example.c @@ -1,3 +1,5 @@ +/* based on example-small.c in the protothreads tarball */ + #include "avr/io.h" #include "util/delay.h" From e3d16c3798aea007efaf6e956390d1e6b5da5774 Mon Sep 17 00:00:00 2001 From: neingeist Date: Sun, 4 Apr 2010 17:37:39 +0200 Subject: [PATCH 13/14] comment macro, remove semicolon --- projekte/protothreads/example.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projekte/protothreads/example.c b/projekte/protothreads/example.c index 82844a4..366d407 100644 --- a/projekte/protothreads/example.c +++ b/projekte/protothreads/example.c @@ -7,12 +7,12 @@ #include "timer/clock.h" #include "timer/timer.h" -/* TIMER_DELAY macro for convenience */ +/* TIMER_DELAY macro for convenience, do { } while(0) is just a macro trick */ #define TIMER_DELAY(pt, timer, t) \ do { \ timer_set(&timer, t); \ PT_WAIT_UNTIL(pt, timer_expired(&timer)); \ - } while(0); + } while(0) /* Two timers for the two protothreads. */ static struct timer timer1, timer2; From 72aefc8c729fef43fb53fb15d5da7262d3eadc36 Mon Sep 17 00:00:00 2001 From: neingeist Date: Mon, 5 Apr 2010 20:44:40 +0200 Subject: [PATCH 14/14] actually use MAGIC_BREATH --- projekte/soundz/arpeggio/arpeggio.pde | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projekte/soundz/arpeggio/arpeggio.pde b/projekte/soundz/arpeggio/arpeggio.pde index 6ceb64a..862d18b 100644 --- a/projekte/soundz/arpeggio/arpeggio.pde +++ b/projekte/soundz/arpeggio/arpeggio.pde @@ -93,12 +93,12 @@ void arpeggio_play(int32_t note, uint32_t len) { // clock tick is 1s/18.2 == 54ms #define MAGIC_CLOCK_TICK 54 #define MAGIC_DELAY_FACTOR 400 // well, should be 1000 us?! - #define MAGIC_BREATH 50 _delay_us(MAGIC_DELAY_FACTOR*(len*MAGIC_CLOCK_TICK/10)); // breath curNote=REST; - _delay_us(50); + #define MAGIC_BREATH 50 + _delay_us(MAGIC_BREATH); } void arpeggio(int32_t n1, int32_t n2, int32_t n3, int32_t len) {