aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorvg <vgm+dev@devys.org>2020-07-07 16:24:01 +0200
committervg <vgm+dev@devys.org>2020-07-07 16:24:01 +0200
commit66dcf910bd4744d8ced56cb9586aa937a1a2d4c5 (patch)
treedf4dca1ae4af1e5df0be0d1f4f2cd0d54751f8e8 /test
downloadhic-66dcf910bd4744d8ced56cb9586aa937a1a2d4c5.tar.gz
hic-66dcf910bd4744d8ced56cb9586aa937a1a2d4c5.tar.bz2
hic-66dcf910bd4744d8ced56cb9586aa937a1a2d4c5.zip
first commitHEADmaster
Diffstat (limited to 'test')
-rw-r--r--test/Makefile6
-rw-r--r--test/applet/HardwareSerial.d28
-rw-r--r--test/applet/Makefile231
-rw-r--r--test/applet/Print.d22
-rw-r--r--test/applet/WInterrupts.d24
-rw-r--r--test/applet/WMath.d3
-rw-r--r--test/applet/board1
-rw-r--r--test/applet/core.abin0 -> 65636 bytes
-rw-r--r--test/applet/pins_arduino.d24
-rw-r--r--test/applet/test.cpp827
-rw-r--r--test/applet/test.d0
-rw-r--r--test/applet/test.elfbin0 -> 18361 bytes
-rw-r--r--test/applet/test.hex315
-rw-r--r--test/applet/wiring.d22
-rw-r--r--test/applet/wiring_analog.d24
-rw-r--r--test/applet/wiring_digital.d24
-rw-r--r--test/applet/wiring_pulse.d24
-rw-r--r--test/applet/wiring_shift.d22
-rw-r--r--test/ardmake.conf3
-rw-r--r--test/ardmake/hardware/boards.txt338
-rw-r--r--test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168.c1054
-rw-r--r--test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex245
-rw-r--r--test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex125
-rw-r--r--test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex124
-rw-r--r--test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex126
-rw-r--r--test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_ng.hex110
-rw-r--r--test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex126
-rw-r--r--test/ardmake/hardware/bootloaders/atmega/Makefile224
-rw-r--r--test/ardmake/hardware/bootloaders/atmega8/ATmegaBOOT.c507
-rw-r--r--test/ardmake/hardware/bootloaders/atmega8/ATmegaBOOT.hex66
-rw-r--r--test/ardmake/hardware/bootloaders/atmega8/Makefile88
-rw-r--r--test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168.c1038
-rw-r--r--test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168.hex121
-rw-r--r--test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex162
-rw-r--r--test/ardmake/hardware/bootloaders/bt/Makefile109
-rw-r--r--test/ardmake/hardware/bootloaders/lilypad/LilyPadBOOT_168.hex117
-rw-r--r--test/ardmake/hardware/bootloaders/lilypad/src/ATmegaBOOT.c979
-rw-r--r--test/ardmake/hardware/bootloaders/lilypad/src/Makefile84
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/Makefile239
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/makeall13
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot.c536
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328.hex33
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328.lst520
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex33
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst520
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_diecimila.hex33
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_diecimila.lst520
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad.hex34
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad.lst533
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad_resonator.hex34
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad_resonator.lst533
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_luminet.hex42
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_luminet.lst604
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_16MHz.hex33
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_16MHz.lst520
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_20mhz.hex33
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_20mhz.lst520
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_8MHz.hex34
-rw-r--r--test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_8MHz.lst533
-rw-r--r--test/ardmake/hardware/bootloaders/stk500v2/Makefile588
-rw-r--r--test/ardmake/hardware/bootloaders/stk500v2/STK500V2.pnproj1
-rw-r--r--test/ardmake/hardware/bootloaders/stk500v2/STK500V2.pnps1
-rw-r--r--test/ardmake/hardware/bootloaders/stk500v2/avrinterruptnames.h742
-rw-r--r--test/ardmake/hardware/bootloaders/stk500v2/command.h114
-rw-r--r--test/ardmake/hardware/bootloaders/stk500v2/stk500boot.c1996
-rw-r--r--test/ardmake/hardware/bootloaders/stk500v2/stk500boot.ppg1
-rw-r--r--test/ardmake/hardware/bootloaders/stk500v2/stk500boot_v2_mega2560.hex513
-rw-r--r--test/ardmake/hardware/cores/arduino/HardwareSerial.cpp303
-rw-r--r--test/ardmake/hardware/cores/arduino/HardwareSerial.d28
-rw-r--r--test/ardmake/hardware/cores/arduino/HardwareSerial.h76
-rw-r--r--test/ardmake/hardware/cores/arduino/Makefile250
-rw-r--r--test/ardmake/hardware/cores/arduino/Print.cpp220
-rw-r--r--test/ardmake/hardware/cores/arduino/Print.d22
-rw-r--r--test/ardmake/hardware/cores/arduino/Print.h66
-rw-r--r--test/ardmake/hardware/cores/arduino/README.Makefile11
-rw-r--r--test/ardmake/hardware/cores/arduino/Stream.h35
-rw-r--r--test/ardmake/hardware/cores/arduino/Tone.cpp601
-rw-r--r--test/ardmake/hardware/cores/arduino/WCharacter.h168
-rw-r--r--test/ardmake/hardware/cores/arduino/WConstants.h1
-rw-r--r--test/ardmake/hardware/cores/arduino/WInterrupts.c249
-rw-r--r--test/ardmake/hardware/cores/arduino/WInterrupts.d24
-rw-r--r--test/ardmake/hardware/cores/arduino/WMath.cpp60
-rw-r--r--test/ardmake/hardware/cores/arduino/WMath.d3
-rw-r--r--test/ardmake/hardware/cores/arduino/WProgram.h63
-rw-r--r--test/ardmake/hardware/cores/arduino/WString.cpp443
-rw-r--r--test/ardmake/hardware/cores/arduino/WString.h112
-rw-r--r--test/ardmake/hardware/cores/arduino/binary.h515
-rw-r--r--test/ardmake/hardware/cores/arduino/main.cpp14
-rw-r--r--test/ardmake/hardware/cores/arduino/main.cxx12
-rw-r--r--test/ardmake/hardware/cores/arduino/pins_arduino.c465
-rw-r--r--test/ardmake/hardware/cores/arduino/pins_arduino.d24
-rw-r--r--test/ardmake/hardware/cores/arduino/pins_arduino.h88
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring.c289
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring.d22
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring.h135
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring_analog.c259
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring_analog.d24
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring_digital.c166
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring_digital.d24
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring_private.h68
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring_pulse.c69
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring_pulse.d24
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring_shift.c55
-rw-r--r--test/ardmake/hardware/cores/arduino/wiring_shift.d22
-rw-r--r--test/ardmake/hardware/firmwares/MEGA-dfu_and_usbserial_combined.hex234
-rw-r--r--test/ardmake/hardware/firmwares/README.txt33
-rw-r--r--test/ardmake/hardware/firmwares/UNO-dfu_and_usbserial_combined.hex234
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbdfu/Arduino-usbdfu.c728
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbdfu/Arduino-usbdfu.h220
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbdfu/Board/LEDs.h110
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbdfu/Descriptors.c189
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbdfu/Descriptors.h177
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbdfu/makefile710
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbdfu/readme.txt7
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex256
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex256
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial.c242
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial.h79
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/Board/LEDs.h110
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/Descriptors.c277
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/Descriptors.h88
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h197
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/makefile776
-rw-r--r--test/ardmake/hardware/firmwares/arduino-usbserial/readme.txt13
-rw-r--r--test/ardmake/hardware/programmers.txt20
-rwxr-xr-xtest/arduino_make.sh1359
-rw-r--r--test/arduinocube/arduinocube.pde812
l---------test/build1
-rw-r--r--test/test.pde812
-rw-r--r--test/test.pde.backup843
130 files changed, 30992 insertions, 0 deletions
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000..0dfbea5
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,6 @@
+all:
+ ./arduino_make.sh
+ ./arduino_make.sh upload
+
+serial:
+ ./arduino_make.sh serial
diff --git a/test/applet/HardwareSerial.d b/test/applet/HardwareSerial.d
new file mode 100644
index 0000000..826b211
--- /dev/null
+++ b/test/applet/HardwareSerial.d
@@ -0,0 +1,28 @@
+applet/HardwareSerial.o applet/HardwareSerial.d: ardmake/hardware/cores/arduino/HardwareSerial.cpp \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/string.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ ardmake/hardware/cores/arduino/HardwareSerial.h \
+ ardmake/hardware/cores/arduino/Stream.h \
+ ardmake/hardware/cores/arduino/Print.h \
+ ardmake/hardware/cores/arduino/WString.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/ctype.h
diff --git a/test/applet/Makefile b/test/applet/Makefile
new file mode 100644
index 0000000..6728b4c
--- /dev/null
+++ b/test/applet/Makefile
@@ -0,0 +1,231 @@
+compile: do_compile
+
+TARGET = $(notdir $(CURDIR))
+PORT = /dev/ttyUSB*
+UPLOAD_RATE = 57600
+AVRDUDE_PROGRAMMER = stk500v1
+MCU = atmega168
+F_CPU = 16000000
+
+
+ARDUINO = /usr/share/arduino/hardware/arduino/cores/arduino
+AVR_TOOLS_PATH = /usr/bin
+SRC = $(ARDUINO)/pins_arduino.c $(ARDUINO)/wiring.c \
+$(ARDUINO)/wiring_analog.c $(ARDUINO)/wiring_digital.c \
+$(ARDUINO)/wiring_pulse.c $(ARDUINO)/wiring_shift.c \
+$(ARDUINO)/WInterrupts.c
+CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(ARDUINO)/WMath.cpp \
+$(ARDUINO)/Print.cpp
+FORMAT = ihex
+
+
+MAKEFILE = Makefile
+
+DEBUG = stabs
+
+OPT = s
+
+CDEFS = -DF_CPU=$(F_CPU)
+CXXDEFS = -DF_CPU=$(F_CPU)
+
+CINCS = -I$(ARDUINO)
+CXXINCS = -I$(ARDUINO)
+
+CSTANDARD = -std=gnu99
+CDEBUG = -g$(DEBUG)
+CWARN = -Wall -Wstrict-prototypes
+CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
+
+CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
+CXXFLAGS = $(CDEFS) $(CINCS) -O$(OPT)
+LDFLAGS = -lm
+
+
+AVRDUDE_PORT = $(PORT)
+AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex
+AVRDUDE_FLAGS = -V -F \
+-p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
+-b $(UPLOAD_RATE)
+
+CC = $(AVR_TOOLS_PATH)/avr-gcc
+CXX = $(AVR_TOOLS_PATH)/avr-g++
+OBJCOPY = $(AVR_TOOLS_PATH)/avr-objcopy
+OBJDUMP = $(AVR_TOOLS_PATH)/avr-objdump
+AR = $(AVR_TOOLS_PATH)/avr-ar
+SIZE = $(AVR_TOOLS_PATH)/avr-size
+NM = $(AVR_TOOLS_PATH)/avr-nm
+AVRDUDE = $(AVR_TOOLS_PATH)/avrdude
+REMOVE = rm -f
+MV = mv -f
+
+OBJ = $(SRC:%.c=build/%.o) $(CXXSRC:%.cpp=build/%.o) $(ASRC:%.S=build/%.o)
+
+LST = $(ASRC:%.S=build/%.lst) $(CXXSRC:%.cpp=build/%.lst) $(SRC:%.c=build/%.lst)
+
+ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS)
+ALL_CXXFLAGS = -mmcu=$(MCU) -I. $(CXXFLAGS)
+ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
+
+
+all: applet_files build sizeafter
+
+build: elf hex
+
+applet_files: $(TARGET).$(EXT)
+ test -d applet || mkdir applet
+ echo '#include "WProgram.h"' > applet/$(TARGET).cpp
+ cat $(TARGET).$(EXT) >> applet/$(TARGET).cpp
+ cat $(ARDUINO)/main.cxx >> applet/$(TARGET).cpp
+
+elf: applet/$(TARGET).elf
+hex: applet/$(TARGET).hex
+eep: applet/$(TARGET).eep
+lss: applet/$(TARGET).lss
+sym: applet/$(TARGET).sym
+
+upload: applet/$(TARGET).hex
+ stty -F $(AVRDUDE_PORT) hupcl ; sleep 0.1 ; stty -F $(AVRDUDE_PORT) -hupcl
+ $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
+
+
+HEXSIZE = $(SIZE) --target=$(FORMAT) applet/$(TARGET).hex
+ELFSIZE = $(SIZE) applet/$(TARGET).elf
+sizebefore:
+ @if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
+
+sizeafter:
+ @if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(HEXSIZE); echo; fi
+
+
+COFFCONVERT=$(OBJCOPY) --debugging \
+--change-section-address .data-0x800000 \
+--change-section-address .bss-0x800000 \
+--change-section-address .noinit-0x800000 \
+--change-section-address .eeprom-0x810000
+
+
+coff: applet/$(TARGET).elf
+ $(COFFCONVERT) -O coff-avr applet/$(TARGET).elf $(TARGET).cof
+
+
+extcoff: $(TARGET).elf
+ $(COFFCONVERT) -O coff-ext-avr applet/$(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) $< $@
+
+.elf.lss:
+ $(OBJDUMP) -h -S $< > $@
+
+.elf.sym:
+ $(NM) -n $< > $@
+
+ $(CXX) $(ALL_CXXFLAGS) -o $@ applet/$(TARGET).cpp -L. applet/core.a $(LDFLAGS)
+
+applet/core.a: $(OBJ)
+ @for i in $(OBJ); do echo $(AR) rcs applet/core.a $$i; $(AR) rcs applet/core.a $$i; done
+
+
+
+build/%.o: %.cpp
+ mkdir -p $(dir $@)
+ $(CXX) -c $(ALL_CXXFLAGS) $< -o $@
+
+build/%.o: %.c
+ mkdir -p $(dir $@)
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
+
+
+build/%.s: %.c
+ $(CC) -S $(ALL_CFLAGS) $< -o $@
+
+
+.S.o:
+ $(CC) -c $(ALL_ASFLAGS) $< -o $@
+
+
+build/%.d: %.c
+ $(CC) -M $(ALL_CFLAGS) $< | sed "s;$(notdir $*).o:;$*.o $*.d:;" > $@
+
+build/%.d: %.cpp
+ $(CXX) -M $(ALL_CXXFLAGS) $< | sed "s;$(notdir $*).o:;$*.o $*.d:;" > $@
+
+
+clean:
+ $(REMOVE) applet/$(TARGET).hex applet/$(TARGET).eep applet/$(TARGET).cof applet/$(TARGET).elf \
+ applet/$(TARGET).map applet/$(TARGET).sym applet/$(TARGET).lss applet/core.a \
+ $(OBJ) $(LST) $(SRC:%.c=build/%.s) $(SRC:%.c=build/%.d) $(CXXSRC:%.cpp=build/%.s) $(CXXSRC:%.cpp=build/%.d)
+
+.PHONY: all build elf hex eep lss sym program coff extcoff clean applet_files sizebefore sizeafter
+
+-include $(SRC:%.c=build/%.d)
+-include $(CXXSRC:%.cpp=build/%.d)
+-e do_compile: do_build show_size
+do_build: applet/$(TARGET).hex
+applet/$(TARGET).hex: applet/$(TARGET).elf
+
+ARDMAKE_BOARD=applet/board
+
+applet/$(TARGET).elf: applet/$(TARGET).cpp applet/core.a
+ $(CXX) $(ALL_CXXFLAGS) -Wl,--gc-sections $(LDFLAGS) -L. -Lapplet/ -o $@ $< applet/core.a
+ @chmod a-x $@ >/dev/null 2>&1 || true
+
+applet/$(TARGET).cpp: $(TARGET).$(EXT) $(ARDUINO)/main.cxx $(ARDUINO)/WProgram.h $(ARDMAKE_BOARD)
+ echo '#include "WProgram.h"' >$@
+ @echo '#line 1 "$<"' >>$@
+ cat $(TARGET).$(EXT) >>$@
+ @echo '#line 1 "$(ARDUINO)/main.cxx"' >>$@
+ cat $(ARDUINO)/main.cxx >>$@
+
+show_size:
+ @echo
+ @echo Program size:
+ @$(HEXSIZE) | awk -v m="$(MAX_SIZE)" '{print;if(NR^1){s=$$4}} \
+ END {printf("\n%d/%d bytes (%.1f%% of capacity, %d bytes left)\n\n",\
+ s,m,s*100.0/m,m-s);}'
+
+upload_autoreset: do_autoreset upload unreset
+
+do_autoreset:
+ @echo Sending reset to prepare for upload...
+ ( stty hupcl; sleep 0.1; true ) <$(PORT) 2>/dev/null
+ @echo
+
+unreset:
+ @stty -hupcl <$(PORT) 2>/dev/null || true
+
+$(OBJ): $(ARDMAKE_BOARD)
+$(DEPS): $(ARDMAKE_BOARD)
+
+$(APPC): applet/%.o: %.c
+ $(CC) -c $(ALL_CFLAGS) -o $@ $<
+
+$(APPCXX): applet/%.o: %.cpp
+ $(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
+
+$(APPA): applet/%.o: %.S
+ $(CC) -c $(ALL_ASFLAGS) -o $@ $<
+
+$(APPC:.o=.d): applet/%.d: %.c
+ $(CC) -M $(ALL_CFLAGS) $< | sed 's;^[^:]*:;applet/$*.o applet/$*.d:;' >$@
+
+$(APPCXX:.o=.d): applet/%.d: %.cpp
+ $(CXX) -M $(ALL_CXXFLAGS) $< | sed 's;^[^:]*:;applet/$*.o applet/$*.d:;' >$@
+
+$(APPA:.o=.d): applet/%.d: %.S
+ $(CC) -M $(ALL_ASFLAGS) $< | sed 's;^[^:]*:;applet/$*.o applet/$*.d:;' >$@
+
+applet/$(TARGET).d: applet/$(TARGET).cpp
+
+vpath %.c applet/ $(sort $(dir $(OBJC)))
+vpath %.cpp applet/ $(sort $(dir $(OBJCXX)))
+vpath %.S applet/ $(sort $(dir $(OBJA)))
+
+include $(DEPS)
diff --git a/test/applet/Print.d b/test/applet/Print.d
new file mode 100644
index 0000000..2e8b58c
--- /dev/null
+++ b/test/applet/Print.d
@@ -0,0 +1,22 @@
+applet/Print.o applet/Print.d: ardmake/hardware/cores/arduino/Print.cpp \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/string.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/math.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/Print.h \
+ ardmake/hardware/cores/arduino/WString.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/ctype.h
diff --git a/test/applet/WInterrupts.d b/test/applet/WInterrupts.d
new file mode 100644
index 0000000..77437b7
--- /dev/null
+++ b/test/applet/WInterrupts.d
@@ -0,0 +1,24 @@
+applet/WInterrupts.o applet/WInterrupts.d: ardmake/hardware/cores/arduino/WInterrupts.c \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ ardmake/hardware/cores/arduino/WConstants.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h
diff --git a/test/applet/WMath.d b/test/applet/WMath.d
new file mode 100644
index 0000000..6d1c210
--- /dev/null
+++ b/test/applet/WMath.d
@@ -0,0 +1,3 @@
+applet/WMath.o applet/WMath.d: ardmake/hardware/cores/arduino/WMath.cpp \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h
diff --git a/test/applet/board b/test/applet/board
new file mode 100644
index 0000000..e438487
--- /dev/null
+++ b/test/applet/board
@@ -0,0 +1 @@
+uno
diff --git a/test/applet/core.a b/test/applet/core.a
new file mode 100644
index 0000000..1416012
--- /dev/null
+++ b/test/applet/core.a
Binary files differ
diff --git a/test/applet/pins_arduino.d b/test/applet/pins_arduino.d
new file mode 100644
index 0000000..9b2299c
--- /dev/null
+++ b/test/applet/pins_arduino.d
@@ -0,0 +1,24 @@
+applet/pins_arduino.o applet/pins_arduino.d: ardmake/hardware/cores/arduino/pins_arduino.c \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/pins_arduino.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h
diff --git a/test/applet/test.cpp b/test/applet/test.cpp
new file mode 100644
index 0000000..1400654
--- /dev/null
+++ b/test/applet/test.cpp
@@ -0,0 +1,827 @@
+#include "WProgram.h"
+#line 1 "test.pde"
+// On the Arduino board, digital pins are also used
+// for the analog output (software PWM). Analog input
+// pins are a separate set.
+
+// ATMEL ATMEGA8 & 168 / ARDUINO
+//
+// +-\/-+
+// PC6 1| |28 PC5 (AI 5)
+// (D 0) PD0 2| |27 PC4 (AI 4)
+// (D 1) PD1 3| |26 PC3 (AI 3)
+// (D 2) PD2 4| |25 PC2 (AI 2)
+// PWM+ (D 3) PD3 5| |24 PC1 (AI 1)
+// (D 4) PD4 6| |23 PC0 (AI 0)
+// VCC 7| |22 GND
+// GND 8| |21 AREF
+// PB6 9| |20 AVCC
+// PB7 10| |19 PB5 (D 13)
+// PWM+ (D 5) PD5 11| |18 PB4 (D 12)
+// PWM+ (D 6) PD6 12| |17 PB3 (D 11) PWM
+// (D 7) PD7 13| |16 PB2 (D 10) PWM
+// (D 8) PB0 14| |15 PB1 (D 9) PWM
+// +----+
+//
+// (PWM+ indicates the additional PWM pins on the ATmega168.)
+
+#define CUBE_SIZE 8
+
+#define AXIS_X 1
+#define AXIS_Y 2
+#define AXIS_Z 3
+
+void setup()
+{
+ Serial.begin(9600);
+ delay(1000);
+ Serial.println("begin");
+
+ DDRB = 0xFF;
+ DDRD = 0xFC;
+
+ PORTB = 0;
+ PORTD &= 0x03;
+
+
+ // Reset any PWM configuration that the arduino may have set up automagically!
+ TCCR2A = 0x00;
+ TCCR2B = 0x00;
+
+ TCCR2A |= (0x01 << WGM21); // CTC mode. clear counter on TCNT2 == OCR2A
+ OCR2A = 50; // Interrupt every 25600th cpu cycle (256*100)
+ TCNT2 = 0x00; // start counting at 0
+ TCCR2B |= (0x01 << CS22) | (0x01 << CS21); // Start the clock with a 256 prescaler
+
+ TIMSK2 |= (0x01 << OCIE2A);
+
+}
+
+volatile unsigned char cube[8][8];
+volatile unsigned char current_layer = 0;
+
+ISR (TIMER2_COMPA_vect)
+{
+ PORTB &= ~0x21; // layer and latch low
+ char current_layer_ = current_layer;
+
+ //for (char j = 0; j < 8; ++j) {
+ for (char j = 0; j < 4; ++j) {
+ unsigned char val = cube[7-j][current_layer_];
+ unsigned char val2 = cube[3-j][current_layer_];
+ for (char i = 0; i < 8; ++i/*, val >>= 1*/) {
+ PORTB &= ~0x02;
+ PORTD = (PORTD & ~0x80) | ((val2 << (7-i)) & 0x80);
+ //PORTD |= 0x80;
+ PORTD = (PORTD & ~0x40) | (((val << (7-i)) & 0x80) >> 1);
+ PORTB |= 0x02;
+ }
+ }
+
+ PORTB = (PORTB & ~0x1C) | (current_layer_ << 2);
+ ++current_layer_;
+ current_layer = current_layer_ & 0x07;
+
+ PORTB |= 0x21; // layer and latch high
+}
+
+/*****************************************************************************
+ * ACCESSORS
+ *****************************************************************************/
+
+unsigned char inrange(int x, int y, int z)
+{
+ if (x >= 0 && x < CUBE_SIZE && y >= 0 && y < CUBE_SIZE && z >= 0 && z < CUBE_SIZE)
+ {
+ return 1;
+ } else
+ {
+ // One of the coordinates was outside the cube.
+ return 0;
+ }
+}
+
+bool get_led(unsigned char x, unsigned char y, unsigned char z)
+{
+ /*
+ assert(x >= 0 && x <= 7);
+ assert(y >= 0 && y <= 7);
+ assert(z >= 0 && z <= 7);
+ */
+
+ if (inrange(x, y, z)) {
+ return cube[y][z] & (1 << x);
+ }
+
+ return false;
+}
+
+void set_led(unsigned char x, unsigned char y, unsigned char z, bool on)
+{
+
+ if (!inrange(x, y, z)) {
+ return;
+ }
+
+ /*
+ assert(x >= 0 && x <= 7);
+ assert(y >= 0 && y <= 7);
+ assert(z >= 0 && z <= 7);
+ */
+
+ if (on) {
+ cube[y][z] |= ((unsigned char)1) << x;
+ }
+ else {
+ cube[y][z] &= ~(((unsigned char)1) << x);
+ }
+}
+
+void clear_led()
+{
+ for (char z = 0; z < 8; ++z) {
+ for (char y = 0; y < 8; ++y) {
+ cube[y][z] = 0;
+ }
+ }
+}
+// Set a single voxel to ON
+void setvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ cube[y][z] |= (1 << x);
+}
+
+unsigned char getvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ {
+ if (cube[y][z] & (1 << x))
+ {
+ return 0x01;
+ } else
+ {
+ return 0x00;
+ }
+ } else
+ {
+ return 0x00;
+ }
+}
+
+
+// Set a single voxel to ON
+void clrvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ cube[y][z] &= ~(1 << x);
+}
+// In some effect we want to just take bool and write it to a voxel
+// this function calls the apropriate voxel manipulation function.
+void altervoxel(int x, int y, int z, int state)
+{
+ if (state == 1)
+ {
+ setvoxel(x,y,z);
+ } else
+ {
+ clrvoxel(x,y,z);
+ }
+}
+
+// Shift the entire contents of the cube along an axis
+// This is great for effects where you want to draw something
+// on one side of the cube and have it flow towards the other
+// side. Like rain flowing down the Z axiz.
+void shift (char axis, int direction)
+{
+ int i, x ,y;
+ int ii, iii;
+ int state;
+
+ for (i = 0; i < 8; i++)
+ {
+ if (direction == -1)
+ {
+ ii = i;
+ } else
+ {
+ ii = (7-i);
+ }
+
+
+ for (x = 0; x < 8; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if (direction == -1)
+ {
+ iii = ii+1;
+ } else
+ {
+ iii = ii-1;
+ }
+
+ if (axis == AXIS_Z)
+ {
+ state = getvoxel(x,y,iii);
+ altervoxel(x,y,ii,state);
+ }
+
+ if (axis == AXIS_Y)
+ {
+ state = getvoxel(x,iii,y);
+ altervoxel(x,ii,y,state);
+ }
+
+ if (axis == AXIS_X)
+ {
+ state = getvoxel(iii,y,x);
+ altervoxel(ii,y,x,state);
+ }
+ }
+ }
+ }
+
+ if (direction == -1)
+ {
+ i = 7;
+ } else
+ {
+ i = 0;
+ }
+
+ for (x = 0; x < 8; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if (axis == AXIS_Z)
+ clrvoxel(x,y,i);
+
+ if (axis == AXIS_Y)
+ clrvoxel(x,i,y);
+
+ if (axis == AXIS_X)
+ clrvoxel(i,y,x);
+ }
+ }
+}
+
+
+// Delay loop.
+// This is not calibrated to milliseconds,
+// but we had allready made to many effects using this
+// calibration when we figured it might be a good idea
+// to calibrate it.
+void delay_ms(uint16_t x)
+{
+ uint8_t y, z;
+ for ( ; x > 0 ; x--){
+ for ( y = 0 ; y < 90 ; y++){
+ for ( z = 0 ; z < 6 ; z++){
+ asm volatile ("nop");
+ }
+ }
+ }
+}
+
+void effect_rain (int iterations)
+{
+ int i, ii;
+ int rnd_x;
+ int rnd_y;
+ int rnd_num;
+
+ for (ii=0;ii<iterations;ii++)
+ {
+ rnd_num = rand()%4;
+
+ for (i=0; i < rnd_num;i++)
+ {
+ rnd_x = rand()%8;
+ rnd_y = rand()%8;
+ setvoxel(rnd_x,rnd_y,7);
+ }
+
+ delay_ms(1000);
+ shift(AXIS_Z,-1);
+ }
+}
+
+volatile const unsigned char font[455] /*EEMEM*/ = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0x5f,0x00,0x00, // !
+ 0x00,0x03,0x00,0x03,0x00,0x14,0x7f,0x14,0x7f,0x14, // "#
+ 0x24,0x2a,0x7f,0x2a,0x12,0x23,0x13,0x08,0x64,0x62, // $%
+ 0x36,0x49,0x55,0x22,0x50,0x00,0x05,0x03,0x00,0x00, // &'
+ 0x00,0x1c,0x22,0x41,0x00,0x00,0x41,0x22,0x1c,0x00, // ()
+ 0x14,0x08,0x3e,0x08,0x14,0x08,0x08,0x3e,0x08,0x08, // *+
+ 0x00,0x50,0x30,0x00,0x00,0x08,0x08,0x08,0x08,0x08, // ,-
+ 0x00,0x60,0x60,0x00,0x00,0x20,0x10,0x08,0x04,0x02, // ./
+ 0x3e,0x51,0x49,0x45,0x3e,0x00,0x42,0x7f,0x40,0x00, // 01
+ 0x42,0x61,0x51,0x49,0x46,0x21,0x41,0x45,0x4b,0x31, // 23
+ 0x18,0x14,0x12,0x7f,0x10,0x27,0x45,0x45,0x45,0x39, // 45
+ 0x3c,0x4a,0x49,0x49,0x30,0x01,0x71,0x09,0x05,0x03, // 67
+ 0x36,0x49,0x49,0x49,0x36,0x06,0x49,0x49,0x29,0x1e, // 89
+ 0x00,0x36,0x36,0x00,0x00,0x00,0x56,0x36,0x00,0x00, // :;
+ 0x08,0x14,0x22,0x41,0x00,0x14,0x14,0x14,0x14,0x14, // <=
+ 0x00,0x41,0x22,0x14,0x08,0x02,0x01,0x51,0x09,0x06, // >?
+ 0x32,0x49,0x79,0x41,0x3e,0x7e,0x11,0x11,0x11,0x7e, // @A
+ 0x7f,0x49,0x49,0x49,0x36,0x3e,0x41,0x41,0x41,0x22, // BC
+ 0x7f,0x41,0x41,0x22,0x1c,0x7f,0x49,0x49,0x49,0x41, // DE
+ 0x7f,0x09,0x09,0x09,0x01,0x3e,0x41,0x49,0x49,0x7a, // FG
+ 0x7f,0x08,0x08,0x08,0x7f,0x00,0x41,0x7f,0x41,0x00, // HI
+ 0x20,0x40,0x41,0x3f,0x01,0x7f,0x08,0x14,0x22,0x41, // JK
+ 0x7f,0x40,0x40,0x40,0x40,0x7f,0x02,0x0c,0x02,0x7f, // LM
+ 0x7f,0x04,0x08,0x10,0x7f,0x3e,0x41,0x41,0x41,0x3e, // NO
+ 0x7f,0x09,0x09,0x09,0x06,0x3e,0x41,0x51,0x21,0x5e, // PQ
+ 0x7f,0x09,0x19,0x29,0x46,0x46,0x49,0x49,0x49,0x31, // RS
+ 0x01,0x01,0x7f,0x01,0x01,0x3f,0x40,0x40,0x40,0x3f, // TU
+ 0x1f,0x20,0x40,0x20,0x1f,0x3f,0x40,0x38,0x40,0x3f, // VW
+ 0x63,0x14,0x08,0x14,0x63,0x07,0x08,0x70,0x08,0x07, // XY
+ 0x61,0x51,0x49,0x45,0x43,0x00,0x7f,0x41,0x41,0x00, // Z[
+ 0x02,0x04,0x08,0x10,0x20,0x00,0x41,0x41,0x7f,0x00, // \]
+ 0x04,0x02,0x01,0x02,0x04,0x40,0x40,0x40,0x40,0x40, // ^_
+ 0x00,0x01,0x02,0x04,0x00,0x20,0x54,0x54,0x54,0x78, // `a
+ 0x7f,0x48,0x44,0x44,0x38,0x38,0x44,0x44,0x44,0x20, // bc
+ 0x38,0x44,0x44,0x48,0x7f,0x38,0x54,0x54,0x54,0x18, // de
+ 0x08,0x7e,0x09,0x01,0x02,0x0c,0x52,0x52,0x52,0x3e, // fg
+ 0x7f,0x08,0x04,0x04,0x78,0x00,0x44,0x7d,0x40,0x00, // hi
+ 0x20,0x40,0x44,0x3d,0x00,0x7f,0x10,0x28,0x44,0x00, // jk
+ 0x00,0x41,0x7f,0x40,0x00,0x7c,0x04,0x18,0x04,0x78, // lm
+ 0x7c,0x08,0x04,0x04,0x78,0x38,0x44,0x44,0x44,0x38, // no
+ 0x7c,0x14,0x14,0x14,0x08,0x08,0x14,0x14,0x18,0x7c, // pq
+ 0x7c,0x08,0x04,0x04,0x08,0x48,0x54,0x54,0x54,0x20, // rs
+ 0x04,0x3f,0x44,0x40,0x20,0x3c,0x40,0x40,0x20,0x7c, // tu
+ 0x1c,0x20,0x40,0x20,0x1c,0x3c,0x40,0x30,0x40,0x3c, // vw
+ 0x44,0x28,0x10,0x28,0x44,0x0c,0x50,0x50,0x50,0x3c, // xy
+ 0x44,0x64,0x54,0x4c,0x44 // z
+};
+
+
+volatile const unsigned char bitmaps[6][8] /*EEMEM*/ = {
+ {0xc3,0xc3,0x00,0x18,0x18,0x81,0xff,0x7e}, // smiley 3 small
+ {0x3c,0x42,0x81,0x81,0xc3,0x24,0xa5,0xe7}, // Omega
+ {0x00,0x04,0x06,0xff,0xff,0x06,0x04,0x00}, // Arrow
+ {0x81,0x42,0x24,0x18,0x18,0x24,0x42,0x81}, // X
+ {0xBD,0xA1,0xA1,0xB9,0xA1,0xA1,0xA1,0x00}, // ifi
+ {0xEF,0x48,0x4B,0x49,0x4F,0x00,0x00,0x00} // TG
+};
+
+const unsigned char paths[44] /*PROGMEM */= {0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00,0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x67,0x57,0x47,0x37,0x27,0x17,
+0x04,0x03,0x12,0x21,0x30,0x40,0x51,0x62,0x73,0x74,0x65,0x56,0x47,0x37,0x26,0x15}; // circle, len 16, offset 28
+
+/*
+void font_getpath (unsigned char path, unsigned char *destination, int length)
+{
+ int i;
+ int offset = 0;
+
+ if (path == 1)
+ offset=28;
+
+ for (i = 0; i < length; i++)
+ destination[i] = pgm_read_byte(&paths[i+offset]);
+}
+*/
+// Fill a value into all 64 byts of the cube buffer
+// Mostly used for clearing. fill(0x00)
+// or setting all on. fill(0xff)
+void fill (unsigned char pattern)
+{
+ int z;
+ int y;
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] = pattern;
+ }
+ }
+}
+
+
+
+void font_getchar (char chr, unsigned char dst[5])
+{
+ //uint8_t i;
+ unsigned char i;
+ chr -= 32; // our bitmap font starts at ascii char 32.
+
+ for (i = 0; i < 5; i++)
+ //dst[i] = (unsigned char)eeprom_read_byte((uint8_t*)&font[(chr*5)+i]);
+ dst[i] = font[(chr*5)+i];
+}
+void effect_stringfly2(const char* str)
+{
+ //int x,y,i;
+ unsigned char x,y,i;
+ unsigned char chr[5];
+ const int DELAY = 80;
+
+ clear_led();
+
+ while (*str)
+ {
+ font_getchar(*str++, chr);
+
+ // Put a character on the back of the cube
+ for (x = 0; x < 5; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if ((chr[x] & (0x80>>y)))
+ {
+ //setvoxel(7,x+2,y);
+ //set_led(7,x+2,y);
+ set_led(x+2, 0, y, true);
+ }
+ }
+ }
+
+ //led_change = true;
+ //SDL_Delay(1000);
+ //clear_led();
+ //continue;
+
+ // Shift the entire contents of the cube forward by 6 steps
+ // before placing the next character
+ for (i = 0; i<6; i++)
+ {
+ //delay_ms(1000);
+ //SDL_Delay(1000);
+ delay(DELAY);
+ shift(AXIS_Y,1);
+ //shift(1,-1);
+ //set_plane(1, 7, false);
+ }
+ }
+
+ //return;
+ // Shift the last character out of the cube.
+ for (i = 0; i<8; i++)
+ {
+ delay(DELAY);
+ //delay_ms(1000);
+ shift(AXIS_Y,1);
+ //shift(1,-1);
+ }
+}
+
+// Sets all voxels along a X/Y plane at a given point
+// on axis Z
+void setplane_z (int z)
+{
+ int i;
+ if (z>=0 && z<8)
+ {
+ for (i=0;i<8;i++)
+ cube[z][i] = 0xff;
+ }
+}
+
+// Clears voxels in the same manner as above
+void clrplane_z (int z)
+{
+ int i;
+ if (z>=0 && z<8)
+ {
+ for (i=0;i<8;i++)
+ cube[z][i] = 0x00;
+ }
+}
+
+void setplane_x (int x)
+{
+ int z;
+ int y;
+ if (x>=0 && x<8)
+ {
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] |= (1 << x);
+ }
+ }
+ }
+}
+
+void clrplane_x (int x)
+{
+ int z;
+ int y;
+ if (x>=0 && x<8)
+ {
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] &= ~(1 << x);
+ }
+ }
+ }
+}
+
+void setplane_y (int y)
+{
+ int z;
+ if (y>=0 && y<8)
+ {
+ for (z=0;z<8;z++)
+ cube[z][y] = 0xff;
+ }
+}
+
+void clrplane_y (int y)
+{
+ int z;
+ if (y>=0 && y<8)
+ {
+ for (z=0;z<8;z++)
+ cube[z][y] = 0x00;
+ }
+}
+
+
+void setplane (char axis, unsigned char i)
+{
+ switch (axis)
+ {
+ case AXIS_X:
+ setplane_x(i);
+ break;
+
+ case AXIS_Y:
+ setplane_y(i);
+ break;
+
+ case AXIS_Z:
+ setplane_z(i);
+ break;
+ }
+}
+
+
+// Draw a plane on one axis and send it back and forth once.
+void effect_planboing (int plane, int speed)
+{
+ int i;
+ for (i=0;i<8;i++)
+ {
+ fill(0x00);
+ setplane(plane, i);
+ delay_ms(speed);
+ }
+
+ for (i=7;i>=0;i--)
+ {
+ fill(0x00);
+ setplane(plane,i);
+ delay_ms(speed);
+ }
+}
+
+void effect_blinky2()
+{
+ int i,r;
+ fill(0x00);
+
+ for (r=0;r<2;r++)
+ {
+ i = 750;
+ while (i>0)
+ {
+ fill(0x00);
+ delay(i/5);
+
+ fill(0xff);
+ delay(20);
+
+ i = i - (15+(1000/(i/10)));
+ }
+
+ delay(500);
+
+ i = 750;
+ while (i>0)
+ {
+ fill(0x00);
+ delay((751-i)/5);
+
+ fill(0xff);
+ delay(20);
+
+ i = i - (15+(1000/(i/10)));
+ }
+ }
+
+}
+// Set or clear exactly 512 voxels in a random order.
+void effect_random_filler (int delay, int state)
+{
+ int x,y,z;
+ int loop = 0;
+
+
+ if (state == 1)
+ {
+ fill(0x00);
+ } else
+ {
+ fill(0xff);
+ }
+
+ while (loop<511)
+ {
+ x = rand()%8;
+ y = rand()%8;
+ z = rand()%8;
+
+ if ((state == 0 && getvoxel(x,y,z) == 0x01) || (state == 1 && getvoxel(x,y,z) == 0x00))
+ {
+ altervoxel(x,y,z,state);
+ delay_ms(delay);
+ loop++;
+ }
+ }
+}
+
+void draw_positions_axis (char axis, unsigned char positions[64], int invert)
+{
+ int x, y, p;
+
+ fill(0x00);
+
+ for (x=0; x<8; x++)
+ {
+ for (y=0; y<8; y++)
+ {
+ if (invert)
+ {
+ p = (7-positions[(x*8)+y]);
+ } else
+ {
+ p = positions[(x*8)+y];
+ }
+
+ if (axis == AXIS_Z)
+ setvoxel(x,y,p);
+
+ if (axis == AXIS_Y)
+ setvoxel(x,p,y);
+
+ if (axis == AXIS_X)
+ setvoxel(p,y,x);
+ }
+ }
+
+}
+
+
+
+void effect_boxside_randsend_parallel (char axis, int origin, int delay, int mode)
+{
+ int i;
+ int done;
+ unsigned char cubepos[64];
+ unsigned char pos[64];
+ int notdone = 1;
+ int notdone2 = 1;
+ int sent = 0;
+
+ for (i=0;i<64;i++)
+ {
+ pos[i] = 0;
+ }
+
+ while (notdone)
+ {
+ if (mode == 1)
+ {
+ notdone2 = 1;
+ while (notdone2 && sent<64)
+ {
+ i = rand()%64;
+ if (pos[i] == 0)
+ {
+ sent++;
+ pos[i] += 1;
+ notdone2 = 0;
+ }
+ }
+ } else if (mode == 2)
+ {
+ if (sent<64)
+ {
+ pos[sent] += 1;
+ sent++;
+ }
+ }
+
+ done = 0;
+ for (i=0;i<64;i++)
+ {
+ if (pos[i] > 0 && pos[i] <7)
+ {
+ pos[i] += 1;
+ }
+
+ if (pos[i] == 7)
+ done++;
+ }
+
+ if (done == 64)
+ notdone = 0;
+
+ for (i=0;i<64;i++)
+ {
+ if (origin == 0)
+ {
+ cubepos[i] = pos[i];
+ } else
+ {
+ cubepos[i] = (7-pos[i]);
+ }
+ }
+
+
+ delay_ms(delay);
+ draw_positions_axis(axis,cubepos,0);
+
+ }
+
+}
+
+
+
+
+/*****************************************************************************
+ * LOOP TEST
+ *****************************************************************************/
+
+void loop()
+{
+ //for (char i = 0; i < 8; ++i) {
+ //PORTB = (PORTB & ~0x1C) | ((i & 0x07) << 2);
+ //display(i);
+ //delay(2);
+
+ //Serial.println(layer, DEC);
+ //delay(1000);
+ //}
+ clear_led();
+ //delay_ms(1000);
+ delay(1000);
+ //return;
+ for (char z = 0; z < 8; ++z) {
+ for (char y = 0; y < 8; ++y) {
+ for (char x = 0; x < 8; ++x) {
+ set_led(x, y, z, true);
+ delay(5);
+ delay(100);
+ //delay(500);
+ //delay(1000);
+ //delay_ms(1000);
+ }
+ }
+ }
+ delay(1000);
+ //delay_ms(1000);
+ clear_led();
+ /* effect_stringfly2("test de texte - c'est trop super genial et tout "
+ "yeahhh!!!!!");
+ */
+ effect_planboing(AXIS_Z, 700);
+ effect_planboing(AXIS_Y, 700);
+ effect_planboing(AXIS_X, 700);
+
+ effect_blinky2();
+
+ effect_random_filler(75,1);
+ effect_random_filler(75,0);
+
+ for (char i = 0; i < 10; ++i) {
+ effect_boxside_randsend_parallel (AXIS_X, 0, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_X, 1, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Y, 0, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Y, 1, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Z, 0, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Z, 1, 950, 2);
+ }
+
+
+ //effect_rain(1000)
+}
+#line 1 "ardmake/hardware/cores/arduino/main.cxx"
+int main(void)
+{
+ init();
+
+ setup();
+
+ for (;;)
+ loop();
+
+ return 0;
+}
+
diff --git a/test/applet/test.d b/test/applet/test.d
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/applet/test.d
diff --git a/test/applet/test.elf b/test/applet/test.elf
new file mode 100644
index 0000000..0af1415
--- /dev/null
+++ b/test/applet/test.elf
Binary files differ
diff --git a/test/applet/test.hex b/test/applet/test.hex
new file mode 100644
index 0000000..d67c46b
--- /dev/null
+++ b/test/applet/test.hex
@@ -0,0 +1,315 @@
+:100000000C9435000C945D000C945D000C945D0024
+:100010000C945D000C945D000C945D000C945F00EA
+:100020000C945D000C945D000C945D000C945D00DC
+:100030000C945D000C945D000C945D000C945D00CC
+:100040000C9463050C945D000C9432060C945D00D6
+:100050000C945D000C945D000C945D000C945D00AC
+:100060000C945D000C945D002E0711241FBECFEF91
+:10007000D8E0DEBFCDBF11E0A0E0B1E0E8E7F3E1FA
+:1000800002C005900D92AC31B107D9F711E0ACE197
+:10009000B1E001C01D92AD3FB107E1F710E0CAE643
+:1000A000D0E004C02297FE010E943609C836D1076D
+:1000B000C9F70E945C050C94BA090C9400001F92C9
+:1000C0000F920FB60F921124EF92FF920F931F938E
+:1000D0002F933F934F935F936F937F938F939F9350
+:1000E000AF93BF93CF93DF93EF93FF9385B18E7D53
+:1000F00085B950915C01A7E0B0E0C52FDD27C7FDB1
+:10010000D095FD0173E0EE0FFF1F7A95E1F7EC0F3C
+:10011000FD1FE45EFE4F9081FD01349763E0EE0F1A
+:10012000FF1F6A95E1F7EC0FFD1FE45EFE4F808133
+:1001300067E070E0082F10E0E92FF0E029984BB15C
+:10014000C801062E02C0880F991F0A94E2F7807832
+:100150004F77842B8BB98BB17F01062E02C0EE0C3A
+:10016000FF1C0A94E2F797012078307035952795A7
+:100170008F7B822B8BB9299A615070408FEF6F3F34
+:100180007807E1F61197A330B10509F0BACF85B130
+:10019000CC0FDD1FCC0FDD1F837E8C2B85B95F5FFD
+:1001A000577050935C0185B1816285B9FF91EF91E1
+:1001B000DF91CF91BF91AF919F918F917F916F917F
+:1001C0005F914F913F912F911F910F91FF90EF9071
+:1001D0000F900FBE0F901F901895089778F477FD39
+:1001E0000DC06830710554F457FD08C090E04830E8
+:1001F00051050CF091E081E0982701C090E0892F33
+:100200000895EF92FF920F931F93CF93DF93F82EF1
+:10021000E22E062F10E0C42FD0E090E0B801AE012E
+:100220000E94ED00882339F1B801F3E0660F771FD3
+:10023000FA95E1F7EE2079F0FB01EC0FFD1FE45E8B
+:10024000FE4F208181E090E002C0880F991FFA9450
+:10025000E2F7282B0FC0FB01EC0FFD1FE45EFE4F01
+:10026000208181E090E002C0880F991FFA94E2F7A4
+:10027000809528232083DF91CF911F910F91FF90CC
+:10028000EF90089520E030E014C0FC01A3E0EE0FF1
+:10029000FF1FAA95E1F7E20FF31FE45EFE4F108205
+:1002A00001968830910589F72F5F3F4F283031053F
+:1002B00019F080E090E0E9CF0895FF920F931F932B
+:1002C000CF93DF93F82EEB018A010E94ED00882383
+:1002D000A1F0FE01B3E0EE0FFF1FBA95E1F7E00FCA
+:1002E000F11FE45EFE4F208181E090E002C0880FA4
+:1002F000991FFA94E2F7282B2083DF91CF911F9169
+:100300000F91FF900895FF920F931F93CF93DF9368
+:10031000F82EEB018A010E94ED00882389F083E02A
+:10032000CC0FDD1F8A95E1F7C00FD11FC45EDE4FF1
+:10033000888190E002C095958795FA94E2F78170E4
+:10034000DF91CF911F910F91FF900895FF920F932E
+:100350001F93CF93DF93F82EEB018A010E94ED00EB
+:100360008823A9F0FE0193E0EE0FFF1F9A95E1F7B5
+:10037000E00FF11FE45EFE4F208181E090E002C0BB
+:10038000880F991FFA94E2F7809528232083DF9144
+:10039000CF911F910F91FF9008952130310519F4ED
+:1003A0000E945D0108950E94A60108950BC020E0FF
+:1003B0000000000000000000000000002F5F2A3550
+:1003C000B9F70197009799F7089540E050E010C001
+:1003D000FB01E20FF31FE45EFE4F80832F5F3F4F70
+:1003E00028303105A9F74F5F5F4F4830510549F07C
+:1003F00020E030E0BA01E3E0660F771FEA95E1F70D
+:10040000E7CF08959C018830910530F581E090E0B8
+:1004100002C0880F991F2A95E2F7982F40E050E01C
+:1004200012C0FB01E20FF31FE45EFE4F8081892BB7
+:1004300080832F5F3F4F2830310599F74F5F5F4F23
+:100440004830510549F020E030E0BA01B3E0660FD2
+:10045000771FBA95E1F7E5CF0895823049F08330F0
+:10046000F9F08130A1F5862F90E00E9402020895F4
+:1004700070E06830710558F520E030E08FEFF90149
+:10048000A3E0EE0FFF1FAA95E1F7E60FF71FE45E6A
+:10049000FE4F80832F5F3F4F2830310581F708954D
+:1004A00070E06830710598F420E030E0E3E0660F1A
+:1004B000771FEA95E1F78FEFFB01E20FF31FE45E90
+:1004C000FE4F80832F5F3F4F28303105A9F70895F5
+:1004D000EF92FF920F931F93E82EF62E072F10E056
+:1004E00080E00E94E5018E2D612F0E942D028F2D4C
+:1004F000902F0E94D6011F5F183091F717E080E01F
+:100500000E94E5018E2D612F0E942D028F2D902FCC
+:100510000E94D601115098F71F910F91FF90EF9014
+:1005200008954F925F926F927F929F92AF92BF9287
+:10053000CF92DF92EF92FF920F931F93CF93DF93AF
+:10054000982E162F072F3A0180E00E94E501212FF7
+:10055000302FC9016C01C0E0D0E0B7E04B2E512C28
+:1005600035C06114710431F0F5018081A201481B8E
+:10057000510904C0F7018081482F50E0F3E09F1635
+:1005800019F4CE01B8010DC082E0981621F4CE0115
+:10059000BA01A80106C091E0991629F4CA01B80170
+:1005A000AE010E945D010F5F1F4F0894A11CB11C9A
+:1005B0000894E11CF11C0830110599F62196E8E039
+:1005C000F0E0CE0EDF1EC830D10529F056017601CD
+:1005D00000E010E0C6CFDF91CF911F910F91FF9007
+:1005E000EF90DF90CF90BF90AF909F907F906F90F3
+:1005F0005F904F900895EF92FF920F931F93CF93C8
+:10060000DF9380E00E94E50100E010E08FEEE82E2D
+:1006100082E0F82E5DC080E00E94E501CE0165E039
+:1006200070E00E949908882777FD8095982F0E9496
+:10063000D1058FEF0E94E50164E170E080E090E079
+:100640000E94D105CE0166EF7FEF0E94990888EEE7
+:1006500093E00E9499086F507040C60FD71F1C1678
+:100660001D06CCF264EF71E080E090E00E94D105BD
+:10067000CEEED2E080E00E94E501C7018C1B9D0B0D
+:1006800065E070E00E949908882777FD8095982F93
+:100690000E94D1058FEF0E94E50164E170E080E0E7
+:1006A00090E00E94D105CE0166EF7FEF0E9499088D
+:1006B00088EE93E00E9499086F507040C60FD71FD4
+:1006C0001C161D06BCF20F5F1F4F0230110519F0FA
+:1006D000CEEED2E0A0CFDF91CF911F910F91FF908E
+:1006E000EF9008952F923F924F925F926F927F9278
+:1006F0008F929F92AF92BF92CF92DF92EF92FF9232
+:100700000F931F93DF93CF93CDB7DEB7C158D0407F
+:100710000FB6F894DEBF0FBECDBFCF57DF4F888333
+:10072000C158D0402B013A01490141E4A42EB12C1B
+:10073000AC0EBD1EF50131E8C32ED12CCC0EDD1E52
+:100740001192EC15FD05E1F700E010E01E010894A0
+:10075000211C311C81E088169104C9F414C00E9448
+:100760008B0960E470E00E949908E1E4F0E0EC0F8E
+:10077000FD1FE80FF91F8081882389F70F5F1F4F46
+:1007800091E0908316C0003411054CF312C082E052
+:100790008816910471F4003411055CF4E1E4F0E092
+:1007A000EC0FFD1FE00FF11F80818F5F80830F5FD3
+:1007B0001F4FF501EE24FF249081892F8150863050
+:1007C00010F49F5F90838081873019F40894E11CB6
+:1007D000F11C3196EC15FD0579F7D101F501808109
+:1007E0004114510419F097E0981B892F8C9331968E
+:1007F0001196EC15FD0599F7C3010E94D601CF575C
+:10080000DF4F8881C158D040B10140E050E00E94E4
+:10081000910280E4E816F10409F09CCFCF57DF4F36
+:100820000FB6F894DEBF0FBECDBFCF91DF911F9101
+:100830000F91FF90EF90DF90CF90BF90AF909F907F
+:100840008F907F906F905F904F903F902F90089582
+:100850008F929F92AF92BF92CF92DF92EF92FF92D0
+:100860000F931F93CF93DF934C018B016130710580
+:1008700011F480E001C08FEF0E94E501C0E0D0E0FC
+:100880000E948B0968E070E00E949908B82EA92E9A
+:100890000E948B0968E070E00E949908D82EC92E4A
+:1008A0000E948B0968E070E00E949908F82EE92EFA
+:1008B0000115110559F48B2D9A2D6D2D7C2D4F2D81
+:1008C0005E2D0E9483018130D9F60DC001301105E3
+:1008D000B9F68B2D9A2D6D2D7C2D4F2D5E2D0E94FE
+:1008E0008301882369F68B2D9A2D6D2D7C2D4F2D3C
+:1008F0005E2D98010E94CD01C4010E94D60121966F
+:1009000081E0CF3FD80709F0BBCFDF91CF911F9196
+:100910000F91FF90EF90DF90CF90BF90AF909F909E
+:100920008F900895FF920F931F930E94420168EEEB
+:1009300073E080E090E00E94D105FF241EC0812F6B
+:10094000602F4F2D21E00E94010165E070E080E002
+:1009500090E00E94D10564E670E080E090E00E94A3
+:10096000D1051F5F183059F70F5F083011F010E004
+:10097000E6CFF39488E0F81611F000E0F8CF68EEC7
+:1009800073E080E090E00E94D1050E94420183E084
+:1009900090E06CEB72E00E94680282E090E06CEB09
+:1009A00072E00E94680281E090E06CEB72E00E94CD
+:1009B00068020E94FB028BE490E061E070E00E941C
+:1009C00028048BE490E060E070E00E94280410E0CE
+:1009D00081E060E070E046EB53E022E030E00E940E
+:1009E000720381E061E070E046EB53E022E030E02A
+:1009F0000E94720382E060E070E046EB53E022E088
+:100A000030E00E94720382E061E070E046EB53E068
+:100A100022E030E00E94720383E060E070E046EB89
+:100A200053E022E030E00E94720383E061E070E076
+:100A300046EB53E022E030E00E9472031F5F1A3061
+:100A400039F61F910F91FF9008950F931F930AEEAF
+:100A500011E0C80140E855E260E070E00E946306E2
+:100A600068EE73E080E090E00E94D105C80160E08C
+:100A700071E00E948E088FEF84B98CEF8AB915B8A7
+:100A80008BB183708BB9E0EBF0E01082A1EBB0E0AA
+:100A90001C9280818260808382E38093B3001092F5
+:100AA000B2008C9186608C93E0E7F0E080818260F8
+:100AB00080831F910F9108950E94F7050E942505DC
+:100AC0000E949204FDCF1F920F920FB60F92112435
+:100AD0002F933F938F939F93AF93BF938091610127
+:100AE00090916201A0916301B09164013091650120
+:100AF0000196A11DB11D232F2D5F2D3720F02D57FD
+:100B00000196A11DB11D2093650180936101909311
+:100B10006201A0936301B093640180915D019091A3
+:100B20005E01A0915F01B09160010196A11DB11D10
+:100B300080935D0190935E01A0935F01B09360018B
+:100B4000BF91AF919F918F913F912F910F900FBEC9
+:100B50000F901F9018959FB7F89420915D013091E8
+:100B60005E0140915F015091600186B5A89B06C06F
+:100B70008F3F21F02F5F3F4F4F4F5F4F9FBF542F4D
+:100B8000432F322F2227280F311D411D511D82E096
+:100B9000220F331F441F551F8A95D1F7B901CA018F
+:100BA0000895EF92FF920F931F93CF93DF937B01F2
+:100BB0008C010E94AB05EB010EC00E94AB056C1BC3
+:100BC0007D0B685E7340C8F30894E108F1080109E1
+:100BD0001109C851DC4FE114F1040105110569F751
+:100BE000DF91CF911F910F91FF90EF90089578942E
+:100BF00084B5826084BD84B5816084BD85B5826022
+:100C000085BD85B5816085BDEEE6F0E080818160BF
+:100C10008083E1E8F0E010828081826080838081BF
+:100C200081608083E0E8F0E0808181608083E1EB97
+:100C3000F0E0808184608083E0EBF0E0808181607F
+:100C40008083EAE7F0E08081846080838081826035
+:100C5000808380818160808380818068808310921E
+:100C6000C10008951F920F920FB60F9211242F9377
+:100C70003F934F938F939F93EF93FF934091C600C1
+:100C8000E091E601F091E70131969F012F773070F6
+:100C900031978091E8019091E9012817390739F0DF
+:100CA000EA59FE4F40833093E7012093E601FF911C
+:100CB000EF919F918F914F913F912F910F900FBE88
+:100CC0000F901F901895CF93DF93EC019A01AB0121
+:100CD000E885F985203081EE380780E0480780E01C
+:100CE000580709F449C081E090E00A8802C0880FE3
+:100CF000991F0A94E2F7808360E079E08DE390E049
+:100D00000E94CE082150304040405040CA01B901F5
+:100D100022E030E040E050E00E94CE08EC81FD810E
+:100D20003083EE81FF812083EA85FB85208141E0CD
+:100D300050E0CA010E8402C0880F991F0A94E2F79E
+:100D4000282B2083EA85FB852081CA010F8402C0FD
+:100D5000880F991F0A94E2F7282B2083EA85FB85E8
+:100D60008081088802C0440F551F0A94E2F7842B43
+:100D70008083DF91CF910895108220E130E0CECFC3
+:100D8000DC011296ED91FC911397E058FF4F2191F1
+:100D9000319180819181281B390B2F773070C901E7
+:100DA0000895DC011296ED91FC911397EE57FF4FD9
+:100DB0002081318192918291E058F040821793070F
+:100DC00019F42FEF3FEF05C0E20FF31F8081282FAA
+:100DD00030E0C9010895DC011296ED91FC91139762
+:100DE000DF01AE57BF4F2D913C911197E058FF4F57
+:100DF00080819181E058F0408217930719F42FEF1A
+:100E00003FEF0BC0E20FF31F80812F5F3F4F2F7723
+:100E100030702D933C93282F30E0C9010895DC01F8
+:100E20001296ED91FC911397EE57FF4F80819181BF
+:100E3000929382930895FC01A085B18521898C91BC
+:100E400090E0022E02C0959587950A94E2F780FF04
+:100E5000F6CF0484F585E02D608308958EE091E05F
+:100E60009093EB018093EA0186E691E09093ED0187
+:100E70008093EC0185EC90E09093EF018093EE017C
+:100E800084EC90E09093F1018093F00180EC90E08D
+:100E90009093F3018093F20181EC90E09093F5013F
+:100EA0008093F40186EC90E09093F7018093F60133
+:100EB00084E08093F80183E08093F90187E08093D8
+:100EC000FA0185E08093FB0181E08093FC010895A5
+:100ED0000F931F93CF93DF938C01EB0109C02196F1
+:100EE000D801ED91FC910190F081E02DC8010995A8
+:100EF00068816623A1F7DF91CF911F910F9108952B
+:100F0000EF92FF920F931F93CF93DF938C017B019E
+:100F1000EA010CC0D7016D917D01D801ED91FC91E2
+:100F20000190F081E02DC80109952197209791F754
+:100F3000DF91CF911F910F91FF90EF900895DC0109
+:100F4000ED91FC910280F381E02D099508952F9297
+:100F50003F924F925F926F927F928F929F92AF9249
+:100F6000BF92CF92DF92EF92FF920F931F93DF9386
+:100F7000CF93CDB7DEB7A0970FB6F894DEBF0FBE04
+:100F8000CDBF1C016A017B01411551056105710549
+:100F900049F440E350E060E070E020E030E00E947F
+:100FA000410856C0882499245401422E55246624B1
+:100FB000772401E010E00C0F1D1F080D191DC7015B
+:100FC000B601A30192010E94AC08F8016083089465
+:100FD000811C911CA11CB11CC701B601A301920187
+:100FE0000E94AC08C901DA016C017D01C114D10471
+:100FF000E104F104F1F681E0E82EF12CEC0EFD1E87
+:10100000E80CF91C3E010894611C711CD501C40157
+:101010000197A109B1096C01C818D90816C0F601D9
+:10102000EE0DFF1D40814A3010F4405D01C0495C67
+:10103000552747FD5095652F752FC10120E030E001
+:101040000E9441080894E108F1086E147F0439F702
+:10105000A0960FB6F894DEBF0FBECDBFCF91DF9143
+:101060001F910F91FF90EF90DF90CF90BF90AF90C6
+:101070009F908F907F906F905F904F903F902F90B8
+:101080000895EF92FF920F931F93CF93DF93EC019C
+:101090007A018B012115310541F4E881F981019034
+:1010A000F081E02D642F09951BC02A303105B1F481
+:1010B00077FF10C04DE250E060E070E020E030E0EB
+:1010C0000E94410810950095F094E094E11CF11CF9
+:1010D000011D111DCE01B801A7012AE00E94A7073A
+:1010E000DF91CF911F910F91FF90EF9008950F9393
+:1010F0001F938C014DE050E060E070E020E030E0B4
+:101100000E944108C8014AE050E060E070E020E041
+:1011100030E00E9441081F910F9108950F931F9393
+:101120008C010E949F07C8010E9477081F910F91B0
+:10113000089597FB092E07260AD077FD04D049D0E1
+:1011400006D000201AF4709561957F4F0895F6F748
+:10115000909581959F4F0895A1E21A2EAA1BBB1B63
+:10116000FD010DC0AA1FBB1FEE1FFF1FA217B30773
+:10117000E407F50720F0A21BB30BE40BF50B661F89
+:10118000771F881F991F1A9469F76095709580954D
+:1011900090959B01AC01BD01CF01089597FB092EED
+:1011A00005260ED057FD04D0D7DF0AD0001C38F436
+:1011B00050954095309521953F4F4F4F5F4F089583
+:1011C000F6F790958095709561957F4F8F4F9F4F63
+:1011D0000895AA1BBB1B51E107C0AA1FBB1FA6177E
+:1011E000B70710F0A61BB70B881F991F5A95A9F7D0
+:1011F00080959095BC01CD0108952F923F924F921A
+:101200005F926F927F928F929F92AF92BF92CF9296
+:10121000DF92EF92FF920F931F93CF93DF93CDB79F
+:10122000DEB7CA1BDB0B0FB6F894DEBF0FBECDBF17
+:1012300009942A88398848885F846E847D848C84E8
+:101240009B84AA84B984C884DF80EE80FD800C81F1
+:101250001B81AA81B981CE0FD11D0FB6F894DEBFD4
+:101260000FBECDBFED010895EE0FFF1F0590F49165
+:10127000E02D0994A0E0B0E0E0E4F9E00C94050969
+:10128000EC01A880B980CA80DB80A114B104C1043C
+:10129000D10441F484E2A82E89EDB82E8BE5C82E46
+:1012A00087E0D82EC601B5012DE133EF41E050E0D3
+:1012B0000E94CE0827EA31E440E050E00E949B09FA
+:1012C0007B018C01C601B5012DE133EF41E050E017
+:1012D0000E94CE08CA01B9012CEE34EF4FEF5FEF48
+:1012E0000E949B096E0D7F1D801F911F97FF04C0F8
+:1012F0006150704080409048688379838A839B83E3
+:101300009B013F77C901CDB7DEB7EAE00C94210914
+:101310000E943A09089586E091E00E943A090895F2
+:10132000A0E0B0E08093060190930701A09308012C
+:10133000B09309010895629FD001739FF001829FCD
+:10134000E00DF11D649FE00DF11D929FF00D839F54
+:10135000F00D749FF00D659FF00D9927729FB00DF1
+:10136000E11DF91F639FB00DE11DF91FBD01CF0104
+:0813700011240895F894FFCF49
+:10137800626567696E0001000000000000001B073D
+:0C13880068078007C006EB06D1060F07BF
+:00000001FF
diff --git a/test/applet/wiring.d b/test/applet/wiring.d
new file mode 100644
index 0000000..8983a5e
--- /dev/null
+++ b/test/applet/wiring.d
@@ -0,0 +1,22 @@
+applet/wiring.o applet/wiring.d: ardmake/hardware/cores/arduino/wiring.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h
diff --git a/test/applet/wiring_analog.d b/test/applet/wiring_analog.d
new file mode 100644
index 0000000..098a29c
--- /dev/null
+++ b/test/applet/wiring_analog.d
@@ -0,0 +1,24 @@
+applet/wiring_analog.o applet/wiring_analog.d: ardmake/hardware/cores/arduino/wiring_analog.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/pins_arduino.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h
diff --git a/test/applet/wiring_digital.d b/test/applet/wiring_digital.d
new file mode 100644
index 0000000..a29fcb4
--- /dev/null
+++ b/test/applet/wiring_digital.d
@@ -0,0 +1,24 @@
+applet/wiring_digital.o applet/wiring_digital.d: ardmake/hardware/cores/arduino/wiring_digital.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/pins_arduino.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h
diff --git a/test/applet/wiring_pulse.d b/test/applet/wiring_pulse.d
new file mode 100644
index 0000000..e52f4a7
--- /dev/null
+++ b/test/applet/wiring_pulse.d
@@ -0,0 +1,24 @@
+applet/wiring_pulse.o applet/wiring_pulse.d: ardmake/hardware/cores/arduino/wiring_pulse.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/pins_arduino.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h
diff --git a/test/applet/wiring_shift.d b/test/applet/wiring_shift.d
new file mode 100644
index 0000000..aefc3d3
--- /dev/null
+++ b/test/applet/wiring_shift.d
@@ -0,0 +1,22 @@
+applet/wiring_shift.o applet/wiring_shift.d: ardmake/hardware/cores/arduino/wiring_shift.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h
diff --git a/test/ardmake.conf b/test/ardmake.conf
new file mode 100644
index 0000000..36a2d31
--- /dev/null
+++ b/test/ardmake.conf
@@ -0,0 +1,3 @@
+ARDUINO_DIR=ardmake
+ARDUINO_BOARD=uno
+ARDUINO_PORT=/dev/ttyACM0
diff --git a/test/ardmake/hardware/boards.txt b/test/ardmake/hardware/boards.txt
new file mode 100644
index 0000000..259c570
--- /dev/null
+++ b/test/ardmake/hardware/boards.txt
@@ -0,0 +1,338 @@
+##############################################################
+
+uno.name=Arduino Uno
+uno.upload.protocol=arduino
+uno.upload.maximum_size=32256
+uno.upload.speed=115200
+uno.bootloader.low_fuses=0xff
+uno.bootloader.high_fuses=0xde
+uno.bootloader.extended_fuses=0x05
+uno.bootloader.path=optiboot
+uno.bootloader.file=optiboot_atmega328.hex
+uno.bootloader.unlock_bits=0x3F
+uno.bootloader.lock_bits=0x0F
+uno.build.mcu=atmega328p
+uno.build.f_cpu=16000000L
+uno.build.core=arduino
+
+##############################################################
+
+atmega328.name=Arduino Duemilanove or Nano w/ ATmega328
+
+atmega328.upload.protocol=arduino
+atmega328.upload.maximum_size=30720
+atmega328.upload.speed=57600
+
+atmega328.bootloader.low_fuses=0xFF
+atmega328.bootloader.high_fuses=0xDA
+atmega328.bootloader.extended_fuses=0x05
+atmega328.bootloader.path=atmega
+atmega328.bootloader.file=ATmegaBOOT_168_atmega328.hex
+atmega328.bootloader.unlock_bits=0x3F
+atmega328.bootloader.lock_bits=0x0F
+
+atmega328.build.mcu=atmega328p
+atmega328.build.f_cpu=16000000L
+atmega328.build.core=arduino
+
+##############################################################
+
+diecimila.name=Arduino Diecimila, Duemilanove, or Nano w/ ATmega168
+
+diecimila.upload.protocol=arduino
+diecimila.upload.maximum_size=14336
+diecimila.upload.speed=19200
+
+diecimila.bootloader.low_fuses=0xff
+diecimila.bootloader.high_fuses=0xdd
+diecimila.bootloader.extended_fuses=0x00
+diecimila.bootloader.path=atmega
+diecimila.bootloader.file=ATmegaBOOT_168_diecimila.hex
+diecimila.bootloader.unlock_bits=0x3F
+diecimila.bootloader.lock_bits=0x0F
+
+diecimila.build.mcu=atmega168
+diecimila.build.f_cpu=16000000L
+diecimila.build.core=arduino
+
+##############################################################
+
+mega2560.name=Arduino Mega 2560
+
+mega2560.upload.protocol=stk500v2
+mega2560.upload.maximum_size=258048
+mega2560.upload.speed=115200
+
+mega2560.bootloader.low_fuses=0xFF
+mega2560.bootloader.high_fuses=0xD8
+mega2560.bootloader.extended_fuses=0xFD
+mega2560.bootloader.path=stk500v2
+mega2560.bootloader.file=stk500boot_v2_mega2560.hex
+mega2560.bootloader.unlock_bits=0x3F
+mega2560.bootloader.lock_bits=0x0F
+
+mega2560.build.mcu=atmega2560
+mega2560.build.f_cpu=16000000L
+mega2560.build.core=arduino
+
+##############################################################
+
+mega.name=Arduino Mega (ATmega1280)
+
+mega.upload.protocol=arduino
+mega.upload.maximum_size=126976
+mega.upload.speed=57600
+
+mega.bootloader.low_fuses=0xFF
+mega.bootloader.high_fuses=0xDA
+mega.bootloader.extended_fuses=0xF5
+mega.bootloader.path=atmega
+mega.bootloader.file=ATmegaBOOT_168_atmega1280.hex
+mega.bootloader.unlock_bits=0x3F
+mega.bootloader.lock_bits=0x0F
+
+mega.build.mcu=atmega1280
+mega.build.f_cpu=16000000L
+mega.build.core=arduino
+
+##############################################################
+
+mini.name=Arduino Mini
+
+mini.upload.protocol=arduino
+mini.upload.maximum_size=14336
+mini.upload.speed=19200
+
+mini.bootloader.low_fuses=0xff
+mini.bootloader.high_fuses=0xdd
+mini.bootloader.extended_fuses=0x00
+mini.bootloader.path=atmega
+mini.bootloader.file=ATmegaBOOT_168_ng.hex
+mini.bootloader.unlock_bits=0x3F
+mini.bootloader.lock_bits=0x0F
+
+mini.build.mcu=atmega168
+mini.build.f_cpu=16000000L
+mini.build.core=arduino
+
+##############################################################
+
+fio.name=Arduino Fio
+
+fio.upload.protocol=arduino
+fio.upload.maximum_size=30720
+fio.upload.speed=57600
+
+fio.bootloader.low_fuses=0xFF
+fio.bootloader.high_fuses=0xDA
+fio.bootloader.extended_fuses=0x05
+fio.bootloader.path=arduino:atmega
+fio.bootloader.file=ATmegaBOOT_168_atmega328_pro_8MHz.hex
+fio.bootloader.unlock_bits=0x3F
+fio.bootloader.lock_bits=0x0F
+
+fio.build.mcu=atmega328p
+fio.build.f_cpu=8000000L
+fio.build.core=arduino:arduino
+
+##############################################################
+
+bt328.name=Arduino BT w/ ATmega328
+
+bt328.upload.protocol=arduino
+bt328.upload.maximum_size=28672
+bt328.upload.speed=19200
+bt328.upload.disable_flushing=true
+
+bt328.bootloader.low_fuses=0xff
+bt328.bootloader.high_fuses=0xd8
+bt328.bootloader.extended_fuses=0x05
+bt328.bootloader.path=bt
+bt328.bootloader.file=ATmegaBOOT_168_atmega328_bt.hex
+bt328.bootloader.unlock_bits=0x3F
+bt328.bootloader.lock_bits=0x0F
+
+bt328.build.mcu=atmega328p
+bt328.build.f_cpu=16000000L
+bt328.build.core=arduino
+
+##############################################################
+
+bt.name=Arduino BT w/ ATmega168
+
+bt.upload.protocol=arduino
+bt.upload.maximum_size=14336
+bt.upload.speed=19200
+bt.upload.disable_flushing=true
+
+bt.bootloader.low_fuses=0xff
+bt.bootloader.high_fuses=0xdd
+bt.bootloader.extended_fuses=0x00
+bt.bootloader.path=bt
+bt.bootloader.file=ATmegaBOOT_168.hex
+bt.bootloader.unlock_bits=0x3F
+bt.bootloader.lock_bits=0x0F
+
+bt.build.mcu=atmega168
+bt.build.f_cpu=16000000L
+bt.build.core=arduino
+
+##############################################################
+
+lilypad328.name=LilyPad Arduino w/ ATmega328
+
+lilypad328.upload.protocol=arduino
+lilypad328.upload.maximum_size=30720
+lilypad328.upload.speed=57600
+
+lilypad328.bootloader.low_fuses=0xFF
+lilypad328.bootloader.high_fuses=0xDA
+lilypad328.bootloader.extended_fuses=0x05
+lilypad328.bootloader.path=atmega
+lilypad328.bootloader.file=ATmegaBOOT_168_atmega328_pro_8MHz.hex
+lilypad328.bootloader.unlock_bits=0x3F
+lilypad328.bootloader.lock_bits=0x0F
+
+lilypad328.build.mcu=atmega328p
+lilypad328.build.f_cpu=8000000L
+lilypad328.build.core=arduino
+
+##############################################################
+
+lilypad.name=LilyPad Arduino w/ ATmega168
+
+lilypad.upload.protocol=arduino
+lilypad.upload.maximum_size=14336
+lilypad.upload.speed=19200
+
+lilypad.bootloader.low_fuses=0xe2
+lilypad.bootloader.high_fuses=0xdd
+lilypad.bootloader.extended_fuses=0x00
+lilypad.bootloader.path=lilypad
+lilypad.bootloader.file=LilyPadBOOT_168.hex
+lilypad.bootloader.unlock_bits=0x3F
+lilypad.bootloader.lock_bits=0x0F
+
+lilypad.build.mcu=atmega168
+lilypad.build.f_cpu=8000000L
+lilypad.build.core=arduino
+
+##############################################################
+
+pro5v328.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega328
+
+pro5v328.upload.protocol=arduino
+pro5v328.upload.maximum_size=30720
+pro5v328.upload.speed=57600
+
+pro5v328.bootloader.low_fuses=0xFF
+pro5v328.bootloader.high_fuses=0xDA
+pro5v328.bootloader.extended_fuses=0x05
+pro5v328.bootloader.path=atmega
+pro5v328.bootloader.file=ATmegaBOOT_168_atmega328.hex
+pro5v328.bootloader.unlock_bits=0x3F
+pro5v328.bootloader.lock_bits=0x0F
+
+pro5v328.build.mcu=atmega328p
+pro5v328.build.f_cpu=16000000L
+pro5v328.build.core=arduino
+
+##############################################################
+
+pro5v.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega168
+
+pro5v.upload.protocol=arduino
+pro5v.upload.maximum_size=14336
+pro5v.upload.speed=19200
+
+pro5v.bootloader.low_fuses=0xff
+pro5v.bootloader.high_fuses=0xdd
+pro5v.bootloader.extended_fuses=0x00
+pro5v.bootloader.path=atmega
+pro5v.bootloader.file=ATmegaBOOT_168_diecimila.hex
+pro5v.bootloader.unlock_bits=0x3F
+pro5v.bootloader.lock_bits=0x0F
+
+pro5v.build.mcu=atmega168
+pro5v.build.f_cpu=16000000L
+pro5v.build.core=arduino
+
+##############################################################
+
+pro328.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega328
+
+pro328.upload.protocol=arduino
+pro328.upload.maximum_size=30720
+pro328.upload.speed=57600
+
+pro328.bootloader.low_fuses=0xFF
+pro328.bootloader.high_fuses=0xDA
+pro328.bootloader.extended_fuses=0x05
+pro328.bootloader.path=atmega
+pro328.bootloader.file=ATmegaBOOT_168_atmega328_pro_8MHz.hex
+pro328.bootloader.unlock_bits=0x3F
+pro328.bootloader.lock_bits=0x0F
+
+pro328.build.mcu=atmega328p
+pro328.build.f_cpu=8000000L
+pro328.build.core=arduino
+
+##############################################################
+
+pro.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega168
+
+pro.upload.protocol=arduino
+pro.upload.maximum_size=14336
+pro.upload.speed=19200
+
+pro.bootloader.low_fuses=0xc6
+pro.bootloader.high_fuses=0xdd
+pro.bootloader.extended_fuses=0x00
+pro.bootloader.path=atmega
+pro.bootloader.file=ATmegaBOOT_168_pro_8MHz.hex
+pro.bootloader.unlock_bits=0x3F
+pro.bootloader.lock_bits=0x0F
+
+pro.build.mcu=atmega168
+pro.build.f_cpu=8000000L
+pro.build.core=arduino
+
+##############################################################
+
+atmega168.name=Arduino NG or older w/ ATmega168
+
+atmega168.upload.protocol=arduino
+atmega168.upload.maximum_size=14336
+atmega168.upload.speed=19200
+
+atmega168.bootloader.low_fuses=0xff
+atmega168.bootloader.high_fuses=0xdd
+atmega168.bootloader.extended_fuses=0x00
+atmega168.bootloader.path=atmega
+atmega168.bootloader.file=ATmegaBOOT_168_ng.hex
+atmega168.bootloader.unlock_bits=0x3F
+atmega168.bootloader.lock_bits=0x0F
+
+atmega168.build.mcu=atmega168
+atmega168.build.f_cpu=16000000L
+atmega168.build.core=arduino
+
+##############################################################
+
+atmega8.name=Arduino NG or older w/ ATmega8
+
+atmega8.upload.protocol=arduino
+atmega8.upload.maximum_size=7168
+atmega8.upload.speed=19200
+
+atmega8.bootloader.low_fuses=0xdf
+atmega8.bootloader.high_fuses=0xca
+atmega8.bootloader.path=atmega8
+atmega8.bootloader.file=ATmegaBOOT.hex
+atmega8.bootloader.unlock_bits=0x3F
+atmega8.bootloader.lock_bits=0x0F
+
+atmega8.build.mcu=atmega8
+atmega8.build.f_cpu=16000000L
+atmega8.build.core=arduino
+
diff --git a/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168.c b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168.c
new file mode 100644
index 0000000..2b9fefa
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168.c
@@ -0,0 +1,1054 @@
+/**********************************************************/
+/* Serial Bootloader for Atmel megaAVR Controllers */
+/* */
+/* tested with ATmega8, ATmega128 and ATmega168 */
+/* should work with other mega's, see code for details */
+/* */
+/* ATmegaBOOT.c */
+/* */
+/* */
+/* 20090308: integrated Mega changes into main bootloader */
+/* source by D. Mellis */
+/* 20080930: hacked for Arduino Mega (with the 1280 */
+/* processor, backwards compatible) */
+/* by D. Cuartielles */
+/* 20070626: hacked for Arduino Diecimila (which auto- */
+/* resets when a USB connection is made to it) */
+/* by D. Mellis */
+/* 20060802: hacked for Arduino by D. Cuartielles */
+/* based on a previous hack by D. Mellis */
+/* and D. Cuartielles */
+/* */
+/* Monitor and debug functions were added to the original */
+/* code by Dr. Erik Lins, chip45.com. (See below) */
+/* */
+/* Thanks to Karl Pitrich for fixing a bootloader pin */
+/* problem and more informative LED blinking! */
+/* */
+/* For the latest version see: */
+/* http://www.chip45.com/ */
+/* */
+/* ------------------------------------------------------ */
+/* */
+/* based on stk500boot.c */
+/* Copyright (c) 2003, Jason P. Kyle */
+/* All rights reserved. */
+/* see avr1.org for original file and information */
+/* */
+/* 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 2 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, write */
+/* to the Free Software Foundation, Inc., */
+/* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+/* */
+/* Licence can be viewed at */
+/* http://www.fsf.org/licenses/gpl.txt */
+/* */
+/* Target = Atmel AVR m128,m64,m32,m16,m8,m162,m163,m169, */
+/* m8515,m8535. ATmega161 has a very small boot block so */
+/* isn't supported. */
+/* */
+/* Tested with m168 */
+/**********************************************************/
+
+/* $Id$ */
+
+
+/* some includes */
+#include <inttypes.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <avr/interrupt.h>
+#include <avr/wdt.h>
+#include <util/delay.h>
+
+/* the current avr-libc eeprom functions do not support the ATmega168 */
+/* own eeprom write/read functions are used instead */
+#if !defined(__AVR_ATmega168__) || !defined(__AVR_ATmega328P__)
+#include <avr/eeprom.h>
+#endif
+
+/* Use the F_CPU defined in Makefile */
+
+/* 20060803: hacked by DojoCorp */
+/* 20070626: hacked by David A. Mellis to decrease waiting time for auto-reset */
+/* set the waiting time for the bootloader */
+/* get this from the Makefile instead */
+/* #define MAX_TIME_COUNT (F_CPU>>4) */
+
+/* 20070707: hacked by David A. Mellis - after this many errors give up and launch application */
+#define MAX_ERROR_COUNT 5
+
+/* set the UART baud rate */
+/* 20060803: hacked by DojoCorp */
+//#define BAUD_RATE 115200
+#ifndef BAUD_RATE
+#define BAUD_RATE 19200
+#endif
+
+
+/* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
+/* never allow AVR Studio to do an update !!!! */
+#define HW_VER 0x02
+#define SW_MAJOR 0x01
+#define SW_MINOR 0x10
+
+
+/* Adjust to suit whatever pin your hardware uses to enter the bootloader */
+/* ATmega128 has two UARTS so two pins are used to enter bootloader and select UART */
+/* ATmega1280 has four UARTS, but for Arduino Mega, we will only use RXD0 to get code */
+/* BL0... means UART0, BL1... means UART1 */
+#ifdef __AVR_ATmega128__
+#define BL_DDR DDRF
+#define BL_PORT PORTF
+#define BL_PIN PINF
+#define BL0 PINF7
+#define BL1 PINF6
+#elif defined __AVR_ATmega1280__
+/* we just don't do anything for the MEGA and enter bootloader on reset anyway*/
+#else
+/* other ATmegas have only one UART, so only one pin is defined to enter bootloader */
+#define BL_DDR DDRD
+#define BL_PORT PORTD
+#define BL_PIN PIND
+#define BL PIND6
+#endif
+
+
+/* onboard LED is used to indicate, that the bootloader was entered (3x flashing) */
+/* if monitor functions are included, LED goes on after monitor was entered */
+#if defined __AVR_ATmega128__ || defined __AVR_ATmega1280__
+/* Onboard LED is connected to pin PB7 (e.g. Crumb128, PROBOmega128, Savvy128, Arduino Mega) */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+#define LED PINB7
+#else
+/* Onboard LED is connected to pin PB5 in Arduino NG, Diecimila, and Duomilanuove */
+/* other boards like e.g. Crumb8, Crumb168 are using PB2 */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+#define LED PINB5
+#endif
+
+
+/* monitor functions will only be compiled when using ATmega128, due to bootblock size constraints */
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+#define MONITOR 1
+#endif
+
+
+/* define various device id's */
+/* manufacturer byte is always the same */
+#define SIG1 0x1E // Yep, Atmel is the only manufacturer of AVR micros. Single source :(
+
+#if defined __AVR_ATmega1280__
+#define SIG2 0x97
+#define SIG3 0x03
+#define PAGE_SIZE 0x80U //128 words
+
+#elif defined __AVR_ATmega1281__
+#define SIG2 0x97
+#define SIG3 0x04
+#define PAGE_SIZE 0x80U //128 words
+
+#elif defined __AVR_ATmega128__
+#define SIG2 0x97
+#define SIG3 0x02
+#define PAGE_SIZE 0x80U //128 words
+
+#elif defined __AVR_ATmega64__
+#define SIG2 0x96
+#define SIG3 0x02
+#define PAGE_SIZE 0x80U //128 words
+
+#elif defined __AVR_ATmega32__
+#define SIG2 0x95
+#define SIG3 0x02
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega16__
+#define SIG2 0x94
+#define SIG3 0x03
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega8__
+#define SIG2 0x93
+#define SIG3 0x07
+#define PAGE_SIZE 0x20U //32 words
+
+#elif defined __AVR_ATmega88__
+#define SIG2 0x93
+#define SIG3 0x0a
+#define PAGE_SIZE 0x20U //32 words
+
+#elif defined __AVR_ATmega168__
+#define SIG2 0x94
+#define SIG3 0x06
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega328P__
+#define SIG2 0x95
+#define SIG3 0x0F
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega162__
+#define SIG2 0x94
+#define SIG3 0x04
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega163__
+#define SIG2 0x94
+#define SIG3 0x02
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega169__
+#define SIG2 0x94
+#define SIG3 0x05
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega8515__
+#define SIG2 0x93
+#define SIG3 0x06
+#define PAGE_SIZE 0x20U //32 words
+
+#elif defined __AVR_ATmega8535__
+#define SIG2 0x93
+#define SIG3 0x08
+#define PAGE_SIZE 0x20U //32 words
+#endif
+
+
+/* function prototypes */
+void putch(char);
+char getch(void);
+void getNch(uint8_t);
+void byte_response(uint8_t);
+void nothing_response(void);
+char gethex(void);
+void puthex(char);
+void flash_led(uint8_t);
+
+/* some variables */
+union address_union {
+ uint16_t word;
+ uint8_t byte[2];
+} address;
+
+union length_union {
+ uint16_t word;
+ uint8_t byte[2];
+} length;
+
+struct flags_struct {
+ unsigned eeprom : 1;
+ unsigned rampz : 1;
+} flags;
+
+uint8_t buff[256];
+uint8_t address_high;
+
+uint8_t pagesz=0x80;
+
+uint8_t i;
+uint8_t bootuart = 0;
+
+uint8_t error_count = 0;
+
+void (*app_start)(void) = 0x0000;
+
+
+/* main program starts here */
+int main(void)
+{
+ uint8_t ch,ch2;
+ uint16_t w;
+
+#ifdef WATCHDOG_MODS
+ ch = MCUSR;
+ MCUSR = 0;
+
+ WDTCSR |= _BV(WDCE) | _BV(WDE);
+ WDTCSR = 0;
+
+ // Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
+ if (! (ch & _BV(EXTRF))) // if its a not an external reset...
+ app_start(); // skip bootloader
+#else
+ asm volatile("nop\n\t");
+#endif
+
+ /* set pin direction for bootloader pin and enable pullup */
+ /* for ATmega128, two pins need to be initialized */
+#ifdef __AVR_ATmega128__
+ BL_DDR &= ~_BV(BL0);
+ BL_DDR &= ~_BV(BL1);
+ BL_PORT |= _BV(BL0);
+ BL_PORT |= _BV(BL1);
+#else
+ /* We run the bootloader regardless of the state of this pin. Thus, don't
+ put it in a different state than the other pins. --DAM, 070709
+ This also applies to Arduino Mega -- DC, 080930
+ BL_DDR &= ~_BV(BL);
+ BL_PORT |= _BV(BL);
+ */
+#endif
+
+
+#ifdef __AVR_ATmega128__
+ /* check which UART should be used for booting */
+ if(bit_is_clear(BL_PIN, BL0)) {
+ bootuart = 1;
+ }
+ else if(bit_is_clear(BL_PIN, BL1)) {
+ bootuart = 2;
+ }
+#endif
+
+#if defined __AVR_ATmega1280__
+ /* the mega1280 chip has four serial ports ... we could eventually use any of them, or not? */
+ /* however, we don't wanna confuse people, to avoid making a mess, we will stick to RXD0, TXD0 */
+ bootuart = 1;
+#endif
+
+ /* check if flash is programmed already, if not start bootloader anyway */
+ if(pgm_read_byte_near(0x0000) != 0xFF) {
+
+#ifdef __AVR_ATmega128__
+ /* no UART was selected, start application */
+ if(!bootuart) {
+ app_start();
+ }
+#else
+ /* check if bootloader pin is set low */
+ /* we don't start this part neither for the m8, nor m168 */
+ //if(bit_is_set(BL_PIN, BL)) {
+ // app_start();
+ // }
+#endif
+ }
+
+#ifdef __AVR_ATmega128__
+ /* no bootuart was selected, default to uart 0 */
+ if(!bootuart) {
+ bootuart = 1;
+ }
+#endif
+
+
+ /* initialize UART(s) depending on CPU defined */
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+ if(bootuart == 1) {
+ UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSR0A = 0x00;
+ UCSR0C = 0x06;
+ UCSR0B = _BV(TXEN0)|_BV(RXEN0);
+ }
+ if(bootuart == 2) {
+ UBRR1L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRR1H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSR1A = 0x00;
+ UCSR1C = 0x06;
+ UCSR1B = _BV(TXEN1)|_BV(RXEN1);
+ }
+#elif defined __AVR_ATmega163__
+ UBRR = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRRHI = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSRA = 0x00;
+ UCSRB = _BV(TXEN)|_BV(RXEN);
+#elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+
+#ifdef DOUBLE_SPEED
+ UCSR0A = (1<<U2X0); //Double speed mode USART0
+ UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*8L)-1);
+ UBRR0H = (F_CPU/(BAUD_RATE*8L)-1) >> 8;
+#else
+ UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+#endif
+
+ UCSR0B = (1<<RXEN0) | (1<<TXEN0);
+ UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
+
+ /* Enable internal pull-up resistor on pin D0 (RX), in order
+ to supress line noise that prevents the bootloader from
+ timing out (DAM: 20070509) */
+ DDRD &= ~_BV(PIND0);
+ PORTD |= _BV(PIND0);
+#elif defined __AVR_ATmega8__
+ /* m8 */
+ UBRRH = (((F_CPU/BAUD_RATE)/16)-1)>>8; // set baud rate
+ UBRRL = (((F_CPU/BAUD_RATE)/16)-1);
+ UCSRB = (1<<RXEN)|(1<<TXEN); // enable Rx & Tx
+ UCSRC = (1<<URSEL)|(1<<UCSZ1)|(1<<UCSZ0); // config USART; 8N1
+#else
+ /* m16,m32,m169,m8515,m8535 */
+ UBRRL = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRRH = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSRA = 0x00;
+ UCSRC = 0x06;
+ UCSRB = _BV(TXEN)|_BV(RXEN);
+#endif
+
+#if defined __AVR_ATmega1280__
+ /* Enable internal pull-up resistor on pin D0 (RX), in order
+ to supress line noise that prevents the bootloader from
+ timing out (DAM: 20070509) */
+ /* feature added to the Arduino Mega --DC: 080930 */
+ DDRE &= ~_BV(PINE0);
+ PORTE |= _BV(PINE0);
+#endif
+
+
+ /* set LED pin as output */
+ LED_DDR |= _BV(LED);
+
+
+ /* flash onboard LED to signal entering of bootloader */
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+ // 4x for UART0, 5x for UART1
+ flash_led(NUM_LED_FLASHES + bootuart);
+#else
+ flash_led(NUM_LED_FLASHES);
+#endif
+
+ /* 20050803: by DojoCorp, this is one of the parts provoking the
+ system to stop listening, cancelled from the original */
+ //putch('\0');
+
+ /* forever loop */
+ for (;;) {
+
+ /* get character from UART */
+ ch = getch();
+
+ /* A bunch of if...else if... gives smaller code than switch...case ! */
+
+ /* Hello is anyone home ? */
+ if(ch=='0') {
+ nothing_response();
+ }
+
+
+ /* Request programmer ID */
+ /* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
+ /* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
+ else if(ch=='1') {
+ if (getch() == ' ') {
+ putch(0x14);
+ putch('A');
+ putch('V');
+ putch('R');
+ putch(' ');
+ putch('I');
+ putch('S');
+ putch('P');
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+ }
+
+
+ /* AVR ISP/STK500 board commands DON'T CARE so default nothing_response */
+ else if(ch=='@') {
+ ch2 = getch();
+ if (ch2>0x85) getch();
+ nothing_response();
+ }
+
+
+ /* AVR ISP/STK500 board requests */
+ else if(ch=='A') {
+ ch2 = getch();
+ if(ch2==0x80) byte_response(HW_VER); // Hardware version
+ else if(ch2==0x81) byte_response(SW_MAJOR); // Software major version
+ else if(ch2==0x82) byte_response(SW_MINOR); // Software minor version
+ else if(ch2==0x98) byte_response(0x03); // Unknown but seems to be required by avr studio 3.56
+ else byte_response(0x00); // Covers various unnecessary responses we don't care about
+ }
+
+
+ /* Device Parameters DON'T CARE, DEVICE IS FIXED */
+ else if(ch=='B') {
+ getNch(20);
+ nothing_response();
+ }
+
+
+ /* Parallel programming stuff DON'T CARE */
+ else if(ch=='E') {
+ getNch(5);
+ nothing_response();
+ }
+
+
+ /* P: Enter programming mode */
+ /* R: Erase device, don't care as we will erase one page at a time anyway. */
+ else if(ch=='P' || ch=='R') {
+ nothing_response();
+ }
+
+
+ /* Leave programming mode */
+ else if(ch=='Q') {
+ nothing_response();
+#ifdef WATCHDOG_MODS
+ // autoreset via watchdog (sneaky!)
+ WDTCSR = _BV(WDE);
+ while (1); // 16 ms
+#endif
+ }
+
+
+ /* Set address, little endian. EEPROM in bytes, FLASH in words */
+ /* Perhaps extra address bytes may be added in future to support > 128kB FLASH. */
+ /* This might explain why little endian was used here, big endian used everywhere else. */
+ else if(ch=='U') {
+ address.byte[0] = getch();
+ address.byte[1] = getch();
+ nothing_response();
+ }
+
+
+ /* Universal SPI programming command, disabled. Would be used for fuses and lock bits. */
+ else if(ch=='V') {
+ if (getch() == 0x30) {
+ getch();
+ ch = getch();
+ getch();
+ if (ch == 0) {
+ byte_response(SIG1);
+ } else if (ch == 1) {
+ byte_response(SIG2);
+ } else {
+ byte_response(SIG3);
+ }
+ } else {
+ getNch(3);
+ byte_response(0x00);
+ }
+ }
+
+
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch=='d') {
+ length.byte[1] = getch();
+ length.byte[0] = getch();
+ flags.eeprom = 0;
+ if (getch() == 'E') flags.eeprom = 1;
+ for (w=0;w<length.word;w++) {
+ buff[w] = getch(); // Store data in buffer, can't keep up with serial data stream whilst programming pages
+ }
+ if (getch() == ' ') {
+ if (flags.eeprom) { //Write to EEPROM one byte at a time
+ address.word <<= 1;
+ for(w=0;w<length.word;w++) {
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+ while(EECR & (1<<EEPE));
+ EEAR = (uint16_t)(void *)address.word;
+ EEDR = buff[w];
+ EECR |= (1<<EEMPE);
+ EECR |= (1<<EEPE);
+#else
+ eeprom_write_byte((void *)address.word,buff[w]);
+#endif
+ address.word++;
+ }
+ }
+ else { //Write to FLASH one page at a time
+ if (address.byte[1]>127) address_high = 0x01; //Only possible with m128, m256 will need 3rd address byte. FIXME
+ else address_high = 0x00;
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega1281__)
+ RAMPZ = address_high;
+#endif
+ address.word = address.word << 1; //address * 2 -> byte location
+ /* if ((length.byte[0] & 0x01) == 0x01) length.word++; //Even up an odd number of bytes */
+ if ((length.byte[0] & 0x01)) length.word++; //Even up an odd number of bytes
+ cli(); //Disable interrupts, just to be sure
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega1281__)
+ while(bit_is_set(EECR,EEPE)); //Wait for previous EEPROM writes to complete
+#else
+ while(bit_is_set(EECR,EEWE)); //Wait for previous EEPROM writes to complete
+#endif
+ asm volatile(
+ "clr r17 \n\t" //page_word_count
+ "lds r30,address \n\t" //Address of FLASH location (in bytes)
+ "lds r31,address+1 \n\t"
+ "ldi r28,lo8(buff) \n\t" //Start of buffer array in RAM
+ "ldi r29,hi8(buff) \n\t"
+ "lds r24,length \n\t" //Length of data to be written (in bytes)
+ "lds r25,length+1 \n\t"
+ "length_loop: \n\t" //Main loop, repeat for number of words in block
+ "cpi r17,0x00 \n\t" //If page_word_count=0 then erase page
+ "brne no_page_erase \n\t"
+ "wait_spm1: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm1 \n\t"
+ "ldi r16,0x03 \n\t" //Erase page pointed to by Z
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+#endif
+ "wait_spm2: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm2 \n\t"
+
+ "ldi r16,0x11 \n\t" //Re-enable RWW section
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+#endif
+ "no_page_erase: \n\t"
+ "ld r0,Y+ \n\t" //Write 2 bytes into page buffer
+ "ld r1,Y+ \n\t"
+
+ "wait_spm3: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm3 \n\t"
+ "ldi r16,0x01 \n\t" //Load r0,r1 into FLASH page buffer
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+
+ "inc r17 \n\t" //page_word_count++
+ "cpi r17,%1 \n\t"
+ "brlo same_page \n\t" //Still same page in FLASH
+ "write_page: \n\t"
+ "clr r17 \n\t" //New page, write current one first
+ "wait_spm4: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm4 \n\t"
+#ifdef __AVR_ATmega163__
+ "andi r30,0x80 \n\t" // m163 requires Z6:Z1 to be zero during page write
+#endif
+ "ldi r16,0x05 \n\t" //Write page pointed to by Z
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+ "ori r30,0x7E \n\t" // recover Z6:Z1 state after page write (had to be zero during write)
+#endif
+ "wait_spm5: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm5 \n\t"
+ "ldi r16,0x11 \n\t" //Re-enable RWW section
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+#endif
+ "same_page: \n\t"
+ "adiw r30,2 \n\t" //Next word in FLASH
+ "sbiw r24,2 \n\t" //length-2
+ "breq final_write \n\t" //Finished
+ "rjmp length_loop \n\t"
+ "final_write: \n\t"
+ "cpi r17,0 \n\t"
+ "breq block_done \n\t"
+ "adiw r24,2 \n\t" //length+2, fool above check on length after short page write
+ "rjmp write_page \n\t"
+ "block_done: \n\t"
+ "clr __zero_reg__ \n\t" //restore zero register
+#if defined __AVR_ATmega168__ || __AVR_ATmega328P__ || __AVR_ATmega128__ || __AVR_ATmega1280__ || __AVR_ATmega1281__
+ : "=m" (SPMCSR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
+#else
+ : "=m" (SPMCR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
+#endif
+ );
+ /* Should really add a wait for RWW section to be enabled, don't actually need it since we never */
+ /* exit the bootloader without a power cycle anyhow */
+ }
+ putch(0x14);
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+ }
+
+
+ /* Read memory block mode, length is big endian. */
+ else if(ch=='t') {
+ length.byte[1] = getch();
+ length.byte[0] = getch();
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+ if (address.word>0x7FFF) flags.rampz = 1; // No go with m256, FIXME
+ else flags.rampz = 0;
+#endif
+ address.word = address.word << 1; // address * 2 -> byte location
+ if (getch() == 'E') flags.eeprom = 1;
+ else flags.eeprom = 0;
+ if (getch() == ' ') { // Command terminator
+ putch(0x14);
+ for (w=0;w < length.word;w++) { // Can handle odd and even lengths okay
+ if (flags.eeprom) { // Byte access EEPROM read
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+ while(EECR & (1<<EEPE));
+ EEAR = (uint16_t)(void *)address.word;
+ EECR |= (1<<EERE);
+ putch(EEDR);
+#else
+ putch(eeprom_read_byte((void *)address.word));
+#endif
+ address.word++;
+ }
+ else {
+
+ if (!flags.rampz) putch(pgm_read_byte_near(address.word));
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+ else putch(pgm_read_byte_far(address.word + 0x10000));
+ // Hmmmm, yuck FIXME when m256 arrvies
+#endif
+ address.word++;
+ }
+ }
+ putch(0x10);
+ }
+ }
+
+
+ /* Get device signature bytes */
+ else if(ch=='u') {
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(SIG1);
+ putch(SIG2);
+ putch(SIG3);
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+ }
+
+
+ /* Read oscillator calibration byte */
+ else if(ch=='v') {
+ byte_response(0x00);
+ }
+
+
+#if defined MONITOR
+
+ /* here come the extended monitor commands by Erik Lins */
+
+ /* check for three times exclamation mark pressed */
+ else if(ch=='!') {
+ ch = getch();
+ if(ch=='!') {
+ ch = getch();
+ if(ch=='!') {
+ PGM_P welcome = "";
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+ uint16_t extaddr;
+#endif
+ uint8_t addrl, addrh;
+
+#ifdef CRUMB128
+ welcome = "ATmegaBOOT / Crumb128 - (C) J.P.Kyle, E.Lins - 050815\n\r";
+#elif defined PROBOMEGA128
+ welcome = "ATmegaBOOT / PROBOmega128 - (C) J.P.Kyle, E.Lins - 050815\n\r";
+#elif defined SAVVY128
+ welcome = "ATmegaBOOT / Savvy128 - (C) J.P.Kyle, E.Lins - 050815\n\r";
+#elif defined __AVR_ATmega1280__
+ welcome = "ATmegaBOOT / Arduino Mega - (C) Arduino LLC - 090930\n\r";
+#endif
+
+ /* turn on LED */
+ LED_DDR |= _BV(LED);
+ LED_PORT &= ~_BV(LED);
+
+ /* print a welcome message and command overview */
+ for(i=0; welcome[i] != '\0'; ++i) {
+ putch(welcome[i]);
+ }
+
+ /* test for valid commands */
+ for(;;) {
+ putch('\n');
+ putch('\r');
+ putch(':');
+ putch(' ');
+
+ ch = getch();
+ putch(ch);
+
+ /* toggle LED */
+ if(ch == 't') {
+ if(bit_is_set(LED_PIN,LED)) {
+ LED_PORT &= ~_BV(LED);
+ putch('1');
+ } else {
+ LED_PORT |= _BV(LED);
+ putch('0');
+ }
+ }
+
+ /* read byte from address */
+ else if(ch == 'r') {
+ ch = getch(); putch(ch);
+ addrh = gethex();
+ addrl = gethex();
+ putch('=');
+ ch = *(uint8_t *)((addrh << 8) + addrl);
+ puthex(ch);
+ }
+
+ /* write a byte to address */
+ else if(ch == 'w') {
+ ch = getch(); putch(ch);
+ addrh = gethex();
+ addrl = gethex();
+ ch = getch(); putch(ch);
+ ch = gethex();
+ *(uint8_t *)((addrh << 8) + addrl) = ch;
+ }
+
+ /* read from uart and echo back */
+ else if(ch == 'u') {
+ for(;;) {
+ putch(getch());
+ }
+ }
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+ /* external bus loop */
+ else if(ch == 'b') {
+ putch('b');
+ putch('u');
+ putch('s');
+ MCUCR = 0x80;
+ XMCRA = 0;
+ XMCRB = 0;
+ extaddr = 0x1100;
+ for(;;) {
+ ch = *(volatile uint8_t *)extaddr;
+ if(++extaddr == 0) {
+ extaddr = 0x1100;
+ }
+ }
+ }
+#endif
+
+ else if(ch == 'j') {
+ app_start();
+ }
+
+ } /* end of monitor functions */
+
+ }
+ }
+ }
+ /* end of monitor */
+#endif
+ else if (++error_count == MAX_ERROR_COUNT) {
+ app_start();
+ }
+ } /* end of forever loop */
+
+}
+
+
+char gethexnib(void) {
+ char a;
+ a = getch(); putch(a);
+ if(a >= 'a') {
+ return (a - 'a' + 0x0a);
+ } else if(a >= '0') {
+ return(a - '0');
+ }
+ return a;
+}
+
+
+char gethex(void) {
+ return (gethexnib() << 4) + gethexnib();
+}
+
+
+void puthex(char ch) {
+ char ah;
+
+ ah = ch >> 4;
+ if(ah >= 0x0a) {
+ ah = ah - 0x0a + 'a';
+ } else {
+ ah += '0';
+ }
+
+ ch &= 0x0f;
+ if(ch >= 0x0a) {
+ ch = ch - 0x0a + 'a';
+ } else {
+ ch += '0';
+ }
+
+ putch(ah);
+ putch(ch);
+}
+
+
+void putch(char ch)
+{
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+ if(bootuart == 1) {
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+ }
+ else if (bootuart == 2) {
+ while (!(UCSR1A & _BV(UDRE1)));
+ UDR1 = ch;
+ }
+#elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+#else
+ /* m8,16,32,169,8515,8535,163 */
+ while (!(UCSRA & _BV(UDRE)));
+ UDR = ch;
+#endif
+}
+
+
+char getch(void)
+{
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+ uint32_t count = 0;
+ if(bootuart == 1) {
+ while(!(UCSR0A & _BV(RXC0))) {
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ /* HACKME:: here is a good place to count times*/
+ count++;
+ if (count > MAX_TIME_COUNT)
+ app_start();
+ }
+
+ return UDR0;
+ }
+ else if(bootuart == 2) {
+ while(!(UCSR1A & _BV(RXC1))) {
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ /* HACKME:: here is a good place to count times*/
+ count++;
+ if (count > MAX_TIME_COUNT)
+ app_start();
+ }
+
+ return UDR1;
+ }
+ return 0;
+#elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+ uint32_t count = 0;
+ while(!(UCSR0A & _BV(RXC0))){
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ /* HACKME:: here is a good place to count times*/
+ count++;
+ if (count > MAX_TIME_COUNT)
+ app_start();
+ }
+ return UDR0;
+#else
+ /* m8,16,32,169,8515,8535,163 */
+ uint32_t count = 0;
+ while(!(UCSRA & _BV(RXC))){
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ /* HACKME:: here is a good place to count times*/
+ count++;
+ if (count > MAX_TIME_COUNT)
+ app_start();
+ }
+ return UDR;
+#endif
+}
+
+
+void getNch(uint8_t count)
+{
+ while(count--) {
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
+ if(bootuart == 1) {
+ while(!(UCSR0A & _BV(RXC0)));
+ UDR0;
+ }
+ else if(bootuart == 2) {
+ while(!(UCSR1A & _BV(RXC1)));
+ UDR1;
+ }
+#elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+ getch();
+#else
+ /* m8,16,32,169,8515,8535,163 */
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ //while(!(UCSRA & _BV(RXC)));
+ //UDR;
+ getch(); // need to handle time out
+#endif
+ }
+}
+
+
+void byte_response(uint8_t val)
+{
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(val);
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+}
+
+
+void nothing_response(void)
+{
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+}
+
+void flash_led(uint8_t count)
+{
+ while (count--) {
+ LED_PORT |= _BV(LED);
+ _delay_ms(100);
+ LED_PORT &= ~_BV(LED);
+ _delay_ms(100);
+ }
+}
+
+
+/* end of file ATmegaBOOT.c */
diff --git a/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
new file mode 100644
index 0000000..f16e877
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
@@ -0,0 +1,245 @@
+:020000021000EC
+:10F000000C9472F80C9492F80C9492F80C9492F878
+:10F010000C9492F80C9492F80C9492F80C9492F848
+:10F020000C9492F80C9492F80C9492F80C9492F838
+:10F030000C9492F80C9492F80C9492F80C9492F828
+:10F040000C9492F80C9492F80C9492F80C9492F818
+:10F050000C9492F80C9492F80C9492F80C9492F808
+:10F060000C9492F80C9492F80C9492F80C9492F8F8
+:10F070000C9492F80C9492F80C9492F80C9492F8E8
+:10F080000C9492F80C9492F80C9492F80C9492F8D8
+:10F090000C9492F80C9492F80C9492F80C9492F8C8
+:10F0A0000C9492F80C9492F80C9492F80C9492F8B8
+:10F0B0000C9492F80C9492F80C9492F80C9492F8A8
+:10F0C0000C9492F80C9492F80C9492F80C9492F898
+:10F0D0000C9492F80C9492F80C9492F80C9492F888
+:10F0E0000C9492F811241FBECFEFD1E2DEBFCDBF4A
+:10F0F00012E0A0E0B2E0EEEDFEEF01E00BBF02C0D7
+:10F1000007900D92A833B107D9F71BBE13E0A8E30F
+:10F11000B2E001C01D92A334B107E1F70E9412FAD8
+:10F120000C946DFF0C9400F8982F959595959595F6
+:10F130009595905D8F708A301CF1282F295A809107
+:10F140003802813019F0823071F008958091C0004A
+:10F1500085FFFCCF9093C6008091C00085FFFCCF57
+:10F160002093C60008958091C80085FFFCCF90933E
+:10F17000CE008091C80085FFFCCF2093CE0008957B
+:10F18000282F205DDCCF982F80913802813019F034
+:10F19000823041F008958091C00085FFFCCF9093AC
+:10F1A000C60008958091C80085FFFCCF9093CE00E3
+:10F1B0000895EF92FF920F931F9380913802813050
+:10F1C00069F1823031F080E01F910F91FF90EF9054
+:10F1D0000895EE24FF2487018091C80087FD17C0A1
+:10F1E0000894E11CF11C011D111D81E4E81682E464
+:10F1F000F8068FE0080780E0180770F3E0913A0204
+:10F20000F0913B0209958091C80087FFE9CF80917A
+:10F21000CE001F910F91FF90EF900895EE24FF24F0
+:10F2200087018091C00087FD17C00894E11CF11C84
+:10F23000011D111D81E4E81682E4F8068FE008073D
+:10F2400080E0180770F3E0913A02F0913B020995D3
+:10F250008091C00087FFE9CF8091C6001F910F9178
+:10F26000FF90EF9008950E94D9F8982F809138026E
+:10F27000813049F0823091F091366CF490330CF08B
+:10F280009053892F08958091C00085FFFCCF909303
+:10F29000C60091369CF39755892F08958091C80038
+:10F2A00085FFFCCF9093CE00E7CF1F930E9433F9E8
+:10F2B000182F0E9433F91295107F810F1F91089526
+:10F2C000982F20913802992339F0213031F02230E3
+:10F2D00061F091509923C9F708958091C00087FF8C
+:10F2E000FCCF8091C6009150F5CF8091C80087FF78
+:10F2F000FCCF8091CE009150EDCF1F93182F0E942C
+:10F30000D9F8803249F0809139028F5F80933902B9
+:10F31000853091F11F910895809138028130B9F0C4
+:10F320008230C1F78091C80085FFFCCF84E18093D3
+:10F33000CE008091C80085FFFCCF1093CE00809155
+:10F34000C80085FFFCCF80E18093CE00E3CF8091A1
+:10F35000C00085FFFCCF84E18093C6008091C0008F
+:10F3600085FFFCCF1093C6008091C00085FFFCCFC5
+:10F3700080E18093C600CECFE0913A02F0913B024B
+:10F3800009951F9108950E94D9F8803241F080912B
+:10F3900039028F5F80933902853029F10895809179
+:10F3A0003802813089F08230C9F78091C80085FF2A
+:10F3B000FCCF84E18093CE008091C80085FFFCCF14
+:10F3C00080E18093CE0008958091C00085FFFCCF3E
+:10F3D00084E18093C6008091C00085FFFCCF80E16E
+:10F3E0008093C6000895E0913A02F0913B0209959E
+:10F3F000089540E951E08823A1F02F9A28EE33E0E8
+:10F40000FA013197F1F721503040D1F72F9828EECB
+:10F4100033E0FA013197F1F721503040D1F78150B4
+:10F4200061F708952F923F924F925F926F927F9271
+:10F430008F929F92AF92BF92CF92DF92EF92FF9204
+:10F440000F931F93CF93DF93000081E080933802E6
+:10F4500080E18093C4001092C5001092C00086E045
+:10F460008093C20088E18093C1006898709A279ABF
+:10F4700081E00E94F9F9E4E1EE2E7EE1D72E67E902
+:10F48000C62E53E0B52E40E1A42E9924939431E486
+:10F49000832E26E5722E92E5692E80E2582E09E42D
+:10F4A000402E13E5312EB0E52B2E0E94D9F8803383
+:10F4B000C9F1813309F452C0803409F4C8C08134E1
+:10F4C00009F4EAC0823489F1853409F4CAC0803570
+:10F4D00049F1823539F1813529F1853509F4ECC0DE
+:10F4E000863509F409C1843609F428C1843709F442
+:10F4F000ABC1853709F473C2863709F4D9C08132AC
+:10F5000009F4B7C2809139028F5F80933902853048
+:10F5100061F6E0913A02F0913B0209950E94D9F818
+:10F52000803339F60E94C3F9C0CF2091380293E1AD
+:10F5300005C0223061F09923A9F391502130C9F719
+:10F540008091C00087FFFCCF8091C600F4CF8091EE
+:10F55000C80087FFFCCF8091CE00EDCF0E94D9F884
+:10F56000803281F6809138028130D1F1823009F009
+:10F570009CCF8091C80085FFFCCFE092CE008091A7
+:10F58000C80085FFFCCF8092CE008091C80085FF27
+:10F59000FCCF7092CE008091C80085FFFCCF6092B6
+:10F5A000CE008091C80085FFFCCF5092CE008091A4
+:10F5B000C80085FFFCCF4092CE008091C80085FF37
+:10F5C000FCCF3092CE008091C80085FFFCCF209206
+:10F5D000CE008091C80085FFFCCFA092CE0065CF01
+:10F5E0008091C00085FFFCCFE092C6008091C000F2
+:10F5F00085FFFCCF8092C6008091C00085FFFCCFC4
+:10F600007092C6008091C00085FFFCCF6092C6005A
+:10F610008091C00085FFFCCF5092C6008091C00051
+:10F6200085FFFCCF4092C6008091C00085FFFCCFD3
+:10F630003092C6008091C00085FFFCCF2092C600AA
+:10F640008091C00085FFFCCFA092C6002ECF0E9403
+:10F65000D9F8863808F466CF0E94D9F80E94C3F919
+:10F6600024CF2091380294E0213041F0223069F01B
+:10F67000992309F457CF91502130C1F78091C000F0
+:10F6800087FFFCCF8091C600F3CF8091C80087FF31
+:10F69000FCCF8091CE00ECCF0E94D9F8803841F1A8
+:10F6A000813809F447C0823809F4CAC08839E1F0CA
+:10F6B00080E00E947DF9F9CE0E94D9F880933C0247
+:10F6C0000E94D9F880933D020E94C3F9EECE0E94B9
+:10F6D000D9F80E94D9F8182F0E94D9F8112309F4FB
+:10F6E0007EC2113009F40AC283E00E947DF9DDCEAA
+:10F6F00082E00E947DF9D9CE0E94D9F8803339F397
+:10F700002091380292E0213039F0223061F09923C3
+:10F7100079F291502130C9F78091C00087FFFCCF6A
+:10F720008091C600F4CF8091C80087FFFCCF809104
+:10F73000CE00EDCF81E00E947DF9B7CE0E94D9F8CE
+:10F7400080933F030E94D9F880933E038091420347
+:10F750008E7F809342030E94D9F8853409F4B3C1A7
+:10F7600080913E0390913F03892B89F000E010E0E7
+:10F770000E94D9F8F801E25CFD4F80830F5F1F4FB4
+:10F7800080913E0390913F030817190788F30E9468
+:10F79000D9F8803209F0B6CE8091420380FFB2C121
+:10F7A00040913C0250913D02440F551F50933D0241
+:10F7B00040933C0260913E0370913F0361157105D7
+:10F7C000F1F080E090E09A01280F391FFC01E25C23
+:10F7D000FD4FE081F999FECF1FBA32BD21BDE0BDDA
+:10F7E0000FB6F894FA9AF99A0FBE01968617970702
+:10F7F00050F3460F571F50933D0240933C028091B7
+:10F800003802813081F0823009F04FCE8091C800FB
+:10F8100085FFFCCFE092CE008091C80085FFFCCF31
+:10F82000A092CE0042CE8091C00085FFFCCFE09236
+:10F83000C6008091C00085FFFCCFA092C60035CEE7
+:10F8400080E10E947DF931CE0E94D9F880933F0378
+:10F850000E94D9F880933E0320913C0230913D02F2
+:10F8600037FD46C1809142038D7F80934203220F72
+:10F87000331F30933D0220933C020E94D9F8853417
+:10F8800009F430C1809142038E7F809342030E942D
+:10F89000D9F8803209F009CE60913802613009F45C
+:10F8A0006FC0623009F473C000913E0310913F03B2
+:10F8B0000115110509F440C080914203782F717041
+:10F8C000F82EF69481E0F82240913C0250913D02DE
+:10F8D00020E030E013C0FF2009F060C0FA019491ED
+:10F8E000613009F43BC0623009F441C0CA0101969D
+:10F8F0002F5F3F4FAC0120173107D0F4772359F326
+:10F90000F999FECF52BD41BDF89A90B56130F9F03A
+:10F91000623061F78091C80085FFFCCF9093CE00E4
+:10F92000CA0101962F5F3F4FAC012017310730F31A
+:10F9300090933D0280933C02613009F4CAC062306A
+:10F9400009F0B3CD8091C80085FFFCCF46CE8091F1
+:10F95000C00085FFFCCF9093C600C8CF8091C00047
+:10F9600085FDF9CF8091C00085FFF8CFF4CF80915D
+:10F97000C80085FDD3CF8091C80085FFF8CFCECFDA
+:10F980008091C00085FFFCCFE092C6008DCF8091B2
+:10F99000C80085FFFCCFE092CE0086CFCA01A0E070
+:10F9A000B0E080509040AF4FBF4FABBFFC0197918C
+:10F9B000613061F0623009F099CF8091C80085FD17
+:10F9C000ADCF8091C80085FFF8CFA8CF8091C0004F
+:10F9D00085FDC1CF8091C00085FFF8CFBCCF0E94CC
+:10F9E000D9F8803209F08ECD80913802813011F142
+:10F9F000823009F05ACD8091C80085FFFCCFE0929B
+:10FA0000CE008091C80085FFFCCFD092CE008091BF
+:10FA1000C80085FFFCCFC092CE008091C80085FF52
+:10FA2000FCCFB092CE008091C80085FFFCCFA092A1
+:10FA3000CE003BCD8091C00085FFFCCFE092C60098
+:10FA40008091C00085FFFCCFD092C6008091C0009D
+:10FA500085FFFCCFC092C6008091C00085FFFCCF1F
+:10FA6000B092C6008091C00085FFFCCFA092C60076
+:10FA70001CCD0E94D9F8813209F017CD0E94D9F827
+:10FA8000813209F012CD279A2F98109240032091CD
+:10FA90003802E1E491E00EC0223009F4A4C0909352
+:10FAA0004003E92FF0E0E050FE4FE0819F5FEE233E
+:10FAB00009F4A0C0213081F78091C00085FFFCCF00
+:10FAC000E093C600ECCF80914203816080934203B3
+:10FAD00047CE8091C00085FDB7CD8091C00085FFE5
+:10FAE000F8CFB2CD80914203816080934203CFCEA4
+:10FAF00080914203826080934203B9CE87E90E94DD
+:10FB00007DF9D3CC80913D028823880F880B892111
+:10FB1000809341038BBF80913C0290913D02880FFE
+:10FB2000991F90933D0280933C0280913E0380FF99
+:10FB300009C080913E0390913F03019690933F034B
+:10FB400080933E03F894F999FECF1127E0913C028F
+:10FB5000F0913D02CEE3D2E080913E0390913F03CD
+:10FB6000103091F40091570001700130D9F303E097
+:10FB700000935700E8950091570001700130D9F3C8
+:10FB800001E100935700E895099019900091570002
+:10FB900001700130D9F301E000935700E895139507
+:10FBA000103898F011270091570001700130D9F3F7
+:10FBB00005E000935700E89500915700017001306F
+:10FBC000D9F301E100935700E8953296029709F0C6
+:10FBD000C7CF103011F00296E5CF112410CE8EE180
+:10FBE0000E947DF962CC8091C80085FFFCCFE09334
+:10FBF000CE0055CF7AE0B72E6DE0A62E5AE3952EB3
+:10FC000040E2842E3DE3732E90E3692E81E3582E6B
+:10FC1000213009F442C0223009F45FC00E94D9F8B3
+:10FC2000982F20913802213089F1223009F44EC0FA
+:10FC3000943709F46BC0923709F405C1973709F47A
+:10FC40007BC0953799F0923609F4BDC09A3601F71A
+:10FC5000E0913A02F0913B02099520913802D8CF09
+:10FC60008091C00085FFFCCF9093C6000E94D9F818
+:10FC7000982F80913802813099F38230B9F78091C2
+:10FC8000C80085FFFCCF9093CE00F0CF8091C000DC
+:10FC900085FFFCCF9093C600CBCF8091C00085FF3D
+:10FCA000FCCFB092C6008091C00085FFFCCFA0922F
+:10FCB000C6008091C00085FFFCCF9092C600809165
+:10FCC000C00085FFFCCF8092C600A8CF8091C800FD
+:10FCD00085FFFCCF9093CE00ABCF8091C80085FF0D
+:10FCE000FCCFB092CE008091C80085FFFCCFA092DF
+:10FCF000CE008091C80085FFFCCF9092CE0080910D
+:10FD0000C80085FFFCCF8092CE0088CF1F9947C0E6
+:10FD10002F9A213051F0223009F07ACF8091C8001B
+:10FD200085FFFCCF6092CE0073CF8091C00085FF2D
+:10FD3000FCCF6092C6006CCF0E94D9F8982F8091BA
+:10FD400038028130F1F0823009F4ABC00E9455F9DD
+:10FD5000082F0E9455F9182F0E94D9F8982F8091EA
+:10FD600038028130A9F0823009F4A2C00E9455F90E
+:10FD7000D02ECC24F601E10FF11D808320913802B2
+:10FD800047CF8091C00085FFFCCF9093C600DECFA7
+:10FD90008091C00085FFFCCF9093C600E7CF2F98DD
+:10FDA000213051F0223009F033CF8091C80085FF17
+:10FDB000FCCF5092CE002CCF8091C00085FFFCCFAD
+:10FDC0005092C60025CF213041F1223081F080E8E9
+:10FDD00085BF109274001092750080E091E1FC01E3
+:10FDE000819180E091E13097D1F3CF01F8CF8091FC
+:10FDF000C80085FFFCCF82E68093CE008091C800CA
+:10FE000085FFFCCF85E78093CE008091C80085FFF9
+:10FE1000FCCF83E78093CE00DACF8091C00085FFCE
+:10FE2000FCCF82E68093C6008091C00085FFFCCFA6
+:10FE300085E78093C6008091C00085FFFCCF83E7F3
+:10FE40008093C600C4CF0E94D9F8982F80913802C1
+:10FE50008130C9F08230D1F10E9455F9182F0E94EB
+:10FE600055F9982F809138028130A1F0823039F114
+:10FE7000F12EEE24F701E90FF11D80810E9494F824
+:10FE800020913802C5CE8091C00085FFFCCF9093B1
+:10FE9000C600E2CF8091C00085FFFCCF7092C60003
+:10FEA000E7CF8091C80085FFFCCF9093CE004ECF66
+:10FEB0008091C80085FFFCCF9093CE0057CF8091F2
+:10FEC000C80085FFFCCF7092CE00D2CF8091C800D1
+:0EFED00085FFFCCF9093CE00BFCFF894FFCFFC
+:10FEDE0041546D656761424F4F54202F204172642B
+:10FEEE0075696E6F204D656761202D20284329208E
+:10FEFE0041726475696E6F204C4C43202D20303951
+:08FF0E00303933300A0D008088
+:040000031000F000F9
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
new file mode 100644
index 0000000..43a8b30
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
@@ -0,0 +1,125 @@
+:107800000C94343C0C94513C0C94513C0C94513CE1
+:107810000C94513C0C94513C0C94513C0C94513CB4
+:107820000C94513C0C94513C0C94513C0C94513CA4
+:107830000C94513C0C94513C0C94513C0C94513C94
+:107840000C94513C0C94513C0C94513C0C94513C84
+:107850000C94513C0C94513C0C94513C0C94513C74
+:107860000C94513C0C94513C11241FBECFEFD8E036
+:10787000DEBFCDBF11E0A0E0B1E0ECE9FFE702C060
+:1078800005900D92A230B107D9F712E0A2E0B1E065
+:1078900001C01D92AD30B107E1F70E942D3D0C945F
+:1078A000CC3F0C94003C982F959595959595959582
+:1078B000905D8F708A307CF0282F295A8091C0000B
+:1078C00085FFFCCF9093C6008091C00085FFFCCF60
+:1078D0002093C6000895282F205DF0CF982F809127
+:1078E000C00085FFFCCF9093C6000895EF92FF92F1
+:1078F0000F931F93EE24FF2487018091C00087FD22
+:1079000017C00894E11CF11C011D111D81E4E8164B
+:1079100082E4F8068FE0080780E0180770F3E09132
+:107920000401F091050109958091C00087FFE9CF1E
+:107930008091C6001F910F91FF90EF9008950E94D3
+:10794000763C982F8091C00085FFFCCF9093C600B5
+:1079500091362CF490330CF09053892F089597555D
+:10796000892F08951F930E949F3C182F0E949F3CCF
+:107970001295107F810F1F9108951F93182F882350
+:1079800021F00E94763C1150E1F71F9108951F935A
+:10799000182F0E94763C803249F0809103018F5F5E
+:1079A000809303018530C1F01F9108958091C0003C
+:1079B00085FFFCCF84E18093C6008091C00085FFE5
+:1079C000FCCF1093C6008091C00085FFFCCF80E102
+:1079D0008093C6001F910895E0910401F091050184
+:1079E00009951F9108950E94763C803241F0809164
+:1079F00003018F5F80930301853081F008958091AA
+:107A0000C00085FFFCCF84E18093C6008091C00058
+:107A100085FFFCCF80E18093C6000895E0910401CA
+:107A2000F09105010995089540E951E08823A1F0FE
+:107A30002D9A28EE33E0FA013197F1F721503040CA
+:107A4000D1F72D9828EE33E0FA013197F1F7215064
+:107A50003040D1F7815061F708953F924F925F9285
+:107A60006F927F928F929F92AF92BF92CF92DF924E
+:107A7000EF92FF920F931F93CF93DF93000080E16B
+:107A80008093C4001092C50088E18093C10086E015
+:107A90008093C2005098589A259A81E00E94143D24
+:107AA00024E1F22E9EE1E92E85E9D82E0FE0C02ECA
+:107AB00010E1B12EAA24A394B1E49B2EA6E58A2E50
+:107AC000F2E57F2EE0E26E2E79E4572E63E5462E36
+:107AD00050E5352E0E94763C8033B1F18133B9F107
+:107AE000803409F46FC0813409F476C0823409F41B
+:107AF00085C0853409F488C0803531F1823521F1A3
+:107B0000813511F1853509F485C0863509F48DC0BC
+:107B1000843609F496C0843709F403C1853709F423
+:107B200072C1863709F466C0809103018F5F80932C
+:107B30000301853079F6E0910401F0910501099582
+:107B40000E94763C803351F60E94F33CC3CF0E94E2
+:107B5000763C803249F78091C00085FFFCCFF092DF
+:107B6000C6008091C00085FFFCCF9092C600809136
+:107B7000C00085FFFCCF8092C6008091C00085FFC9
+:107B8000FCCF7092C6008091C00085FFFCCF609250
+:107B9000C6008091C00085FFFCCF5092C600809146
+:107BA000C00085FFFCCF4092C6008091C00085FFD9
+:107BB000FCCF3092C6008091C00085FFFCCFB09210
+:107BC000C60088CF0E94763C863808F4BDCF0E945C
+:107BD000763C0E94F33C7ECF0E94763C803809F4CC
+:107BE0009CC0813809F40BC1823809F43CC1883942
+:107BF00009F48FC080E00E94C73C6CCF84E10E94F2
+:107C0000BD3C0E94F33C66CF85E00E94BD3C0E94D3
+:107C1000F33C60CF0E94763C809306010E94763C44
+:107C2000809307010E94F33C55CF0E94763C80333D
+:107C300009F41DC183E00E94BD3C80E00E94C73C66
+:107C400049CF0E94763C809309020E94763C809343
+:107C5000080280910C028E7F80930C020E94763C79
+:107C6000853409F415C18091080290910902892B8D
+:107C700089F000E010E00E94763CF801E85FFE4FDA
+:107C800080830F5F1F4F80910802909109020817AF
+:107C9000190788F30E94763C803209F045CF809125
+:107CA0000C0280FF01C16091060170910701660F0F
+:107CB000771F7093070160930601A0910802B091AD
+:107CC00009021097C9F0E8E0F1E09B01AD014E0F09
+:107CD0005F1FF999FECF32BD21BD819180BDFA9A17
+:107CE000F99A2F5F3F4FE417F50799F76A0F7B1F4B
+:107CF00070930701609306018091C00085FFFCCF5F
+:107D0000F092C6008091C00085FFFCCFB092C60003
+:107D1000E1CE83E00E94C73CDDCE82E00E94C73CFA
+:107D2000D9CE0E94763C809309020E94763C8093D3
+:107D300008028091060190910701880F991F909386
+:107D40000701809306010E94763C853409F4A6C0A1
+:107D500080910C028E7F80930C020E94763C8032D0
+:107D600009F0B8CE8091C00085FFFCCFF092C6002C
+:107D7000609108027091090261157105B9F140E046
+:107D800050E080910C02A82FA170B82FB27011C0E2
+:107D9000BB2309F45CC0E0910601F0910701319624
+:107DA000F0930701E09306014F5F5F4F46175707B7
+:107DB000E8F4AA2369F3F999FECF209106013091E6
+:107DC000070132BD21BDF89A90B58091C00085FFB2
+:107DD000FCCF9093C6002F5F3F4F30930701209355
+:107DE00006014F5F5F4F4617570718F38091C00099
+:107DF00085FDE5CE8091C00085FFF8CFE0CE81E023
+:107E00000E94C73C67CE0E94763C803209F08CCE3F
+:107E10008091C00085FFFCCFF092C6008091C00029
+:107E200085FFFCCFE092C6008091C00085FFFCCFAB
+:107E3000D092C6008091C00085FFFCCFC092C600E2
+:107E40008091C00085FFFCCFB092C60043CEE09188
+:107E50000601F091070194918091C00085FFFCCF4D
+:107E60009093C6009CCF80E10E94C73C33CE0E9415
+:107E7000763C0E94763C182F0E94763C112309F430
+:107E800083C0113009F484C08FE00E94C73C22CE29
+:107E900080910C02816080930C02E5CE80910C02EF
+:107EA000816080930C0259CF809107018823880F4D
+:107EB000880B8A2180930B02809106019091070123
+:107EC000880F991F90930701809306018091080203
+:107ED00080FF09C080910802909109020196909359
+:107EE000090280930802F894F999FECF1127E091D6
+:107EF0000601F0910701C8E0D1E08091080290915D
+:107F00000902103091F40091570001700130D9F34B
+:107F100003E000935700E89500915700017001308D
+:107F2000D9F301E100935700E89509901990009169
+:107F3000570001700130D9F301E000935700E89534
+:107F40001395103498F011270091570001700130FB
+:107F5000D9F305E000935700E895009157000170B0
+:107F60000130D9F301E100935700E895329602976A
+:107F700009F0C7CF103011F00296E5CF112480919F
+:107F8000C00085FFB9CEBCCE8EE10E94C73CA2CD19
+:0C7F900085E90E94C73C9ECDF894FFCF0D
+:027F9C00800063
+:040000030000780081
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
new file mode 100644
index 0000000..9753e2e
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
@@ -0,0 +1,124 @@
+:107800000C94343C0C94513C0C94513C0C94513CE1
+:107810000C94513C0C94513C0C94513C0C94513CB4
+:107820000C94513C0C94513C0C94513C0C94513CA4
+:107830000C94513C0C94513C0C94513C0C94513C94
+:107840000C94513C0C94513C0C94513C0C94513C84
+:107850000C94513C0C94513C0C94513C0C94513C74
+:107860000C94513C0C94513C11241FBECFEFD8E036
+:10787000DEBFCDBF11E0A0E0B1E0EAE8FFE702C063
+:1078800005900D92A230B107D9F712E0A2E0B1E065
+:1078900001C01D92AD30B107E1F70E942D3D0C945F
+:1078A000C33F0C94003C982F95959595959595958B
+:1078B000905D8F708A307CF0282F295A8091C0000B
+:1078C00085FFFCCF9093C6008091C00085FFFCCF60
+:1078D0002093C6000895282F205DF0CF982F809127
+:1078E000C00085FFFCCF9093C6000895EF92FF92F1
+:1078F0000F931F93EE24FF2487018091C00087FD22
+:1079000017C00894E11CF11C011D111D81E2E8164D
+:1079100081EAF80687E0080780E0180770F3E09135
+:107920000401F091050109958091C00087FFE9CF1E
+:107930008091C6001F910F91FF90EF9008950E94D3
+:10794000763C982F8091C00085FFFCCF9093C600B5
+:1079500091362CF490330CF09053892F089597555D
+:10796000892F08951F930E949F3C182F0E949F3CCF
+:107970001295107F810F1F9108951F93182F882350
+:1079800021F00E94763C1150E1F71F9108951F935A
+:10799000182F0E94763C803249F0809103018F5F5E
+:1079A000809303018530C1F01F9108958091C0003C
+:1079B00085FFFCCF84E18093C6008091C00085FFE5
+:1079C000FCCF1093C6008091C00085FFFCCF80E102
+:1079D0008093C6001F910895E0910401F091050184
+:1079E00009951F9108950E94763C803241F0809164
+:1079F00003018F5F80930301853081F008958091AA
+:107A0000C00085FFFCCF84E18093C6008091C00058
+:107A100085FFFCCF80E18093C6000895E0910401CA
+:107A2000F09105010995089548EC50E08823A1F0F4
+:107A30002D9A28EE33E0FA013197F1F721503040CA
+:107A4000D1F72D9828EE33E0FA013197F1F7215064
+:107A50003040D1F7815061F708953F924F925F9285
+:107A60006F927F928F929F92AF92BF92CF92DF924E
+:107A7000EF92FF920F931F93CF93DF93000082E06A
+:107A80008093C00080E18093C4001092C50088E11B
+:107A90008093C10086E08093C2005098589A259A3E
+:107AA00081E00E94143D24E1F22E9EE1E92E85E959
+:107AB000D82E0FE0C02E10E1B12EAA24A394B1E479
+:107AC0009B2EA6E58A2EF2E57F2EE0E26E2E79E46B
+:107AD000572E63E5462E50E5352E0E94763C8033C6
+:107AE000B1F18133B9F1803409F46FC0813409F404
+:107AF00076C0823409F485C0853409F488C08035A5
+:107B000031F1823521F1813511F1853509F485C0D6
+:107B1000863509F48DC0843609F496C0843709F49B
+:107B200003C1853709F472C1863709F466C08091B4
+:107B300003018F5F80930301853079F6E0910401A2
+:107B4000F091050109950E94763C803351F60E9420
+:107B5000F33CC3CF0E94763C803249F78091C0004D
+:107B600085FFFCCFF092C6008091C00085FFFCCF5E
+:107B70009092C6008091C00085FFFCCF8092C60025
+:107B80008091C00085FFFCCF7092C6008091C0003C
+:107B900085FFFCCF6092C6008091C00085FFFCCFBE
+:107BA0005092C6008091C00085FFFCCF4092C60075
+:107BB0008091C00085FFFCCF3092C6008091C0004C
+:107BC00085FFFCCFB092C60088CF0E94763C8638F5
+:107BD00008F4BDCF0E94763C0E94F33C7ECF0E9409
+:107BE000763C803809F49CC0813809F40BC1823896
+:107BF00009F430C1883909F48FC080E00E94C73C85
+:107C00006CCF84E10E94BD3C0E94F33C66CF85E0CE
+:107C10000E94BD3C0E94F33C60CF0E94763C809362
+:107C200006010E94763C809307010E94F33C55CFE9
+:107C30000E94763C803309F411C183E00E94BD3C70
+:107C400080E00E94C73C49CF0E94763C80930902A5
+:107C50000E94763C8093080280910C028E7F809374
+:107C60000C020E94763C853409F409C18091080217
+:107C700090910902892B89F000E010E00E94763C87
+:107C8000F801E85FFE4F80830F5F1F4F809108026D
+:107C9000909109020817190788F30E94763C8032F8
+:107CA00009F045CF80910C0280FFF5C0609106017C
+:107CB00070910701660F771F7093070160930601AB
+:107CC000A0910802B09109021097C9F0E8E0F1E034
+:107CD0009B01AD014E0F5F1FF999FECF32BD21BD53
+:107CE000819180BDFA9AF99A2F5F3F4FE417F5070B
+:107CF00099F76A0F7B1F70930701609306018091CB
+:107D0000C00085FFFCCFF092C6008091C00085FFC7
+:107D1000FCCFB092C600E1CE83E00E94C73CDDCE2E
+:107D200082E00E94C73CD9CE0E94763C8093090233
+:107D30000E94763C80930802809106019091070191
+:107D4000880F991F90930701809306010E94763C4B
+:107D5000853409F49AC080910C028E7F80930C02C6
+:107D60000E94763C803209F0B8CE8091C00085FF39
+:107D7000FCCFF092C600A0910802B09109021097C2
+:107D8000C1F180910C02082F0170182F1695117007
+:107D9000E0910601F0910701AF014F5F5F4FBA011B
+:107DA00020E030E00023B1F4112339F49491809164
+:107DB000C00085FFFCCF9093C6002F5F3F4FCB01E3
+:107DC0000196FA012A173B0780F4BC014F5F5F4F11
+:107DD000002351F3F999FECFF2BDE1BDF89A90B5B9
+:107DE0008091C00085FFFCCFE6CF709307016093C0
+:107DF00006018091C00085FDE5CE8091C00085FF21
+:107E0000F8CFE0CE81E00E94C73C67CE0E94763C6E
+:107E1000803209F08CCE8091C00085FFFCCFF092BB
+:107E2000C6008091C00085FFFCCFE092C600809123
+:107E3000C00085FFFCCFD092C6008091C00085FFB6
+:107E4000FCCFC092C6008091C00085FFFCCFB092ED
+:107E5000C60043CE80E10E94C73C3FCE0E94763CE4
+:107E60000E94763C182F0E94763C112309F483C0AF
+:107E7000113009F484C08FE00E94C73C2ECE80915F
+:107E80000C02816080930C02F1CE80910C02816023
+:107E900080930C0265CF809107018823880F880B9F
+:107EA0008A2180930B028091060190910701880F2F
+:107EB000991F90930701809306018091080280FF2B
+:107EC00009C08091080290910902019690930902DD
+:107ED00080930802F894F999FECF1127E0910601EA
+:107EE000F0910701C8E0D1E0809108029091090269
+:107EF000103091F40091570001700130D9F303E084
+:107F000000935700E8950091570001700130D9F3B4
+:107F100001E100935700E8950990199000915700EE
+:107F200001700130D9F301E000935700E8951395F3
+:107F3000103498F011270091570001700130D9F3E7
+:107F400005E000935700E89500915700017001305B
+:107F5000D9F301E100935700E8953296029709F0B2
+:107F6000C7CF103011F00296E5CF11248091C000E8
+:107F700085FFC5CEC8CE8EE10E94C73CAECD85E957
+:0A7F80000E94C73CAACDF894FFCF81
+:027F8A00800075
+:040000030000780081
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
new file mode 100644
index 0000000..feac9d2
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
@@ -0,0 +1,126 @@
+:103800000C94341C0C94511C0C94511C0C94511CA1
+:103810000C94511C0C94511C0C94511C0C94511C74
+:103820000C94511C0C94511C0C94511C0C94511C64
+:103830000C94511C0C94511C0C94511C0C94511C54
+:103840000C94511C0C94511C0C94511C0C94511C44
+:103850000C94511C0C94511C0C94511C0C94511C34
+:103860000C94511C0C94511C11241FBECFEFD4E0BA
+:10387000DEBFCDBF11E0A0E0B1E0E4EAFFE302C0AB
+:1038800005900D92A230B107D9F712E0A2E0B1E0A5
+:1038900001C01D92AD30B107E1F70E94361D0C94B6
+:1038A000D01F0C94001C982F9595959595959595FE
+:1038B000905D8F708A307CF0282F295A8091C0004B
+:1038C00085FFFCCF9093C6008091C00085FFFCCFA0
+:1038D0002093C6000895282F205DF0CF982F809167
+:1038E000C00085FFFCCF9093C6000895EF92FF9231
+:1038F0000F931F93EE24FF2487018091C00087FD62
+:1039000017C00894E11CF11C011D111D81E4E8168B
+:1039100082E4F8068FE0080780E0180770F3E09172
+:103920000401F091050109958091C00087FFE9CF5E
+:103930008091C6001F910F91FF90EF9008950E9413
+:10394000761C982F8091C00085FFFCCF9093C60015
+:1039500091362CF490330CF09053892F089597559D
+:10396000892F08951F930E949F1C182F0E949F1C4F
+:103970001295107F810F1F910895882351F0982F81
+:1039800091508091C00087FFFCCF8091C6009923A1
+:10399000B9F708951F93182F0E94761C803249F0C2
+:1039A000809103018F5F809303018530C1F01F91E7
+:1039B00008958091C00085FFFCCF84E18093C6000C
+:1039C0008091C00085FFFCCF1093C6008091C0009D
+:1039D00085FFFCCF80E18093C6001F910895E091A0
+:1039E0000401F091050109951F9108950E94761C2C
+:1039F000803241F0809103018F5F80930301853015
+:103A000081F008958091C00085FFFCCF84E1809310
+:103A1000C6008091C00085FFFCCF80E18093C60086
+:103A20000895E0910401F09105010995089510921F
+:103A30000A028823D1F090E040E951E02D9A28EE67
+:103A400033E0FA013197F1F721503040D1F72D984A
+:103A500028EE33E0FA013197F1F721503040D1F7E9
+:103A60009F5F981758F380930A0208953F924F92F0
+:103A70005F926F927F928F929F92AF92BF92CF92FE
+:103A8000DF92EF92FF920F931F93CF93DF9300008B
+:103A900083E38093C4001092C50088E18093C10045
+:103AA00086E08093C2005098589A259A81E00E943F
+:103AB000171D44E1F42E3EE1E32E24E9D22E96E0D8
+:103AC000C92E80E1B82EAA24A39401E4902E16E515
+:103AD000812EB2E57B2EA0E26A2EF9E45F2EE3E5AB
+:103AE0004E2E70E5372E0E94761C8033B1F1813363
+:103AF00009F441C0803409F479C0813409F48CC0E0
+:103B0000823471F1853409F47BC0803531F182351E
+:103B100021F1813511F1853509F48DC0863509F41F
+:103B20009DC0843609F4AEC0843709F41BC18537C3
+:103B300009F485C1863709F47AC0809103018F5F4B
+:103B400080930301853079F6E0910401F09105013D
+:103B500009950E94761C803351F60E94F61CC3CF53
+:103B600093E18091C00087FFFCCF8091C60099232C
+:103B7000A1F39150F6CF0E94761C8032F1F680912D
+:103B8000C00085FFFCCFF092C6008091C00085FF89
+:103B9000FCCF9092C6008091C00085FFFCCF809240
+:103BA000C6008091C00085FFFCCF7092C600809156
+:103BB000C00085FFFCCF6092C6008091C00085FFE9
+:103BC000FCCF5092C6008091C00085FFFCCF409290
+:103BD000C6008091C00085FFFCCF3092C600809166
+:103BE000C00085FFFCCFB092C6007DCF0E94761C3E
+:103BF000863808F4B2CF0E94761C0E94F61C73CF60
+:103C000094E08091C00087FFFCCF8091C60099238B
+:103C100009F4A3CF9150F5CF0E94761C8038D1F0E3
+:103C2000813861F1823809F499C0883979F080E0EF
+:103C30000E94CA1C58CF0E94761C809306010E94E5
+:103C4000761C809307010E94F61C4DCF83E00E94F2
+:103C5000CA1C49CF82E00E94CA1C45CF0E94761C34
+:103C6000803309F486C192E08091C00087FFFCCFC9
+:103C70008091C6009923D9F29150F6CF81E00E943D
+:103C8000CA1C31CF0E94761C809309020E94761CC8
+:103C90008093080280910C028E7F80930C020E9418
+:103CA000761C853429F480910C02816080930C028B
+:103CB0008091080290910902892B89F000E010E0C0
+:103CC0000E94761CF801E85FFE4F80830F5F1F4F54
+:103CD00080910802909109020817190788F30E9441
+:103CE000761C803209F029CF80910C0280FFD1C070
+:103CF0004091060150910701440F551F5093070151
+:103D000040930601A0910802B09109021097C9F0F2
+:103D1000E8E0F1E09A01BD016E0F7F1FF999FECF37
+:103D200032BD21BD819180BDFA9AF99A2F5F3F4F34
+:103D3000E617F70799F74A0F5B1F50930701409367
+:103D400006018091C00085FFFCCFF092C6008091F3
+:103D5000C00085FFFCCFB092C600C5CE80E10E94B6
+:103D6000CA1CC1CE0E94761C809309020E94761C58
+:103D7000809308028091060190910701880F991F96
+:103D800090930701809306010E94761C853409F404
+:103D90007AC080910C028E7F80930C020E94761C68
+:103DA000803209F0A0CE8091C00085FFFCCFF09258
+:103DB000C600A0910802B09109021097B9F1809154
+:103DC0000C02182F1170082F0270E0910601F0917B
+:103DD00007019F012F5F3F4FB90140E050E01123E1
+:103DE000B1F4002339F494918091C00085FFFCCF99
+:103DF0009093C6004F5F5F4FCB010196F9014A17C0
+:103E00005B0780F4BC012F5F3F4F112351F3F999F9
+:103E1000FECFF2BDE1BDF89A90B58091C00085FF5C
+:103E2000FCCFE6CF70930701609306018091C0003C
+:103E300085FDD9CE8091C00085FFF8CFD4CE0E94F9
+:103E4000761C803209F079CE8091C00085FFFCCFCE
+:103E5000F092C6008091C00085FFFCCFE092C600C2
+:103E60008091C00085FFFCCFD092C6008091C00039
+:103E700085FFFCCFC092C6008091C00085FFFCCFBB
+:103E8000B092C60030CE80910C02816080930C020B
+:103E900085CF809107018823880F880B8A21809322
+:103EA0000B028091060190910701880F991F909352
+:103EB0000701809306018091080280FF09C080916C
+:103EC00008029091090201969093090280930802DA
+:103ED000F894F999FECF1127E0910601F0910701BE
+:103EE000C8E0D1E08091080290910902103091F46D
+:103EF0000091570001700130D9F303E0009357009F
+:103F0000E8950091570001700130D9F301E1009369
+:103F10005700E89509901990009157000170013001
+:103F2000D9F301E000935700E8951395103498F009
+:103F300011270091570001700130D9F305E000937B
+:103F40005700E8950091570001700130D9F301E165
+:103F500000935700E8953296029709F0C7CF1030CA
+:103F600011F00296E5CF11248091C00085FFE9CEC3
+:103F7000ECCE0E94761C0E94761C182F0E94761CA4
+:103F8000112351F0113021F086E00E94CA1CABCD04
+:103F900084E90E94CA1CA7CD8EE10E94CA1CA3CD51
+:043FA000F894FFCFC3
+:023FA40080009B
+:0400000300003800C1
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_ng.hex b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_ng.hex
new file mode 100644
index 0000000..387091e
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_ng.hex
@@ -0,0 +1,110 @@
+:103800000C94341C0C94511C0C94511C0C94511CA1
+:103810000C94511C0C94511C0C94511C0C94511C74
+:103820000C94511C0C94511C0C94511C0C94511C64
+:103830000C94511C0C94511C0C94511C0C94511C54
+:103840000C94511C0C94511C0C94511C0C94511C44
+:103850000C94511C0C94511C0C94511C0C94511C34
+:103860000C94511C0C94511C11241FBECFEFD4E0BA
+:10387000DEBFCDBF11E0A0E0B1E0E4EAFEE302C0AC
+:1038800005900D92A230B107D9F712E0A2E0B1E0A5
+:1038900001C01D92AD30B107E1F70E94ED1C0C9400
+:1038A000511F0C94001C482F10920A0280E08417CC
+:1038B000E0F4582F2D9A28EE33E080E991E001974B
+:1038C000F1F721503040C9F72D9828EE33E080E918
+:1038D00091E00197F1F721503040C9F7852F8F5FB4
+:1038E000582F841738F380930A020895EF92FF92BD
+:1038F0000F931F93EE24FF2487018091C00087FD62
+:1039000017C00894E11CF11C011D111D81E0E8168F
+:1039100082E1F8068AE7080780E0180770F3E09173
+:103920000201F091030109958091C00087FFE9CF62
+:103930008091C600992787FD90951F910F91FF9068
+:10394000EF900895982F8091C00085FFFCCF909351
+:10395000C60008950E94761C803271F080910401A7
+:103960008F5F80930401853009F00895E091020192
+:10397000F09103010995089584E10E94A21C80E161
+:103980000E94A21C0895CF93C82F0E94761C8032FB
+:1039900041F0809104018F5F80930401853081F4B0
+:1039A0000AC084E10E94A21C8C2F0E94A21C80E10C
+:1039B0000E94A21C05C0E0910201F091030109954B
+:1039C000CF910895CF93C82FC150CF3F21F00E94CF
+:1039D000761CC150E0F7CF910895CFEFD4E0DEBF61
+:1039E000CDBF000083E38093C4001092C50088E13E
+:1039F0008093C10086E08093C2005098589A259A1F
+:103A000083E00E94531C0E94761C8033B1F1813305
+:103A1000B9F1803409F455C0813409F45BC08234B3
+:103A200009F46DC0853409F470C0803531F18235F8
+:103A300021F1813511F1853509F46BC0863509F422
+:103A400073C0843609F47AC0843709F4CEC0853750
+:103A500009F429C1863709F44AC0809104018F5FB7
+:103A600080930401853079F6E0910201F091030121
+:103A700009950E94761C803351F60E94AA1CC3CF80
+:103A80000E94761CC82F803241F784E10E94A21C5C
+:103A900081E40E94A21C86E50E94A21C82E50E948D
+:103AA000A21C8C2F0E94A21C89E40E94A21C83E508
+:103AB0000E94A21C80E50E94A21C80E10E94A21C20
+:103AC000A2CF0E94761C8638C0F20E94761C0E940B
+:103AD000AA1C99CF0E94761C803809F486C18138CF
+:103AE00009F487C1823809F488C1883921F080E05F
+:103AF0000E94C31C88CF83E00E94C31C84CF84E152
+:103B00000E94E21C0E94AA1C7ECF85E00E94E21C5B
+:103B1000F9CF0E94761C809306010E94761C809348
+:103B200007010E94AA1C6FCF0E94761C803309F403
+:103B3000CAC083E00E94E21C80E0DACF0E94761CBB
+:103B4000809309020E94761C8093080280910C02E7
+:103B50008E7F80930C020E94761C853409F4C4C0C9
+:103B600000E010E0809108029091090218161906F1
+:103B700070F4C8E0D1E00E94761C89930F5F1F4F5C
+:103B8000809108029091090208171907A0F30E947A
+:103B9000761C803209F061CF80910C0280FFAEC0AC
+:103BA000E0910601F0910701EE0FFF1F00E010E029
+:103BB00020910802309109021216130680F4A8E041
+:103BC000B1E0F999FECFF2BDE1BD8D9180BDFA9AC9
+:103BD000F99A31960F5F1F4F0217130790F3F09376
+:103BE0000701E093060184E166CF0E94761C809372
+:103BF00009020E94761C8093080280910601909130
+:103C00000701880F991F90930701809306010E9476
+:103C1000761C853409F46EC080910C028E7F8093EF
+:103C20000C020E94761C803209F0EDCE84E10E94E5
+:103C3000A21C00E010E02091080230910902121647
+:103C4000130608F03ACFE0910601F0910701809148
+:103C50000C0280FF1FC0F999FECFF2BDE1BDF89ABA
+:103C600080B50E94A21CE0910601F09107013196F7
+:103C7000F0930701E09306012091080230910902B8
+:103C80000F5F1F4F0217130708F017CF80910C0228
+:103C900080FDE1CF869580FFB4C03196F093070197
+:103CA000E0930601EDCF0E94761C803209F0D5CE5C
+:103CB00084E10E94A21C8EE10E94A21C84E90E9461
+:103CC000A21C86E0F8CE0E94761C0E94761CC82FAB
+:103CD0000E94761CCC2309F47CC0C13009F47DC05D
+:103CE00086E00E94C31C8FCE80910C02816080937D
+:103CF0000C0236CF80910C02816091CF8091070138
+:103D000087FD6FC010920B02809106019091070110
+:103D1000880F991F909307018093060180910802F4
+:103D200080FF09C08091080290910902019690934A
+:103D3000090280930802F894F999FECF1127E091C7
+:103D40000601F0910701C8E0D1E08091080290914E
+:103D50000902103091F40091570001700130D9F33D
+:103D600003E000935700E89500915700017001307F
+:103D7000D9F301E100935700E8950990199000915B
+:103D8000570001700130D9F301E000935700E89526
+:103D90001395103498F011270091570001700130ED
+:103DA000D9F305E000935700E895009157000170A2
+:103DB0000130D9F301E100935700E895329602975C
+:103DC00009F0C7CF103011F00296E5CF112484E13D
+:103DD00072CE8EE10E94C31C16CE84E90E94C31CE1
+:103DE00012CE81E080930B028FCF82E00E94C31C31
+:103DF0000ACE81E00E94C31C06CE80E10E94C31C53
+:103E000002CE84910E94A21C2091080230910902E6
+:103E1000E0910601F091070140CFCF930E94761CFC
+:103E2000C82F0E94A21CC13614F0C75503C0C0336E
+:103E30000CF0C0538C2F992787FD9095CF91089552
+:103E40000F931F930E940D1F082F112707FD109538
+:103E500002951295107F1027007F10270E940D1FDA
+:103E6000800F992787FD90951F910F910895CF930B
+:103E7000C82F85958595859585958A3034F0895A22
+:103E8000CF70CA3034F0C95A05C0805DCF70CA30D7
+:103E9000D4F7C05D0E94A21C8C2F0E94A21CCF915F
+:043EA0000895FFCFB3
+:023EA40080009C
+:0400000300003800C1
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
new file mode 100644
index 0000000..994e478
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
@@ -0,0 +1,126 @@
+:103800000C94341C0C94511C0C94511C0C94511CA1
+:103810000C94511C0C94511C0C94511C0C94511C74
+:103820000C94511C0C94511C0C94511C0C94511C64
+:103830000C94511C0C94511C0C94511C0C94511C54
+:103840000C94511C0C94511C0C94511C0C94511C44
+:103850000C94511C0C94511C0C94511C0C94511C34
+:103860000C94511C0C94511C11241FBECFEFD4E0BA
+:10387000DEBFCDBF11E0A0E0B1E0EEEAFFE302C0A1
+:1038800005900D92A230B107D9F712E0A2E0B1E0A5
+:1038900001C01D92AD30B107E1F70E94331D0C94B9
+:1038A000D51F0C94001C982F9595959595959595F9
+:1038B000905D8F708A307CF0282F295A8091C0004B
+:1038C00085FFFCCF9093C6008091C00085FFFCCFA0
+:1038D0002093C6000895282F205DF0CF982F809167
+:1038E000C00085FFFCCF9093C6000895EF92FF9231
+:1038F0000F931F93EE24FF2487018091C00087FD62
+:1039000017C00894E11CF11C011D111D81E2E8168D
+:1039100081EAF80687E0080780E0180770F3E09175
+:103920000401F091050109958091C00087FFE9CF5E
+:103930008091C6001F910F91FF90EF9008950E9413
+:10394000761C982F8091C00085FFFCCF9093C60015
+:1039500091362CF490330CF09053892F089597559D
+:10396000892F08951F930E949F1C182F0E949F1C4F
+:103970001295107F810F1F9108951F93182F882390
+:1039800021F00E94761C1150E1F71F9108951F93BA
+:10399000182F0E94761C803249F0809103018F5FBE
+:1039A000809303018530C1F01F9108958091C0007C
+:1039B00085FFFCCF84E18093C6008091C00085FF25
+:1039C000FCCF1093C6008091C00085FFFCCF80E142
+:1039D0008093C6001F910895E0910401F0910501C4
+:1039E00009951F9108950E94761C803241F08091C4
+:1039F00003018F5F80930301853081F008958091EA
+:103A0000C00085FFFCCF84E18093C6008091C00098
+:103A100085FFFCCF80E18093C6000895E09104010A
+:103A2000F09105010995089510920A028823D1F0BA
+:103A300090E048EC50E02D9A28EE33E0FA013197FF
+:103A4000F1F721503040D1F72D9828EE33E0FA01FC
+:103A50003197F1F721503040D1F79F5F981758F315
+:103A600080930A0208953F924F925F926F927F92E5
+:103A70008F929F92AF92BF92CF92DF92EF92FF927E
+:103A80000F931F93CF93DF9394B714BE8091600080
+:103A90008861809360001092600091FF0CC289E100
+:103AA0008093C4001092C50088E18093C10086E035
+:103AB0008093C2005098589A259A81E00E94141D64
+:103AC00044E1F42E3EE1E32E24E9D22E96E0C92E05
+:103AD00080E1B82EAA24A39401E4902E16E5812E4D
+:103AE000B2E57B2EA0E26A2EF9E45F2EE3E54E2ECE
+:103AF00070E5372E0E94761C8033B9F18133C1F115
+:103B0000803409F470C0813409F477C0823409F438
+:103B100086C0853409F489C0803539F1823529F1B0
+:103B2000813509F4AFC1853509F485C0863509F4BE
+:103B30008DC0843609F435C1843709F4C1C0853796
+:103B400009F490C0863709F466C0809103018F5F45
+:103B500080930301853071F6E0910401F091050135
+:103B600009950E94761C803349F60E94F31CC2CF4F
+:103B70000E94761C803249F78091C00085FFFCCFFF
+:103B8000F092C6008091C00085FFFCCF9092C600E5
+:103B90008091C00085FFFCCF8092C6008091C0005C
+:103BA00085FFFCCF7092C6008091C00085FFFCCFDE
+:103BB0006092C6008091C00085FFFCCF5092C60085
+:103BC0008091C00085FFFCCF4092C6008091C0006C
+:103BD00085FFFCCF3092C6008091C00085FFFCCFEE
+:103BE000B092C60087CF0E94761C863808F4BDCFFD
+:103BF0000E94761C0E94F31C7DCF0E94761C8038A8
+:103C000009F45AC0813809F453C0823809F440C11C
+:103C1000883909F449C080E00E94C71C6BCF84E159
+:103C20000E94BD1C0E94F31C65CF85E00E94BD1C54
+:103C30000E94F31C5FCF0E94761C809306010E94B5
+:103C4000761C809307010E94F31C54CF0E94761CBF
+:103C5000803309F421C183E00E94BD1C80E00E94F2
+:103C6000C71C48CF0E94761C803209F06ECF80912D
+:103C7000C00085FFFCCFF092C6008091C00085FF98
+:103C8000FCCFE092C6008091C00085FFFCCFD092AF
+:103C9000C6008091C00085FFFCCFC092C600809115
+:103CA000C00085FFFCCF9CCF83E00E94C71C22CFC1
+:103CB00081E00E94C71C1ECF82E00E94C71C1ACF61
+:103CC0000E94761C809309020E94761C8093080251
+:103CD0008091060190910701880F991F9093070129
+:103CE000809306010E94761C853409F4C5C080913A
+:103CF0000C028E7F80930C020E94761C803209F0A9
+:103D0000F9CE8091C00085FFFCCFF092C600609193
+:103D10000802709109026115710591F140E050E0CF
+:103D200080910C02A82FA170B82FB27010C0BB23D5
+:103D300061F1E0910601F09107013196F0930701DE
+:103D4000E09306014F5F5F4F46175707C8F4AA2359
+:103D500071F3F999FECF209106013091070132BD30
+:103D600021BDF89A90B58091C00085FFFCCF90935B
+:103D7000C6002F5F3F4F3093070120930601E2CF2B
+:103D80008091C00085FFFCCF2BCFE0910601F09120
+:103D9000070194918091C00085FFFCCF9093C600ED
+:103DA000CCCF0E94761C809309020E94761C8093DF
+:103DB000080280910C028E7F80930C020E94761C78
+:103DC000853429F480910C02816080930C028091EB
+:103DD000080290910902892B89F000E010E00E940E
+:103DE000761CF801E85FFE4F80830F5F1F4F8091C4
+:103DF0000802909109020817190788F30E94761C9F
+:103E0000803209F0A2CE80910C0280FF62C0409106
+:103E1000060150910701440F551F5093070140932D
+:103E20000601609108027091090261157105C9F0DF
+:103E3000E8E0F1E09A01DB01AE0FBF1FF999FECF78
+:103E400032BD21BD819180BDFA9AF99A2F5F3F4F13
+:103E5000EA17FB0799F7460F571F50930701409346
+:103E600006018091C00085FFFCCFF092C6008091D2
+:103E7000C00085FFFCCFB4CE80910C02816080939E
+:103E80000C023ACF0E94F31C88E080936000FFCFC1
+:103E900080E10E94C71C2ECE0E94761C0E94761CD8
+:103EA000182F0E94761C112381F0113051F086E00A
+:103EB0000E94C71C1FCEE0910401F09105010995F5
+:103EC000EECD84E90E94C71C15CE8EE10E94C71C6E
+:103ED00011CE809107018823880F880B8A21809357
+:103EE0000B028091060190910701880F991F909312
+:103EF0000701809306018091080280FF09C080912C
+:103F00000802909109020196909309028093080299
+:103F1000F894F999FECF1127E0910601F09107017D
+:103F2000C8E0D1E08091080290910902103091F42C
+:103F30000091570001700130D9F303E0009357005E
+:103F4000E8950091570001700130D9F301E1009329
+:103F50005700E895099019900091570001700130C1
+:103F6000D9F301E000935700E8951395103498F0C9
+:103F700011270091570001700130D9F305E000933B
+:103F80005700E8950091570001700130D9F301E125
+:103F900000935700E8953296029709F0C7CF10308A
+:0E3FA00011F00296E5CF11245CCFF894FFCF0C
+:023FAE00800091
+:0400000300003800C1
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/atmega/Makefile b/test/ardmake/hardware/bootloaders/atmega/Makefile
new file mode 100644
index 0000000..0fd54db
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega/Makefile
@@ -0,0 +1,224 @@
+# Makefile for ATmegaBOOT
+# E.Lins, 18.7.2005
+# $Id$
+#
+# Instructions
+#
+# To make bootloader .hex file:
+# make diecimila
+# make lilypad
+# make ng
+# etc...
+#
+# To burn bootloader .hex file:
+# make diecimila_isp
+# make lilypad_isp
+# make ng_isp
+# etc...
+
+# program name should not be changed...
+PROGRAM = ATmegaBOOT_168
+
+# enter the parameters for the avrdude isp tool
+ISPTOOL = stk500v2
+ISPPORT = usb
+ISPSPEED = -b 115200
+
+MCU_TARGET = atmega168
+LDSECTION = --section-start=.text=0x3800
+
+# the efuse should really be 0xf8; since, however, only the lower
+# three bits of that byte are used on the atmega168, avrdude gets
+# confused if you specify 1's for the higher bits, see:
+# http://tinker.it/now/2007/02/24/the-tale-of-avrdude-atmega168-and-extended-bits-fuses/
+#
+# similarly, the lock bits should be 0xff instead of 0x3f (to
+# unlock the bootloader section) and 0xcf instead of 0x0f (to
+# lock it), but since the high two bits of the lock byte are
+# unused, avrdude would get confused.
+
+ISPFUSES = avrdude -c $(ISPTOOL) -p $(MCU_TARGET) -P $(ISPPORT) $(ISPSPEED) \
+-e -u -U lock:w:0x3f:m -U efuse:w:0x$(EFUSE):m -U hfuse:w:0x$(HFUSE):m -U lfuse:w:0x$(LFUSE):m
+ISPFLASH = avrdude -c $(ISPTOOL) -p $(MCU_TARGET) -P $(ISPPORT) $(ISPSPEED) \
+-U flash:w:$(PROGRAM)_$(TARGET).hex -U lock:w:0x0f:m
+
+STK500 = "C:\Program Files\Atmel\AVR Tools\STK500\Stk500.exe"
+STK500-1 = $(STK500) -e -d$(MCU_TARGET) -pf -vf -if$(PROGRAM)_$(TARGET).hex \
+-lFF -LFF -f$(HFUSE)$(LFUSE) -EF8 -ms -q -cUSB -I200kHz -s -wt
+STK500-2 = $(STK500) -d$(MCU_TARGET) -ms -q -lCF -LCF -cUSB -I200kHz -s -wt
+
+
+OBJ = $(PROGRAM).o
+OPTIMIZE = -O2
+
+DEFS =
+LIBS =
+
+CC = avr-gcc
+
+# Override is only needed by avr-lib build system.
+
+override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -DF_CPU=$(AVR_FREQ) $(DEFS)
+override LDFLAGS = -Wl,$(LDSECTION)
+#override LDFLAGS = -Wl,-Map,$(PROGRAM).map,$(LDSECTION)
+
+OBJCOPY = avr-objcopy
+OBJDUMP = avr-objdump
+
+all:
+
+lilypad: TARGET = lilypad
+lilypad: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>1' '-DNUM_LED_FLASHES=3'
+lilypad: AVR_FREQ = 8000000L
+lilypad: $(PROGRAM)_lilypad.hex
+
+lilypad_isp: lilypad
+lilypad_isp: TARGET = lilypad
+lilypad_isp: HFUSE = DD
+lilypad_isp: LFUSE = E2
+lilypad_isp: EFUSE = 00
+lilypad_isp: isp
+
+lilypad_resonator: TARGET = lilypad_resonator
+lilypad_resonator: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=3'
+lilypad_resonator: AVR_FREQ = 8000000L
+lilypad_resonator: $(PROGRAM)_lilypad_resonator.hex
+
+lilypad_resonator_isp: lilypad_resonator
+lilypad_resonator_isp: TARGET = lilypad_resonator
+lilypad_resonator_isp: HFUSE = DD
+lilypad_resonator_isp: LFUSE = C6
+lilypad_resonator_isp: EFUSE = 00
+lilypad_resonator_isp: isp
+
+pro8: TARGET = pro_8MHz
+pro8: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' '-DWATCHDOG_MODS'
+pro8: AVR_FREQ = 8000000L
+pro8: $(PROGRAM)_pro_8MHz.hex
+
+pro8_isp: pro8
+pro8_isp: TARGET = pro_8MHz
+pro8_isp: HFUSE = DD
+pro8_isp: LFUSE = C6
+pro8_isp: EFUSE = 00
+pro8_isp: isp
+
+pro16: TARGET = pro_16MHz
+pro16: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' '-DWATCHDOG_MODS'
+pro16: AVR_FREQ = 16000000L
+pro16: $(PROGRAM)_pro_16MHz.hex
+
+pro16_isp: pro16
+pro16_isp: TARGET = pro_16MHz
+pro16_isp: HFUSE = DD
+pro16_isp: LFUSE = C6
+pro16_isp: EFUSE = 00
+pro16_isp: isp
+
+pro20: TARGET = pro_20mhz
+pro20: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' '-DWATCHDOG_MODS'
+pro20: AVR_FREQ = 20000000L
+pro20: $(PROGRAM)_pro_20mhz.hex
+
+pro20_isp: pro20
+pro20_isp: TARGET = pro_20mhz
+pro20_isp: HFUSE = DD
+pro20_isp: LFUSE = C6
+pro20_isp: EFUSE = 00
+pro20_isp: isp
+
+diecimila: TARGET = diecimila
+diecimila: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1'
+diecimila: AVR_FREQ = 16000000L
+diecimila: $(PROGRAM)_diecimila.hex
+
+diecimila_isp: diecimila
+diecimila_isp: TARGET = diecimila
+diecimila_isp: HFUSE = DD
+diecimila_isp: LFUSE = FF
+diecimila_isp: EFUSE = 00
+diecimila_isp: isp
+
+ng: TARGET = ng
+ng: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>1' '-DNUM_LED_FLASHES=3'
+ng: AVR_FREQ = 16000000L
+ng: $(PROGRAM)_ng.hex
+
+ng_isp: ng
+ng_isp: TARGET = ng
+ng_isp: HFUSE = DD
+ng_isp: LFUSE = FF
+ng_isp: EFUSE = 00
+ng_isp: isp
+
+atmega328: TARGET = atmega328
+atmega328: MCU_TARGET = atmega328p
+atmega328: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' -DBAUD_RATE=57600
+atmega328: AVR_FREQ = 16000000L
+atmega328: LDSECTION = --section-start=.text=0x7800
+atmega328: $(PROGRAM)_atmega328.hex
+
+atmega328_isp: atmega328
+atmega328_isp: TARGET = atmega328
+atmega328_isp: MCU_TARGET = atmega328p
+atmega328_isp: HFUSE = DA
+atmega328_isp: LFUSE = FF
+atmega328_isp: EFUSE = 05
+atmega328_isp: isp
+
+atmega328_pro8: TARGET = atmega328_pro_8MHz
+atmega328_pro8: MCU_TARGET = atmega328p
+atmega328_pro8: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' -DBAUD_RATE=57600 -DDOUBLE_SPEED
+atmega328_pro8: AVR_FREQ = 8000000L
+atmega328_pro8: LDSECTION = --section-start=.text=0x7800
+atmega328_pro8: $(PROGRAM)_atmega328_pro_8MHz.hex
+
+atmega328_pro8_isp: atmega328_pro8
+atmega328_pro8_isp: TARGET = atmega328_pro_8MHz
+atmega328_pro8_isp: MCU_TARGET = atmega328p
+atmega328_pro8_isp: HFUSE = DA
+atmega328_pro8_isp: LFUSE = FF
+atmega328_pro8_isp: EFUSE = 05
+atmega328_pro8_isp: isp
+
+mega: TARGET = atmega1280
+mega: MCU_TARGET = atmega1280
+mega: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=0' -DBAUD_RATE=57600
+mega: AVR_FREQ = 16000000L
+mega: LDSECTION = --section-start=.text=0x1F000
+mega: $(PROGRAM)_atmega1280.hex
+
+mega_isp: mega
+mega_isp: TARGET = atmega1280
+mega_isp: MCU_TARGET = atmega1280
+mega_isp: HFUSE = DA
+mega_isp: LFUSE = FF
+mega_isp: EFUSE = F5
+mega_isp: isp
+
+isp: $(TARGET)
+ $(ISPFUSES)
+ $(ISPFLASH)
+
+isp-stk500: $(PROGRAM)_$(TARGET).hex
+ $(STK500-1)
+ $(STK500-2)
+
+%.elf: $(OBJ)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+clean:
+ rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex
+
+%.lst: %.elf
+ $(OBJDUMP) -h -S $< > $@
+
+%.hex: %.elf
+ $(OBJCOPY) -j .text -j .data -O ihex $< $@
+
+%.srec: %.elf
+ $(OBJCOPY) -j .text -j .data -O srec $< $@
+
+%.bin: %.elf
+ $(OBJCOPY) -j .text -j .data -O binary $< $@
+
diff --git a/test/ardmake/hardware/bootloaders/atmega8/ATmegaBOOT.c b/test/ardmake/hardware/bootloaders/atmega8/ATmegaBOOT.c
new file mode 100644
index 0000000..17977e6
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega8/ATmegaBOOT.c
@@ -0,0 +1,507 @@
+/**********************************************************/
+/* Serial Bootloader for Atmel mega8 AVR Controller */
+/* */
+/* ATmegaBOOT.c */
+/* */
+/* Copyright (c) 2003, Jason P. Kyle */
+/* */
+/* Hacked by DojoCorp - ZGZ - MMX - IVR */
+/* Hacked by David A. Mellis */
+/* */
+/* 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 2 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, write */
+/* to the Free Software Foundation, Inc., */
+/* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+/* */
+/* Licence can be viewed at */
+/* http://www.fsf.org/licenses/gpl.txt */
+/* */
+/* Target = Atmel AVR m8 */
+/**********************************************************/
+
+#include <inttypes.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
+#include <avr/interrupt.h>
+#include <avr/delay.h>
+
+//#define F_CPU 16000000
+
+/* We, Malmoitians, like slow interaction
+ * therefore the slow baud rate ;-)
+ */
+//#define BAUD_RATE 9600
+
+/* 6.000.000 is more or less 8 seconds at the
+ * speed configured here
+ */
+//#define MAX_TIME_COUNT 6000000
+#define MAX_TIME_COUNT (F_CPU>>1)
+///#define MAX_TIME_COUNT_MORATORY 1600000
+
+/* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
+#define HW_VER 0x02
+#define SW_MAJOR 0x01
+#define SW_MINOR 0x12
+
+// AVR-GCC compiler compatibility
+// avr-gcc compiler v3.1.x and older doesn't support outb() and inb()
+// if necessary, convert outb and inb to outp and inp
+#ifndef outb
+ #define outb(sfr,val) (_SFR_BYTE(sfr) = (val))
+#endif
+#ifndef inb
+ #define inb(sfr) _SFR_BYTE(sfr)
+#endif
+
+/* defines for future compatibility */
+#ifndef cbi
+ #define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+#endif
+#ifndef sbi
+ #define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+#endif
+
+/* Adjust to suit whatever pin your hardware uses to enter the bootloader */
+#define eeprom_rb(addr) eeprom_read_byte ((uint8_t *)(addr))
+#define eeprom_rw(addr) eeprom_read_word ((uint16_t *)(addr))
+#define eeprom_wb(addr, val) eeprom_write_byte ((uint8_t *)(addr), (uint8_t)(val))
+
+/* Onboard LED is connected to pin PB5 */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+#define LED PINB5
+
+
+#define SIG1 0x1E // Yep, Atmel is the only manufacturer of AVR micros. Single source :(
+#define SIG2 0x93
+#define SIG3 0x07
+#define PAGE_SIZE 0x20U //32 words
+
+
+void putch(char);
+char getch(void);
+void getNch(uint8_t);
+void byte_response(uint8_t);
+void nothing_response(void);
+
+union address_union {
+ uint16_t word;
+ uint8_t byte[2];
+} address;
+
+union length_union {
+ uint16_t word;
+ uint8_t byte[2];
+} length;
+
+struct flags_struct {
+ unsigned eeprom : 1;
+ unsigned rampz : 1;
+} flags;
+
+uint8_t buff[256];
+//uint8_t address_high;
+
+uint8_t pagesz=0x80;
+
+uint8_t i;
+//uint8_t bootuart0=0,bootuart1=0;
+
+
+void (*app_start)(void) = 0x0000;
+
+int main(void)
+{
+ uint8_t ch,ch2;
+ uint16_t w;
+
+ //cbi(BL_DDR,BL);
+ //sbi(BL_PORT,BL);
+
+ asm volatile("nop\n\t");
+
+ /* check if flash is programmed already, if not start bootloader anyway */
+ //if(pgm_read_byte_near(0x0000) != 0xFF) {
+
+ /* check if bootloader pin is set low */
+ //if(bit_is_set(BL_PIN,BL)) app_start();
+ //}
+
+ /* initialize UART(s) depending on CPU defined */
+ /* m8 */
+ UBRRH = (((F_CPU/BAUD_RATE)/16)-1)>>8; // set baud rate
+ UBRRL = (((F_CPU/BAUD_RATE)/16)-1);
+ UCSRB = (1<<RXEN)|(1<<TXEN); // enable Rx & Tx
+ UCSRC = (1<<URSEL)|(1<<UCSZ1)|(1<<UCSZ0); // config USART; 8N1
+
+ //UBRRL = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ //UBRRH = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ //UCSRA = 0x00;
+ //UCSRC = 0x86;
+ //UCSRB = _BV(TXEN)|_BV(RXEN);
+
+
+ /* this was giving uisp problems, so I removed it; without it, the boot
+ works on with uisp and avrdude on the mac (at least). */
+ //putch('\0');
+
+ //uint32_t l;
+ //uint32_t time_count;
+ //time_count=0;
+
+ /* set LED pin as output */
+ sbi(LED_DDR,LED);
+ for (i = 0; i < 16; i++) {
+ outb(LED_PORT, inb(LED_PORT) ^ _BV(LED));
+ _delay_loop_2(0);
+ }
+
+ //for (l=0; l<40000000; l++)
+ //outb(LED_PORT, inb(LED_PORT) ^= _BV(LED));
+
+ /* flash onboard LED three times to signal entering of bootloader */
+ //for(i=0; i<3; ++i) {
+ //for(l=0; l<40000000; ++l);
+ //sbi(LED_PORT,LED);
+ //for(l=0; l<40000000; ++l);
+ //cbi(LED_PORT,LED);
+ //}
+
+ /* see comment at previous call to putch() */
+ //putch('\0'); // this line is needed for the synchronization of the programmer
+
+ /* forever */
+ for (;;) {
+ //if((inb(UCSRA) & _BV(RXC))){
+ /* get character from UART */
+ ch = getch();
+
+ /* A bunch of if...else if... gives smaller code than switch...case ! */
+
+ /* Hello is anyone home ? */
+ if(ch=='0') {
+ nothing_response();
+ }
+
+ /* Request programmer ID */
+ /* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
+ /* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
+ else if(ch=='1') {
+ if (getch() == ' ') {
+ putch(0x14);
+ putch('A');
+ putch('V');
+ putch('R');
+ putch(' ');
+ putch('I');
+ putch('S');
+ putch('P');
+ putch(0x10);
+ }
+ }
+
+ /* AVR ISP/STK500 board commands DON'T CARE so default nothing_response */
+ else if(ch=='@') {
+ ch2 = getch();
+ if (ch2>0x85) getch();
+ nothing_response();
+ }
+
+ /* AVR ISP/STK500 board requests */
+ else if(ch=='A') {
+ ch2 = getch();
+ if(ch2==0x80) byte_response(HW_VER); // Hardware version
+ else if(ch2==0x81) byte_response(SW_MAJOR); // Software major version
+ else if(ch2==0x82) byte_response(SW_MINOR); // Software minor version
+ //else if(ch2==0x98) byte_response(0x03); // Unknown but seems to be required by avr studio 3.56
+ else byte_response(0x00); // Covers various unnecessary responses we don't care about
+ }
+
+ /* Device Parameters DON'T CARE, DEVICE IS FIXED */
+ else if(ch=='B') {
+ getNch(20);
+ nothing_response();
+ }
+
+ /* Parallel programming stuff DON'T CARE */
+ else if(ch=='E') {
+ getNch(5);
+ nothing_response();
+ }
+
+ /* Enter programming mode */
+ else if(ch=='P') {
+ nothing_response();
+ // FIXME: modified only here by DojoCorp, Mumbai, India, 20050626
+ //time_count=0; // exted the delay once entered prog.mode
+ }
+
+ /* Leave programming mode */
+ else if(ch=='Q') {
+ nothing_response();
+ //time_count=MAX_TIME_COUNT_MORATORY; // once the programming is done,
+ // we should start the application
+ // but uisp has problems with this,
+ // therefore we just change the times
+ // and give the programmer 1 sec to react
+ }
+
+ /* Erase device, don't care as we will erase one page at a time anyway. */
+ else if(ch=='R') {
+ nothing_response();
+ }
+
+ /* Set address, little endian. EEPROM in bytes, FLASH in words */
+ /* Perhaps extra address bytes may be added in future to support > 128kB FLASH. */
+ /* This might explain why little endian was used here, big endian used everywhere else. */
+ else if(ch=='U') {
+ address.byte[0] = getch();
+ address.byte[1] = getch();
+ nothing_response();
+ }
+
+ /* Universal SPI programming command, disabled. Would be used for fuses and lock bits. */
+ else if(ch=='V') {
+ getNch(4);
+ byte_response(0x00);
+ }
+
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch=='d') {
+ length.byte[1] = getch();
+ length.byte[0] = getch();
+ flags.eeprom = 0;
+ if (getch() == 'E') flags.eeprom = 1;
+ for (w=0;w<length.word;w++) {
+ buff[w] = getch(); // Store data in buffer, can't keep up with serial data stream whilst programming pages
+ }
+ if (getch() == ' ') {
+ if (flags.eeprom) { //Write to EEPROM one byte at a time
+ for(w=0;w<length.word;w++) {
+ eeprom_wb(address.word,buff[w]);
+ address.word++;
+ }
+ } else { //Write to FLASH one page at a time
+ //if (address.byte[1]>127) address_high = 0x01; //Only possible with m128, m256 will need 3rd address byte. FIXME
+ //else address_high = 0x00;
+
+ //address.word = address.word << 1; //address * 2 -> byte location
+ //if ((length.byte[0] & 0x01)) length.word++; //Even up an odd number of bytes
+ cli(); //Disable interrupts, just to be sure
+ while(bit_is_set(EECR,EEWE)); //Wait for previous EEPROM writes to complete
+ asm volatile(
+ "clr r17 \n\t" //page_word_count
+ "lds r30,address \n\t" //Address of FLASH location (in words)
+ "lds r31,address+1 \n\t"
+ "lsl r30 \n\t" //address * 2 -> byte location
+ "rol r31 \n\t"
+ "ldi r28,lo8(buff) \n\t" //Start of buffer array in RAM
+ "ldi r29,hi8(buff) \n\t"
+ "lds r24,length \n\t" //Length of data to be written (in bytes)
+ "lds r25,length+1 \n\t"
+ "sbrs r24,0 \n\t" //Even up an odd number of bytes
+ "rjmp length_loop \n\t"
+ "adiw r24,1 \n\t"
+ "length_loop: \n\t" //Main loop, repeat for number of words in block
+ "cpi r17,0x00 \n\t" //If page_word_count=0 then erase page
+ "brne no_page_erase \n\t"
+ "rcall wait_spm \n\t"
+// "wait_spm1: \n\t"
+// "lds r16,%0 \n\t" //Wait for previous spm to complete
+// "andi r16,1 \n\t"
+// "cpi r16,1 \n\t"
+// "breq wait_spm1 \n\t"
+ "ldi r16,0x03 \n\t" //Erase page pointed to by Z
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+ "rcall wait_spm \n\t"
+// "wait_spm2: \n\t"
+// "lds r16,%0 \n\t" //Wait for previous spm to complete
+// "andi r16,1 \n\t"
+// "cpi r16,1 \n\t"
+// "breq wait_spm2 \n\t"
+ "ldi r16,0x11 \n\t" //Re-enable RWW section
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+ "no_page_erase: \n\t"
+ "ld r0,Y+ \n\t" //Write 2 bytes into page buffer
+ "ld r1,Y+ \n\t"
+
+ "rcall wait_spm \n\t"
+// "wait_spm3: \n\t"
+// "lds r16,%0 \n\t" //Wait for previous spm to complete
+// "andi r16,1 \n\t"
+// "cpi r16,1 \n\t"
+// "breq wait_spm3 \n\t"
+ "ldi r16,0x01 \n\t" //Load r0,r1 into FLASH page buffer
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+
+ "inc r17 \n\t" //page_word_count++
+ "cpi r17,%1 \n\t"
+ "brlo same_page \n\t" //Still same page in FLASH
+ "write_page: \n\t"
+ "clr r17 \n\t" //New page, write current one first
+ "rcall wait_spm \n\t"
+// "wait_spm4: \n\t"
+// "lds r16,%0 \n\t" //Wait for previous spm to complete
+// "andi r16,1 \n\t"
+// "cpi r16,1 \n\t"
+// "breq wait_spm4 \n\t"
+ "ldi r16,0x05 \n\t" //Write page pointed to by Z
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+ "rcall wait_spm \n\t"
+// "wait_spm5: \n\t"
+// "lds r16,%0 \n\t" //Wait for previous spm to complete
+// "andi r16,1 \n\t"
+// "cpi r16,1 \n\t"
+// "breq wait_spm5 \n\t"
+ "ldi r16,0x11 \n\t" //Re-enable RWW section
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+ "same_page: \n\t"
+ "adiw r30,2 \n\t" //Next word in FLASH
+ "sbiw r24,2 \n\t" //length-2
+ "breq final_write \n\t" //Finished
+ "rjmp length_loop \n\t"
+
+ "wait_spm: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm \n\t"
+ "ret \n\t"
+
+ "final_write: \n\t"
+ "cpi r17,0 \n\t"
+ "breq block_done \n\t"
+ "adiw r24,2 \n\t" //length+2, fool above check on length after short page write
+ "rjmp write_page \n\t"
+ "block_done: \n\t"
+ "clr __zero_reg__ \n\t" //restore zero register
+ : "=m" (SPMCR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31");
+
+ /* Should really add a wait for RWW section to be enabled, don't actually need it since we never */
+ /* exit the bootloader without a power cycle anyhow */
+ }
+ putch(0x14);
+ putch(0x10);
+ }
+ }
+
+ /* Read memory block mode, length is big endian. */
+ else if(ch=='t') {
+ length.byte[1] = getch();
+ length.byte[0] = getch();
+ if (getch() == 'E') flags.eeprom = 1;
+ else {
+ flags.eeprom = 0;
+ address.word = address.word << 1; // address * 2 -> byte location
+ }
+ if (getch() == ' ') { // Command terminator
+ putch(0x14);
+ for (w=0;w < length.word;w++) { // Can handle odd and even lengths okay
+ if (flags.eeprom) { // Byte access EEPROM read
+ putch(eeprom_rb(address.word));
+ address.word++;
+ } else {
+ if (!flags.rampz) putch(pgm_read_byte_near(address.word));
+ address.word++;
+ }
+ }
+ putch(0x10);
+ }
+ }
+
+ /* Get device signature bytes */
+ else if(ch=='u') {
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(SIG1);
+ putch(SIG2);
+ putch(SIG3);
+ putch(0x10);
+ }
+ }
+
+ /* Read oscillator calibration byte */
+ else if(ch=='v') {
+ byte_response(0x00);
+ }
+// } else {
+// time_count++;
+// if (time_count>=MAX_TIME_COUNT) {
+// app_start();
+// }
+// }
+ } /* end of forever loop */
+}
+
+void putch(char ch)
+{
+ /* m8 */
+ while (!(inb(UCSRA) & _BV(UDRE)));
+ outb(UDR,ch);
+}
+
+char getch(void)
+{
+ /* m8 */
+ uint32_t count = 0;
+ while(!(inb(UCSRA) & _BV(RXC))) {
+ /* HACKME:: here is a good place to count times*/
+ count++;
+ if (count > MAX_TIME_COUNT)
+ app_start();
+ }
+ return (inb(UDR));
+}
+
+void getNch(uint8_t count)
+{
+ uint8_t i;
+ for(i=0;i<count;i++) {
+ /* m8 */
+ //while(!(inb(UCSRA) & _BV(RXC)));
+ //inb(UDR);
+ getch(); // need to handle time out
+ }
+}
+
+void byte_response(uint8_t val)
+{
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(val);
+ putch(0x10);
+ }
+}
+
+void nothing_response(void)
+{
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(0x10);
+ }
+}
+
+/* end of file ATmegaBOOT.c */
+
+
+
diff --git a/test/ardmake/hardware/bootloaders/atmega8/ATmegaBOOT.hex b/test/ardmake/hardware/bootloaders/atmega8/ATmegaBOOT.hex
new file mode 100644
index 0000000..6190d48
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega8/ATmegaBOOT.hex
@@ -0,0 +1,66 @@
+:101C000012C02BC02AC029C028C027C026C025C0AA
+:101C100024C023C022C021C020C01FC01EC01DC0C0
+:101C20001CC01BC01AC011241FBECFE5D4E0DEBF0C
+:101C3000CDBF10E0A0E6B0E0E8EEFFE102C0059005
+:101C40000D92A236B107D9F711E0A2E6B0E001C0CB
+:101C50001D92AA36B107E1F74FC0D2CFEF92FF92A3
+:101C60000F931F93EE24FF24870113C00894E11CF7
+:101C7000F11C011D111D81E0E81682E1F8068AE7DA
+:101C8000080780E0180728F0E0916200F0916300F7
+:101C900009955F9BEBCF8CB1992787FD90951F919C
+:101CA0000F91FF90EF9008955D9BFECF8CB9089542
+:101CB000D5DF803221F484E1F7DF80E1F5DF08959C
+:101CC0001F93182FCBDF803231F484E1EDDF812FB9
+:101CD000EBDF80E1E9DF1F9108951F93CF93DF933E
+:101CE000182FC0E0D0E002C0B9DF2196C117E0F3A1
+:101CF000DF91CF911F910895CFE5D4E0DEBFCDBF36
+:101D0000000010BC83E389B988E18AB986E880BD08
+:101D1000BD9A1092680130E2E0E0F0E02FE088B375
+:101D2000832788BBCF010197F1F7215027FFF7CF19
+:101D300020E12093680192DF803381F1813399F4AF
+:101D40008DDF8032C1F784E1AFDF81E4ADDF86E56E
+:101D5000ABDF82E5A9DF80E2A7DF89E4A5DF83E5C9
+:101D6000A3DF80E5C7C0803429F478DF8638B0F07F
+:101D700075DF14C0813471F471DF803811F482E0B2
+:101D80001DC1813811F481E019C1823809F015C1F3
+:101D900082E114C1823421F484E19FDF89DFCBCF5B
+:101DA000853411F485E0F9CF8035C1F38135B1F385
+:101DB0008235A1F3853539F451DF809364004EDF1D
+:101DC00080936500EBCF863519F484E086DFF5C09B
+:101DD000843609F093C042DF809367013FDF809330
+:101DE0006601809169018E7F8093690137DF8534B8
+:101DF00029F480916901816080936901C0E0D0E09D
+:101E000006E610E005C02ADFF80181938F012196D4
+:101E10008091660190916701C817D907A0F31EDF72
+:101E2000803209F088CF8091690180FF1FC020E0D7
+:101E300030E0E6E6F0E012C0A0916400B0916500E9
+:101E40008191082EC5D08091640090916500019623
+:101E500090936500809364002F5F3F4F80916601EF
+:101E6000909167012817390738F343C0F894E19936
+:101E7000FECF1127E0916400F0916500EE0FFF1F87
+:101E8000C6E6D0E0809166019091670180FF01C0B5
+:101E90000196103051F422D003E000935700E895EA
+:101EA0001DD001E100935700E8950990199016D0D4
+:101EB00001E000935700E8951395103258F0112770
+:101EC0000DD005E000935700E89508D001E100939C
+:101ED0005700E8953296029739F0DBCF0091570012
+:101EE00001700130D9F30895103011F00296E7CF58
+:101EF000112484E1D9DE80E1D7DE1DCF843709F0DB
+:101F00004BC0ACDE80936701A9DE80936601A6DE3C
+:101F100090916901853421F49160909369010DC01D
+:101F20009E7F909369018091640090916500880F75
+:101F3000991F909365008093640090DE803209F0D1
+:101F4000FACE84E1B1DEC0E0D0E01EC0809169012C
+:101F500080FF07C0A0916400B091650031D0802D52
+:101F600008C081FD07C0E0916400F0916500E49134
+:101F70008E2F9ADE80916400909165000196909377
+:101F800065008093640021968091660190916701BD
+:101F9000C817D907D8F2AFCF853761F45FDE80323A
+:101FA00009F0C9CE84E180DE8EE17EDE83E97CDE4D
+:101FB00087E0A0CF863709F0BECE80E081DEBBCEC1
+:101FC000E199FECFBFBBAEBBE09A11960DB208956A
+:101FD000E199FECFBFBBAEBB0DBA11960FB6F89418
+:081FE000E29AE19A0FBE089598
+:021FE800800077
+:0400000300001C00DD
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/atmega8/Makefile b/test/ardmake/hardware/bootloaders/atmega8/Makefile
new file mode 100644
index 0000000..8c0edd3
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/atmega8/Makefile
@@ -0,0 +1,88 @@
+# Makefile for ATmegaBOOT
+# E.Lins, 2004-10-14
+
+# program name should not be changed...
+PROGRAM = ATmegaBOOT
+
+PRODUCT=atmega8
+
+# enter the parameters for the UISP isp tool
+ISPPARAMS = -dprog=stk500 -dserial=$(SERIAL) -dspeed=115200
+
+
+#DIRAVR = /usr/local/avr
+DIRAVRBIN = $(DIRAVR)/bin
+DIRAVRUTILS = $(DIRAVR)/utils/bin
+DIRINC = $(DIRAVR)/include
+DIRLIB = $(DIRAVR)/avr/lib
+
+
+MCU_TARGET = atmega8
+LDSECTION = --section-start=.text=0x1c00
+FUSE_L = 0xdf
+FUSE_H = 0xca
+ISPFUSES = $(DIRAVRBIN)/uisp -dpart=ATmega8 $(ISPPARAMS) --wr_fuse_l=$(FUSE_L) --wr_fuse_h=$(FUSE_H)
+ISPFLASH = $(DIRAVRBIN)/uisp -dpart=ATmega8 $(ISPPARAMS) --erase --upload if=$(PROGRAM).hex -v
+
+
+OBJ = $(PROGRAM).o
+OPTIMIZE = -Os
+
+DEFS = -DF_CPU=16000000 -DBAUD_RATE=19200
+LIBS =
+
+CC = $(DIRAVRBIN)/avr-gcc
+
+
+# Override is only needed by avr-lib build system.
+
+override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -D$(PRODUCT) $(DEFS) -I$(DIRINC)
+override LDFLAGS = -Wl,-Map,$(PROGRAM).map,$(LDSECTION)
+
+OBJCOPY = $(DIRAVRBIN)/avr-objcopy
+OBJDUMP = $(DIRAVRBIN)/avr-objdump
+SIZE = $(DIRAVRBIN)/avr-size
+
+all: $(PROGRAM).elf lst text asm size
+
+isp: $(PROGRAM).hex
+ $(ISPFUSES)
+ $(ISPFLASH)
+
+$(PROGRAM).elf: $(OBJ)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+clean:
+ rm -rf *.s
+ rm -rf *.o *.elf
+ rm -rf *.lst *.map
+
+asm: $(PROGRAM).s
+
+%.s: %.c
+ $(CC) -S $(CFLAGS) -g1 $^
+
+lst: $(PROGRAM).lst
+
+%.lst: %.elf
+ $(OBJDUMP) -h -S $< > $@
+
+size: $(PROGRAM).hex
+ $(SIZE) $^
+
+# Rules for building the .text rom images
+
+text: hex bin srec
+
+hex: $(PROGRAM).hex
+bin: $(PROGRAM).bin
+srec: $(PROGRAM).srec
+
+%.hex: %.elf
+ $(OBJCOPY) -j .text -j .data -O ihex $< $@
+
+%.srec: %.elf
+ $(OBJCOPY) -j .text -j .data -O srec $< $@
+
+%.bin: %.elf
+ $(OBJCOPY) -j .text -j .data -O binary $< $@
diff --git a/test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168.c b/test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168.c
new file mode 100644
index 0000000..c73eefa
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168.c
@@ -0,0 +1,1038 @@
+/**********************************************************/
+/* Serial Bootloader for Atmel megaAVR Controllers */
+/* */
+/* tested with ATmega8, ATmega128 and ATmega168 */
+/* should work with other mega's, see code for details */
+/* */
+/* ATmegaBOOT.c */
+/* */
+/* build: 050815 */
+/* date : 15.08.2005 */
+/* */
+/* 20060802: hacked for Arduino by D. Cuartielles */
+/* based on a previous hack by D. Mellis */
+/* and D. Cuartielles */
+/* */
+/* Monitor and debug functions were added to the original */
+/* code by Dr. Erik Lins, chip45.com. (See below) */
+/* */
+/* Thanks to Karl Pitrich for fixing a bootloader pin */
+/* problem and more informative LED blinking! */
+/* */
+/* For the latest version see: */
+/* http://www.chip45.com/ */
+/* */
+/* ------------------------------------------------------ */
+/* */
+/* based on stk500boot.c */
+/* Copyright (c) 2003, Jason P. Kyle */
+/* All rights reserved. */
+/* see avr1.org for original file and information */
+/* */
+/* 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 2 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, write */
+/* to the Free Software Foundation, Inc., */
+/* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+/* */
+/* Licence can be viewed at */
+/* http://www.fsf.org/licenses/gpl.txt */
+/* */
+/* Target = Atmel AVR m128,m64,m32,m16,m8,m162,m163,m169, */
+/* m8515,m8535. ATmega161 has a very small boot block so */
+/* isn't supported. */
+/* */
+/* Tested with m128,m8,m163 - feel free to let me know */
+/* how/if it works for you. */
+/* */
+/**********************************************************/
+
+
+/* some includes */
+#include <inttypes.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <avr/interrupt.h>
+#include <avr/wdt.h>
+
+
+#define set_output(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+#define set_input(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+
+
+#define high(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+#define low(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+
+
+
+
+/* the current avr-libc eeprom functions do not support the ATmega168 */
+/* own eeprom write/read functions are used instead */
+#if !defined(__AVR_ATmega168__) || !defined(__AVR_ATmega328P__)
+#include <avr/eeprom.h>
+#endif
+
+/* define F_CPU according to AVR_FREQ set in Makefile */
+/* Is there a better way to pass such a parameter from Makefile to source code ? */
+
+#define F_CPU 16000000L
+
+#include <util/delay.h>
+
+
+/* 20060803: hacked by DojoCorp */
+/* set the waiting time for the bootloader */
+#define MAX_TIME_COUNT (F_CPU>>1)
+
+/* set the UART baud rate */
+/* 20060803: hacked by DojoCorp */
+#define BAUD_RATE 115200
+
+
+/* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
+/* never allow AVR Studio to do an update !!!! */
+#define HW_VER 0x02
+#define SW_MAJOR 0x01
+#define SW_MINOR 0x0f
+
+
+/* Adjust to suit whatever pin your hardware uses to enter the bootloader */
+/* ATmega128 has two UARTS so two pins are used to enter bootloader and select UART */
+/* BL0... means UART0, BL1... means UART1 */
+#ifdef __AVR_ATmega128__
+#define BL_DDR DDRF
+#define BL_PORT PORTF
+#define BL_PIN PINF
+#define BL0 PINF7
+#define BL1 PINF6
+#else
+/* other ATmegas have only one UART, so only one pin is defined to enter bootloader */
+#define BL_DDR DDRD
+#define BL_PORT PORTD
+#define BL_PIN PIND
+#define BL PIND6
+#endif
+
+
+/* onboard LED is used to indicate, that the bootloader was entered (3x flashing) */
+/* if monitor functions are included, LED goes on after monitor was entered */
+#ifdef __AVR_ATmega128__
+/* Onboard LED is connected to pin PB7 (e.g. Crumb128, PROBOmega128, Savvy128) */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+#define LED PINB7
+#else
+/* Onboard LED is connected to pin PB2 (e.g. Crumb8, Crumb168) */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+/* 20060803: hacked by DojoCorp, LED pin is B5 in Arduino */
+/* #define LED PINB2 */
+#define LED PINB5
+#endif
+
+
+/* monitor functions will only be compiled when using ATmega128, due to bootblock size constraints */
+#ifdef __AVR_ATmega128__
+#define MONITOR
+#endif
+
+
+/* define various device id's */
+/* manufacturer byte is always the same */
+#define SIG1 0x1E // Yep, Atmel is the only manufacturer of AVR micros. Single source :(
+
+#if defined __AVR_ATmega128__
+#define SIG2 0x97
+#define SIG3 0x02
+#define PAGE_SIZE 0x80U //128 words
+
+#elif defined __AVR_ATmega64__
+#define SIG2 0x96
+#define SIG3 0x02
+#define PAGE_SIZE 0x80U //128 words
+
+#elif defined __AVR_ATmega32__
+#define SIG2 0x95
+#define SIG3 0x02
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega16__
+#define SIG2 0x94
+#define SIG3 0x03
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega8__
+#define SIG2 0x93
+#define SIG3 0x07
+#define PAGE_SIZE 0x20U //32 words
+
+#elif defined __AVR_ATmega88__
+#define SIG2 0x93
+#define SIG3 0x0a
+#define PAGE_SIZE 0x20U //32 words
+
+#elif defined __AVR_ATmega168__
+#define SIG2 0x94
+#define SIG3 0x06
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega328P__
+#define SIG2 0x95
+#define SIG3 0x0F
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega162__
+#define SIG2 0x94
+#define SIG3 0x04
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega163__
+#define SIG2 0x94
+#define SIG3 0x02
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega169__
+#define SIG2 0x94
+#define SIG3 0x05
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega8515__
+#define SIG2 0x93
+#define SIG3 0x06
+#define PAGE_SIZE 0x20U //32 words
+
+#elif defined __AVR_ATmega8535__
+#define SIG2 0x93
+#define SIG3 0x08
+#define PAGE_SIZE 0x20U //32 words
+#endif
+
+
+/* function prototypes */
+void putch(char);
+char getch(void);
+void getNch(uint8_t);
+void byte_response(uint8_t);
+void nothing_response(void);
+char gethex(void);
+void puthex(char);
+void flash_led(uint8_t);
+
+/* some variables */
+union address_union {
+ uint16_t word;
+ uint8_t byte[2];
+} address;
+
+union length_union {
+ uint16_t word;
+ uint8_t byte[2];
+} length;
+
+struct flags_struct {
+ unsigned eeprom : 1;
+ unsigned rampz : 1;
+} flags;
+
+uint8_t buff[256];
+uint8_t address_high;
+
+uint8_t pagesz=0x80;
+
+uint8_t i;
+uint8_t bootuart = 0;
+
+void (*app_start)(void) = 0x0000;
+
+
+/* main program starts here */
+int main(void)
+{
+ uint8_t ch,ch2;
+ uint16_t w;
+
+ asm volatile("nop\n\t");
+
+ /* set pin direction for bootloader pin and enable pullup */
+ /* for ATmega128, two pins need to be initialized */
+#ifdef __AVR_ATmega128__
+ BL_DDR &= ~_BV(BL0);
+ BL_DDR &= ~_BV(BL1);
+ BL_PORT |= _BV(BL0);
+ BL_PORT |= _BV(BL1);
+#else
+ BL_DDR &= ~_BV(BL);
+ BL_PORT |= _BV(BL);
+#endif
+
+
+#ifdef __AVR_ATmega128__
+ /* check which UART should be used for booting */
+ if(bit_is_clear(BL_PIN, BL0)) {
+ bootuart = 1;
+ }
+ else if(bit_is_clear(BL_PIN, BL1)) {
+ bootuart = 2;
+ }
+#endif
+
+ /* check if flash is programmed already, if not start bootloader anyway */
+ if(pgm_read_byte_near(0x0000) != 0xFF) {
+
+#ifdef __AVR_ATmega128__
+ /* no UART was selected, start application */
+ if(!bootuart) {
+ app_start();
+ }
+#else
+ /* check if bootloader pin is set low */
+ /* we don't start this part neither for the m8, nor m168 */
+ //if(bit_is_set(BL_PIN, BL)) {
+ // app_start();
+ // }
+#endif
+ }
+
+#ifdef __AVR_ATmega128__
+ /* no bootuart was selected, default to uart 0 */
+ if(!bootuart) {
+ bootuart = 1;
+ }
+#endif
+
+
+ /* initialize UART(s) depending on CPU defined */
+#ifdef __AVR_ATmega128__
+ if(bootuart == 1) {
+ UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSR0A = 0x00;
+ UCSR0C = 0x06;
+ UCSR0B = _BV(TXEN0)|_BV(RXEN0);
+ }
+ if(bootuart == 2) {
+ UBRR1L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRR1H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSR1A = 0x00;
+ UCSR1C = 0x06;
+ UCSR1B = _BV(TXEN1)|_BV(RXEN1);
+ }
+#elif defined __AVR_ATmega163__
+ UBRR = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRRHI = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSRA = 0x00;
+ UCSRB = _BV(TXEN)|_BV(RXEN);
+#elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+
+ UBRR0H = ((F_CPU / 16 + BAUD_RATE / 2) / BAUD_RATE - 1) >> 8;
+ UBRR0L = ((F_CPU / 16 + BAUD_RATE / 2) / BAUD_RATE - 1);
+
+
+ //UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ //UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSR0B = (1<<RXEN0) | (1<<TXEN0);
+ UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
+#elif defined __AVR_ATmega8__
+ /* m8 */
+ UBRRH = (((F_CPU/BAUD_RATE)/16)-1)>>8; // set baud rate
+ UBRRL = (((F_CPU/BAUD_RATE)/16)-1);
+ UCSRB = (1<<RXEN)|(1<<TXEN); // enable Rx & Tx
+ UCSRC = (1<<URSEL)|(1<<UCSZ1)|(1<<UCSZ0); // config USART; 8N1
+#else
+ /* m16,m32,m169,m8515,m8535 */
+ UBRRL = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRRH = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSRA = 0x00;
+ UCSRC = 0x06;
+ UCSRB = _BV(TXEN)|_BV(RXEN);
+#endif
+
+ /* set LED pin as output */
+ LED_DDR |= _BV(LED);
+
+
+
+ set_output(DDRD,PIND7);
+ high(PORTD,PD7);
+ for (i = 0; i < 16; i++) {
+
+ _delay_loop_2(0);
+ }
+
+
+ low(PORTD,PD7);
+
+
+ /* flash onboard LED to signal entering of bootloader */
+#ifdef __AVR_ATmega128__
+ // 4x for UART0, 5x for UART1
+ flash_led(3 + bootuart);
+#else
+ flash_led(3);
+#endif
+
+ /* 20050803: by DojoCorp, this is one of the parts provoking the
+ system to stop listening, cancelled from the original */
+ //putch('\0');
+
+
+ //message("SET BT PAGEMODE 3 2000 1");
+putch('S');
+putch('E');
+putch('T');
+putch(' ');
+putch('B');
+putch('T');
+putch(' ');
+putch('P');
+putch('A');
+putch('G');
+putch('E');
+putch('M');
+putch('O');
+putch('D');
+putch('E');
+putch(' ');
+putch('3');
+putch(' ');
+putch('2');
+putch('0');
+putch('0');
+putch('0');
+putch(' ');
+putch('1');
+putch(0x0D);
+
+
+ //put_s("SET BT ROLE 0 f 7d00");
+ putch('S');
+ putch('E');
+ putch('T');
+ putch(' ');
+ putch('B');
+ putch('T');
+ putch(' ');
+ putch('R');
+ putch('O');
+ putch('L');
+ putch('E');
+ putch(' ');
+ putch('0');
+ putch(' ');
+ putch('f');
+ putch(' ');
+ putch('7');
+ putch('d');
+ putch('0');
+ putch('0');
+ putch(0x0D);
+
+
+
+
+
+
+ /* forever loop */
+ for (;;) {
+
+ /* get character from UART */
+ ch = getch();
+
+ /* A bunch of if...else if... gives smaller code than switch...case ! */
+
+ /* Hello is anyone home ? */
+ if(ch=='0') {
+ nothing_response();
+ }
+
+
+ /* Request programmer ID */
+ /* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
+ /* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
+ else if(ch=='1') {
+ if (getch() == ' ') {
+ putch(0x14);
+ putch('A');
+ putch('V');
+ putch('R');
+ putch(' ');
+ putch('I');
+ putch('S');
+ putch('P');
+ putch(0x10);
+ }
+ }
+
+
+ /* AVR ISP/STK500 board commands DON'T CARE so default nothing_response */
+ else if(ch=='@') {
+ ch2 = getch();
+ if (ch2>0x85) getch();
+ nothing_response();
+ }
+
+
+ /* AVR ISP/STK500 board requests */
+ else if(ch=='A') {
+ ch2 = getch();
+ if(ch2==0x80) byte_response(HW_VER); // Hardware version
+ else if(ch2==0x81) byte_response(SW_MAJOR); // Software major version
+ else if(ch2==0x82) byte_response(SW_MINOR); // Software minor version
+ else if(ch2==0x98) byte_response(0x03); // Unknown but seems to be required by avr studio 3.56
+ else byte_response(0x00); // Covers various unnecessary responses we don't care about
+ }
+
+
+ /* Device Parameters DON'T CARE, DEVICE IS FIXED */
+ else if(ch=='B') {
+ getNch(20);
+ nothing_response();
+ }
+
+
+ /* Parallel programming stuff DON'T CARE */
+ else if(ch=='E') {
+ getNch(5);
+ nothing_response();
+ }
+
+
+ /* Enter programming mode */
+ else if(ch=='P') {
+ nothing_response();
+ }
+
+
+ /* Leave programming mode */
+ else if(ch=='Q') {
+ nothing_response();
+ }
+
+
+ /* Erase device, don't care as we will erase one page at a time anyway. */
+ else if(ch=='R') {
+ nothing_response();
+ }
+
+
+ /* Set address, little endian. EEPROM in bytes, FLASH in words */
+ /* Perhaps extra address bytes may be added in future to support > 128kB FLASH. */
+ /* This might explain why little endian was used here, big endian used everywhere else. */
+ else if(ch=='U') {
+ address.byte[0] = getch();
+ address.byte[1] = getch();
+ nothing_response();
+ }
+
+
+ /* Universal SPI programming command, disabled. Would be used for fuses and lock bits. */
+ else if(ch=='V') {
+ getNch(4);
+ byte_response(0x00);
+ }
+
+
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch=='d') {
+ length.byte[1] = getch();
+ length.byte[0] = getch();
+ flags.eeprom = 0;
+ if (getch() == 'E') flags.eeprom = 1;
+ for (w=0;w<length.word;w++) {
+ buff[w] = getch(); // Store data in buffer, can't keep up with serial data stream whilst programming pages
+ }
+ if (getch() == ' ') {
+ if (flags.eeprom) { //Write to EEPROM one byte at a time
+ for(w=0;w<length.word;w++) {
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+ while(EECR & (1<<EEPE));
+ EEAR = (uint16_t)(void *)address.word;
+ EEDR = buff[w];
+ EECR |= (1<<EEMPE);
+ EECR |= (1<<EEPE);
+#else
+ eeprom_write_byte((void *)address.word,buff[w]);
+#endif
+ address.word++;
+ }
+ }
+ else { //Write to FLASH one page at a time
+ if (address.byte[1]>127) address_high = 0x01; //Only possible with m128, m256 will need 3rd address byte. FIXME
+ else address_high = 0x00;
+#ifdef __AVR_ATmega128__
+ RAMPZ = address_high;
+#endif
+ address.word = address.word << 1; //address * 2 -> byte location
+ /* if ((length.byte[0] & 0x01) == 0x01) length.word++; //Even up an odd number of bytes */
+ if ((length.byte[0] & 0x01)) length.word++; //Even up an odd number of bytes
+ cli(); //Disable interrupts, just to be sure
+ // HACKME: EEPE used to be EEWE
+ while(bit_is_set(EECR,EEPE)); //Wait for previous EEPROM writes to complete
+ asm volatile(
+ "clr r17 \n\t" //page_word_count
+ "lds r30,address \n\t" //Address of FLASH location (in bytes)
+ "lds r31,address+1 \n\t"
+ "ldi r28,lo8(buff) \n\t" //Start of buffer array in RAM
+ "ldi r29,hi8(buff) \n\t"
+ "lds r24,length \n\t" //Length of data to be written (in bytes)
+ "lds r25,length+1 \n\t"
+ "length_loop: \n\t" //Main loop, repeat for number of words in block
+ "cpi r17,0x00 \n\t" //If page_word_count=0 then erase page
+ "brne no_page_erase \n\t"
+ "wait_spm1: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm1 \n\t"
+ "ldi r16,0x03 \n\t" //Erase page pointed to by Z
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+#endif
+ "wait_spm2: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm2 \n\t"
+
+ "ldi r16,0x11 \n\t" //Re-enable RWW section
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+#endif
+ "no_page_erase: \n\t"
+ "ld r0,Y+ \n\t" //Write 2 bytes into page buffer
+ "ld r1,Y+ \n\t"
+
+ "wait_spm3: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm3 \n\t"
+ "ldi r16,0x01 \n\t" //Load r0,r1 into FLASH page buffer
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+
+ "inc r17 \n\t" //page_word_count++
+ "cpi r17,%1 \n\t"
+ "brlo same_page \n\t" //Still same page in FLASH
+ "write_page: \n\t"
+ "clr r17 \n\t" //New page, write current one first
+ "wait_spm4: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm4 \n\t"
+#ifdef __AVR_ATmega163__
+ "andi r30,0x80 \n\t" // m163 requires Z6:Z1 to be zero during page write
+#endif
+ "ldi r16,0x05 \n\t" //Write page pointed to by Z
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+ "ori r30,0x7E \n\t" // recover Z6:Z1 state after page write (had to be zero during write)
+#endif
+ "wait_spm5: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm5 \n\t"
+ "ldi r16,0x11 \n\t" //Re-enable RWW section
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+#endif
+ "same_page: \n\t"
+ "adiw r30,2 \n\t" //Next word in FLASH
+ "sbiw r24,2 \n\t" //length-2
+ "breq final_write \n\t" //Finished
+ "rjmp length_loop \n\t"
+ "final_write: \n\t"
+ "cpi r17,0 \n\t"
+ "breq block_done \n\t"
+ "adiw r24,2 \n\t" //length+2, fool above check on length after short page write
+ "rjmp write_page \n\t"
+ "block_done: \n\t"
+ "clr __zero_reg__ \n\t" //restore zero register
+#if defined __AVR_ATmega168__ || __AVR_ATmega328P__
+ : "=m" (SPMCSR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
+#else
+ : "=m" (SPMCR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
+#endif
+ );
+ /* Should really add a wait for RWW section to be enabled, don't actually need it since we never */
+ /* exit the bootloader without a power cycle anyhow */
+ }
+ putch(0x14);
+ putch(0x10);
+ }
+ }
+
+
+ /* Read memory block mode, length is big endian. */
+ else if(ch=='t') {
+ length.byte[1] = getch();
+ length.byte[0] = getch();
+#if defined __AVR_ATmega128__
+ if (address.word>0x7FFF) flags.rampz = 1; // No go with m256, FIXME
+ else flags.rampz = 0;
+#endif
+ if (getch() == 'E') flags.eeprom = 1;
+ else {
+ flags.eeprom = 0;
+ address.word = address.word << 1; // address * 2 -> byte location
+ }
+ if (getch() == ' ') { // Command terminator
+ putch(0x14);
+ for (w=0;w < length.word;w++) { // Can handle odd and even lengths okay
+ if (flags.eeprom) { // Byte access EEPROM read
+#if defined __AVR_ATmega168__ || __AVR_ATmega328P__
+ while(EECR & (1<<EEPE));
+ EEAR = (uint16_t)(void *)address.word;
+ EECR |= (1<<EERE);
+ putch(EEDR);
+#else
+ putch(eeprom_read_byte((void *)address.word));
+#endif
+ address.word++;
+ }
+ else {
+
+ if (!flags.rampz) putch(pgm_read_byte_near(address.word));
+#if defined __AVR_ATmega128__
+ else putch(pgm_read_byte_far(address.word + 0x10000));
+ // Hmmmm, yuck FIXME when m256 arrvies
+#endif
+ address.word++;
+ }
+ }
+ putch(0x10);
+ }
+ }
+
+
+ /* Get device signature bytes */
+ else if(ch=='u') {
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(SIG1);
+ putch(SIG2);
+ putch(SIG3);
+ putch(0x10);
+ }
+ }
+
+
+ /* Read oscillator calibration byte */
+ else if(ch=='v') {
+ byte_response(0x00);
+ }
+
+
+#ifdef MONITOR
+
+ /* here come the extended monitor commands by Erik Lins */
+
+ /* check for three times exclamation mark pressed */
+ else if(ch=='!') {
+ ch = getch();
+ if(ch=='!') {
+ ch = getch();
+ if(ch=='!') {
+
+#ifdef __AVR_ATmega128__
+ uint16_t extaddr;
+#endif
+ uint8_t addrl, addrh;
+
+#ifdef CRUMB128
+ PGM_P welcome = {"ATmegaBOOT / Crumb128 - (C) J.P.Kyle, E.Lins - 050815\n\r"};
+#elif defined PROBOMEGA128
+ PGM_P welcome = {"ATmegaBOOT / PROBOmega128 - (C) J.P.Kyle, E.Lins - 050815\n\r"};
+#elif defined SAVVY128
+ PGM_P welcome = {"ATmegaBOOT / Savvy128 - (C) J.P.Kyle, E.Lins - 050815\n\r"};
+#endif
+
+ /* turn on LED */
+ LED_DDR |= _BV(LED);
+ LED_PORT &= ~_BV(LED);
+
+ /* print a welcome message and command overview */
+ for(i=0; welcome[i] != '\0'; ++i) {
+ putch(welcome[i]);
+ }
+
+ /* test for valid commands */
+ for(;;) {
+ putch('\n');
+ putch('\r');
+ putch(':');
+ putch(' ');
+
+ ch = getch();
+ putch(ch);
+
+ /* toggle LED */
+ if(ch == 't') {
+ if(bit_is_set(LED_PIN,LED)) {
+ LED_PORT &= ~_BV(LED);
+ putch('1');
+ } else {
+ LED_PORT |= _BV(LED);
+ putch('0');
+ }
+
+ }
+
+ /* read byte from address */
+ else if(ch == 'r') {
+ ch = getch(); putch(ch);
+ addrh = gethex();
+ addrl = gethex();
+ putch('=');
+ ch = *(uint8_t *)((addrh << 8) + addrl);
+ puthex(ch);
+ }
+
+ /* write a byte to address */
+ else if(ch == 'w') {
+ ch = getch(); putch(ch);
+ addrh = gethex();
+ addrl = gethex();
+ ch = getch(); putch(ch);
+ ch = gethex();
+ *(uint8_t *)((addrh << 8) + addrl) = ch;
+
+ }
+
+ /* read from uart and echo back */
+ else if(ch == 'u') {
+ for(;;) {
+ putch(getch());
+ }
+ }
+#ifdef __AVR_ATmega128__
+ /* external bus loop */
+ else if(ch == 'b') {
+ putch('b');
+ putch('u');
+ putch('s');
+ MCUCR = 0x80;
+ XMCRA = 0;
+ XMCRB = 0;
+ extaddr = 0x1100;
+ for(;;) {
+ ch = *(volatile uint8_t *)extaddr;
+ if(++extaddr == 0) {
+ extaddr = 0x1100;
+ }
+ }
+ }
+#endif
+
+ else if(ch == 'j') {
+ app_start();
+ }
+
+ }
+ /* end of monitor functions */
+
+ }
+ }
+ }
+ /* end of monitor */
+#endif
+
+
+ }
+ /* end of forever loop */
+
+}
+
+
+char gethex(void) {
+ char ah,al;
+
+ ah = getch(); putch(ah);
+ al = getch(); putch(al);
+ if(ah >= 'a') {
+ ah = ah - 'a' + 0x0a;
+ } else if(ah >= '0') {
+ ah -= '0';
+ }
+ if(al >= 'a') {
+ al = al - 'a' + 0x0a;
+ } else if(al >= '0') {
+ al -= '0';
+ }
+ return (ah << 4) + al;
+}
+
+
+void puthex(char ch) {
+ char ah,al;
+
+ ah = (ch & 0xf0) >> 4;
+ if(ah >= 0x0a) {
+ ah = ah - 0x0a + 'a';
+ } else {
+ ah += '0';
+ }
+ al = (ch & 0x0f);
+ if(al >= 0x0a) {
+ al = al - 0x0a + 'a';
+ } else {
+ al += '0';
+ }
+ putch(ah);
+ putch(al);
+}
+
+
+void putch(char ch)
+{
+#ifdef __AVR_ATmega128__
+ if(bootuart == 1) {
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+ }
+ else if (bootuart == 2) {
+ while (!(UCSR1A & _BV(UDRE1)));
+ UDR1 = ch;
+ }
+#elif defined (__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+#else
+ /* m8,16,32,169,8515,8535,163 */
+ while (!(UCSRA & _BV(UDRE)));
+ UDR = ch;
+#endif
+}
+
+
+char getch(void)
+{
+#ifdef __AVR_ATmega128__
+ if(bootuart == 1) {
+ while(!(UCSR0A & _BV(RXC0)));
+ return UDR0;
+ }
+ else if(bootuart == 2) {
+ while(!(UCSR1A & _BV(RXC1)));
+ return UDR1;
+ }
+ return 0;
+#elif defined (__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+ uint32_t count = 0;
+ while(!(UCSR0A & _BV(RXC0))){
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ /* HACKME:: here is a good place to count times*/
+ count++;
+ if (count > MAX_TIME_COUNT)
+ app_start();
+ }
+ return UDR0;
+#else
+ /* m8,16,32,169,8515,8535,163 */
+ uint32_t count = 0;
+ while(!(UCSRA & _BV(RXC))){
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ /* HACKME:: here is a good place to count times*/
+ count++;
+ if (count > MAX_TIME_COUNT)
+ app_start();
+ }
+ return UDR;
+#endif
+}
+
+
+void getNch(uint8_t count)
+{
+ uint8_t i;
+ for(i=0;i<count;i++) {
+#ifdef __AVR_ATmega128__
+ if(bootuart == 1) {
+ while(!(UCSR0A & _BV(RXC0)));
+ UDR0;
+ }
+ else if(bootuart == 2) {
+ while(!(UCSR1A & _BV(RXC1)));
+ UDR1;
+ }
+#elif (defined __AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+ while(!(UCSR0A & _BV(RXC0)));
+ UDR0;
+#else
+ /* m8,16,32,169,8515,8535,163 */
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ //while(!(UCSRA & _BV(RXC)));
+ //UDR;
+ uint8_t i;
+ for(i=0;i<count;i++) {
+ getch(); // need to handle time out
+ }
+#endif
+ }
+}
+
+
+void byte_response(uint8_t val)
+{
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(val);
+ putch(0x10);
+ }
+}
+
+
+void nothing_response(void)
+{
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(0x10);
+ }
+}
+
+void flash_led(uint8_t count)
+{
+ /* flash onboard LED three times to signal entering of bootloader */
+ uint32_t l;
+
+ if (count == 0) {
+ count = 3;
+ }
+
+ for (i = 0; i < count; ++i) {
+ LED_PORT |= _BV(LED);
+ for(l = 0; l < (2 * F_CPU); ++l);
+ LED_PORT &= ~_BV(LED);
+ for(l = 0; l < (F_CPU / 5); ++l);
+ }
+}
+
+
+/* end of file ATmegaBOOT.c */
diff --git a/test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168.hex b/test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168.hex
new file mode 100644
index 0000000..036ae54
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168.hex
@@ -0,0 +1,121 @@
+:103800000C94341C0C944F1C0C944F1C0C944F1CA7
+:103810000C944F1C0C944F1C0C944F1C0C944F1C7C
+:103820000C944F1C0C944F1C0C944F1C0C944F1C6C
+:103830000C944F1C0C944F1C0C944F1C0C944F1C5C
+:103840000C944F1C0C944F1C0C944F1C0C944F1C4C
+:103850000C944F1C0C944F1C0C944F1C0C944F1C3C
+:103860000C944F1C0C944F1C11241FBECFEFD4E0BE
+:10387000DEBFCDBF11E0A0E0B1E0E0E6FFE302C0B3
+:1038800005900D92A230B107D9F712E0A2E0B1E0A5
+:1038900001C01D92AC30B107E1F70C94D61C0C941A
+:1038A000001C882309F483E01092090290E0981725
+:1038B000F0F4692F2D9A2FEF37E448EE51E02253B0
+:1038C00030404040504057FFFACF2D982FEF33ED56
+:1038D00040E350E0225330404040504057FFFACF81
+:1038E000962F9F5F692F981728F3909309020895E8
+:1038F000982F8091C00085FFFCCF9093C60008955B
+:10390000EF92FF920F931F93EE24FF248701809183
+:10391000C00087FD17C00894E11CF11C011D111D9A
+:1039200081E0E81682E1F8068AE7080780E01807D8
+:1039300070F3E0910201F091030109958091C000BC
+:1039400087FFE9CF8091C600992787FD90951F9149
+:103950000F91FF90EF9008950E94801C803209F033
+:10396000089584E10E94781C80E10E94781C0895EB
+:10397000CF93C82F0E94801C803249F484E10E94BA
+:10398000781C8C2F0E94781C80E10E94781CCF91BB
+:103990000895282F90E007C08091C0008823E4F7A5
+:1039A0008091C6009F5F9217B8F30895CFEFD4E0DF
+:1039B000DEBFCDBF000056985E9A1092C50088E029
+:1039C0008093C40088E18093C10086E08093C200A8
+:1039D000259A579A5F9A109209022FE080E090E0B2
+:1039E0000197F1F7215027FFF9CF20E12093090239
+:1039F0005F9883E00E94511C83E50E94781C85E457
+:103A00000E94781C84E50E94781C80E20E94781C49
+:103A100082E40E94781C84E50E94781C80E20E9467
+:103A2000781C80E50E94781C81E40E94781C87E461
+:103A30000E94781C85E40E94781C8DE40E94781C0A
+:103A40008FE40E94781C84E40E94781C85E40E9424
+:103A5000781C80E20E94781C83E30E94781C80E23C
+:103A60000E94781C82E30E94781C80E30E94781CEC
+:103A700080E30E94781C80E30E94781C80E20E9410
+:103A8000781C81E30E94781C8DE00E94781C83E5FD
+:103A90000E94781C85E40E94781C84E50E94781CB2
+:103AA00080E20E94781C82E40E94781C84E50E94D7
+:103AB000781C80E20E94781C82E50E94781C8FE4CA
+:103AC0000E94781C8CE40E94781C85E40E94781C7B
+:103AD00080E20E94781C80E30E94781C80E20E94B1
+:103AE000781C86E60E94781C80E20E94781C87E39E
+:103AF0000E94781C84E60E94781C80E30E94781C57
+:103B000080E30E94781C8DE00E94781C0E94801C3B
+:103B1000803361F1813369F1803409F449C0813423
+:103B200009F44FC0823409F45DC0853409F460C0E3
+:103B30008035E1F08135D1F08235C1F0853509F469
+:103B40005BC0863509F463C0843609F465C08437E8
+:103B500009F4B9C0853709F414C18637B9F680E095
+:103B60000E94B81C0E94801C8033A1F60E94AC1CED
+:103B7000CDCF0E94801CC82F803241F684E10E9484
+:103B8000781C81E40E94781C86E50E94781C82E5FE
+:103B90000E94781C8C2F0E94781C89E40E94781C5B
+:103BA00083E50E94781C80E50E94781C80E1ACCF00
+:103BB0000E94801C8638D0F20E94801C0E94AC1C9F
+:103BC000A5CF0E94801C803809F4EDC0813809F42B
+:103BD000EEC0823809F4EFC0883909F683E00E940C
+:103BE000B81CC0CF84E10E94C91C0E94AC1C8ECFBF
+:103BF00085E00E94C91CF9CF0E94801C80930501BA
+:103C00000E94801C809306010E94AC1C7FCF84E040
+:103C10000E94C91C80E0A4CF0E94801C80930802EF
+:103C20000E94801C8093070280910B028E7F8093FC
+:103C30000B020E94801C853409F4C1C000E010E032
+:103C400080910702909108021816190670F4C7E0D7
+:103C5000D1E00E94801C89930F5F1F4F8091070263
+:103C60009091080208171907A0F30E94801C803267
+:103C700009F04CCF80910B0280FFADC000E010E056
+:103C8000209107023091080212161306C0F4E09149
+:103C90000501F0910601A7E0B1E0F999FECFF2BD70
+:103CA000E1BD8D9180BDFA9AF99A31960F5F1F4F51
+:103CB0000217130790F3F0930601E093050184E1E6
+:103CC0000E94781C73CF0E94801C809308020E947F
+:103CD000801C809307020E94801C853409F475C003
+:103CE00080910B028E7F80930B0280910501909151
+:103CF0000601880F991F90930601809305010E9489
+:103D0000801C803209F002CF84E10E94781C00E020
+:103D100010E020910702309108021216130608F0F5
+:103D200045CFE0910501F091060180910B0280FFE3
+:103D30001FC0F999FECFF2BDE1BDF89A80B50E948F
+:103D4000781CE0910501F09106013196F09306018F
+:103D5000E093050120910702309108020F5F1F4F89
+:103D60000217130708F022CF80910B0280FDE1CFEC
+:103D7000869580FF9BC03196F0930601E093050184
+:103D8000EDCF0E94801C803209F0C0CE84E10E94F9
+:103D9000781C8EE10E94781C84E90E94781C86E0E1
+:103DA0000E94781C03CF82E00E94B81CDBCE81E029
+:103DB0000E94B81CD7CE8FE00E94B81CD3CE809151
+:103DC0000B02816080930B0239CF80910B028160DE
+:103DD00080930B0294CF8091060187FD73C01092EF
+:103DE0000A028091050190910601880F991F909316
+:103DF0000601809305018091070280FF09C0809130
+:103E0000070290910802019690930802809307029E
+:103E1000F894F999FECF1127E0910501F091060180
+:103E2000C7E0D1E08091070290910802103091F430
+:103E30000091570001700130D9F303E0009357005F
+:103E4000E8950091570001700130D9F301E100932A
+:103E50005700E895099019900091570001700130C2
+:103E6000D9F301E000935700E8951395103498F0CA
+:103E700011270091570001700130D9F305E000933C
+:103E80005700E8950091570001700130D9F301E126
+:103E900000935700E8953296029709F0C7CF10308B
+:103EA00011F00296E5CF112484E10ACF84910E949B
+:103EB000781C2091070230910802E0910501F091F1
+:103EC000060159CF81E080930A028BCF1F93CF93D5
+:103ED0000E94801CC82F0E94781C0E94801C182FF2
+:103EE0000E94781CC1362CF0C75511363CF017558E
+:103EF00008C0C033D4F3C0531136CCF710330CF0E4
+:103F00001053C295C07FC10F8C2F992787FD9095C4
+:103F1000CF911F910895CF93282F992787FD9095D2
+:103F2000807F9070959587959595879595958795C0
+:103F3000959587958A303CF0895AC22FCF70CA3048
+:103F40003CF0C95A06C0805DC22FCF70CA30CCF792
+:103F5000C05D0E94781C8C2F0E94781CCF91089520
+:023F60008000DF
+:0400000300003800C1
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex b/test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
new file mode 100644
index 0000000..a50c7c3
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
@@ -0,0 +1,162 @@
+:107000000C9434380C9451380C9451380C945138F9
+:107010000C9451380C9451380C9451380C945138CC
+:107020000C9451380C9451380C9451380C945138BC
+:107030000C9451380C9451380C9451380C945138AC
+:107040000C9451380C9451380C9451380C9451389C
+:107050000C9451380C9451380C9451380C9451388C
+:107060000C9451380C94513811241FBECFEFD8E046
+:10707000DEBFCDBF11E0A0E0B1E0E4EEF9E702C071
+:1070800005900D92A230B107D9F712E0A2E0B1E06D
+:1070900001C01D92AC30B107E1F70E942D390C946C
+:1070A000F03C0C940038282F992787FD9095807F1D
+:1070B00090709595879595958795959587959595D4
+:1070C00087958A30C4F0382F395A822F8F708A30D2
+:1070D0007CF0982F995A8091C00085FFFCCF3093A7
+:1070E000C6008091C00085FFFCCF9093C600089534
+:1070F000982F905DF0CF382F305DE7CF982F80919B
+:10710000C00085FFFCCF9093C6000895EF92FF92D8
+:107110000F931F93EE24FF2487018091C00087FD09
+:1071200017C00894E11CF11C011D111D81E0E81637
+:1071300082E1F8068AE7080780E0180770F3E0911B
+:107140000301F091040109958091C00087FFE9CF08
+:107150008091C6001F910F91FF90EF9008951F93AB
+:107160000E948638182F8091C00085FFFCCF1093B5
+:10717000C6000E948638982F8091C00085FFFCCF02
+:107180009093C600113664F01755913674F490331D
+:107190000CF090531295107F892F810F1F91089545
+:1071A00010339CF31053913694F397551295107F3A
+:1071B000892F810F1F910895282F882351F090E087
+:1071C0008091C00087FFFCCF8091C6009F5F92171F
+:1071D000B8F308951F93182F0E948638803211F05B
+:1071E0001F9108958091C00085FFFCCF84E18093BA
+:1071F000C6008091C00085FFFCCF1093C60080912F
+:10720000C00085FFFCCF80E18093C6001F910895E8
+:107210000E948638803209F008958091C00085FF71
+:10722000FCCF84E18093C6008091C00085FFFCCF35
+:1072300080E18093C6000895882359F010920902D6
+:1072400090E02D9A2D989F5F9817D8F3909309029C
+:1072500008951092090283E0F3CF3F924F925F921C
+:107260006F927F928F929F92AF92BF92CF92DF9256
+:10727000EF92FF920F931F93CF93DF9300005698E6
+:107280005E9A1092C50088E08093C40088E18093E4
+:10729000C10086E08093C200259A579A5F9A21E048
+:1072A00040E050E0CA010197F1F72F5F2131D1F79B
+:1072B00080E1809309025F9883E00E941C398091ED
+:1072C000C00085FFFCCF83E58093C6008091C0009D
+:1072D00085FFFCCF85E48093C6008091C00085FFC8
+:1072E000FCCF84E58093C6008091C00085FFFCCF71
+:1072F00080E28093C6008091C00085FFFCCF82E4CD
+:107300008093C6008091C00085FFFCCF84E5809308
+:10731000C6008091C00085FFFCCF80E28093C6004C
+:107320008091C00085FFFCCF80E58093C6008091EE
+:10733000C00085FFFCCF81E48093C6008091C0002F
+:1073400085FFFCCF87E48093C6008091C00085FF55
+:10735000FCCF85E48093C6008091C00085FFFCCF00
+:107360008DE48093C6008091C00085FFFCCF8FE440
+:107370008093C6008091C00085FFFCCF84E4809399
+:10738000C6008091C00085FFFCCF85E48093C600D5
+:107390008091C00085FFFCCF80E28093C600809181
+:1073A000C00085FFFCCF83E38093C6008091C000BE
+:1073B00085FFFCCF80E28093C6008091C00085FFEE
+:1073C000FCCF82E38093C6008091C00085FFFCCF94
+:1073D00080E38093C6008091C00085FFFCCF80E3EE
+:1073E0008093C6008091C00085FFFCCF80E380932E
+:1073F000C6008091C00085FFFCCF80E28093C6006C
+:107400008091C00085FFFCCF81E38093C60080910E
+:10741000C00085FFFCCF8DE08093C6008091C00046
+:1074200085FFFCCF83E58093C6008091C00085FF77
+:10743000FCCF85E48093C6008091C00085FFFCCF1F
+:1074400084E58093C6008091C00085FFFCCF80E278
+:107450008093C6008091C00085FFFCCF82E48093BA
+:10746000C6008091C00085FFFCCF84E58093C600F4
+:107470008091C00085FFFCCF80E28093C6008091A0
+:10748000C00085FFFCCF82E58093C6008091C000DC
+:1074900085FFFCCF8FE48093C6008091C00085FFFC
+:1074A000FCCF8CE48093C6008091C00085FFFCCFA8
+:1074B00085E48093C6008091C00085FFFCCF80E208
+:1074C0008093C6008091C00085FFFCCF80E380934D
+:1074D000C6008091C00085FFFCCF80E28093C6008B
+:1074E0008091C00085FFFCCF86E68093C600809126
+:1074F000C00085FFFCCF80E28093C6008091C00071
+:1075000085FFFCCF87E38093C6008091C00085FF94
+:10751000FCCF84E68093C6008091C00085FFFCCF3D
+:1075200080E38093C6008091C00085FFFCCF80E39C
+:107530008093C6008091C00085FFFCCF8DE08093D2
+:10754000C60034E1F32E2EE1E22E95E9D92E8FE02C
+:10755000C82E00E1B02EAA24A39411E4912EB6E522
+:107560008B2EA2E57A2EF0E26F2EE9E45E2E73E513
+:10757000472E60E5362E0E948638803359F18133DC
+:10758000C9F1803409F472C0813409F486C08234B0
+:1075900021F1853409F474C08035E1F08135D1F0F2
+:1075A0008235C1F0853509F497C0863509F486C067
+:1075B000843609F4A0C0843709F40BC1853709F477
+:1075C00075C18637C1F680E00E94EA380E9486388D
+:1075D0008033A9F60E940839CECF90E08091C00098
+:1075E00087FFFCCF8091C6009F5F9431B9F70E945E
+:1075F0000839C1CF0E948638803209F0BCCF809113
+:10760000C00085FFFCCFF092C6008091C00085FFCE
+:10761000FCCF9092C6008091C00085FFFCCF809285
+:10762000C6008091C00085FFFCCF7092C60080919B
+:10763000C00085FFFCCF6092C6008091C00085FF2E
+:10764000FCCF5092C6008091C00085FFFCCF4092D5
+:10765000C6008091C00085FFFCCF3092C6008091AB
+:10766000C00085FFFCCFB092C60085CF0E9486384F
+:10767000863808F4AFCF0E9486380E9408397BCF45
+:1076800090E08091C00087FFFCCF8091C6009F5F93
+:107690009530B9F70E9408396ECF0E94863880383D
+:1076A00031F1813809F48DC0823809F48EC08839EF
+:1076B00009F089CF83E00E94EA385DCF90E08091A5
+:1076C000C00087FFFCCF8091C6009F5F9430B9F760
+:1076D00080E00E94EA387ACF0E94863880930501C4
+:1076E0000E948638809306010E94083944CF82E0C8
+:1076F0000E94EA3840CF0E948638809308020E9498
+:1077000086388093070280910B028E7F80930B0254
+:107710000E948638853429F480910B028160809321
+:107720000B028091070290910802892B89F000E0FA
+:1077300010E00E948638F801E95FFE4F80830F5FFA
+:107740001F4F80910702909108020817190788F3CC
+:107750000E948638803209F00ECF80910B0280FFA4
+:10776000CFC0A0910702B09108021097E9F0609194
+:10777000050170910601E7E0F1E09B01AD014E0FBC
+:107780005F1FF999FECF32BD21BD819180BDFA9A6C
+:10779000F99A2F5F3F4FE417F50799F76A0F7B1FA0
+:1077A00070930601609305018091C00085FFFCCFB6
+:1077B000F092C6008091C00085FFFCCFB092C60059
+:1077C000DACE81E00E94EA38D6CE8FE00E94EA3815
+:1077D000D2CE0E948638809308020E948638809319
+:1077E00007020E948638853409F484C080910B0218
+:1077F0008E7F80930B028091050190910601880F86
+:10780000991F90930601809305010E94863880326B
+:1078100009F0B1CE8091C00085FFFCCFF092C60088
+:10782000A0910702B09108021097B9F180910B0264
+:10783000182F1170082F0270E0910501F0910601D8
+:107840009F012F5F3F4FB90140E050E01123B1F499
+:10785000002339F494918091C00085FFFCCF909370
+:10786000C6004F5F5F4FCB010196F9014A175B07D6
+:1078700080F4BC012F5F3F4F112351F3F999FECFE4
+:10788000F2BDE1BDF89A90B58091C00085FFFCCFB4
+:10789000E6CF70930601609305018091C00085FDDD
+:1078A000E2CE8091C00085FFF8CFDDCE0E94863801
+:1078B000803209F060CE8091C00085FFFCCFF0924D
+:1078C000C6008091C00085FFFCCFE092C600809189
+:1078D000C00085FFFCCFD092C6008091C00085FF1C
+:1078E000FCCFC092C6008091C00085FFFCCFB09253
+:1078F000C60041CE80910B02816080930B0285CF40
+:10790000809106018823880F880B8A2180930A02C0
+:107910008091050190910601880F991F90930601AF
+:10792000809305018091070280FF09C080910702C2
+:107930009091080201969093080280930702F894B0
+:10794000F999FECF1127E0910501F0910601C7E0FA
+:10795000D1E08091070290910802103091F40091DB
+:10796000570001700130D9F303E000935700E89508
+:107970000091570001700130D9F301E100935700E5
+:10798000E895099019900091570001700130D9F3E2
+:1079900001E000935700E8951395103498F01127F3
+:1079A0000091570001700130D9F305E000935700B2
+:1079B000E8950091570001700130D9F301E100937F
+:1079C0005700E8953296029709F0C7CF103011F0B2
+:1079D0000296E5CF11248091C00085FFE5CEE8CE68
+:0479E000F894FFCF49
+:0279E400800021
+:040000030000700089
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/bt/Makefile b/test/ardmake/hardware/bootloaders/bt/Makefile
new file mode 100644
index 0000000..431f2e7
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/bt/Makefile
@@ -0,0 +1,109 @@
+# Makefile for ATmegaBOOT
+# E.Lins, 18.7.2005
+# $Id$
+#
+# Instructions
+#
+# To make bootloader .hex file:
+# make diecimila
+# make lilypad
+# make ng
+# etc...
+#
+# To burn bootloader .hex file:
+# make diecimila_isp
+# make lilypad_isp
+# make ng_isp
+# etc...
+
+# program name should not be changed...
+PROGRAM = ATmegaBOOT_168
+
+# enter the parameters for the avrdude isp tool
+ISPTOOL = stk500v2
+ISPPORT = usb
+ISPSPEED = -b 115200
+
+MCU_TARGET = atmega168
+LDSECTION = --section-start=.text=0x3800
+
+# the efuse should really be 0xf8; since, however, only the lower
+# three bits of that byte are used on the atmega168, avrdude gets
+# confused if you specify 1's for the higher bits, see:
+# http://tinker.it/now/2007/02/24/the-tale-of-avrdude-atmega168-and-extended-bits-fuses/
+#
+# similarly, the lock bits should be 0xff instead of 0x3f (to
+# unlock the bootloader section) and 0xcf instead of 0x0f (to
+# lock it), but since the high two bits of the lock byte are
+# unused, avrdude would get confused.
+
+ISPFUSES = avrdude -c $(ISPTOOL) -p $(MCU_TARGET) -P $(ISPPORT) $(ISPSPEED) \
+-e -u -U lock:w:0x3f:m -U efuse:w:0x$(EFUSE):m -U hfuse:w:0x$(HFUSE):m -U lfuse:w:0x$(LFUSE):m
+ISPFLASH = avrdude -c $(ISPTOOL) -p $(MCU_TARGET) -P $(ISPPORT) $(ISPSPEED) \
+-U flash:w:$(PROGRAM)_$(TARGET).hex -U lock:w:0x0f:m
+
+STK500 = "C:\Program Files\Atmel\AVR Tools\STK500\Stk500.exe"
+STK500-1 = $(STK500) -e -d$(MCU_TARGET) -pf -vf -if$(PROGRAM)_$(TARGET).hex \
+-lFF -LFF -f$(HFUSE)$(LFUSE) -EF8 -ms -q -cUSB -I200kHz -s -wt
+STK500-2 = $(STK500) -d$(MCU_TARGET) -ms -q -lCF -LCF -cUSB -I200kHz -s -wt
+
+
+OBJ = $(PROGRAM).o
+OPTIMIZE = -O2
+
+DEFS =
+LIBS =
+
+CC = avr-gcc
+
+# Override is only needed by avr-lib build system.
+
+override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -DF_CPU=$(AVR_FREQ) $(DEFS)
+override LDFLAGS = -Wl,$(LDSECTION)
+#override LDFLAGS = -Wl,-Map,$(PROGRAM).map,$(LDSECTION)
+
+OBJCOPY = avr-objcopy
+OBJDUMP = avr-objdump
+
+all:
+
+atmega328_bt: TARGET = atmega328_bt
+atmega328_bt: MCU_TARGET = atmega328p
+atmega328_bt: AVR_FREQ = 16000000L
+atmega328_bt: LDSECTION = --section-start=.text=0x7000
+atmega328_bt: $(PROGRAM)_atmega328_bt.hex
+
+atmega328_bt_isp: atmega328_bt
+atmega328_bt_isp: TARGET = atmega328_bt
+atmega328_bt_isp: MCU_TARGET = atmega328p
+atmega328_bt_isp: HFUSE = D8
+atmega328_bt_isp: LFUSE = FF
+atmega328_bt_isp: EFUSE = 05
+atmega328_bt_isp: isp
+
+isp: $(TARGET)
+ $(ISPFUSES)
+ $(ISPFLASH)
+
+isp-stk500: $(PROGRAM)_$(TARGET).hex
+ $(STK500-1)
+ $(STK500-2)
+
+%.elf: $(OBJ)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+clean:
+ rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex
+
+%.lst: %.elf
+ $(OBJDUMP) -h -S $< > $@
+
+%.hex: %.elf
+ $(OBJCOPY) -j .text -j .data -O ihex $< $@
+
+%.srec: %.elf
+ $(OBJCOPY) -j .text -j .data -O srec $< $@
+
+%.bin: %.elf
+ $(OBJCOPY) -j .text -j .data -O binary $< $@
+
diff --git a/test/ardmake/hardware/bootloaders/lilypad/LilyPadBOOT_168.hex b/test/ardmake/hardware/bootloaders/lilypad/LilyPadBOOT_168.hex
new file mode 100644
index 0000000..aea378e
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/lilypad/LilyPadBOOT_168.hex
@@ -0,0 +1,117 @@
+:103800000C94341C0C944F1C0C944F1C0C944F1CA7
+:103810000C944F1C0C944F1C0C944F1C0C944F1C7C
+:103820000C944F1C0C944F1C0C944F1C0C944F1C6C
+:103830000C944F1C0C944F1C0C944F1C0C944F1C5C
+:103840000C944F1C0C944F1C0C944F1C0C944F1C4C
+:103850000C944F1C0C944F1C0C944F1C0C944F1C3C
+:103860000C944F1C0C944F1C11241FBECFEFD4E0BE
+:10387000DEBFCDBF11E0A0E0B1E0E8E1FFE302C0B0
+:1038800005900D92A230B107D9F712E0A2E0B1E0A5
+:1038900001C01D92AD30B107E1F70C94311D0C94BD
+:1038A000001CCF93DF93CDB7DEB724970FB6F89403
+:1038B000DEBF0FBECDBF382F882309F433E010924E
+:1038C0000A02332309F44BC020E02D9A19821A8290
+:1038D0001B821C8289819A81AB81BC8180549F416B
+:1038E000A040B040A0F489819A81AB81BC8101964F
+:1038F000A11DB11D89839A83AB83BC8389819A8181
+:10390000AB81BC8180549F41A040B04060F32D98B2
+:1039100019821A821B821C8289819A81AB81BC81A7
+:1039200080549F41A040B040A0F489819A81AB812E
+:10393000BC810196A11DB11D89839A83AB83BC8391
+:1039400089819A81AB81BC8180549F41A040B04065
+:1039500060F32F5F231708F4B8CF20930A02249650
+:103960000FB6F894DEBF0FBECDBFDF91CF910895A3
+:10397000EF92FF920F931F93EE24FF248701809113
+:10398000C00087FD17C00894E11CF11C011D111D2A
+:1039900081E0E81689E0F8068DE3080780E0180763
+:1039A00070F3E0910201F091030109958091C0004C
+:1039B00087FFE9CF8091C600992787FD90951F91D9
+:1039C0000F91FF90EF900895982F8091C00085FF90
+:1039D000FCCF9093C60008950E94B81C803271F00D
+:1039E000809104018F5F80930401853009F0089570
+:1039F000E0910201F09103010995089584E10E948C
+:103A0000E41C80E10E94E41C08951F93182F0E947B
+:103A1000B81C803269F0809104018F5F80930401AB
+:103A2000853079F4E0910201F0910301099509C014
+:103A300084E10E94E41C812F0E94E41C80E10E942A
+:103A4000E41C1F910895282F882351F090E0809165
+:103A5000C00087FFFCCF8091C6009F5F2917B9F790
+:103A60000895CFEFD4E0DEBFCDBF000089E18093A1
+:103A7000C4001092C50088E18093C10086E0809365
+:103A8000C2005098589A259A83E00E94511C0E94C7
+:103A9000B81C8033B1F18133B9F1803409F454C0DA
+:103AA000813409F45AC0823409F469C0853409F4B8
+:103AB0006CC0803531F1813521F1823511F18535C8
+:103AC00009F4B2C0863509F4BAC0843609F463C07B
+:103AD000843709F4BBC0853709F40EC1863709F471
+:103AE0004AC0809104018F5F80930401853079F68C
+:103AF000E0910201F091030109950E94B81C803306
+:103B000051F60E94EC1CC3CF0E94B81C803249F7CA
+:103B100084E10E94E41C81E40E94E41C86E50E948A
+:103B2000E41C82E50E94E41C80E20E94E41C89E41B
+:103B30000E94E41C83E50E94E41C80E50E94E41CD2
+:103B400080E10E94E41CA3CF0E94B81C8638C8F212
+:103B50000E94B81C0E94EC1C9ACF0E94B81C8038AE
+:103B600009F4F7C0813809F4F8C0823809F4F9C0C3
+:103B7000883909F4BDC080E00E94051D88CF84E12A
+:103B80000E94231D0E94EC1C82CF85E00E94231D11
+:103B90000E94EC1C7CCF0E94B81C809309020E94FA
+:103BA000B81C8093080280910C028E7F80930C02D7
+:103BB0000E94B81C853409F4C6C080910802909117
+:103BC0000902892B09F0ADC00E94B81C803209F0AF
+:103BD00088CF80910C0280FFC8C08091080290912C
+:103BE00009020097D1F02091060130910701E8E029
+:103BF000F1E0AC014E0F5F1FF999FECF32BD21BD40
+:103C0000819180BDFA9AF99A2F5F3F4F4E175F0757
+:103C100099F7309307012093060184E10E94E41C88
+:103C200080E10E94E41C33CF0E94B81C80930601FF
+:103C30000E94B81C809307010E94EC1C28CF84E0EE
+:103C40000E94231D80E00E94051D21CF0E94B81C08
+:103C5000809309020E94B81C809308020E94B81C3D
+:103C6000853409F4F4C080910C028E7F80930C029D
+:103C70008091060190910701880F991F9093070189
+:103C8000809306010E94B81C803209F000CF84E1C5
+:103C90000E94E41C2091080230910902211531058F
+:103CA00019F1C0E0D0E0E0910601F09107018091A8
+:103CB0000C0280FFC4C0F999FECFF2BDE1BDF89AB5
+:103CC00080B50E94E41CE0910601F0910701319655
+:103CD000F0930701E0930601209108023091090258
+:103CE0002196C217D30718F380E10E94E41CCFCEBF
+:103CF00083E00E94051DCBCE0E94B81C803209F0E3
+:103D0000F0CE84E10E94E41C8EE10E94E41C84E970
+:103D10000E94E41C86E00E94E41C80E10E94E41CF6
+:103D2000B6CEC0E0D0E008E011E00E94B81CF80177
+:103D300081938F0121968091080290910902C81702
+:103D4000D90798F341CF80910C02816080930C02D7
+:103D500034CF82E00E94051D9ACE81E00E94051DAD
+:103D600096CE80E10E94051D92CE8091070187FDCD
+:103D700080C010920B028091060190910701880F7C
+:103D8000991F90930701809306018091080280FF9C
+:103D900009C080910802909109020196909309024E
+:103DA00080930802F894F999FECF1127E09106015B
+:103DB000F0910701C8E0D1E08091080290910902DA
+:103DC000103091F40091570001700130D9F303E0F5
+:103DD00000935700E8950091570001700130D9F326
+:103DE00001E100935700E895099019900091570060
+:103DF00001700130D9F301E000935700E895139565
+:103E0000103498F011270091570001700130D9F358
+:103E100005E000935700E8950091570001700130CC
+:103E2000D9F301E100935700E8953296029709F023
+:103E3000C7CF103011F00296E5CF1124EECE81FFEE
+:103E40000CC03196F0930701E093060149CF8091B1
+:103E50000C02816080930C0215CF84910E94E41CB7
+:103E60002091080230910902E0910601F0910701CA
+:103E7000E8CF81E080930B027ECF0F931F930E94C7
+:103E8000B81C182F0E94E41C0E94B81C082F0E9426
+:103E9000E41C11362CF0175501363CF0075508C0CC
+:103EA0001033D4F310530136CCF700330CF0005329
+:103EB0001295107F100F812F992787FD90951F91E4
+:103EC0000F9108951F93282F992787FD9095807F44
+:103ED00090709595879595958795959587959595E6
+:103EE00087958A304CF0982F995A822F8F708A309C
+:103EF0004CF0182F195A08C0982F905D822F8F70A0
+:103F00008A30BCF7182F105D892F0E94E41C812F86
+:083F10000E94E41C1F910895BA
+:023F1800800027
+:0400000300003800C1
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/lilypad/src/ATmegaBOOT.c b/test/ardmake/hardware/bootloaders/lilypad/src/ATmegaBOOT.c
new file mode 100644
index 0000000..915bc57
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/lilypad/src/ATmegaBOOT.c
@@ -0,0 +1,979 @@
+/**********************************************************/
+/* Serial Bootloader for Atmel megaAVR Controllers */
+/* */
+/* tested with ATmega8, ATmega128 and ATmega168 */
+/* should work with other mega's, see code for details */
+/* */
+/* ATmegaBOOT.c */
+/* */
+/* 20070626: hacked for Arduino Diecimila (which auto- */
+/* resets when a USB connection is made to it) */
+/* by D. Mellis */
+/* 20060802: hacked for Arduino by D. Cuartielles */
+/* based on a previous hack by D. Mellis */
+/* and D. Cuartielles */
+/* */
+/* Monitor and debug functions were added to the original */
+/* code by Dr. Erik Lins, chip45.com. (See below) */
+/* */
+/* Thanks to Karl Pitrich for fixing a bootloader pin */
+/* problem and more informative LED blinking! */
+/* */
+/* For the latest version see: */
+/* http://www.chip45.com/ */
+/* */
+/* ------------------------------------------------------ */
+/* */
+/* based on stk500boot.c */
+/* Copyright (c) 2003, Jason P. Kyle */
+/* All rights reserved. */
+/* see avr1.org for original file and information */
+/* */
+/* 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 2 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, write */
+/* to the Free Software Foundation, Inc., */
+/* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+/* */
+/* Licence can be viewed at */
+/* http://www.fsf.org/licenses/gpl.txt */
+/* */
+/* Target = Atmel AVR m128,m64,m32,m16,m8,m162,m163,m169, */
+/* m8515,m8535. ATmega161 has a very small boot block so */
+/* isn't supported. */
+/* */
+/* Tested with m168 */
+/**********************************************************/
+
+/* $Id$ */
+
+
+/* some includes */
+#include <inttypes.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <avr/interrupt.h>
+#include <avr/wdt.h>
+
+
+/* the current avr-libc eeprom functions do not support the ATmega168 */
+/* own eeprom write/read functions are used instead */
+#ifndef __AVR_ATmega168__
+#include <avr/eeprom.h>
+#endif
+
+/* Use the F_CPU defined in Makefile */
+
+/* 20060803: hacked by DojoCorp */
+/* 20070626: hacked by David A. Mellis to decrease waiting time for auto-reset */
+/* set the waiting time for the bootloader */
+/* get this from the Makefile instead */
+/* #define MAX_TIME_COUNT (F_CPU>>4) */
+
+/* 20070707: hacked by David A. Mellis - after this many errors give up and launch application */
+#define MAX_ERROR_COUNT 5
+
+/* set the UART baud rate */
+/* 20060803: hacked by DojoCorp */
+//#define BAUD_RATE 115200
+#define BAUD_RATE 19200
+
+
+/* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
+/* never allow AVR Studio to do an update !!!! */
+#define HW_VER 0x02
+#define SW_MAJOR 0x01
+#define SW_MINOR 0x10
+
+
+/* Adjust to suit whatever pin your hardware uses to enter the bootloader */
+/* ATmega128 has two UARTS so two pins are used to enter bootloader and select UART */
+/* BL0... means UART0, BL1... means UART1 */
+#ifdef __AVR_ATmega128__
+#define BL_DDR DDRF
+#define BL_PORT PORTF
+#define BL_PIN PINF
+#define BL0 PINF7
+#define BL1 PINF6
+#else
+/* other ATmegas have only one UART, so only one pin is defined to enter bootloader */
+#define BL_DDR DDRD
+#define BL_PORT PORTD
+#define BL_PIN PIND
+#define BL PIND6
+#endif
+
+
+/* onboard LED is used to indicate, that the bootloader was entered (3x flashing) */
+/* if monitor functions are included, LED goes on after monitor was entered */
+#ifdef __AVR_ATmega128__
+/* Onboard LED is connected to pin PB7 (e.g. Crumb128, PROBOmega128, Savvy128) */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+#define LED PINB7
+#else
+/* Onboard LED is connected to pin PB2 (e.g. Crumb8, Crumb168) */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+/* 20060803: hacked by DojoCorp, LED pin is B5 in Arduino */
+/* #define LED PINB2 */
+#define LED PINB5
+#endif
+
+
+/* monitor functions will only be compiled when using ATmega128, due to bootblock size constraints */
+#ifdef __AVR_ATmega128__
+#define MONITOR
+#endif
+
+
+/* define various device id's */
+/* manufacturer byte is always the same */
+#define SIG1 0x1E // Yep, Atmel is the only manufacturer of AVR micros. Single source :(
+
+#if defined __AVR_ATmega128__
+#define SIG2 0x97
+#define SIG3 0x02
+#define PAGE_SIZE 0x80U //128 words
+
+#elif defined __AVR_ATmega64__
+#define SIG2 0x96
+#define SIG3 0x02
+#define PAGE_SIZE 0x80U //128 words
+
+#elif defined __AVR_ATmega32__
+#define SIG2 0x95
+#define SIG3 0x02
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega16__
+#define SIG2 0x94
+#define SIG3 0x03
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega8__
+#define SIG2 0x93
+#define SIG3 0x07
+#define PAGE_SIZE 0x20U //32 words
+
+#elif defined __AVR_ATmega88__
+#define SIG2 0x93
+#define SIG3 0x0a
+#define PAGE_SIZE 0x20U //32 words
+
+#elif defined __AVR_ATmega168__
+#define SIG2 0x94
+#define SIG3 0x06
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega162__
+#define SIG2 0x94
+#define SIG3 0x04
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega163__
+#define SIG2 0x94
+#define SIG3 0x02
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega169__
+#define SIG2 0x94
+#define SIG3 0x05
+#define PAGE_SIZE 0x40U //64 words
+
+#elif defined __AVR_ATmega8515__
+#define SIG2 0x93
+#define SIG3 0x06
+#define PAGE_SIZE 0x20U //32 words
+
+#elif defined __AVR_ATmega8535__
+#define SIG2 0x93
+#define SIG3 0x08
+#define PAGE_SIZE 0x20U //32 words
+#endif
+
+
+/* function prototypes */
+void putch(char);
+char getch(void);
+void getNch(uint8_t);
+void byte_response(uint8_t);
+void nothing_response(void);
+char gethex(void);
+void puthex(char);
+void flash_led(uint8_t);
+
+/* some variables */
+union address_union {
+ uint16_t word;
+ uint8_t byte[2];
+} address;
+
+union length_union {
+ uint16_t word;
+ uint8_t byte[2];
+} length;
+
+struct flags_struct {
+ unsigned eeprom : 1;
+ unsigned rampz : 1;
+} flags;
+
+uint8_t buff[256];
+uint8_t address_high;
+
+uint8_t pagesz=0x80;
+
+uint8_t i;
+uint8_t bootuart = 0;
+
+uint8_t error_count = 0;
+
+void (*app_start)(void) = 0x0000;
+
+
+/* main program starts here */
+int main(void)
+{
+ uint8_t ch,ch2;
+ uint16_t w;
+
+ asm volatile("nop\n\t");
+
+ /* set pin direction for bootloader pin and enable pullup */
+ /* for ATmega128, two pins need to be initialized */
+#ifdef __AVR_ATmega128__
+ BL_DDR &= ~_BV(BL0);
+ BL_DDR &= ~_BV(BL1);
+ BL_PORT |= _BV(BL0);
+ BL_PORT |= _BV(BL1);
+#else
+ /* We run the bootloader regardless of the state of this pin. Thus, don't
+ put it in a different state than the other pins. --DAM, 070709
+ BL_DDR &= ~_BV(BL);
+ BL_PORT |= _BV(BL);
+ */
+#endif
+
+
+#ifdef __AVR_ATmega128__
+ /* check which UART should be used for booting */
+ if(bit_is_clear(BL_PIN, BL0)) {
+ bootuart = 1;
+ }
+ else if(bit_is_clear(BL_PIN, BL1)) {
+ bootuart = 2;
+ }
+#endif
+
+ /* check if flash is programmed already, if not start bootloader anyway */
+ if(pgm_read_byte_near(0x0000) != 0xFF) {
+
+#ifdef __AVR_ATmega128__
+ /* no UART was selected, start application */
+ if(!bootuart) {
+ app_start();
+ }
+#else
+ /* check if bootloader pin is set low */
+ /* we don't start this part neither for the m8, nor m168 */
+ //if(bit_is_set(BL_PIN, BL)) {
+ // app_start();
+ // }
+#endif
+ }
+
+#ifdef __AVR_ATmega128__
+ /* no bootuart was selected, default to uart 0 */
+ if(!bootuart) {
+ bootuart = 1;
+ }
+#endif
+
+
+ /* initialize UART(s) depending on CPU defined */
+#ifdef __AVR_ATmega128__
+ if(bootuart == 1) {
+ UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSR0A = 0x00;
+ UCSR0C = 0x06;
+ UCSR0B = _BV(TXEN0)|_BV(RXEN0);
+ }
+ if(bootuart == 2) {
+ UBRR1L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRR1H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSR1A = 0x00;
+ UCSR1C = 0x06;
+ UCSR1B = _BV(TXEN1)|_BV(RXEN1);
+ }
+#elif defined __AVR_ATmega163__
+ UBRR = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRRHI = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSRA = 0x00;
+ UCSRB = _BV(TXEN)|_BV(RXEN);
+#elif defined __AVR_ATmega168__
+ UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSR0B = (1<<RXEN0) | (1<<TXEN0);
+ UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
+
+ /* Enable internal pull-up resistor on pin D0 (RX), in order
+ to supress line noise that prevents the bootloader from
+ timing out (DAM: 20070509) */
+ DDRD &= ~_BV(PIND0);
+ PORTD |= _BV(PIND0);
+#elif defined __AVR_ATmega8__
+ /* m8 */
+ UBRRH = (((F_CPU/BAUD_RATE)/16)-1)>>8; // set baud rate
+ UBRRL = (((F_CPU/BAUD_RATE)/16)-1);
+ UCSRB = (1<<RXEN)|(1<<TXEN); // enable Rx & Tx
+ UCSRC = (1<<URSEL)|(1<<UCSZ1)|(1<<UCSZ0); // config USART; 8N1
+#else
+ /* m16,m32,m169,m8515,m8535 */
+ UBRRL = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+ UBRRH = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+ UCSRA = 0x00;
+ UCSRC = 0x06;
+ UCSRB = _BV(TXEN)|_BV(RXEN);
+#endif
+
+ /* set LED pin as output */
+ LED_DDR |= _BV(LED);
+
+
+ /* flash onboard LED to signal entering of bootloader */
+#ifdef __AVR_ATmega128__
+ // 4x for UART0, 5x for UART1
+ flash_led(NUM_LED_FLASHES + bootuart);
+#else
+ flash_led(NUM_LED_FLASHES);
+#endif
+
+ /* 20050803: by DojoCorp, this is one of the parts provoking the
+ system to stop listening, cancelled from the original */
+ //putch('\0');
+
+
+ /* forever loop */
+ for (;;) {
+
+ /* get character from UART */
+ ch = getch();
+
+ /* A bunch of if...else if... gives smaller code than switch...case ! */
+
+ /* Hello is anyone home ? */
+ if(ch=='0') {
+ nothing_response();
+ }
+
+
+ /* Request programmer ID */
+ /* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
+ /* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
+ else if(ch=='1') {
+ if (getch() == ' ') {
+ putch(0x14);
+ putch('A');
+ putch('V');
+ putch('R');
+ putch(' ');
+ putch('I');
+ putch('S');
+ putch('P');
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+ }
+
+
+ /* AVR ISP/STK500 board commands DON'T CARE so default nothing_response */
+ else if(ch=='@') {
+ ch2 = getch();
+ if (ch2>0x85) getch();
+ nothing_response();
+ }
+
+
+ /* AVR ISP/STK500 board requests */
+ else if(ch=='A') {
+ ch2 = getch();
+ if(ch2==0x80) byte_response(HW_VER); // Hardware version
+ else if(ch2==0x81) byte_response(SW_MAJOR); // Software major version
+ else if(ch2==0x82) byte_response(SW_MINOR); // Software minor version
+ else if(ch2==0x98) byte_response(0x03); // Unknown but seems to be required by avr studio 3.56
+ else byte_response(0x00); // Covers various unnecessary responses we don't care about
+ }
+
+
+ /* Device Parameters DON'T CARE, DEVICE IS FIXED */
+ else if(ch=='B') {
+ getNch(20);
+ nothing_response();
+ }
+
+
+ /* Parallel programming stuff DON'T CARE */
+ else if(ch=='E') {
+ getNch(5);
+ nothing_response();
+ }
+
+
+ /* Enter programming mode */
+ else if(ch=='P') {
+ nothing_response();
+ }
+
+
+ /* Leave programming mode */
+ else if(ch=='Q') {
+ nothing_response();
+ }
+
+
+ /* Erase device, don't care as we will erase one page at a time anyway. */
+ else if(ch=='R') {
+ nothing_response();
+ }
+
+
+ /* Set address, little endian. EEPROM in bytes, FLASH in words */
+ /* Perhaps extra address bytes may be added in future to support > 128kB FLASH. */
+ /* This might explain why little endian was used here, big endian used everywhere else. */
+ else if(ch=='U') {
+ address.byte[0] = getch();
+ address.byte[1] = getch();
+ nothing_response();
+ }
+
+
+ /* Universal SPI programming command, disabled. Would be used for fuses and lock bits. */
+ else if(ch=='V') {
+ getNch(4);
+ byte_response(0x00);
+ }
+
+
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch=='d') {
+ length.byte[1] = getch();
+ length.byte[0] = getch();
+ flags.eeprom = 0;
+ if (getch() == 'E') flags.eeprom = 1;
+ for (w=0;w<length.word;w++) {
+ buff[w] = getch(); // Store data in buffer, can't keep up with serial data stream whilst programming pages
+ }
+ if (getch() == ' ') {
+ if (flags.eeprom) { //Write to EEPROM one byte at a time
+ for(w=0;w<length.word;w++) {
+#ifdef __AVR_ATmega168__
+ while(EECR & (1<<EEPE));
+ EEAR = (uint16_t)(void *)address.word;
+ EEDR = buff[w];
+ EECR |= (1<<EEMPE);
+ EECR |= (1<<EEPE);
+#else
+ eeprom_write_byte((void *)address.word,buff[w]);
+#endif
+ address.word++;
+ }
+ }
+ else { //Write to FLASH one page at a time
+ if (address.byte[1]>127) address_high = 0x01; //Only possible with m128, m256 will need 3rd address byte. FIXME
+ else address_high = 0x00;
+#ifdef __AVR_ATmega128__
+ RAMPZ = address_high;
+#endif
+ address.word = address.word << 1; //address * 2 -> byte location
+ /* if ((length.byte[0] & 0x01) == 0x01) length.word++; //Even up an odd number of bytes */
+ if ((length.byte[0] & 0x01)) length.word++; //Even up an odd number of bytes
+ cli(); //Disable interrupts, just to be sure
+ // HACKME: EEPE used to be EEWE
+ while(bit_is_set(EECR,EEPE)); //Wait for previous EEPROM writes to complete
+ asm volatile(
+ "clr r17 \n\t" //page_word_count
+ "lds r30,address \n\t" //Address of FLASH location (in bytes)
+ "lds r31,address+1 \n\t"
+ "ldi r28,lo8(buff) \n\t" //Start of buffer array in RAM
+ "ldi r29,hi8(buff) \n\t"
+ "lds r24,length \n\t" //Length of data to be written (in bytes)
+ "lds r25,length+1 \n\t"
+ "length_loop: \n\t" //Main loop, repeat for number of words in block
+ "cpi r17,0x00 \n\t" //If page_word_count=0 then erase page
+ "brne no_page_erase \n\t"
+ "wait_spm1: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm1 \n\t"
+ "ldi r16,0x03 \n\t" //Erase page pointed to by Z
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+#endif
+ "wait_spm2: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm2 \n\t"
+
+ "ldi r16,0x11 \n\t" //Re-enable RWW section
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+#endif
+ "no_page_erase: \n\t"
+ "ld r0,Y+ \n\t" //Write 2 bytes into page buffer
+ "ld r1,Y+ \n\t"
+
+ "wait_spm3: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm3 \n\t"
+ "ldi r16,0x01 \n\t" //Load r0,r1 into FLASH page buffer
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+
+ "inc r17 \n\t" //page_word_count++
+ "cpi r17,%1 \n\t"
+ "brlo same_page \n\t" //Still same page in FLASH
+ "write_page: \n\t"
+ "clr r17 \n\t" //New page, write current one first
+ "wait_spm4: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm4 \n\t"
+#ifdef __AVR_ATmega163__
+ "andi r30,0x80 \n\t" // m163 requires Z6:Z1 to be zero during page write
+#endif
+ "ldi r16,0x05 \n\t" //Write page pointed to by Z
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+ "ori r30,0x7E \n\t" // recover Z6:Z1 state after page write (had to be zero during write)
+#endif
+ "wait_spm5: \n\t"
+ "lds r16,%0 \n\t" //Wait for previous spm to complete
+ "andi r16,1 \n\t"
+ "cpi r16,1 \n\t"
+ "breq wait_spm5 \n\t"
+ "ldi r16,0x11 \n\t" //Re-enable RWW section
+ "sts %0,r16 \n\t"
+ "spm \n\t"
+#ifdef __AVR_ATmega163__
+ ".word 0xFFFF \n\t"
+ "nop \n\t"
+#endif
+ "same_page: \n\t"
+ "adiw r30,2 \n\t" //Next word in FLASH
+ "sbiw r24,2 \n\t" //length-2
+ "breq final_write \n\t" //Finished
+ "rjmp length_loop \n\t"
+ "final_write: \n\t"
+ "cpi r17,0 \n\t"
+ "breq block_done \n\t"
+ "adiw r24,2 \n\t" //length+2, fool above check on length after short page write
+ "rjmp write_page \n\t"
+ "block_done: \n\t"
+ "clr __zero_reg__ \n\t" //restore zero register
+#if defined __AVR_ATmega168__
+ : "=m" (SPMCSR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
+#else
+ : "=m" (SPMCR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
+#endif
+ );
+ /* Should really add a wait for RWW section to be enabled, don't actually need it since we never */
+ /* exit the bootloader without a power cycle anyhow */
+ }
+ putch(0x14);
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+ }
+
+
+ /* Read memory block mode, length is big endian. */
+ else if(ch=='t') {
+ length.byte[1] = getch();
+ length.byte[0] = getch();
+#if defined __AVR_ATmega128__
+ if (address.word>0x7FFF) flags.rampz = 1; // No go with m256, FIXME
+ else flags.rampz = 0;
+#endif
+ if (getch() == 'E') flags.eeprom = 1;
+ else {
+ flags.eeprom = 0;
+ address.word = address.word << 1; // address * 2 -> byte location
+ }
+ if (getch() == ' ') { // Command terminator
+ putch(0x14);
+ for (w=0;w < length.word;w++) { // Can handle odd and even lengths okay
+ if (flags.eeprom) { // Byte access EEPROM read
+#ifdef __AVR_ATmega168__
+ while(EECR & (1<<EEPE));
+ EEAR = (uint16_t)(void *)address.word;
+ EECR |= (1<<EERE);
+ putch(EEDR);
+#else
+ putch(eeprom_read_byte((void *)address.word));
+#endif
+ address.word++;
+ }
+ else {
+
+ if (!flags.rampz) putch(pgm_read_byte_near(address.word));
+#if defined __AVR_ATmega128__
+ else putch(pgm_read_byte_far(address.word + 0x10000));
+ // Hmmmm, yuck FIXME when m256 arrvies
+#endif
+ address.word++;
+ }
+ }
+ putch(0x10);
+ }
+ }
+
+
+ /* Get device signature bytes */
+ else if(ch=='u') {
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(SIG1);
+ putch(SIG2);
+ putch(SIG3);
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+ }
+
+
+ /* Read oscillator calibration byte */
+ else if(ch=='v') {
+ byte_response(0x00);
+ }
+
+
+#ifdef MONITOR
+
+ /* here come the extended monitor commands by Erik Lins */
+
+ /* check for three times exclamation mark pressed */
+ else if(ch=='!') {
+ ch = getch();
+ if(ch=='!') {
+ ch = getch();
+ if(ch=='!') {
+
+#ifdef __AVR_ATmega128__
+ uint16_t extaddr;
+#endif
+ uint8_t addrl, addrh;
+
+#ifdef CRUMB128
+ PGM_P welcome = {"ATmegaBOOT / Crumb128 - (C) J.P.Kyle, E.Lins - 050815\n\r"};
+#elif defined PROBOMEGA128
+ PGM_P welcome = {"ATmegaBOOT / PROBOmega128 - (C) J.P.Kyle, E.Lins - 050815\n\r"};
+#elif defined SAVVY128
+ PGM_P welcome = {"ATmegaBOOT / Savvy128 - (C) J.P.Kyle, E.Lins - 050815\n\r"};
+#endif
+
+ /* turn on LED */
+ LED_DDR |= _BV(LED);
+ LED_PORT &= ~_BV(LED);
+
+ /* print a welcome message and command overview */
+ for(i=0; welcome[i] != '\0'; ++i) {
+ putch(welcome[i]);
+ }
+
+ /* test for valid commands */
+ for(;;) {
+ putch('\n');
+ putch('\r');
+ putch(':');
+ putch(' ');
+
+ ch = getch();
+ putch(ch);
+
+ /* toggle LED */
+ if(ch == 't') {
+ if(bit_is_set(LED_PIN,LED)) {
+ LED_PORT &= ~_BV(LED);
+ putch('1');
+ } else {
+ LED_PORT |= _BV(LED);
+ putch('0');
+ }
+
+ }
+
+ /* read byte from address */
+ else if(ch == 'r') {
+ ch = getch(); putch(ch);
+ addrh = gethex();
+ addrl = gethex();
+ putch('=');
+ ch = *(uint8_t *)((addrh << 8) + addrl);
+ puthex(ch);
+ }
+
+ /* write a byte to address */
+ else if(ch == 'w') {
+ ch = getch(); putch(ch);
+ addrh = gethex();
+ addrl = gethex();
+ ch = getch(); putch(ch);
+ ch = gethex();
+ *(uint8_t *)((addrh << 8) + addrl) = ch;
+
+ }
+
+ /* read from uart and echo back */
+ else if(ch == 'u') {
+ for(;;) {
+ putch(getch());
+ }
+ }
+#ifdef __AVR_ATmega128__
+ /* external bus loop */
+ else if(ch == 'b') {
+ putch('b');
+ putch('u');
+ putch('s');
+ MCUCR = 0x80;
+ XMCRA = 0;
+ XMCRB = 0;
+ extaddr = 0x1100;
+ for(;;) {
+ ch = *(volatile uint8_t *)extaddr;
+ if(++extaddr == 0) {
+ extaddr = 0x1100;
+ }
+ }
+ }
+#endif
+
+ else if(ch == 'j') {
+ app_start();
+ }
+
+ }
+ /* end of monitor functions */
+
+ }
+ }
+ }
+ /* end of monitor */
+#endif
+ else if (++error_count == MAX_ERROR_COUNT) {
+ app_start();
+ }
+ }
+ /* end of forever loop */
+
+}
+
+
+char gethex(void) {
+ char ah,al;
+
+ ah = getch(); putch(ah);
+ al = getch(); putch(al);
+ if(ah >= 'a') {
+ ah = ah - 'a' + 0x0a;
+ } else if(ah >= '0') {
+ ah -= '0';
+ }
+ if(al >= 'a') {
+ al = al - 'a' + 0x0a;
+ } else if(al >= '0') {
+ al -= '0';
+ }
+ return (ah << 4) + al;
+}
+
+
+void puthex(char ch) {
+ char ah,al;
+
+ ah = (ch & 0xf0) >> 4;
+ if(ah >= 0x0a) {
+ ah = ah - 0x0a + 'a';
+ } else {
+ ah += '0';
+ }
+ al = (ch & 0x0f);
+ if(al >= 0x0a) {
+ al = al - 0x0a + 'a';
+ } else {
+ al += '0';
+ }
+ putch(ah);
+ putch(al);
+}
+
+
+void putch(char ch)
+{
+#ifdef __AVR_ATmega128__
+ if(bootuart == 1) {
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+ }
+ else if (bootuart == 2) {
+ while (!(UCSR1A & _BV(UDRE1)));
+ UDR1 = ch;
+ }
+#elif defined __AVR_ATmega168__
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+#else
+ /* m8,16,32,169,8515,8535,163 */
+ while (!(UCSRA & _BV(UDRE)));
+ UDR = ch;
+#endif
+}
+
+
+char getch(void)
+{
+#ifdef __AVR_ATmega128__
+ if(bootuart == 1) {
+ while(!(UCSR0A & _BV(RXC0)));
+ return UDR0;
+ }
+ else if(bootuart == 2) {
+ while(!(UCSR1A & _BV(RXC1)));
+ return UDR1;
+ }
+ return 0;
+#elif defined __AVR_ATmega168__
+ uint32_t count = 0;
+ while(!(UCSR0A & _BV(RXC0))){
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ /* HACKME:: here is a good place to count times*/
+ count++;
+ if (count > MAX_TIME_COUNT)
+ app_start();
+ }
+ return UDR0;
+#else
+ /* m8,16,32,169,8515,8535,163 */
+ uint32_t count = 0;
+ while(!(UCSRA & _BV(RXC))){
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ /* HACKME:: here is a good place to count times*/
+ count++;
+ if (count > MAX_TIME_COUNT)
+ app_start();
+ }
+ return UDR;
+#endif
+}
+
+
+void getNch(uint8_t count)
+{
+ uint8_t i;
+ for(i=0;i<count;i++) {
+#ifdef __AVR_ATmega128__
+ if(bootuart == 1) {
+ while(!(UCSR0A & _BV(RXC0)));
+ UDR0;
+ }
+ else if(bootuart == 2) {
+ while(!(UCSR1A & _BV(RXC1)));
+ UDR1;
+ }
+#elif defined __AVR_ATmega168__
+ while(!(UCSR0A & _BV(RXC0)));
+ UDR0;
+#else
+ /* m8,16,32,169,8515,8535,163 */
+ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
+ //while(!(UCSRA & _BV(RXC)));
+ //UDR;
+ uint8_t i;
+ for(i=0;i<count;i++) {
+ getch(); // need to handle time out
+ }
+#endif
+ }
+}
+
+
+void byte_response(uint8_t val)
+{
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(val);
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+}
+
+
+void nothing_response(void)
+{
+ if (getch() == ' ') {
+ putch(0x14);
+ putch(0x10);
+ } else {
+ if (++error_count == MAX_ERROR_COUNT)
+ app_start();
+ }
+}
+
+void flash_led(uint8_t count)
+{
+ /* flash onboard LED three times to signal entering of bootloader */
+ /* l needs to be volatile or the delay loops below might get
+ optimized away if compiling with optimizations (DAM). */
+ volatile uint32_t l;
+
+ if (count == 0) {
+ count = 3;
+ }
+
+ for (i = 0; i < count; ++i) {
+ LED_PORT |= _BV(LED);
+ for(l = 0; l < (F_CPU / 1000); ++l);
+ LED_PORT &= ~_BV(LED);
+ for(l = 0; l < (F_CPU / 1000); ++l);
+ }
+}
+
+
+/* end of file ATmegaBOOT.c */
diff --git a/test/ardmake/hardware/bootloaders/lilypad/src/Makefile b/test/ardmake/hardware/bootloaders/lilypad/src/Makefile
new file mode 100644
index 0000000..516d5b2
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/lilypad/src/Makefile
@@ -0,0 +1,84 @@
+# Makefile for ATmegaBOOT
+# E.Lins, 18.7.2005
+# $Id$
+
+# Instructions
+#
+# To build the bootloader for the LilyPad:
+# make lily
+
+
+# program name should not be changed...
+PROGRAM = ATmegaBOOT_168
+
+# enter the target CPU frequency
+AVR_FREQ = 8000000L
+
+# enter the parameters for the avrdude isp tool
+ISPTOOL = stk500v2
+ISPPORT = usb
+ISPSPEED = -b 115200
+
+MCU_TARGET = atmega168
+LDSECTION = --section-start=.text=0x3800
+
+# the efuse should really be 0xf8; since, however, only the lower
+# three bits of that byte are used on the atmega168, avrdude gets
+# confused if you specify 1's for the higher bits, see:
+# http://tinker.it/now/2007/02/24/the-tale-of-avrdude-atmega168-and-extended-bits-fuses/
+#
+# similarly, the lock bits should be 0xff instead of 0x3f (to
+# unlock the bootloader section) and 0xcf instead of 0x0f (to
+# lock it), but since the high two bits of the lock byte are
+# unused, avrdude would get confused.
+ISPFUSES = avrdude -c $(ISPTOOL) -p m168 -P $(ISPPORT) $(ISPSPEED) -e -u -U lock:w:0x3f:m -U efuse:w:0x00:m -U hfuse:w:0xdd:m -U lfuse:w:0xff:m
+ISPFLASH = avrdude -c $(ISPTOOL) -p m168 -P $(ISPPORT) $(ISPSPEED) -U flash:w:$(PROGRAM)_$(TARGET).hex -U lock:w:0x0f:m
+
+
+OBJ = $(PROGRAM).o
+OPTIMIZE = -O2
+
+DEFS =
+LIBS =
+
+CC = avr-gcc
+
+
+# Override is only needed by avr-lib build system.
+
+override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -DF_CPU=$(AVR_FREQ) $(DEFS)
+override LDFLAGS = -Wl,$(LDSECTION)
+#override LDFLAGS = -Wl,-Map,$(PROGRAM).map,$(LDSECTION)
+
+OBJCOPY = avr-objcopy
+OBJDUMP = avr-objdump
+
+all:
+
+lily: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>1' '-DNUM_LED_FLASHES=3'
+lily: $(PROGRAM).hex
+
+$(PROGRAM).hex: $(PROGRAM).elf
+ $(OBJCOPY) -j .text -j .data -O ihex $< $@
+
+$(PROGRAM).elf: $(OBJ)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+$(OBJ):
+ avr-gcc $(CFLAGS) $(LDFLAGS) -c -g -O2 -Wall -mmcu=atmega168 ATmegaBOOT.c -o ATmegaBOOT_168.o
+
+%.lst: %.elf
+ $(OBJDUMP) -h -S $< > $@
+
+%.srec: %.elf
+ $(OBJCOPY) -j .text -j .data -O srec $< $@
+
+%.bin: %.elf
+ $(OBJCOPY) -j .text -j .data -O binary $< $@
+
+clean:
+ rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex
+
+install:
+ avrdude -p m168 -c stk500v2 -P /dev/cu.USA19H1b1P1.1 -e -u -U lock:w:0x3f:m -U efuse:w:0x00:m -U hfuse:w:0xdd:m -U lfuse:w:0xe2:m
+ avrdude -p m168 -c stk500v2 -P /dev/cu.USA19H1b1P1.1 -e -u -U flash:w:ATmegaBOOT_168.hex -U lock:w:0x0f:m
diff --git a/test/ardmake/hardware/bootloaders/optiboot/Makefile b/test/ardmake/hardware/bootloaders/optiboot/Makefile
new file mode 100644
index 0000000..0fd6005
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/Makefile
@@ -0,0 +1,239 @@
+# Makefile for ATmegaBOOT
+# E.Lins, 18.7.2005
+# $Id$
+#
+# Instructions
+#
+# To make bootloader .hex file:
+# make diecimila
+# make lilypad
+# make ng
+# etc...
+#
+# To burn bootloader .hex file:
+# make diecimila_isp
+# make lilypad_isp
+# make ng_isp
+# etc...
+
+# program name should not be changed...
+PROGRAM = optiboot
+
+# enter the parameters for the avrdude isp tool
+ISPTOOL = stk500v2
+ISPPORT = usb
+ISPSPEED = -b 115200
+
+MCU_TARGET = atmega168
+LDSECTION = --section-start=.text=0x3e00
+
+# the efuse should really be 0xf8; since, however, only the lower
+# three bits of that byte are used on the atmega168, avrdude gets
+# confused if you specify 1's for the higher bits, see:
+# http://tinker.it/now/2007/02/24/the-tale-of-avrdude-atmega168-and-extended-bits-fuses/
+#
+# similarly, the lock bits should be 0xff instead of 0x3f (to
+# unlock the bootloader section) and 0xcf instead of 0x0f (to
+# lock it), but since the high two bits of the lock byte are
+# unused, avrdude would get confused.
+
+ISPFUSES = avrdude -c $(ISPTOOL) -p $(MCU_TARGET) -P $(ISPPORT) $(ISPSPEED) \
+-e -u -U lock:w:0x3f:m -U efuse:w:0x$(EFUSE):m -U hfuse:w:0x$(HFUSE):m -U lfuse:w:0x$(LFUSE):m
+ISPFLASH = avrdude -c $(ISPTOOL) -p $(MCU_TARGET) -P $(ISPPORT) $(ISPSPEED) \
+-U flash:w:$(PROGRAM)_$(TARGET).hex -U lock:w:0x0f:m
+
+STK500 = "C:\Program Files\Atmel\AVR Tools\STK500\Stk500.exe"
+STK500-1 = $(STK500) -e -d$(MCU_TARGET) -pf -vf -if$(PROGRAM)_$(TARGET).hex \
+-lFF -LFF -f$(HFUSE)$(LFUSE) -EF8 -ms -q -cUSB -I200kHz -s -wt
+STK500-2 = $(STK500) -d$(MCU_TARGET) -ms -q -lCF -LCF -cUSB -I200kHz -s -wt
+
+OBJ = $(PROGRAM).o
+OPTIMIZE = -Os -fno-inline-small-functions -fno-split-wide-types -mshort-calls
+
+DEFS =
+LIBS =
+
+CC = avr-gcc
+
+# Override is only needed by avr-lib build system.
+
+override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -DF_CPU=$(AVR_FREQ) $(DEFS)
+override LDFLAGS = -Wl,$(LDSECTION) -Wl,--relax -nostartfiles
+
+OBJCOPY = avr-objcopy
+OBJDUMP = avr-objdump
+
+# 20MHz clocked platforms
+#
+# These are capable of 230400 baud, or 115200 baud on PC (Arduino Avrdude issue)
+#
+
+pro20: TARGET = pro_20mhz
+pro20: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
+pro20: AVR_FREQ = 20000000L
+pro20: $(PROGRAM)_pro_20mhz.hex
+pro20: $(PROGRAM)_pro_20mhz.lst
+
+pro20_isp: pro20
+pro20_isp: TARGET = pro_20mhz
+pro20_isp: HFUSE = DD # 2.7V brownout
+pro20_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
+pro20_isp: EFUSE = 02 # 512 byte boot
+pro20_isp: isp
+
+# 16MHz clocked platforms
+#
+# These are capable of 230400 baud, or 115200 baud on PC (Arduino Avrdude issue)
+#
+
+pro16: TARGET = pro_16MHz
+pro16: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
+pro16: AVR_FREQ = 16000000L
+pro16: $(PROGRAM)_pro_16MHz.hex
+pro16: $(PROGRAM)_pro_16MHz.lst
+
+pro16_isp: pro16
+pro16_isp: TARGET = pro_16MHz
+pro16_isp: HFUSE = DD # 2.7V brownout
+pro16_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
+pro16_isp: EFUSE = 02 # 512 byte boot
+pro16_isp: isp
+
+# Diecimila and NG use identical bootloaders
+#
+diecimila: TARGET = diecimila
+diecimila: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
+diecimila: AVR_FREQ = 16000000L
+diecimila: $(PROGRAM)_diecimila.hex
+diecimila: $(PROGRAM)_diecimila.lst
+
+diecimila_isp: diecimila
+diecimila_isp: TARGET = diecimila
+diecimila_isp: HFUSE = DD # 2.7V brownout
+diecimila_isp: LFUSE = FF # Low power xtal (16MHz) 16KCK/14CK+65ms
+diecimila_isp: EFUSE = 02 # 512 byte boot
+diecimila_isp: isp
+
+atmega328: TARGET = atmega328
+atmega328: MCU_TARGET = atmega328p
+atmega328: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
+atmega328: AVR_FREQ = 16000000L
+atmega328: LDSECTION = --section-start=.text=0x7e00
+atmega328: $(PROGRAM)_atmega328.hex
+atmega328: $(PROGRAM)_atmega328.lst
+
+atmega328_isp: atmega328
+atmega328_isp: TARGET = atmega328
+atmega328_isp: MCU_TARGET = atmega328p
+atmega328_isp: HFUSE = DE # 512 byte boot
+atmega328_isp: LFUSE = FF # Low power xtal (16MHz) 16KCK/14CK+65ms
+atmega328_isp: EFUSE = 05 # 2.7V brownout
+atmega328_isp: isp
+
+# 8MHz clocked platforms
+#
+# These are capable of 115200 baud
+#
+
+lilypad: TARGET = lilypad
+lilypad: CFLAGS += '-DLED_START_FLASHES=3' '-DSOFT_UART' '-DBAUD_RATE=115200'
+lilypad: AVR_FREQ = 8000000L
+lilypad: $(PROGRAM)_lilypad.hex
+lilypad: $(PROGRAM)_lilypad.lst
+
+lilypad_isp: lilypad
+lilypad_isp: TARGET = lilypad
+lilypad_isp: HFUSE = DD # 2.7V brownout
+lilypad_isp: LFUSE = E2 # Internal 8MHz osc (8MHz) Slow rising power
+lilypad_isp: EFUSE = 02 # 512 byte boot
+lilypad_isp: isp
+
+lilypad_resonator: TARGET = lilypad_resonator
+lilypad_resonator: CFLAGS += '-DLED_START_FLASHES=3' '-DSOFT_UART' '-DBAUD_RATE=115200'
+lilypad_resonator: AVR_FREQ = 8000000L
+lilypad_resonator: $(PROGRAM)_lilypad_resonator.hex
+lilypad_resonator: $(PROGRAM)_lilypad_resonator.lst
+
+lilypad_resonator_isp: lilypad_resonator
+lilypad_resonator_isp: TARGET = lilypad_resonator
+lilypad_resonator_isp: HFUSE = DD # 2.7V brownout
+lilypad_resonator_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
+lilypad_resonator_isp: EFUSE = 02 # 512 byte boot
+lilypad_resonator_isp: isp
+
+pro8: TARGET = pro_8MHz
+pro8: CFLAGS += '-DLED_START_FLASHES=3' '-DSOFT_UART' '-DBAUD_RATE=115200'
+pro8: AVR_FREQ = 8000000L
+pro8: $(PROGRAM)_pro_8MHz.hex
+pro8: $(PROGRAM)_pro_8MHz.lst
+
+pro8_isp: pro8
+pro8_isp: TARGET = pro_8MHz
+pro8_isp: HFUSE = DD # 2.7V brownout
+pro8_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
+pro8_isp: EFUSE = 02 # 512 byte boot
+pro8_isp: isp
+
+atmega328_pro8: TARGET = atmega328_pro_8MHz
+atmega328_pro8: MCU_TARGET = atmega328p
+atmega328_pro8: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
+atmega328_pro8: AVR_FREQ = 8000000L
+atmega328_pro8: LDSECTION = --section-start=.text=0x7e00
+atmega328_pro8: $(PROGRAM)_atmega328_pro_8MHz.hex
+atmega328_pro8: $(PROGRAM)_atmega328_pro_8MHz.lst
+
+atmega328_pro8_isp: atmega328_pro8
+atmega328_pro8_isp: TARGET = atmega328_pro_8MHz
+atmega328_pro8_isp: MCU_TARGET = atmega328p
+atmega328_pro8_isp: HFUSE = DE # 512 byte boot
+atmega328_pro8_isp: LFUSE = FF # Low power xtal (16MHz) 16KCK/14CK+65ms
+atmega328_pro8_isp: EFUSE = 05 # 2.7V brownout
+atmega328_pro8_isp: isp
+
+# 1MHz clocked platforms
+#
+# These are capable of 9600 baud
+#
+
+luminet: TARGET = luminet
+luminet: MCU_TARGET = attiny84
+luminet: CFLAGS += '-DLED_START_FLASHES=3' '-DSOFT_UART' '-DBAUD_RATE=9600'
+luminet: CFLAGS += '-DVIRTUAL_BOOT_PARTITION'
+luminet: AVR_FREQ = 1000000L
+luminet: LDSECTION = --section-start=.text=0x1d00
+luminet: $(PROGRAM)_luminet.hex
+luminet: $(PROGRAM)_luminet.lst
+
+luminet_isp: luminet
+luminet_isp: TARGET = luminet
+luminet_isp: MCU_TARGET = attiny84
+luminet_isp: HFUSE = DF # Brownout disabled
+luminet_isp: LFUSE = 62 # 1MHz internal oscillator, slowly rising power
+luminet_isp: EFUSE = FE # Self-programming enable
+luminet_isp: isp
+
+isp: $(TARGET)
+ $(ISPFUSES)
+ $(ISPFLASH)
+
+isp-stk500: $(PROGRAM)_$(TARGET).hex
+ $(STK500-1)
+ $(STK500-2)
+
+%.elf: $(OBJ)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+clean:
+ rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex
+
+%.lst: %.elf
+ $(OBJDUMP) -h -S $< > $@
+
+%.hex: %.elf
+ $(OBJCOPY) -j .text -j .data -O ihex $< $@
+
+%.srec: %.elf
+ $(OBJCOPY) -j .text -j .data -O srec $< $@
+
+%.bin: %.elf
+ $(OBJCOPY) -j .text -j .data -O binary $< $@
diff --git a/test/ardmake/hardware/bootloaders/optiboot/makeall b/test/ardmake/hardware/bootloaders/optiboot/makeall
new file mode 100644
index 0000000..7a0b82d
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/makeall
@@ -0,0 +1,13 @@
+#!/bin/bash
+make clean
+make lilypad
+make lilypad_resonator
+make pro8
+make pro16
+make pro20
+make diecimila
+make ng
+make atmega328
+make atmega328_pro8
+make luminet
+
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot.c b/test/ardmake/hardware/bootloaders/optiboot/optiboot.c
new file mode 100644
index 0000000..af92995
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot.c
@@ -0,0 +1,536 @@
+/**********************************************************/
+/* Optiboot bootloader for Arduino */
+/* */
+/* Heavily optimised bootloader that is faster and */
+/* smaller than the Arduino standard bootloader */
+/* */
+/* Enhancements: */
+/* Fits in 512 bytes, saving 1.5K of code space */
+/* Background page erasing speeds up programming */
+/* Higher baud rate speeds up programming */
+/* Written almost entirely in C */
+/* Customisable timeout with accurate timeconstant */
+/* */
+/* What you lose: */
+/* Implements a skeleton STK500 protocol which is */
+/* missing several features including EEPROM */
+/* programming and non-page-aligned writes */
+/* High baud rate breaks compatibility with standard */
+/* Arduino flash settings */
+/* */
+/* Currently supports: */
+/* ATmega168 based devices (Diecimila etc) */
+/* ATmega328P based devices (Duemilanove etc) */
+/* */
+/* Does not support: */
+/* ATmega1280 based devices (eg. Mega) */
+/* */
+/* Assumptions: */
+/* The code makes several assumptions that reduce the */
+/* code size. They are all true after a hardware reset, */
+/* but may not be true if the bootloader is called by */
+/* other means or on other hardware. */
+/* No interrupts can occur */
+/* UART and Timer 1 are set to their reset state */
+/* SP points to RAMEND */
+/* */
+/* Code builds on code, libraries and optimisations from: */
+/* stk500boot.c by Jason P. Kyle */
+/* Arduino bootloader http://arduino.cc */
+/* Spiff's 1K bootloader http://spiffie.org/know/arduino_1k_bootloader/bootloader.shtml */
+/* avr-libc project http://nongnu.org/avr-libc */
+/* Adaboot http://www.ladyada.net/library/arduino/bootloader.html */
+/* AVR305 Atmel Application Note */
+/* */
+/* 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 2 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, write */
+/* to the Free Software Foundation, Inc., */
+/* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+/* */
+/* Licence can be viewed at */
+/* http://www.fsf.org/licenses/gpl.txt */
+/* */
+/**********************************************************/
+
+#include <inttypes.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <avr/boot.h>
+
+//#define LED_DATA_FLASH
+
+#ifndef LED_START_FLASHES
+#define LED_START_FLASHES 0
+#endif
+
+/* Build-time variables */
+/* BAUD_RATE Programming baud rate */
+/* LED_NO_FLASHES Number of LED flashes on boot */
+/* FLASH_TIME_MS Duration of each LED flash */
+/* BOOT_TIMEOUT_MS Serial port wait time before exiting bootloader */
+
+/* set the UART baud rate */
+#ifndef BAUD_RATE
+#define BAUD_RATE 19200
+#endif
+
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+/* Onboard LED is connected to pin PB5 in Arduino NG, Diecimila, and Duemilanove */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+#define LED PINB5
+
+/* Ports for soft UART */
+#ifdef SOFT_UART
+#define UART_PORT PORTD
+#define UART_PIN PIND
+#define UART_DDR DDRD
+#define UART_TX_BIT 1
+#define UART_RX_BIT 0
+#endif
+#endif
+
+#if defined(__AVR_ATtiny84__)
+/* Onboard LED is connected to pin PB5 in Arduino NG, Diecimila, and Duemilanove */
+#define LED_DDR DDRA
+#define LED_PORT PORTA
+#define LED_PIN PINA
+#define LED PINA4
+
+/* Ports for soft UART - left port only for now*/
+#ifdef SOFT_UART
+#define UART_PORT PORTA
+#define UART_PIN PINA
+#define UART_DDR DDRA
+#define UART_TX_BIT 2
+#define UART_RX_BIT 3
+#endif
+#endif
+
+/* STK500 constants list, from AVRDUDE */
+#define STK_OK 0x10
+#define STK_FAILED 0x11 // Not used
+#define STK_UNKNOWN 0x12 // Not used
+#define STK_NODEVICE 0x13 // Not used
+#define STK_INSYNC 0x14 // ' '
+#define STK_NOSYNC 0x15 // Not used
+#define ADC_CHANNEL_ERROR 0x16 // Not used
+#define ADC_MEASURE_OK 0x17 // Not used
+#define PWM_CHANNEL_ERROR 0x18 // Not used
+#define PWM_ADJUST_OK 0x19 // Not used
+#define CRC_EOP 0x20 // 'SPACE'
+#define STK_GET_SYNC 0x30 // '0'
+#define STK_GET_SIGN_ON 0x31 // '1'
+#define STK_SET_PARAMETER 0x40 // '@'
+#define STK_GET_PARAMETER 0x41 // 'A'
+#define STK_SET_DEVICE 0x42 // 'B'
+#define STK_SET_DEVICE_EXT 0x45 // 'E'
+#define STK_ENTER_PROGMODE 0x50 // 'P'
+#define STK_LEAVE_PROGMODE 0x51 // 'Q'
+#define STK_CHIP_ERASE 0x52 // 'R'
+#define STK_CHECK_AUTOINC 0x53 // 'S'
+#define STK_LOAD_ADDRESS 0x55 // 'U'
+#define STK_UNIVERSAL 0x56 // 'V'
+#define STK_PROG_FLASH 0x60 // '`'
+#define STK_PROG_DATA 0x61 // 'a'
+#define STK_PROG_FUSE 0x62 // 'b'
+#define STK_PROG_LOCK 0x63 // 'c'
+#define STK_PROG_PAGE 0x64 // 'd'
+#define STK_PROG_FUSE_EXT 0x65 // 'e'
+#define STK_READ_FLASH 0x70 // 'p'
+#define STK_READ_DATA 0x71 // 'q'
+#define STK_READ_FUSE 0x72 // 'r'
+#define STK_READ_LOCK 0x73 // 's'
+#define STK_READ_PAGE 0x74 // 't'
+#define STK_READ_SIGN 0x75 // 'u'
+#define STK_READ_OSCCAL 0x76 // 'v'
+#define STK_READ_FUSE_EXT 0x77 // 'w'
+#define STK_READ_OSCCAL_EXT 0x78 // 'x'
+
+/* Watchdog settings */
+#define WATCHDOG_OFF (0)
+#define WATCHDOG_16MS (_BV(WDE))
+#define WATCHDOG_32MS (_BV(WDP0) | _BV(WDE))
+#define WATCHDOG_64MS (_BV(WDP1) | _BV(WDE))
+#define WATCHDOG_125MS (_BV(WDP1) | _BV(WDP0) | _BV(WDE))
+#define WATCHDOG_250MS (_BV(WDP2) | _BV(WDE))
+#define WATCHDOG_500MS (_BV(WDP2) | _BV(WDP0) | _BV(WDE))
+#define WATCHDOG_1S (_BV(WDP2) | _BV(WDP1) | _BV(WDE))
+#define WATCHDOG_2S (_BV(WDP2) | _BV(WDP1) | _BV(WDP0) | _BV(WDE))
+#define WATCHDOG_4S (_BV(WDE3) | _BV(WDE))
+#define WATCHDOG_8S (_BV(WDE3) | _BV(WDE0) | _BV(WDE))
+
+/* Function Prototypes */
+/* The main function is in init9, which removes the interrupt vector table */
+/* we don't need. It is also 'naked', which means the compiler does not */
+/* generate any entry or exit code itself. */
+int main(void) __attribute__ ((naked)) __attribute__ ((section (".init9")));
+void putch(char);
+uint8_t getch(void);
+static inline void getNch(uint8_t); /* "static inline" is a compiler hint to reduce code size */
+void verifySpace();
+static inline void flash_led(uint8_t);
+uint8_t getLen();
+static inline void watchdogReset();
+void watchdogConfig(uint8_t x);
+#ifdef SOFT_UART
+void uartDelay() __attribute__ ((naked));
+#endif
+void appStart() __attribute__ ((naked));
+
+/* C zero initialises all global variables. However, that requires */
+/* These definitions are NOT zero initialised, but that doesn't matter */
+/* This allows us to drop the zero init code, saving us memory */
+#define buff ((uint8_t*)(0x100))
+#define address (*(uint16_t*)(0x200))
+#define length (*(uint8_t*)(0x202))
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ // After the zero init loop, this is the first code to run.
+ //
+ // This code makes the following assumptions:
+ // No interrupts will execute
+ // SP points to RAMEND
+ // r1 contains zero
+ //
+ // If not, uncomment the following instructions:
+ // cli();
+ // SP=RAMEND; // This is done by hardware reset
+ // asm volatile ("clr __zero_reg__");
+
+ uint8_t ch;
+
+#if LED_START_FLASHES > 0
+ // Set up Timer 1 for timeout counter
+ TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
+#endif
+#ifndef SOFT_UART
+ UCSR0A = _BV(U2X0); //Double speed mode USART0
+ UCSR0B = _BV(RXEN0) | _BV(TXEN0);
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ MCUSR = 0;
+ if (!(ch & _BV(EXTRF))) appStart();
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+
+#ifdef SOFT_UART
+ /* Set TX pin as output */
+ UART_DDR |= _BV(UART_TX_BIT);
+#endif
+
+#if LED_START_FLASHES > 0
+ /* Flash onboard LED to signal entering of bootloader */
+ flash_led(LED_START_FLASHES * 2);
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ putch(0x03);
+ }
+ else if(ch == STK_SET_DEVICE) {
+ // SET DEVICE is ignored
+ getNch(20);
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ // LOAD ADDRESS
+ address = getch();
+ address = (address & 0xff) | (getch() << 8);
+ address += address; // Convert from word address to byte address
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ // UNIVERSAL command is ignored
+ getNch(4);
+ putch(0x00);
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ while (--length);
+
+ // Read command terminator, start reply
+ verifySpace();
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+
+#ifdef VIRTUAL_BOOT_PARTITION
+ if ((uint16_t)(void*)address == 0) {
+ // This is the reset vector page. We need to live-patch the code so the
+ // bootloader runs.
+ //
+ // Move RESET vector to WDT vector
+ uint16_t vect = buff[0] | (buff[1]<<8);
+ rstVect = vect;
+ wdtVect = buff[10] | (buff[11]<<8);
+ vect -= 4; // Instruction is a relative jump (rjmp), so recalculate.
+ buff[10] = vect & 0xff;
+ buff[11] = vect >> 8;
+
+ // Add jump to bootloader at RESET vector
+ buff[0] = 0x7f;
+ buff[1] = 0xce; // rjmp 0x1d00 instruction
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ // READ PAGE - we only read flash
+ getLen();
+ verifySpace();
+#ifdef VIRTUAL_BOOT_PARTITION
+ do {
+ // Undo vector patch in bottom page so verify passes
+ if (address == 0) ch=rstVect & 0xff;
+ else if (address == 1) ch=rstVect >> 8;
+ else if (address == 10) ch=wdtVect & 0xff;
+ else if (address == 11) ch=wdtVect >> 8;
+ else ch = pgm_read_byte_near(address);
+ address++;
+ putch(ch);
+ } while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ while (--length);
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ putch(SIGNATURE_0);
+ putch(SIGNATURE_1);
+ putch(SIGNATURE_2);
+ }
+ else if (ch == 'Q') {
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ }
+ putch(STK_OK);
+ }
+}
+
+void putch(char ch) {
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+#else
+ __asm__ __volatile__ (
+ " com %[ch]\n" // ones complement, carry set
+ " sec\n"
+ "1: brcc 2f\n"
+ " cbi %[uartPort],%[uartBit]\n"
+ " rjmp 3f\n"
+ "2: sbi %[uartPort],%[uartBit]\n"
+ " nop\n"
+ "3: rcall uartDelay\n"
+ " rcall uartDelay\n"
+ " lsr %[ch]\n"
+ " dec %[bitcnt]\n"
+ " brne 1b\n"
+ :
+ :
+ [bitcnt] "d" (10),
+ [ch] "r" (ch),
+ [uartPort] "I" (_SFR_IO_ADDR(UART_PORT)),
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+
+uint8_t getch(void) {
+ uint8_t ch;
+
+ watchdogReset();
+
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+#ifdef SOFT_UART
+ __asm__ __volatile__ (
+ "1: sbic %[uartPin],%[uartBit]\n" // Wait for start edge
+ " rjmp 1b\n"
+ " rcall uartDelay\n" // Get to middle of start bit
+ "2: rcall uartDelay\n" // Wait 1 bit period
+ " rcall uartDelay\n" // Wait 1 bit period
+ " clc\n"
+ " sbic %[uartPin],%[uartBit]\n"
+ " sec\n"
+ " dec %[bitCnt]\n"
+ " breq 3f\n"
+ " ror %[ch]\n"
+ " rjmp 2b\n"
+ "3:\n"
+ :
+ [ch] "=r" (ch)
+ :
+ [bitCnt] "d" (9),
+ [uartPin] "I" (_SFR_IO_ADDR(UART_PIN)),
+ [uartBit] "I" (UART_RX_BIT)
+ :
+ "r25"
+);
+#else
+ while(!(UCSR0A & _BV(RXC0)));
+ ch = UDR0;
+#endif
+
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+
+#ifdef SOFT_UART
+//#define UART_B_VALUE (((F_CPU/BAUD_RATE)-23)/6)
+#define UART_B_VALUE (((F_CPU/BAUD_RATE)-20)/6)
+#if UART_B_VALUE > 255
+#error Baud rate too slow for soft UART
+#endif
+
+void uartDelay() {
+ __asm__ __volatile__ (
+ "ldi r25,%[count]\n"
+ "1:dec r25\n"
+ "brne 1b\n"
+ "ret\n"
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ putch(STK_INSYNC);
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ length = getch();
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ WDTCSR = x;
+}
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ __asm__ __volatile__ (
+#ifdef VIRTUAL_BOOT_PARTITION
+ // Jump to WDT vector
+ "ldi r30,5\n"
+ "clr r31\n"
+#else
+ // Jump to RST vector
+ "clr r30\n"
+ "clr r31\n"
+#endif
+ "ijmp\n"
+ );
+}
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328.hex b/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328.hex
new file mode 100644
index 0000000..b1c8567
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328.hex
@@ -0,0 +1,33 @@
+:107E000085E08093810082E08093C00088E18093C8
+:107E1000C10086E08093C20080E18093C40084B7F3
+:107E200014BE81FFD0D08DE0C8D0259A86E020E333
+:107E30003CEF91E0309385002093840096BBB09B8B
+:107E4000FECF1D9AA8958150A9F7DD24D394A5E013
+:107E5000EA2EF1E1FF2EA4D0813421F481E0BED0DE
+:107E600083E024C0823411F484E103C0853419F422
+:107E700085E0B4D08AC08535A1F492D0082F10E0F7
+:107E800010930102009300028BD090E0982F882776
+:107E9000802B912B880F991F9093010280930002F1
+:107EA00073C0863529F484E099D080E071D06DC02C
+:107EB000843609F043C07CD0E0910002F0910102C9
+:107EC00083E080935700E895C0E0D1E069D08993C2
+:107ED000809102028150809302028823B9F778D002
+:107EE00007B600FCFDCF4091000250910102A0E0D6
+:107EF000B1E02C9130E011968C91119790E0982F81
+:107F00008827822B932B1296FA010C01D0925700EE
+:107F1000E89511244E5F5F4FF1E0A038BF0749F7A5
+:107F2000E0910002F0910102E0925700E89507B657
+:107F300000FCFDCFF0925700E89527C08437B9F4D4
+:107F400037D046D0E0910002F09101023196F093D3
+:107F50000102E09300023197E4918E2F19D08091B5
+:107F60000202815080930202882361F70EC0853798
+:107F700039F42ED08EE10CD085E90AD08FE096CF6F
+:107F8000813511F488E019D023D080E101D063CF8E
+:107F9000982F8091C00085FFFCCF9093C600089574
+:107FA000A8958091C00087FFFCCF8091C6000895FE
+:107FB000F7DFF6DF80930202F3CFE0E6F0E098E12E
+:107FC00090838083089580E0F8DFEE27FF270994EF
+:107FD000E7DF803209F0F7DF84E1DACF1F93182F53
+:0C7FE000DFDF1150E9F7F4DF1F91089576
+:0400000300007E007B
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328.lst b/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328.lst
new file mode 100644
index 0000000..888871d
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328.lst
@@ -0,0 +1,520 @@
+
+optiboot_atmega328.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001ec 00007e00 00007e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .debug_aranges 00000028 00000000 00000000 00000240 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 2 .debug_pubnames 0000006a 00000000 00000000 00000268 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_info 00000269 00000000 00000000 000002d2 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_abbrev 00000196 00000000 00000000 0000053b 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_line 000003d3 00000000 00000000 000006d1 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_frame 00000090 00000000 00000000 00000aa4 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_str 00000135 00000000 00000000 00000b34 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_loc 000001d1 00000000 00000000 00000c69 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_ranges 00000068 00000000 00000000 00000e3a 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00007e00 <main>:
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 7e00: 85 e0 ldi r24, 0x05 ; 5
+ 7e02: 80 93 81 00 sts 0x0081, r24
+#if LED_START_FLASHES > 0
+ // Set up Timer 1 for timeout counter
+ TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
+#endif
+#ifndef SOFT_UART
+ UCSR0A = _BV(U2X0); //Double speed mode USART0
+ 7e06: 82 e0 ldi r24, 0x02 ; 2
+ 7e08: 80 93 c0 00 sts 0x00C0, r24
+ UCSR0B = _BV(RXEN0) | _BV(TXEN0);
+ 7e0c: 88 e1 ldi r24, 0x18 ; 24
+ 7e0e: 80 93 c1 00 sts 0x00C1, r24
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ 7e12: 86 e0 ldi r24, 0x06 ; 6
+ 7e14: 80 93 c2 00 sts 0x00C2, r24
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+ 7e18: 80 e1 ldi r24, 0x10 ; 16
+ 7e1a: 80 93 c4 00 sts 0x00C4, r24
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 7e1e: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 7e20: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 7e22: 81 ff sbrs r24, 1
+ 7e24: d0 d0 rcall .+416 ; 0x7fc6 <appStart>
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+ 7e26: 8d e0 ldi r24, 0x0D ; 13
+ 7e28: c8 d0 rcall .+400 ; 0x7fba <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 7e2a: 25 9a sbi 0x04, 5 ; 4
+ 7e2c: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 7e2e: 20 e3 ldi r18, 0x30 ; 48
+ 7e30: 3c ef ldi r19, 0xFC ; 252
+ TIFR1 = _BV(TOV1);
+ 7e32: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 7e34: 30 93 85 00 sts 0x0085, r19
+ 7e38: 20 93 84 00 sts 0x0084, r18
+ TIFR1 = _BV(TOV1);
+ 7e3c: 96 bb out 0x16, r25 ; 22
+ while(!(TIFR1 & _BV(TOV1)));
+ 7e3e: b0 9b sbis 0x16, 0 ; 22
+ 7e40: fe cf rjmp .-4 ; 0x7e3e <main+0x3e>
+ LED_PIN |= _BV(LED);
+ 7e42: 1d 9a sbi 0x03, 5 ; 3
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 7e44: a8 95 wdr
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+ 7e46: 81 50 subi r24, 0x01 ; 1
+ 7e48: a9 f7 brne .-22 ; 0x7e34 <main+0x34>
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 7e4a: dd 24 eor r13, r13
+ 7e4c: d3 94 inc r13
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 7e4e: a5 e0 ldi r26, 0x05 ; 5
+ 7e50: ea 2e mov r14, r26
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 7e52: f1 e1 ldi r31, 0x11 ; 17
+ 7e54: ff 2e mov r15, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 7e56: a4 d0 rcall .+328 ; 0x7fa0 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 7e58: 81 34 cpi r24, 0x41 ; 65
+ 7e5a: 21 f4 brne .+8 ; 0x7e64 <main+0x64>
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 7e5c: 81 e0 ldi r24, 0x01 ; 1
+ 7e5e: be d0 rcall .+380 ; 0x7fdc <verifySpace+0xc>
+ putch(0x03);
+ 7e60: 83 e0 ldi r24, 0x03 ; 3
+ 7e62: 24 c0 rjmp .+72 ; 0x7eac <main+0xac>
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 7e64: 82 34 cpi r24, 0x42 ; 66
+ 7e66: 11 f4 brne .+4 ; 0x7e6c <main+0x6c>
+ // SET DEVICE is ignored
+ getNch(20);
+ 7e68: 84 e1 ldi r24, 0x14 ; 20
+ 7e6a: 03 c0 rjmp .+6 ; 0x7e72 <main+0x72>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 7e6c: 85 34 cpi r24, 0x45 ; 69
+ 7e6e: 19 f4 brne .+6 ; 0x7e76 <main+0x76>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 7e70: 85 e0 ldi r24, 0x05 ; 5
+ 7e72: b4 d0 rcall .+360 ; 0x7fdc <verifySpace+0xc>
+ 7e74: 8a c0 rjmp .+276 ; 0x7f8a <main+0x18a>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 7e76: 85 35 cpi r24, 0x55 ; 85
+ 7e78: a1 f4 brne .+40 ; 0x7ea2 <main+0xa2>
+ // LOAD ADDRESS
+ address = getch();
+ 7e7a: 92 d0 rcall .+292 ; 0x7fa0 <getch>
+ 7e7c: 08 2f mov r16, r24
+ 7e7e: 10 e0 ldi r17, 0x00 ; 0
+ 7e80: 10 93 01 02 sts 0x0201, r17
+ 7e84: 00 93 00 02 sts 0x0200, r16
+ address = (address & 0xff) | (getch() << 8);
+ 7e88: 8b d0 rcall .+278 ; 0x7fa0 <getch>
+ 7e8a: 90 e0 ldi r25, 0x00 ; 0
+ 7e8c: 98 2f mov r25, r24
+ 7e8e: 88 27 eor r24, r24
+ 7e90: 80 2b or r24, r16
+ 7e92: 91 2b or r25, r17
+ address += address; // Convert from word address to byte address
+ 7e94: 88 0f add r24, r24
+ 7e96: 99 1f adc r25, r25
+ 7e98: 90 93 01 02 sts 0x0201, r25
+ 7e9c: 80 93 00 02 sts 0x0200, r24
+ 7ea0: 73 c0 rjmp .+230 ; 0x7f88 <main+0x188>
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 7ea2: 86 35 cpi r24, 0x56 ; 86
+ 7ea4: 29 f4 brne .+10 ; 0x7eb0 <main+0xb0>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 7ea6: 84 e0 ldi r24, 0x04 ; 4
+ 7ea8: 99 d0 rcall .+306 ; 0x7fdc <verifySpace+0xc>
+ putch(0x00);
+ 7eaa: 80 e0 ldi r24, 0x00 ; 0
+ 7eac: 71 d0 rcall .+226 ; 0x7f90 <putch>
+ 7eae: 6d c0 rjmp .+218 ; 0x7f8a <main+0x18a>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 7eb0: 84 36 cpi r24, 0x64 ; 100
+ 7eb2: 09 f0 breq .+2 ; 0x7eb6 <main+0xb6>
+ 7eb4: 43 c0 rjmp .+134 ; 0x7f3c <main+0x13c>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+ 7eb6: 7c d0 rcall .+248 ; 0x7fb0 <getLen>
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+ 7eb8: e0 91 00 02 lds r30, 0x0200
+ 7ebc: f0 91 01 02 lds r31, 0x0201
+ 7ec0: 83 e0 ldi r24, 0x03 ; 3
+ 7ec2: 80 93 57 00 sts 0x0057, r24
+ 7ec6: e8 95 spm
+ 7ec8: c0 e0 ldi r28, 0x00 ; 0
+ 7eca: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 7ecc: 69 d0 rcall .+210 ; 0x7fa0 <getch>
+ 7ece: 89 93 st Y+, r24
+ while (--length);
+ 7ed0: 80 91 02 02 lds r24, 0x0202
+ 7ed4: 81 50 subi r24, 0x01 ; 1
+ 7ed6: 80 93 02 02 sts 0x0202, r24
+ 7eda: 88 23 and r24, r24
+ 7edc: b9 f7 brne .-18 ; 0x7ecc <main+0xcc>
+
+ // Read command terminator, start reply
+ verifySpace();
+ 7ede: 78 d0 rcall .+240 ; 0x7fd0 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 7ee0: 07 b6 in r0, 0x37 ; 55
+ 7ee2: 00 fc sbrc r0, 0
+ 7ee4: fd cf rjmp .-6 ; 0x7ee0 <main+0xe0>
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ 7ee6: 40 91 00 02 lds r20, 0x0200
+ 7eea: 50 91 01 02 lds r21, 0x0201
+ 7eee: a0 e0 ldi r26, 0x00 ; 0
+ 7ef0: b1 e0 ldi r27, 0x01 ; 1
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 7ef2: 2c 91 ld r18, X
+ 7ef4: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 7ef6: 11 96 adiw r26, 0x01 ; 1
+ 7ef8: 8c 91 ld r24, X
+ 7efa: 11 97 sbiw r26, 0x01 ; 1
+ 7efc: 90 e0 ldi r25, 0x00 ; 0
+ 7efe: 98 2f mov r25, r24
+ 7f00: 88 27 eor r24, r24
+ 7f02: 82 2b or r24, r18
+ 7f04: 93 2b or r25, r19
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 7f06: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 7f08: fa 01 movw r30, r20
+ 7f0a: 0c 01 movw r0, r24
+ 7f0c: d0 92 57 00 sts 0x0057, r13
+ 7f10: e8 95 spm
+ 7f12: 11 24 eor r1, r1
+ addrPtr += 2;
+ 7f14: 4e 5f subi r20, 0xFE ; 254
+ 7f16: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 7f18: f1 e0 ldi r31, 0x01 ; 1
+ 7f1a: a0 38 cpi r26, 0x80 ; 128
+ 7f1c: bf 07 cpc r27, r31
+ 7f1e: 49 f7 brne .-46 ; 0x7ef2 <main+0xf2>
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 7f20: e0 91 00 02 lds r30, 0x0200
+ 7f24: f0 91 01 02 lds r31, 0x0201
+ 7f28: e0 92 57 00 sts 0x0057, r14
+ 7f2c: e8 95 spm
+ boot_spm_busy_wait();
+ 7f2e: 07 b6 in r0, 0x37 ; 55
+ 7f30: 00 fc sbrc r0, 0
+ 7f32: fd cf rjmp .-6 ; 0x7f2e <main+0x12e>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 7f34: f0 92 57 00 sts 0x0057, r15
+ 7f38: e8 95 spm
+ 7f3a: 27 c0 rjmp .+78 ; 0x7f8a <main+0x18a>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 7f3c: 84 37 cpi r24, 0x74 ; 116
+ 7f3e: b9 f4 brne .+46 ; 0x7f6e <main+0x16e>
+ // READ PAGE - we only read flash
+ getLen();
+ 7f40: 37 d0 rcall .+110 ; 0x7fb0 <getLen>
+ verifySpace();
+ 7f42: 46 d0 rcall .+140 ; 0x7fd0 <verifySpace>
+ else ch = pgm_read_byte_near(address);
+ address++;
+ putch(ch);
+ } while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 7f44: e0 91 00 02 lds r30, 0x0200
+ 7f48: f0 91 01 02 lds r31, 0x0201
+ 7f4c: 31 96 adiw r30, 0x01 ; 1
+ 7f4e: f0 93 01 02 sts 0x0201, r31
+ 7f52: e0 93 00 02 sts 0x0200, r30
+ 7f56: 31 97 sbiw r30, 0x01 ; 1
+ 7f58: e4 91 lpm r30, Z+
+ 7f5a: 8e 2f mov r24, r30
+ 7f5c: 19 d0 rcall .+50 ; 0x7f90 <putch>
+ while (--length);
+ 7f5e: 80 91 02 02 lds r24, 0x0202
+ 7f62: 81 50 subi r24, 0x01 ; 1
+ 7f64: 80 93 02 02 sts 0x0202, r24
+ 7f68: 88 23 and r24, r24
+ 7f6a: 61 f7 brne .-40 ; 0x7f44 <main+0x144>
+ 7f6c: 0e c0 rjmp .+28 ; 0x7f8a <main+0x18a>
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 7f6e: 85 37 cpi r24, 0x75 ; 117
+ 7f70: 39 f4 brne .+14 ; 0x7f80 <main+0x180>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 7f72: 2e d0 rcall .+92 ; 0x7fd0 <verifySpace>
+ putch(SIGNATURE_0);
+ 7f74: 8e e1 ldi r24, 0x1E ; 30
+ 7f76: 0c d0 rcall .+24 ; 0x7f90 <putch>
+ putch(SIGNATURE_1);
+ 7f78: 85 e9 ldi r24, 0x95 ; 149
+ 7f7a: 0a d0 rcall .+20 ; 0x7f90 <putch>
+ putch(SIGNATURE_2);
+ 7f7c: 8f e0 ldi r24, 0x0F ; 15
+ 7f7e: 96 cf rjmp .-212 ; 0x7eac <main+0xac>
+ }
+ else if (ch == 'Q') {
+ 7f80: 81 35 cpi r24, 0x51 ; 81
+ 7f82: 11 f4 brne .+4 ; 0x7f88 <main+0x188>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 7f84: 88 e0 ldi r24, 0x08 ; 8
+ 7f86: 19 d0 rcall .+50 ; 0x7fba <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 7f88: 23 d0 rcall .+70 ; 0x7fd0 <verifySpace>
+ }
+ putch(STK_OK);
+ 7f8a: 80 e1 ldi r24, 0x10 ; 16
+ 7f8c: 01 d0 rcall .+2 ; 0x7f90 <putch>
+ 7f8e: 63 cf rjmp .-314 ; 0x7e56 <main+0x56>
+
+00007f90 <putch>:
+ }
+}
+
+void putch(char ch) {
+ 7f90: 98 2f mov r25, r24
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ 7f92: 80 91 c0 00 lds r24, 0x00C0
+ 7f96: 85 ff sbrs r24, 5
+ 7f98: fc cf rjmp .-8 ; 0x7f92 <putch+0x2>
+ UDR0 = ch;
+ 7f9a: 90 93 c6 00 sts 0x00C6, r25
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 7f9e: 08 95 ret
+
+00007fa0 <getch>:
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 7fa0: a8 95 wdr
+ [uartBit] "I" (UART_RX_BIT)
+ :
+ "r25"
+);
+#else
+ while(!(UCSR0A & _BV(RXC0)));
+ 7fa2: 80 91 c0 00 lds r24, 0x00C0
+ 7fa6: 87 ff sbrs r24, 7
+ 7fa8: fc cf rjmp .-8 ; 0x7fa2 <getch+0x2>
+ ch = UDR0;
+ 7faa: 80 91 c6 00 lds r24, 0x00C6
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+ 7fae: 08 95 ret
+
+00007fb0 <getLen>:
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ 7fb0: f7 df rcall .-18 ; 0x7fa0 <getch>
+ length = getch();
+ 7fb2: f6 df rcall .-20 ; 0x7fa0 <getch>
+ 7fb4: 80 93 02 02 sts 0x0202, r24
+ return getch();
+}
+ 7fb8: f3 cf rjmp .-26 ; 0x7fa0 <getch>
+
+00007fba <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 7fba: e0 e6 ldi r30, 0x60 ; 96
+ 7fbc: f0 e0 ldi r31, 0x00 ; 0
+ 7fbe: 98 e1 ldi r25, 0x18 ; 24
+ 7fc0: 90 83 st Z, r25
+ WDTCSR = x;
+ 7fc2: 80 83 st Z, r24
+}
+ 7fc4: 08 95 ret
+
+00007fc6 <appStart>:
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 7fc6: 80 e0 ldi r24, 0x00 ; 0
+ 7fc8: f8 df rcall .-16 ; 0x7fba <watchdogConfig>
+ __asm__ __volatile__ (
+ 7fca: ee 27 eor r30, r30
+ 7fcc: ff 27 eor r31, r31
+ 7fce: 09 94 ijmp
+
+00007fd0 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ 7fd0: e7 df rcall .-50 ; 0x7fa0 <getch>
+ 7fd2: 80 32 cpi r24, 0x20 ; 32
+ 7fd4: 09 f0 breq .+2 ; 0x7fd8 <verifySpace+0x8>
+ 7fd6: f7 df rcall .-18 ; 0x7fc6 <appStart>
+ putch(STK_INSYNC);
+ 7fd8: 84 e1 ldi r24, 0x14 ; 20
+}
+ 7fda: da cf rjmp .-76 ; 0x7f90 <putch>
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 7fdc: 1f 93 push r17
+ 7fde: 18 2f mov r17, r24
+
+00007fe0 <getNch>:
+ do getch(); while (--count);
+ 7fe0: df df rcall .-66 ; 0x7fa0 <getch>
+ 7fe2: 11 50 subi r17, 0x01 ; 1
+ 7fe4: e9 f7 brne .-6 ; 0x7fe0 <getNch>
+ verifySpace();
+ 7fe6: f4 df rcall .-24 ; 0x7fd0 <verifySpace>
+}
+ 7fe8: 1f 91 pop r17
+ 7fea: 08 95 ret
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex b/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
new file mode 100644
index 0000000..d6ac145
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
@@ -0,0 +1,33 @@
+:107E000085E08093810082E08093C00088E18093C8
+:107E1000C10086E08093C20088E08093C40084B7EC
+:107E200014BE81FFD0D08DE0C8D0259A86E028E12D
+:107E30003EEF91E0309385002093840096BBB09B89
+:107E4000FECF1D9AA8958150A9F7DD24D394A5E013
+:107E5000EA2EF1E1FF2EA4D0813421F481E0BED0DE
+:107E600083E024C0823411F484E103C0853419F422
+:107E700085E0B4D08AC08535A1F492D0082F10E0F7
+:107E800010930102009300028BD090E0982F882776
+:107E9000802B912B880F991F9093010280930002F1
+:107EA00073C0863529F484E099D080E071D06DC02C
+:107EB000843609F043C07CD0E0910002F0910102C9
+:107EC00083E080935700E895C0E0D1E069D08993C2
+:107ED000809102028150809302028823B9F778D002
+:107EE00007B600FCFDCF4091000250910102A0E0D6
+:107EF000B1E02C9130E011968C91119790E0982F81
+:107F00008827822B932B1296FA010C01D0925700EE
+:107F1000E89511244E5F5F4FF1E0A038BF0749F7A5
+:107F2000E0910002F0910102E0925700E89507B657
+:107F300000FCFDCFF0925700E89527C08437B9F4D4
+:107F400037D046D0E0910002F09101023196F093D3
+:107F50000102E09300023197E4918E2F19D08091B5
+:107F60000202815080930202882361F70EC0853798
+:107F700039F42ED08EE10CD085E90AD08FE096CF6F
+:107F8000813511F488E019D023D080E101D063CF8E
+:107F9000982F8091C00085FFFCCF9093C600089574
+:107FA000A8958091C00087FFFCCF8091C6000895FE
+:107FB000F7DFF6DF80930202F3CFE0E6F0E098E12E
+:107FC00090838083089580E0F8DFEE27FF270994EF
+:107FD000E7DF803209F0F7DF84E1DACF1F93182F53
+:0C7FE000DFDF1150E9F7F4DF1F91089576
+:0400000300007E007B
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst b/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
new file mode 100644
index 0000000..46eda68
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
@@ -0,0 +1,520 @@
+
+optiboot_atmega328_pro_8MHz.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001ec 00007e00 00007e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .debug_aranges 00000028 00000000 00000000 00000240 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 2 .debug_pubnames 0000006a 00000000 00000000 00000268 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_info 00000269 00000000 00000000 000002d2 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_abbrev 00000196 00000000 00000000 0000053b 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_line 000003d3 00000000 00000000 000006d1 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_frame 00000090 00000000 00000000 00000aa4 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_str 00000135 00000000 00000000 00000b34 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_loc 000001d1 00000000 00000000 00000c69 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_ranges 00000068 00000000 00000000 00000e3a 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00007e00 <main>:
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 7e00: 85 e0 ldi r24, 0x05 ; 5
+ 7e02: 80 93 81 00 sts 0x0081, r24
+#if LED_START_FLASHES > 0
+ // Set up Timer 1 for timeout counter
+ TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
+#endif
+#ifndef SOFT_UART
+ UCSR0A = _BV(U2X0); //Double speed mode USART0
+ 7e06: 82 e0 ldi r24, 0x02 ; 2
+ 7e08: 80 93 c0 00 sts 0x00C0, r24
+ UCSR0B = _BV(RXEN0) | _BV(TXEN0);
+ 7e0c: 88 e1 ldi r24, 0x18 ; 24
+ 7e0e: 80 93 c1 00 sts 0x00C1, r24
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ 7e12: 86 e0 ldi r24, 0x06 ; 6
+ 7e14: 80 93 c2 00 sts 0x00C2, r24
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+ 7e18: 88 e0 ldi r24, 0x08 ; 8
+ 7e1a: 80 93 c4 00 sts 0x00C4, r24
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 7e1e: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 7e20: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 7e22: 81 ff sbrs r24, 1
+ 7e24: d0 d0 rcall .+416 ; 0x7fc6 <appStart>
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+ 7e26: 8d e0 ldi r24, 0x0D ; 13
+ 7e28: c8 d0 rcall .+400 ; 0x7fba <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 7e2a: 25 9a sbi 0x04, 5 ; 4
+ 7e2c: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 7e2e: 28 e1 ldi r18, 0x18 ; 24
+ 7e30: 3e ef ldi r19, 0xFE ; 254
+ TIFR1 = _BV(TOV1);
+ 7e32: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 7e34: 30 93 85 00 sts 0x0085, r19
+ 7e38: 20 93 84 00 sts 0x0084, r18
+ TIFR1 = _BV(TOV1);
+ 7e3c: 96 bb out 0x16, r25 ; 22
+ while(!(TIFR1 & _BV(TOV1)));
+ 7e3e: b0 9b sbis 0x16, 0 ; 22
+ 7e40: fe cf rjmp .-4 ; 0x7e3e <main+0x3e>
+ LED_PIN |= _BV(LED);
+ 7e42: 1d 9a sbi 0x03, 5 ; 3
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 7e44: a8 95 wdr
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+ 7e46: 81 50 subi r24, 0x01 ; 1
+ 7e48: a9 f7 brne .-22 ; 0x7e34 <main+0x34>
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 7e4a: dd 24 eor r13, r13
+ 7e4c: d3 94 inc r13
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 7e4e: a5 e0 ldi r26, 0x05 ; 5
+ 7e50: ea 2e mov r14, r26
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 7e52: f1 e1 ldi r31, 0x11 ; 17
+ 7e54: ff 2e mov r15, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 7e56: a4 d0 rcall .+328 ; 0x7fa0 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 7e58: 81 34 cpi r24, 0x41 ; 65
+ 7e5a: 21 f4 brne .+8 ; 0x7e64 <main+0x64>
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 7e5c: 81 e0 ldi r24, 0x01 ; 1
+ 7e5e: be d0 rcall .+380 ; 0x7fdc <verifySpace+0xc>
+ putch(0x03);
+ 7e60: 83 e0 ldi r24, 0x03 ; 3
+ 7e62: 24 c0 rjmp .+72 ; 0x7eac <main+0xac>
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 7e64: 82 34 cpi r24, 0x42 ; 66
+ 7e66: 11 f4 brne .+4 ; 0x7e6c <main+0x6c>
+ // SET DEVICE is ignored
+ getNch(20);
+ 7e68: 84 e1 ldi r24, 0x14 ; 20
+ 7e6a: 03 c0 rjmp .+6 ; 0x7e72 <main+0x72>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 7e6c: 85 34 cpi r24, 0x45 ; 69
+ 7e6e: 19 f4 brne .+6 ; 0x7e76 <main+0x76>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 7e70: 85 e0 ldi r24, 0x05 ; 5
+ 7e72: b4 d0 rcall .+360 ; 0x7fdc <verifySpace+0xc>
+ 7e74: 8a c0 rjmp .+276 ; 0x7f8a <main+0x18a>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 7e76: 85 35 cpi r24, 0x55 ; 85
+ 7e78: a1 f4 brne .+40 ; 0x7ea2 <main+0xa2>
+ // LOAD ADDRESS
+ address = getch();
+ 7e7a: 92 d0 rcall .+292 ; 0x7fa0 <getch>
+ 7e7c: 08 2f mov r16, r24
+ 7e7e: 10 e0 ldi r17, 0x00 ; 0
+ 7e80: 10 93 01 02 sts 0x0201, r17
+ 7e84: 00 93 00 02 sts 0x0200, r16
+ address = (address & 0xff) | (getch() << 8);
+ 7e88: 8b d0 rcall .+278 ; 0x7fa0 <getch>
+ 7e8a: 90 e0 ldi r25, 0x00 ; 0
+ 7e8c: 98 2f mov r25, r24
+ 7e8e: 88 27 eor r24, r24
+ 7e90: 80 2b or r24, r16
+ 7e92: 91 2b or r25, r17
+ address += address; // Convert from word address to byte address
+ 7e94: 88 0f add r24, r24
+ 7e96: 99 1f adc r25, r25
+ 7e98: 90 93 01 02 sts 0x0201, r25
+ 7e9c: 80 93 00 02 sts 0x0200, r24
+ 7ea0: 73 c0 rjmp .+230 ; 0x7f88 <main+0x188>
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 7ea2: 86 35 cpi r24, 0x56 ; 86
+ 7ea4: 29 f4 brne .+10 ; 0x7eb0 <main+0xb0>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 7ea6: 84 e0 ldi r24, 0x04 ; 4
+ 7ea8: 99 d0 rcall .+306 ; 0x7fdc <verifySpace+0xc>
+ putch(0x00);
+ 7eaa: 80 e0 ldi r24, 0x00 ; 0
+ 7eac: 71 d0 rcall .+226 ; 0x7f90 <putch>
+ 7eae: 6d c0 rjmp .+218 ; 0x7f8a <main+0x18a>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 7eb0: 84 36 cpi r24, 0x64 ; 100
+ 7eb2: 09 f0 breq .+2 ; 0x7eb6 <main+0xb6>
+ 7eb4: 43 c0 rjmp .+134 ; 0x7f3c <main+0x13c>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+ 7eb6: 7c d0 rcall .+248 ; 0x7fb0 <getLen>
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+ 7eb8: e0 91 00 02 lds r30, 0x0200
+ 7ebc: f0 91 01 02 lds r31, 0x0201
+ 7ec0: 83 e0 ldi r24, 0x03 ; 3
+ 7ec2: 80 93 57 00 sts 0x0057, r24
+ 7ec6: e8 95 spm
+ 7ec8: c0 e0 ldi r28, 0x00 ; 0
+ 7eca: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 7ecc: 69 d0 rcall .+210 ; 0x7fa0 <getch>
+ 7ece: 89 93 st Y+, r24
+ while (--length);
+ 7ed0: 80 91 02 02 lds r24, 0x0202
+ 7ed4: 81 50 subi r24, 0x01 ; 1
+ 7ed6: 80 93 02 02 sts 0x0202, r24
+ 7eda: 88 23 and r24, r24
+ 7edc: b9 f7 brne .-18 ; 0x7ecc <main+0xcc>
+
+ // Read command terminator, start reply
+ verifySpace();
+ 7ede: 78 d0 rcall .+240 ; 0x7fd0 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 7ee0: 07 b6 in r0, 0x37 ; 55
+ 7ee2: 00 fc sbrc r0, 0
+ 7ee4: fd cf rjmp .-6 ; 0x7ee0 <main+0xe0>
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ 7ee6: 40 91 00 02 lds r20, 0x0200
+ 7eea: 50 91 01 02 lds r21, 0x0201
+ 7eee: a0 e0 ldi r26, 0x00 ; 0
+ 7ef0: b1 e0 ldi r27, 0x01 ; 1
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 7ef2: 2c 91 ld r18, X
+ 7ef4: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 7ef6: 11 96 adiw r26, 0x01 ; 1
+ 7ef8: 8c 91 ld r24, X
+ 7efa: 11 97 sbiw r26, 0x01 ; 1
+ 7efc: 90 e0 ldi r25, 0x00 ; 0
+ 7efe: 98 2f mov r25, r24
+ 7f00: 88 27 eor r24, r24
+ 7f02: 82 2b or r24, r18
+ 7f04: 93 2b or r25, r19
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 7f06: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 7f08: fa 01 movw r30, r20
+ 7f0a: 0c 01 movw r0, r24
+ 7f0c: d0 92 57 00 sts 0x0057, r13
+ 7f10: e8 95 spm
+ 7f12: 11 24 eor r1, r1
+ addrPtr += 2;
+ 7f14: 4e 5f subi r20, 0xFE ; 254
+ 7f16: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 7f18: f1 e0 ldi r31, 0x01 ; 1
+ 7f1a: a0 38 cpi r26, 0x80 ; 128
+ 7f1c: bf 07 cpc r27, r31
+ 7f1e: 49 f7 brne .-46 ; 0x7ef2 <main+0xf2>
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 7f20: e0 91 00 02 lds r30, 0x0200
+ 7f24: f0 91 01 02 lds r31, 0x0201
+ 7f28: e0 92 57 00 sts 0x0057, r14
+ 7f2c: e8 95 spm
+ boot_spm_busy_wait();
+ 7f2e: 07 b6 in r0, 0x37 ; 55
+ 7f30: 00 fc sbrc r0, 0
+ 7f32: fd cf rjmp .-6 ; 0x7f2e <main+0x12e>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 7f34: f0 92 57 00 sts 0x0057, r15
+ 7f38: e8 95 spm
+ 7f3a: 27 c0 rjmp .+78 ; 0x7f8a <main+0x18a>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 7f3c: 84 37 cpi r24, 0x74 ; 116
+ 7f3e: b9 f4 brne .+46 ; 0x7f6e <main+0x16e>
+ // READ PAGE - we only read flash
+ getLen();
+ 7f40: 37 d0 rcall .+110 ; 0x7fb0 <getLen>
+ verifySpace();
+ 7f42: 46 d0 rcall .+140 ; 0x7fd0 <verifySpace>
+ else ch = pgm_read_byte_near(address);
+ address++;
+ putch(ch);
+ } while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 7f44: e0 91 00 02 lds r30, 0x0200
+ 7f48: f0 91 01 02 lds r31, 0x0201
+ 7f4c: 31 96 adiw r30, 0x01 ; 1
+ 7f4e: f0 93 01 02 sts 0x0201, r31
+ 7f52: e0 93 00 02 sts 0x0200, r30
+ 7f56: 31 97 sbiw r30, 0x01 ; 1
+ 7f58: e4 91 lpm r30, Z+
+ 7f5a: 8e 2f mov r24, r30
+ 7f5c: 19 d0 rcall .+50 ; 0x7f90 <putch>
+ while (--length);
+ 7f5e: 80 91 02 02 lds r24, 0x0202
+ 7f62: 81 50 subi r24, 0x01 ; 1
+ 7f64: 80 93 02 02 sts 0x0202, r24
+ 7f68: 88 23 and r24, r24
+ 7f6a: 61 f7 brne .-40 ; 0x7f44 <main+0x144>
+ 7f6c: 0e c0 rjmp .+28 ; 0x7f8a <main+0x18a>
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 7f6e: 85 37 cpi r24, 0x75 ; 117
+ 7f70: 39 f4 brne .+14 ; 0x7f80 <main+0x180>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 7f72: 2e d0 rcall .+92 ; 0x7fd0 <verifySpace>
+ putch(SIGNATURE_0);
+ 7f74: 8e e1 ldi r24, 0x1E ; 30
+ 7f76: 0c d0 rcall .+24 ; 0x7f90 <putch>
+ putch(SIGNATURE_1);
+ 7f78: 85 e9 ldi r24, 0x95 ; 149
+ 7f7a: 0a d0 rcall .+20 ; 0x7f90 <putch>
+ putch(SIGNATURE_2);
+ 7f7c: 8f e0 ldi r24, 0x0F ; 15
+ 7f7e: 96 cf rjmp .-212 ; 0x7eac <main+0xac>
+ }
+ else if (ch == 'Q') {
+ 7f80: 81 35 cpi r24, 0x51 ; 81
+ 7f82: 11 f4 brne .+4 ; 0x7f88 <main+0x188>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 7f84: 88 e0 ldi r24, 0x08 ; 8
+ 7f86: 19 d0 rcall .+50 ; 0x7fba <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 7f88: 23 d0 rcall .+70 ; 0x7fd0 <verifySpace>
+ }
+ putch(STK_OK);
+ 7f8a: 80 e1 ldi r24, 0x10 ; 16
+ 7f8c: 01 d0 rcall .+2 ; 0x7f90 <putch>
+ 7f8e: 63 cf rjmp .-314 ; 0x7e56 <main+0x56>
+
+00007f90 <putch>:
+ }
+}
+
+void putch(char ch) {
+ 7f90: 98 2f mov r25, r24
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ 7f92: 80 91 c0 00 lds r24, 0x00C0
+ 7f96: 85 ff sbrs r24, 5
+ 7f98: fc cf rjmp .-8 ; 0x7f92 <putch+0x2>
+ UDR0 = ch;
+ 7f9a: 90 93 c6 00 sts 0x00C6, r25
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 7f9e: 08 95 ret
+
+00007fa0 <getch>:
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 7fa0: a8 95 wdr
+ [uartBit] "I" (UART_RX_BIT)
+ :
+ "r25"
+);
+#else
+ while(!(UCSR0A & _BV(RXC0)));
+ 7fa2: 80 91 c0 00 lds r24, 0x00C0
+ 7fa6: 87 ff sbrs r24, 7
+ 7fa8: fc cf rjmp .-8 ; 0x7fa2 <getch+0x2>
+ ch = UDR0;
+ 7faa: 80 91 c6 00 lds r24, 0x00C6
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+ 7fae: 08 95 ret
+
+00007fb0 <getLen>:
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ 7fb0: f7 df rcall .-18 ; 0x7fa0 <getch>
+ length = getch();
+ 7fb2: f6 df rcall .-20 ; 0x7fa0 <getch>
+ 7fb4: 80 93 02 02 sts 0x0202, r24
+ return getch();
+}
+ 7fb8: f3 cf rjmp .-26 ; 0x7fa0 <getch>
+
+00007fba <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 7fba: e0 e6 ldi r30, 0x60 ; 96
+ 7fbc: f0 e0 ldi r31, 0x00 ; 0
+ 7fbe: 98 e1 ldi r25, 0x18 ; 24
+ 7fc0: 90 83 st Z, r25
+ WDTCSR = x;
+ 7fc2: 80 83 st Z, r24
+}
+ 7fc4: 08 95 ret
+
+00007fc6 <appStart>:
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 7fc6: 80 e0 ldi r24, 0x00 ; 0
+ 7fc8: f8 df rcall .-16 ; 0x7fba <watchdogConfig>
+ __asm__ __volatile__ (
+ 7fca: ee 27 eor r30, r30
+ 7fcc: ff 27 eor r31, r31
+ 7fce: 09 94 ijmp
+
+00007fd0 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ 7fd0: e7 df rcall .-50 ; 0x7fa0 <getch>
+ 7fd2: 80 32 cpi r24, 0x20 ; 32
+ 7fd4: 09 f0 breq .+2 ; 0x7fd8 <verifySpace+0x8>
+ 7fd6: f7 df rcall .-18 ; 0x7fc6 <appStart>
+ putch(STK_INSYNC);
+ 7fd8: 84 e1 ldi r24, 0x14 ; 20
+}
+ 7fda: da cf rjmp .-76 ; 0x7f90 <putch>
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 7fdc: 1f 93 push r17
+ 7fde: 18 2f mov r17, r24
+
+00007fe0 <getNch>:
+ do getch(); while (--count);
+ 7fe0: df df rcall .-66 ; 0x7fa0 <getch>
+ 7fe2: 11 50 subi r17, 0x01 ; 1
+ 7fe4: e9 f7 brne .-6 ; 0x7fe0 <getNch>
+ verifySpace();
+ 7fe6: f4 df rcall .-24 ; 0x7fd0 <verifySpace>
+}
+ 7fe8: 1f 91 pop r17
+ 7fea: 08 95 ret
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_diecimila.hex b/test/ardmake/hardware/bootloaders/optiboot/optiboot_diecimila.hex
new file mode 100644
index 0000000..1e93414
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_diecimila.hex
@@ -0,0 +1,33 @@
+:103E000085E08093810082E08093C00088E1809308
+:103E1000C10086E08093C20080E18093C40084B733
+:103E200014BE81FFD0D08DE0C8D0259A86E020E373
+:103E30003CEF91E0309385002093840096BBB09BCB
+:103E4000FECF1D9AA8958150A9F7DD24D394A5E053
+:103E5000EA2EF1E1FF2EA4D0813421F481E0BED01E
+:103E600083E024C0823411F484E103C0853419F462
+:103E700085E0B4D08AC08535A1F492D0082F10E037
+:103E800010930102009300028BD090E0982F8827B6
+:103E9000802B912B880F991F909301028093000231
+:103EA00073C0863529F484E099D080E071D06DC06C
+:103EB000843609F043C07CD0E0910002F091010209
+:103EC00083E080935700E895C0E0D1E069D0899302
+:103ED000809102028150809302028823B9F778D042
+:103EE00007B600FCFDCF4091000250910102A0E016
+:103EF000B1E02C9130E011968C91119790E0982FC1
+:103F00008827822B932B1296FA010C01D09257002E
+:103F1000E89511244E5F5F4FF1E0A038BF0749F7E5
+:103F2000E0910002F0910102E0925700E89507B697
+:103F300000FCFDCFF0925700E89527C08437B9F414
+:103F400037D046D0E0910002F09101023196F09313
+:103F50000102E09300023197E4918E2F19D08091F5
+:103F60000202815080930202882361F70EC08537D8
+:103F700039F42ED08EE10CD084E90AD086E096CFB9
+:103F8000813511F488E019D023D080E101D063CFCE
+:103F9000982F8091C00085FFFCCF9093C6000895B4
+:103FA000A8958091C00087FFFCCF8091C60008953E
+:103FB000F7DFF6DF80930202F3CFE0E6F0E098E16E
+:103FC00090838083089580E0F8DFEE27FF2709942F
+:103FD000E7DF803209F0F7DF84E1DACF1F93182F93
+:0C3FE000DFDF1150E9F7F4DF1F910895B6
+:0400000300003E00BB
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_diecimila.lst b/test/ardmake/hardware/bootloaders/optiboot/optiboot_diecimila.lst
new file mode 100644
index 0000000..1121893
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_diecimila.lst
@@ -0,0 +1,520 @@
+
+optiboot_diecimila.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001ec 00003e00 00003e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .debug_aranges 00000028 00000000 00000000 00000240 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 2 .debug_pubnames 0000006a 00000000 00000000 00000268 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_info 00000269 00000000 00000000 000002d2 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_abbrev 00000196 00000000 00000000 0000053b 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_line 000003d3 00000000 00000000 000006d1 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_frame 00000090 00000000 00000000 00000aa4 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_str 00000135 00000000 00000000 00000b34 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_loc 000001d1 00000000 00000000 00000c69 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_ranges 00000068 00000000 00000000 00000e3a 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00003e00 <main>:
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3e00: 85 e0 ldi r24, 0x05 ; 5
+ 3e02: 80 93 81 00 sts 0x0081, r24
+#if LED_START_FLASHES > 0
+ // Set up Timer 1 for timeout counter
+ TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
+#endif
+#ifndef SOFT_UART
+ UCSR0A = _BV(U2X0); //Double speed mode USART0
+ 3e06: 82 e0 ldi r24, 0x02 ; 2
+ 3e08: 80 93 c0 00 sts 0x00C0, r24
+ UCSR0B = _BV(RXEN0) | _BV(TXEN0);
+ 3e0c: 88 e1 ldi r24, 0x18 ; 24
+ 3e0e: 80 93 c1 00 sts 0x00C1, r24
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ 3e12: 86 e0 ldi r24, 0x06 ; 6
+ 3e14: 80 93 c2 00 sts 0x00C2, r24
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+ 3e18: 80 e1 ldi r24, 0x10 ; 16
+ 3e1a: 80 93 c4 00 sts 0x00C4, r24
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 3e1e: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 3e20: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 3e22: 81 ff sbrs r24, 1
+ 3e24: d0 d0 rcall .+416 ; 0x3fc6 <appStart>
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+ 3e26: 8d e0 ldi r24, 0x0D ; 13
+ 3e28: c8 d0 rcall .+400 ; 0x3fba <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 3e2a: 25 9a sbi 0x04, 5 ; 4
+ 3e2c: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e2e: 20 e3 ldi r18, 0x30 ; 48
+ 3e30: 3c ef ldi r19, 0xFC ; 252
+ TIFR1 = _BV(TOV1);
+ 3e32: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e34: 30 93 85 00 sts 0x0085, r19
+ 3e38: 20 93 84 00 sts 0x0084, r18
+ TIFR1 = _BV(TOV1);
+ 3e3c: 96 bb out 0x16, r25 ; 22
+ while(!(TIFR1 & _BV(TOV1)));
+ 3e3e: b0 9b sbis 0x16, 0 ; 22
+ 3e40: fe cf rjmp .-4 ; 0x3e3e <main+0x3e>
+ LED_PIN |= _BV(LED);
+ 3e42: 1d 9a sbi 0x03, 5 ; 3
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3e44: a8 95 wdr
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+ 3e46: 81 50 subi r24, 0x01 ; 1
+ 3e48: a9 f7 brne .-22 ; 0x3e34 <main+0x34>
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e4a: dd 24 eor r13, r13
+ 3e4c: d3 94 inc r13
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3e4e: a5 e0 ldi r26, 0x05 ; 5
+ 3e50: ea 2e mov r14, r26
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3e52: f1 e1 ldi r31, 0x11 ; 17
+ 3e54: ff 2e mov r15, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 3e56: a4 d0 rcall .+328 ; 0x3fa0 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 3e58: 81 34 cpi r24, 0x41 ; 65
+ 3e5a: 21 f4 brne .+8 ; 0x3e64 <main+0x64>
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e5c: 81 e0 ldi r24, 0x01 ; 1
+ 3e5e: be d0 rcall .+380 ; 0x3fdc <verifySpace+0xc>
+ putch(0x03);
+ 3e60: 83 e0 ldi r24, 0x03 ; 3
+ 3e62: 24 c0 rjmp .+72 ; 0x3eac <main+0xac>
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 3e64: 82 34 cpi r24, 0x42 ; 66
+ 3e66: 11 f4 brne .+4 ; 0x3e6c <main+0x6c>
+ // SET DEVICE is ignored
+ getNch(20);
+ 3e68: 84 e1 ldi r24, 0x14 ; 20
+ 3e6a: 03 c0 rjmp .+6 ; 0x3e72 <main+0x72>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 3e6c: 85 34 cpi r24, 0x45 ; 69
+ 3e6e: 19 f4 brne .+6 ; 0x3e76 <main+0x76>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 3e70: 85 e0 ldi r24, 0x05 ; 5
+ 3e72: b4 d0 rcall .+360 ; 0x3fdc <verifySpace+0xc>
+ 3e74: 8a c0 rjmp .+276 ; 0x3f8a <main+0x18a>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 3e76: 85 35 cpi r24, 0x55 ; 85
+ 3e78: a1 f4 brne .+40 ; 0x3ea2 <main+0xa2>
+ // LOAD ADDRESS
+ address = getch();
+ 3e7a: 92 d0 rcall .+292 ; 0x3fa0 <getch>
+ 3e7c: 08 2f mov r16, r24
+ 3e7e: 10 e0 ldi r17, 0x00 ; 0
+ 3e80: 10 93 01 02 sts 0x0201, r17
+ 3e84: 00 93 00 02 sts 0x0200, r16
+ address = (address & 0xff) | (getch() << 8);
+ 3e88: 8b d0 rcall .+278 ; 0x3fa0 <getch>
+ 3e8a: 90 e0 ldi r25, 0x00 ; 0
+ 3e8c: 98 2f mov r25, r24
+ 3e8e: 88 27 eor r24, r24
+ 3e90: 80 2b or r24, r16
+ 3e92: 91 2b or r25, r17
+ address += address; // Convert from word address to byte address
+ 3e94: 88 0f add r24, r24
+ 3e96: 99 1f adc r25, r25
+ 3e98: 90 93 01 02 sts 0x0201, r25
+ 3e9c: 80 93 00 02 sts 0x0200, r24
+ 3ea0: 73 c0 rjmp .+230 ; 0x3f88 <main+0x188>
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 3ea2: 86 35 cpi r24, 0x56 ; 86
+ 3ea4: 29 f4 brne .+10 ; 0x3eb0 <main+0xb0>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 3ea6: 84 e0 ldi r24, 0x04 ; 4
+ 3ea8: 99 d0 rcall .+306 ; 0x3fdc <verifySpace+0xc>
+ putch(0x00);
+ 3eaa: 80 e0 ldi r24, 0x00 ; 0
+ 3eac: 71 d0 rcall .+226 ; 0x3f90 <putch>
+ 3eae: 6d c0 rjmp .+218 ; 0x3f8a <main+0x18a>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 3eb0: 84 36 cpi r24, 0x64 ; 100
+ 3eb2: 09 f0 breq .+2 ; 0x3eb6 <main+0xb6>
+ 3eb4: 43 c0 rjmp .+134 ; 0x3f3c <main+0x13c>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+ 3eb6: 7c d0 rcall .+248 ; 0x3fb0 <getLen>
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+ 3eb8: e0 91 00 02 lds r30, 0x0200
+ 3ebc: f0 91 01 02 lds r31, 0x0201
+ 3ec0: 83 e0 ldi r24, 0x03 ; 3
+ 3ec2: 80 93 57 00 sts 0x0057, r24
+ 3ec6: e8 95 spm
+ 3ec8: c0 e0 ldi r28, 0x00 ; 0
+ 3eca: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 3ecc: 69 d0 rcall .+210 ; 0x3fa0 <getch>
+ 3ece: 89 93 st Y+, r24
+ while (--length);
+ 3ed0: 80 91 02 02 lds r24, 0x0202
+ 3ed4: 81 50 subi r24, 0x01 ; 1
+ 3ed6: 80 93 02 02 sts 0x0202, r24
+ 3eda: 88 23 and r24, r24
+ 3edc: b9 f7 brne .-18 ; 0x3ecc <main+0xcc>
+
+ // Read command terminator, start reply
+ verifySpace();
+ 3ede: 78 d0 rcall .+240 ; 0x3fd0 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 3ee0: 07 b6 in r0, 0x37 ; 55
+ 3ee2: 00 fc sbrc r0, 0
+ 3ee4: fd cf rjmp .-6 ; 0x3ee0 <main+0xe0>
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ 3ee6: 40 91 00 02 lds r20, 0x0200
+ 3eea: 50 91 01 02 lds r21, 0x0201
+ 3eee: a0 e0 ldi r26, 0x00 ; 0
+ 3ef0: b1 e0 ldi r27, 0x01 ; 1
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 3ef2: 2c 91 ld r18, X
+ 3ef4: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 3ef6: 11 96 adiw r26, 0x01 ; 1
+ 3ef8: 8c 91 ld r24, X
+ 3efa: 11 97 sbiw r26, 0x01 ; 1
+ 3efc: 90 e0 ldi r25, 0x00 ; 0
+ 3efe: 98 2f mov r25, r24
+ 3f00: 88 27 eor r24, r24
+ 3f02: 82 2b or r24, r18
+ 3f04: 93 2b or r25, r19
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3f06: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 3f08: fa 01 movw r30, r20
+ 3f0a: 0c 01 movw r0, r24
+ 3f0c: d0 92 57 00 sts 0x0057, r13
+ 3f10: e8 95 spm
+ 3f12: 11 24 eor r1, r1
+ addrPtr += 2;
+ 3f14: 4e 5f subi r20, 0xFE ; 254
+ 3f16: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 3f18: f1 e0 ldi r31, 0x01 ; 1
+ 3f1a: a0 38 cpi r26, 0x80 ; 128
+ 3f1c: bf 07 cpc r27, r31
+ 3f1e: 49 f7 brne .-46 ; 0x3ef2 <main+0xf2>
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3f20: e0 91 00 02 lds r30, 0x0200
+ 3f24: f0 91 01 02 lds r31, 0x0201
+ 3f28: e0 92 57 00 sts 0x0057, r14
+ 3f2c: e8 95 spm
+ boot_spm_busy_wait();
+ 3f2e: 07 b6 in r0, 0x37 ; 55
+ 3f30: 00 fc sbrc r0, 0
+ 3f32: fd cf rjmp .-6 ; 0x3f2e <main+0x12e>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3f34: f0 92 57 00 sts 0x0057, r15
+ 3f38: e8 95 spm
+ 3f3a: 27 c0 rjmp .+78 ; 0x3f8a <main+0x18a>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 3f3c: 84 37 cpi r24, 0x74 ; 116
+ 3f3e: b9 f4 brne .+46 ; 0x3f6e <main+0x16e>
+ // READ PAGE - we only read flash
+ getLen();
+ 3f40: 37 d0 rcall .+110 ; 0x3fb0 <getLen>
+ verifySpace();
+ 3f42: 46 d0 rcall .+140 ; 0x3fd0 <verifySpace>
+ else ch = pgm_read_byte_near(address);
+ address++;
+ putch(ch);
+ } while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 3f44: e0 91 00 02 lds r30, 0x0200
+ 3f48: f0 91 01 02 lds r31, 0x0201
+ 3f4c: 31 96 adiw r30, 0x01 ; 1
+ 3f4e: f0 93 01 02 sts 0x0201, r31
+ 3f52: e0 93 00 02 sts 0x0200, r30
+ 3f56: 31 97 sbiw r30, 0x01 ; 1
+ 3f58: e4 91 lpm r30, Z+
+ 3f5a: 8e 2f mov r24, r30
+ 3f5c: 19 d0 rcall .+50 ; 0x3f90 <putch>
+ while (--length);
+ 3f5e: 80 91 02 02 lds r24, 0x0202
+ 3f62: 81 50 subi r24, 0x01 ; 1
+ 3f64: 80 93 02 02 sts 0x0202, r24
+ 3f68: 88 23 and r24, r24
+ 3f6a: 61 f7 brne .-40 ; 0x3f44 <main+0x144>
+ 3f6c: 0e c0 rjmp .+28 ; 0x3f8a <main+0x18a>
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 3f6e: 85 37 cpi r24, 0x75 ; 117
+ 3f70: 39 f4 brne .+14 ; 0x3f80 <main+0x180>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 3f72: 2e d0 rcall .+92 ; 0x3fd0 <verifySpace>
+ putch(SIGNATURE_0);
+ 3f74: 8e e1 ldi r24, 0x1E ; 30
+ 3f76: 0c d0 rcall .+24 ; 0x3f90 <putch>
+ putch(SIGNATURE_1);
+ 3f78: 84 e9 ldi r24, 0x94 ; 148
+ 3f7a: 0a d0 rcall .+20 ; 0x3f90 <putch>
+ putch(SIGNATURE_2);
+ 3f7c: 86 e0 ldi r24, 0x06 ; 6
+ 3f7e: 96 cf rjmp .-212 ; 0x3eac <main+0xac>
+ }
+ else if (ch == 'Q') {
+ 3f80: 81 35 cpi r24, 0x51 ; 81
+ 3f82: 11 f4 brne .+4 ; 0x3f88 <main+0x188>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 3f84: 88 e0 ldi r24, 0x08 ; 8
+ 3f86: 19 d0 rcall .+50 ; 0x3fba <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 3f88: 23 d0 rcall .+70 ; 0x3fd0 <verifySpace>
+ }
+ putch(STK_OK);
+ 3f8a: 80 e1 ldi r24, 0x10 ; 16
+ 3f8c: 01 d0 rcall .+2 ; 0x3f90 <putch>
+ 3f8e: 63 cf rjmp .-314 ; 0x3e56 <main+0x56>
+
+00003f90 <putch>:
+ }
+}
+
+void putch(char ch) {
+ 3f90: 98 2f mov r25, r24
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ 3f92: 80 91 c0 00 lds r24, 0x00C0
+ 3f96: 85 ff sbrs r24, 5
+ 3f98: fc cf rjmp .-8 ; 0x3f92 <putch+0x2>
+ UDR0 = ch;
+ 3f9a: 90 93 c6 00 sts 0x00C6, r25
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 3f9e: 08 95 ret
+
+00003fa0 <getch>:
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3fa0: a8 95 wdr
+ [uartBit] "I" (UART_RX_BIT)
+ :
+ "r25"
+);
+#else
+ while(!(UCSR0A & _BV(RXC0)));
+ 3fa2: 80 91 c0 00 lds r24, 0x00C0
+ 3fa6: 87 ff sbrs r24, 7
+ 3fa8: fc cf rjmp .-8 ; 0x3fa2 <getch+0x2>
+ ch = UDR0;
+ 3faa: 80 91 c6 00 lds r24, 0x00C6
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+ 3fae: 08 95 ret
+
+00003fb0 <getLen>:
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ 3fb0: f7 df rcall .-18 ; 0x3fa0 <getch>
+ length = getch();
+ 3fb2: f6 df rcall .-20 ; 0x3fa0 <getch>
+ 3fb4: 80 93 02 02 sts 0x0202, r24
+ return getch();
+}
+ 3fb8: f3 cf rjmp .-26 ; 0x3fa0 <getch>
+
+00003fba <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 3fba: e0 e6 ldi r30, 0x60 ; 96
+ 3fbc: f0 e0 ldi r31, 0x00 ; 0
+ 3fbe: 98 e1 ldi r25, 0x18 ; 24
+ 3fc0: 90 83 st Z, r25
+ WDTCSR = x;
+ 3fc2: 80 83 st Z, r24
+}
+ 3fc4: 08 95 ret
+
+00003fc6 <appStart>:
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 3fc6: 80 e0 ldi r24, 0x00 ; 0
+ 3fc8: f8 df rcall .-16 ; 0x3fba <watchdogConfig>
+ __asm__ __volatile__ (
+ 3fca: ee 27 eor r30, r30
+ 3fcc: ff 27 eor r31, r31
+ 3fce: 09 94 ijmp
+
+00003fd0 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ 3fd0: e7 df rcall .-50 ; 0x3fa0 <getch>
+ 3fd2: 80 32 cpi r24, 0x20 ; 32
+ 3fd4: 09 f0 breq .+2 ; 0x3fd8 <verifySpace+0x8>
+ 3fd6: f7 df rcall .-18 ; 0x3fc6 <appStart>
+ putch(STK_INSYNC);
+ 3fd8: 84 e1 ldi r24, 0x14 ; 20
+}
+ 3fda: da cf rjmp .-76 ; 0x3f90 <putch>
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 3fdc: 1f 93 push r17
+ 3fde: 18 2f mov r17, r24
+
+00003fe0 <getNch>:
+ do getch(); while (--count);
+ 3fe0: df df rcall .-66 ; 0x3fa0 <getch>
+ 3fe2: 11 50 subi r17, 0x01 ; 1
+ 3fe4: e9 f7 brne .-6 ; 0x3fe0 <getNch>
+ verifySpace();
+ 3fe6: f4 df rcall .-24 ; 0x3fd0 <verifySpace>
+}
+ 3fe8: 1f 91 pop r17
+ 3fea: 08 95 ret
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad.hex b/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad.hex
new file mode 100644
index 0000000..9d31a7a
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad.hex
@@ -0,0 +1,34 @@
+:103E000085E08093810084B714BE81FFE4D08DE00B
+:103E1000DCD0259A519A86E028E13EEF91E030937C
+:103E200085002093840096BBB09BFECF1D9AA89579
+:103E30008150A9F7DD24D394A5E0EA2EF1E1FF2E0D
+:103E4000ABD0813421F481E0D1D083E024C082342E
+:103E500011F484E103C0853419F485E0C7D08AC029
+:103E60008535A1F499D0082F10E01093010200933A
+:103E7000000292D090E0982F8827802B912B880FFA
+:103E8000991F909301028093000273C0863529F434
+:103E900084E0ACD080E071D06DC0843609F043C0BE
+:103EA0008FD0E0910002F091010283E080935700EF
+:103EB000E895C0E0D1E070D08993809102028150F2
+:103EC000809302028823B9F78BD007B600FCFDCFA0
+:103ED0004091000250910102A0E0B1E02C9130E04D
+:103EE00011968C91119790E0982F8827822B932B15
+:103EF0001296FA010C01D0925700E89511244E5FFA
+:103F00005F4FF1E0A038BF0749F7E0910002F09160
+:103F10000102E0925700E89507B600FCFDCFF09251
+:103F20005700E89527C08437B9F44AD059D0E091BA
+:103F30000002F09101023196F0930102E093000239
+:103F40003197E4918E2F19D0809102028150809395
+:103F50000202882361F70EC0853739F441D08EE123
+:103F60000CD084E90AD086E096CF813511F488E040
+:103F70002CD036D080E101D063CF2AE030E08095AC
+:103F8000089410F4599802C0599A000015D014D022
+:103F900086952A95B1F70895A89529E030E04899CB
+:103FA000FECF0AD009D008D08894489908942A9561
+:103FB00011F08795F7CF089598E09A95F1F7089555
+:103FC000EBDFEADF80930202E7CFE0E6F0E098E182
+:103FD00090838083089580E0F8DFEE27FF2709941F
+:103FE000DBDF803209F0F7DF84E1C7CF1F93182FA2
+:0C3FF000D3DF1150E9F7F4DF1F910895B2
+:0400000300003E00BB
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad.lst b/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad.lst
new file mode 100644
index 0000000..0e46bd1
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad.lst
@@ -0,0 +1,533 @@
+
+optiboot_lilypad.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001fc 00003e00 00003e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .debug_aranges 00000028 00000000 00000000 00000250 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 2 .debug_pubnames 00000078 00000000 00000000 00000278 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_info 00000277 00000000 00000000 000002f0 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_abbrev 00000194 00000000 00000000 00000567 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_line 000003bb 00000000 00000000 000006fb 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_frame 000000a0 00000000 00000000 00000ab8 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_str 0000013f 00000000 00000000 00000b58 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_loc 000001a0 00000000 00000000 00000c97 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_ranges 00000070 00000000 00000000 00000e37 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00003e00 <main>:
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3e00: 85 e0 ldi r24, 0x05 ; 5
+ 3e02: 80 93 81 00 sts 0x0081, r24
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 3e06: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 3e08: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 3e0a: 81 ff sbrs r24, 1
+ 3e0c: e4 d0 rcall .+456 ; 0x3fd6 <appStart>
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+ 3e0e: 8d e0 ldi r24, 0x0D ; 13
+ 3e10: dc d0 rcall .+440 ; 0x3fca <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 3e12: 25 9a sbi 0x04, 5 ; 4
+
+#ifdef SOFT_UART
+ /* Set TX pin as output */
+ UART_DDR |= _BV(UART_TX_BIT);
+ 3e14: 51 9a sbi 0x0a, 1 ; 10
+ 3e16: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e18: 28 e1 ldi r18, 0x18 ; 24
+ 3e1a: 3e ef ldi r19, 0xFE ; 254
+ TIFR1 = _BV(TOV1);
+ 3e1c: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e1e: 30 93 85 00 sts 0x0085, r19
+ 3e22: 20 93 84 00 sts 0x0084, r18
+ TIFR1 = _BV(TOV1);
+ 3e26: 96 bb out 0x16, r25 ; 22
+ while(!(TIFR1 & _BV(TOV1)));
+ 3e28: b0 9b sbis 0x16, 0 ; 22
+ 3e2a: fe cf rjmp .-4 ; 0x3e28 <main+0x28>
+ LED_PIN |= _BV(LED);
+ 3e2c: 1d 9a sbi 0x03, 5 ; 3
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3e2e: a8 95 wdr
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+ 3e30: 81 50 subi r24, 0x01 ; 1
+ 3e32: a9 f7 brne .-22 ; 0x3e1e <main+0x1e>
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e34: dd 24 eor r13, r13
+ 3e36: d3 94 inc r13
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3e38: a5 e0 ldi r26, 0x05 ; 5
+ 3e3a: ea 2e mov r14, r26
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3e3c: f1 e1 ldi r31, 0x11 ; 17
+ 3e3e: ff 2e mov r15, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 3e40: ab d0 rcall .+342 ; 0x3f98 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 3e42: 81 34 cpi r24, 0x41 ; 65
+ 3e44: 21 f4 brne .+8 ; 0x3e4e <main+0x4e>
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e46: 81 e0 ldi r24, 0x01 ; 1
+ 3e48: d1 d0 rcall .+418 ; 0x3fec <verifySpace+0xc>
+ putch(0x03);
+ 3e4a: 83 e0 ldi r24, 0x03 ; 3
+ 3e4c: 24 c0 rjmp .+72 ; 0x3e96 <main+0x96>
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 3e4e: 82 34 cpi r24, 0x42 ; 66
+ 3e50: 11 f4 brne .+4 ; 0x3e56 <main+0x56>
+ // SET DEVICE is ignored
+ getNch(20);
+ 3e52: 84 e1 ldi r24, 0x14 ; 20
+ 3e54: 03 c0 rjmp .+6 ; 0x3e5c <main+0x5c>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 3e56: 85 34 cpi r24, 0x45 ; 69
+ 3e58: 19 f4 brne .+6 ; 0x3e60 <main+0x60>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 3e5a: 85 e0 ldi r24, 0x05 ; 5
+ 3e5c: c7 d0 rcall .+398 ; 0x3fec <verifySpace+0xc>
+ 3e5e: 8a c0 rjmp .+276 ; 0x3f74 <main+0x174>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 3e60: 85 35 cpi r24, 0x55 ; 85
+ 3e62: a1 f4 brne .+40 ; 0x3e8c <main+0x8c>
+ // LOAD ADDRESS
+ address = getch();
+ 3e64: 99 d0 rcall .+306 ; 0x3f98 <getch>
+ 3e66: 08 2f mov r16, r24
+ 3e68: 10 e0 ldi r17, 0x00 ; 0
+ 3e6a: 10 93 01 02 sts 0x0201, r17
+ 3e6e: 00 93 00 02 sts 0x0200, r16
+ address = (address & 0xff) | (getch() << 8);
+ 3e72: 92 d0 rcall .+292 ; 0x3f98 <getch>
+ 3e74: 90 e0 ldi r25, 0x00 ; 0
+ 3e76: 98 2f mov r25, r24
+ 3e78: 88 27 eor r24, r24
+ 3e7a: 80 2b or r24, r16
+ 3e7c: 91 2b or r25, r17
+ address += address; // Convert from word address to byte address
+ 3e7e: 88 0f add r24, r24
+ 3e80: 99 1f adc r25, r25
+ 3e82: 90 93 01 02 sts 0x0201, r25
+ 3e86: 80 93 00 02 sts 0x0200, r24
+ 3e8a: 73 c0 rjmp .+230 ; 0x3f72 <main+0x172>
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 3e8c: 86 35 cpi r24, 0x56 ; 86
+ 3e8e: 29 f4 brne .+10 ; 0x3e9a <main+0x9a>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 3e90: 84 e0 ldi r24, 0x04 ; 4
+ 3e92: ac d0 rcall .+344 ; 0x3fec <verifySpace+0xc>
+ putch(0x00);
+ 3e94: 80 e0 ldi r24, 0x00 ; 0
+ 3e96: 71 d0 rcall .+226 ; 0x3f7a <putch>
+ 3e98: 6d c0 rjmp .+218 ; 0x3f74 <main+0x174>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 3e9a: 84 36 cpi r24, 0x64 ; 100
+ 3e9c: 09 f0 breq .+2 ; 0x3ea0 <main+0xa0>
+ 3e9e: 43 c0 rjmp .+134 ; 0x3f26 <main+0x126>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+ 3ea0: 8f d0 rcall .+286 ; 0x3fc0 <getLen>
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+ 3ea2: e0 91 00 02 lds r30, 0x0200
+ 3ea6: f0 91 01 02 lds r31, 0x0201
+ 3eaa: 83 e0 ldi r24, 0x03 ; 3
+ 3eac: 80 93 57 00 sts 0x0057, r24
+ 3eb0: e8 95 spm
+ 3eb2: c0 e0 ldi r28, 0x00 ; 0
+ 3eb4: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 3eb6: 70 d0 rcall .+224 ; 0x3f98 <getch>
+ 3eb8: 89 93 st Y+, r24
+ while (--length);
+ 3eba: 80 91 02 02 lds r24, 0x0202
+ 3ebe: 81 50 subi r24, 0x01 ; 1
+ 3ec0: 80 93 02 02 sts 0x0202, r24
+ 3ec4: 88 23 and r24, r24
+ 3ec6: b9 f7 brne .-18 ; 0x3eb6 <main+0xb6>
+
+ // Read command terminator, start reply
+ verifySpace();
+ 3ec8: 8b d0 rcall .+278 ; 0x3fe0 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 3eca: 07 b6 in r0, 0x37 ; 55
+ 3ecc: 00 fc sbrc r0, 0
+ 3ece: fd cf rjmp .-6 ; 0x3eca <main+0xca>
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ 3ed0: 40 91 00 02 lds r20, 0x0200
+ 3ed4: 50 91 01 02 lds r21, 0x0201
+ 3ed8: a0 e0 ldi r26, 0x00 ; 0
+ 3eda: b1 e0 ldi r27, 0x01 ; 1
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 3edc: 2c 91 ld r18, X
+ 3ede: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 3ee0: 11 96 adiw r26, 0x01 ; 1
+ 3ee2: 8c 91 ld r24, X
+ 3ee4: 11 97 sbiw r26, 0x01 ; 1
+ 3ee6: 90 e0 ldi r25, 0x00 ; 0
+ 3ee8: 98 2f mov r25, r24
+ 3eea: 88 27 eor r24, r24
+ 3eec: 82 2b or r24, r18
+ 3eee: 93 2b or r25, r19
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3ef0: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 3ef2: fa 01 movw r30, r20
+ 3ef4: 0c 01 movw r0, r24
+ 3ef6: d0 92 57 00 sts 0x0057, r13
+ 3efa: e8 95 spm
+ 3efc: 11 24 eor r1, r1
+ addrPtr += 2;
+ 3efe: 4e 5f subi r20, 0xFE ; 254
+ 3f00: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 3f02: f1 e0 ldi r31, 0x01 ; 1
+ 3f04: a0 38 cpi r26, 0x80 ; 128
+ 3f06: bf 07 cpc r27, r31
+ 3f08: 49 f7 brne .-46 ; 0x3edc <main+0xdc>
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3f0a: e0 91 00 02 lds r30, 0x0200
+ 3f0e: f0 91 01 02 lds r31, 0x0201
+ 3f12: e0 92 57 00 sts 0x0057, r14
+ 3f16: e8 95 spm
+ boot_spm_busy_wait();
+ 3f18: 07 b6 in r0, 0x37 ; 55
+ 3f1a: 00 fc sbrc r0, 0
+ 3f1c: fd cf rjmp .-6 ; 0x3f18 <main+0x118>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3f1e: f0 92 57 00 sts 0x0057, r15
+ 3f22: e8 95 spm
+ 3f24: 27 c0 rjmp .+78 ; 0x3f74 <main+0x174>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 3f26: 84 37 cpi r24, 0x74 ; 116
+ 3f28: b9 f4 brne .+46 ; 0x3f58 <main+0x158>
+ // READ PAGE - we only read flash
+ getLen();
+ 3f2a: 4a d0 rcall .+148 ; 0x3fc0 <getLen>
+ verifySpace();
+ 3f2c: 59 d0 rcall .+178 ; 0x3fe0 <verifySpace>
+ else ch = pgm_read_byte_near(address);
+ address++;
+ putch(ch);
+ } while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 3f2e: e0 91 00 02 lds r30, 0x0200
+ 3f32: f0 91 01 02 lds r31, 0x0201
+ 3f36: 31 96 adiw r30, 0x01 ; 1
+ 3f38: f0 93 01 02 sts 0x0201, r31
+ 3f3c: e0 93 00 02 sts 0x0200, r30
+ 3f40: 31 97 sbiw r30, 0x01 ; 1
+ 3f42: e4 91 lpm r30, Z+
+ 3f44: 8e 2f mov r24, r30
+ 3f46: 19 d0 rcall .+50 ; 0x3f7a <putch>
+ while (--length);
+ 3f48: 80 91 02 02 lds r24, 0x0202
+ 3f4c: 81 50 subi r24, 0x01 ; 1
+ 3f4e: 80 93 02 02 sts 0x0202, r24
+ 3f52: 88 23 and r24, r24
+ 3f54: 61 f7 brne .-40 ; 0x3f2e <main+0x12e>
+ 3f56: 0e c0 rjmp .+28 ; 0x3f74 <main+0x174>
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 3f58: 85 37 cpi r24, 0x75 ; 117
+ 3f5a: 39 f4 brne .+14 ; 0x3f6a <main+0x16a>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 3f5c: 41 d0 rcall .+130 ; 0x3fe0 <verifySpace>
+ putch(SIGNATURE_0);
+ 3f5e: 8e e1 ldi r24, 0x1E ; 30
+ 3f60: 0c d0 rcall .+24 ; 0x3f7a <putch>
+ putch(SIGNATURE_1);
+ 3f62: 84 e9 ldi r24, 0x94 ; 148
+ 3f64: 0a d0 rcall .+20 ; 0x3f7a <putch>
+ putch(SIGNATURE_2);
+ 3f66: 86 e0 ldi r24, 0x06 ; 6
+ 3f68: 96 cf rjmp .-212 ; 0x3e96 <main+0x96>
+ }
+ else if (ch == 'Q') {
+ 3f6a: 81 35 cpi r24, 0x51 ; 81
+ 3f6c: 11 f4 brne .+4 ; 0x3f72 <main+0x172>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 3f6e: 88 e0 ldi r24, 0x08 ; 8
+ 3f70: 2c d0 rcall .+88 ; 0x3fca <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 3f72: 36 d0 rcall .+108 ; 0x3fe0 <verifySpace>
+ }
+ putch(STK_OK);
+ 3f74: 80 e1 ldi r24, 0x10 ; 16
+ 3f76: 01 d0 rcall .+2 ; 0x3f7a <putch>
+ 3f78: 63 cf rjmp .-314 ; 0x3e40 <main+0x40>
+
+00003f7a <putch>:
+void putch(char ch) {
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+#else
+ __asm__ __volatile__ (
+ 3f7a: 2a e0 ldi r18, 0x0A ; 10
+ 3f7c: 30 e0 ldi r19, 0x00 ; 0
+ 3f7e: 80 95 com r24
+ 3f80: 08 94 sec
+ 3f82: 10 f4 brcc .+4 ; 0x3f88 <putch+0xe>
+ 3f84: 59 98 cbi 0x0b, 1 ; 11
+ 3f86: 02 c0 rjmp .+4 ; 0x3f8c <putch+0x12>
+ 3f88: 59 9a sbi 0x0b, 1 ; 11
+ 3f8a: 00 00 nop
+ 3f8c: 15 d0 rcall .+42 ; 0x3fb8 <uartDelay>
+ 3f8e: 14 d0 rcall .+40 ; 0x3fb8 <uartDelay>
+ 3f90: 86 95 lsr r24
+ 3f92: 2a 95 dec r18
+ 3f94: b1 f7 brne .-20 ; 0x3f82 <putch+0x8>
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 3f96: 08 95 ret
+
+00003f98 <getch>:
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3f98: a8 95 wdr
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+ 3f9a: 29 e0 ldi r18, 0x09 ; 9
+ 3f9c: 30 e0 ldi r19, 0x00 ; 0
+ 3f9e: 48 99 sbic 0x09, 0 ; 9
+ 3fa0: fe cf rjmp .-4 ; 0x3f9e <getch+0x6>
+ 3fa2: 0a d0 rcall .+20 ; 0x3fb8 <uartDelay>
+ 3fa4: 09 d0 rcall .+18 ; 0x3fb8 <uartDelay>
+ 3fa6: 08 d0 rcall .+16 ; 0x3fb8 <uartDelay>
+ 3fa8: 88 94 clc
+ 3faa: 48 99 sbic 0x09, 0 ; 9
+ 3fac: 08 94 sec
+ 3fae: 2a 95 dec r18
+ 3fb0: 11 f0 breq .+4 ; 0x3fb6 <getch+0x1e>
+ 3fb2: 87 95 ror r24
+ 3fb4: f7 cf rjmp .-18 ; 0x3fa4 <getch+0xc>
+ 3fb6: 08 95 ret
+
+00003fb8 <uartDelay>:
+#if UART_B_VALUE > 255
+#error Baud rate too slow for soft UART
+#endif
+
+void uartDelay() {
+ __asm__ __volatile__ (
+ 3fb8: 98 e0 ldi r25, 0x08 ; 8
+ 3fba: 9a 95 dec r25
+ 3fbc: f1 f7 brne .-4 ; 0x3fba <uartDelay+0x2>
+ 3fbe: 08 95 ret
+
+00003fc0 <getLen>:
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ 3fc0: eb df rcall .-42 ; 0x3f98 <getch>
+ length = getch();
+ 3fc2: ea df rcall .-44 ; 0x3f98 <getch>
+ 3fc4: 80 93 02 02 sts 0x0202, r24
+ return getch();
+}
+ 3fc8: e7 cf rjmp .-50 ; 0x3f98 <getch>
+
+00003fca <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 3fca: e0 e6 ldi r30, 0x60 ; 96
+ 3fcc: f0 e0 ldi r31, 0x00 ; 0
+ 3fce: 98 e1 ldi r25, 0x18 ; 24
+ 3fd0: 90 83 st Z, r25
+ WDTCSR = x;
+ 3fd2: 80 83 st Z, r24
+}
+ 3fd4: 08 95 ret
+
+00003fd6 <appStart>:
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 3fd6: 80 e0 ldi r24, 0x00 ; 0
+ 3fd8: f8 df rcall .-16 ; 0x3fca <watchdogConfig>
+ __asm__ __volatile__ (
+ 3fda: ee 27 eor r30, r30
+ 3fdc: ff 27 eor r31, r31
+ 3fde: 09 94 ijmp
+
+00003fe0 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ 3fe0: db df rcall .-74 ; 0x3f98 <getch>
+ 3fe2: 80 32 cpi r24, 0x20 ; 32
+ 3fe4: 09 f0 breq .+2 ; 0x3fe8 <verifySpace+0x8>
+ 3fe6: f7 df rcall .-18 ; 0x3fd6 <appStart>
+ putch(STK_INSYNC);
+ 3fe8: 84 e1 ldi r24, 0x14 ; 20
+}
+ 3fea: c7 cf rjmp .-114 ; 0x3f7a <putch>
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 3fec: 1f 93 push r17
+ 3fee: 18 2f mov r17, r24
+
+00003ff0 <getNch>:
+ do getch(); while (--count);
+ 3ff0: d3 df rcall .-90 ; 0x3f98 <getch>
+ 3ff2: 11 50 subi r17, 0x01 ; 1
+ 3ff4: e9 f7 brne .-6 ; 0x3ff0 <getNch>
+ verifySpace();
+ 3ff6: f4 df rcall .-24 ; 0x3fe0 <verifySpace>
+}
+ 3ff8: 1f 91 pop r17
+ 3ffa: 08 95 ret
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad_resonator.hex b/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad_resonator.hex
new file mode 100644
index 0000000..9d31a7a
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad_resonator.hex
@@ -0,0 +1,34 @@
+:103E000085E08093810084B714BE81FFE4D08DE00B
+:103E1000DCD0259A519A86E028E13EEF91E030937C
+:103E200085002093840096BBB09BFECF1D9AA89579
+:103E30008150A9F7DD24D394A5E0EA2EF1E1FF2E0D
+:103E4000ABD0813421F481E0D1D083E024C082342E
+:103E500011F484E103C0853419F485E0C7D08AC029
+:103E60008535A1F499D0082F10E01093010200933A
+:103E7000000292D090E0982F8827802B912B880FFA
+:103E8000991F909301028093000273C0863529F434
+:103E900084E0ACD080E071D06DC0843609F043C0BE
+:103EA0008FD0E0910002F091010283E080935700EF
+:103EB000E895C0E0D1E070D08993809102028150F2
+:103EC000809302028823B9F78BD007B600FCFDCFA0
+:103ED0004091000250910102A0E0B1E02C9130E04D
+:103EE00011968C91119790E0982F8827822B932B15
+:103EF0001296FA010C01D0925700E89511244E5FFA
+:103F00005F4FF1E0A038BF0749F7E0910002F09160
+:103F10000102E0925700E89507B600FCFDCFF09251
+:103F20005700E89527C08437B9F44AD059D0E091BA
+:103F30000002F09101023196F0930102E093000239
+:103F40003197E4918E2F19D0809102028150809395
+:103F50000202882361F70EC0853739F441D08EE123
+:103F60000CD084E90AD086E096CF813511F488E040
+:103F70002CD036D080E101D063CF2AE030E08095AC
+:103F8000089410F4599802C0599A000015D014D022
+:103F900086952A95B1F70895A89529E030E04899CB
+:103FA000FECF0AD009D008D08894489908942A9561
+:103FB00011F08795F7CF089598E09A95F1F7089555
+:103FC000EBDFEADF80930202E7CFE0E6F0E098E182
+:103FD00090838083089580E0F8DFEE27FF2709941F
+:103FE000DBDF803209F0F7DF84E1C7CF1F93182FA2
+:0C3FF000D3DF1150E9F7F4DF1F910895B2
+:0400000300003E00BB
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad_resonator.lst b/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad_resonator.lst
new file mode 100644
index 0000000..80ecb83
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_lilypad_resonator.lst
@@ -0,0 +1,533 @@
+
+optiboot_lilypad_resonator.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001fc 00003e00 00003e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .debug_aranges 00000028 00000000 00000000 00000250 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 2 .debug_pubnames 00000078 00000000 00000000 00000278 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_info 00000277 00000000 00000000 000002f0 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_abbrev 00000194 00000000 00000000 00000567 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_line 000003bb 00000000 00000000 000006fb 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_frame 000000a0 00000000 00000000 00000ab8 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_str 0000013f 00000000 00000000 00000b58 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_loc 000001a0 00000000 00000000 00000c97 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_ranges 00000070 00000000 00000000 00000e37 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00003e00 <main>:
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3e00: 85 e0 ldi r24, 0x05 ; 5
+ 3e02: 80 93 81 00 sts 0x0081, r24
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 3e06: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 3e08: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 3e0a: 81 ff sbrs r24, 1
+ 3e0c: e4 d0 rcall .+456 ; 0x3fd6 <appStart>
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+ 3e0e: 8d e0 ldi r24, 0x0D ; 13
+ 3e10: dc d0 rcall .+440 ; 0x3fca <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 3e12: 25 9a sbi 0x04, 5 ; 4
+
+#ifdef SOFT_UART
+ /* Set TX pin as output */
+ UART_DDR |= _BV(UART_TX_BIT);
+ 3e14: 51 9a sbi 0x0a, 1 ; 10
+ 3e16: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e18: 28 e1 ldi r18, 0x18 ; 24
+ 3e1a: 3e ef ldi r19, 0xFE ; 254
+ TIFR1 = _BV(TOV1);
+ 3e1c: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e1e: 30 93 85 00 sts 0x0085, r19
+ 3e22: 20 93 84 00 sts 0x0084, r18
+ TIFR1 = _BV(TOV1);
+ 3e26: 96 bb out 0x16, r25 ; 22
+ while(!(TIFR1 & _BV(TOV1)));
+ 3e28: b0 9b sbis 0x16, 0 ; 22
+ 3e2a: fe cf rjmp .-4 ; 0x3e28 <main+0x28>
+ LED_PIN |= _BV(LED);
+ 3e2c: 1d 9a sbi 0x03, 5 ; 3
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3e2e: a8 95 wdr
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+ 3e30: 81 50 subi r24, 0x01 ; 1
+ 3e32: a9 f7 brne .-22 ; 0x3e1e <main+0x1e>
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e34: dd 24 eor r13, r13
+ 3e36: d3 94 inc r13
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3e38: a5 e0 ldi r26, 0x05 ; 5
+ 3e3a: ea 2e mov r14, r26
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3e3c: f1 e1 ldi r31, 0x11 ; 17
+ 3e3e: ff 2e mov r15, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 3e40: ab d0 rcall .+342 ; 0x3f98 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 3e42: 81 34 cpi r24, 0x41 ; 65
+ 3e44: 21 f4 brne .+8 ; 0x3e4e <main+0x4e>
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e46: 81 e0 ldi r24, 0x01 ; 1
+ 3e48: d1 d0 rcall .+418 ; 0x3fec <verifySpace+0xc>
+ putch(0x03);
+ 3e4a: 83 e0 ldi r24, 0x03 ; 3
+ 3e4c: 24 c0 rjmp .+72 ; 0x3e96 <main+0x96>
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 3e4e: 82 34 cpi r24, 0x42 ; 66
+ 3e50: 11 f4 brne .+4 ; 0x3e56 <main+0x56>
+ // SET DEVICE is ignored
+ getNch(20);
+ 3e52: 84 e1 ldi r24, 0x14 ; 20
+ 3e54: 03 c0 rjmp .+6 ; 0x3e5c <main+0x5c>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 3e56: 85 34 cpi r24, 0x45 ; 69
+ 3e58: 19 f4 brne .+6 ; 0x3e60 <main+0x60>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 3e5a: 85 e0 ldi r24, 0x05 ; 5
+ 3e5c: c7 d0 rcall .+398 ; 0x3fec <verifySpace+0xc>
+ 3e5e: 8a c0 rjmp .+276 ; 0x3f74 <main+0x174>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 3e60: 85 35 cpi r24, 0x55 ; 85
+ 3e62: a1 f4 brne .+40 ; 0x3e8c <main+0x8c>
+ // LOAD ADDRESS
+ address = getch();
+ 3e64: 99 d0 rcall .+306 ; 0x3f98 <getch>
+ 3e66: 08 2f mov r16, r24
+ 3e68: 10 e0 ldi r17, 0x00 ; 0
+ 3e6a: 10 93 01 02 sts 0x0201, r17
+ 3e6e: 00 93 00 02 sts 0x0200, r16
+ address = (address & 0xff) | (getch() << 8);
+ 3e72: 92 d0 rcall .+292 ; 0x3f98 <getch>
+ 3e74: 90 e0 ldi r25, 0x00 ; 0
+ 3e76: 98 2f mov r25, r24
+ 3e78: 88 27 eor r24, r24
+ 3e7a: 80 2b or r24, r16
+ 3e7c: 91 2b or r25, r17
+ address += address; // Convert from word address to byte address
+ 3e7e: 88 0f add r24, r24
+ 3e80: 99 1f adc r25, r25
+ 3e82: 90 93 01 02 sts 0x0201, r25
+ 3e86: 80 93 00 02 sts 0x0200, r24
+ 3e8a: 73 c0 rjmp .+230 ; 0x3f72 <main+0x172>
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 3e8c: 86 35 cpi r24, 0x56 ; 86
+ 3e8e: 29 f4 brne .+10 ; 0x3e9a <main+0x9a>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 3e90: 84 e0 ldi r24, 0x04 ; 4
+ 3e92: ac d0 rcall .+344 ; 0x3fec <verifySpace+0xc>
+ putch(0x00);
+ 3e94: 80 e0 ldi r24, 0x00 ; 0
+ 3e96: 71 d0 rcall .+226 ; 0x3f7a <putch>
+ 3e98: 6d c0 rjmp .+218 ; 0x3f74 <main+0x174>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 3e9a: 84 36 cpi r24, 0x64 ; 100
+ 3e9c: 09 f0 breq .+2 ; 0x3ea0 <main+0xa0>
+ 3e9e: 43 c0 rjmp .+134 ; 0x3f26 <main+0x126>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+ 3ea0: 8f d0 rcall .+286 ; 0x3fc0 <getLen>
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+ 3ea2: e0 91 00 02 lds r30, 0x0200
+ 3ea6: f0 91 01 02 lds r31, 0x0201
+ 3eaa: 83 e0 ldi r24, 0x03 ; 3
+ 3eac: 80 93 57 00 sts 0x0057, r24
+ 3eb0: e8 95 spm
+ 3eb2: c0 e0 ldi r28, 0x00 ; 0
+ 3eb4: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 3eb6: 70 d0 rcall .+224 ; 0x3f98 <getch>
+ 3eb8: 89 93 st Y+, r24
+ while (--length);
+ 3eba: 80 91 02 02 lds r24, 0x0202
+ 3ebe: 81 50 subi r24, 0x01 ; 1
+ 3ec0: 80 93 02 02 sts 0x0202, r24
+ 3ec4: 88 23 and r24, r24
+ 3ec6: b9 f7 brne .-18 ; 0x3eb6 <main+0xb6>
+
+ // Read command terminator, start reply
+ verifySpace();
+ 3ec8: 8b d0 rcall .+278 ; 0x3fe0 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 3eca: 07 b6 in r0, 0x37 ; 55
+ 3ecc: 00 fc sbrc r0, 0
+ 3ece: fd cf rjmp .-6 ; 0x3eca <main+0xca>
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ 3ed0: 40 91 00 02 lds r20, 0x0200
+ 3ed4: 50 91 01 02 lds r21, 0x0201
+ 3ed8: a0 e0 ldi r26, 0x00 ; 0
+ 3eda: b1 e0 ldi r27, 0x01 ; 1
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 3edc: 2c 91 ld r18, X
+ 3ede: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 3ee0: 11 96 adiw r26, 0x01 ; 1
+ 3ee2: 8c 91 ld r24, X
+ 3ee4: 11 97 sbiw r26, 0x01 ; 1
+ 3ee6: 90 e0 ldi r25, 0x00 ; 0
+ 3ee8: 98 2f mov r25, r24
+ 3eea: 88 27 eor r24, r24
+ 3eec: 82 2b or r24, r18
+ 3eee: 93 2b or r25, r19
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3ef0: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 3ef2: fa 01 movw r30, r20
+ 3ef4: 0c 01 movw r0, r24
+ 3ef6: d0 92 57 00 sts 0x0057, r13
+ 3efa: e8 95 spm
+ 3efc: 11 24 eor r1, r1
+ addrPtr += 2;
+ 3efe: 4e 5f subi r20, 0xFE ; 254
+ 3f00: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 3f02: f1 e0 ldi r31, 0x01 ; 1
+ 3f04: a0 38 cpi r26, 0x80 ; 128
+ 3f06: bf 07 cpc r27, r31
+ 3f08: 49 f7 brne .-46 ; 0x3edc <main+0xdc>
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3f0a: e0 91 00 02 lds r30, 0x0200
+ 3f0e: f0 91 01 02 lds r31, 0x0201
+ 3f12: e0 92 57 00 sts 0x0057, r14
+ 3f16: e8 95 spm
+ boot_spm_busy_wait();
+ 3f18: 07 b6 in r0, 0x37 ; 55
+ 3f1a: 00 fc sbrc r0, 0
+ 3f1c: fd cf rjmp .-6 ; 0x3f18 <main+0x118>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3f1e: f0 92 57 00 sts 0x0057, r15
+ 3f22: e8 95 spm
+ 3f24: 27 c0 rjmp .+78 ; 0x3f74 <main+0x174>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 3f26: 84 37 cpi r24, 0x74 ; 116
+ 3f28: b9 f4 brne .+46 ; 0x3f58 <main+0x158>
+ // READ PAGE - we only read flash
+ getLen();
+ 3f2a: 4a d0 rcall .+148 ; 0x3fc0 <getLen>
+ verifySpace();
+ 3f2c: 59 d0 rcall .+178 ; 0x3fe0 <verifySpace>
+ else ch = pgm_read_byte_near(address);
+ address++;
+ putch(ch);
+ } while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 3f2e: e0 91 00 02 lds r30, 0x0200
+ 3f32: f0 91 01 02 lds r31, 0x0201
+ 3f36: 31 96 adiw r30, 0x01 ; 1
+ 3f38: f0 93 01 02 sts 0x0201, r31
+ 3f3c: e0 93 00 02 sts 0x0200, r30
+ 3f40: 31 97 sbiw r30, 0x01 ; 1
+ 3f42: e4 91 lpm r30, Z+
+ 3f44: 8e 2f mov r24, r30
+ 3f46: 19 d0 rcall .+50 ; 0x3f7a <putch>
+ while (--length);
+ 3f48: 80 91 02 02 lds r24, 0x0202
+ 3f4c: 81 50 subi r24, 0x01 ; 1
+ 3f4e: 80 93 02 02 sts 0x0202, r24
+ 3f52: 88 23 and r24, r24
+ 3f54: 61 f7 brne .-40 ; 0x3f2e <main+0x12e>
+ 3f56: 0e c0 rjmp .+28 ; 0x3f74 <main+0x174>
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 3f58: 85 37 cpi r24, 0x75 ; 117
+ 3f5a: 39 f4 brne .+14 ; 0x3f6a <main+0x16a>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 3f5c: 41 d0 rcall .+130 ; 0x3fe0 <verifySpace>
+ putch(SIGNATURE_0);
+ 3f5e: 8e e1 ldi r24, 0x1E ; 30
+ 3f60: 0c d0 rcall .+24 ; 0x3f7a <putch>
+ putch(SIGNATURE_1);
+ 3f62: 84 e9 ldi r24, 0x94 ; 148
+ 3f64: 0a d0 rcall .+20 ; 0x3f7a <putch>
+ putch(SIGNATURE_2);
+ 3f66: 86 e0 ldi r24, 0x06 ; 6
+ 3f68: 96 cf rjmp .-212 ; 0x3e96 <main+0x96>
+ }
+ else if (ch == 'Q') {
+ 3f6a: 81 35 cpi r24, 0x51 ; 81
+ 3f6c: 11 f4 brne .+4 ; 0x3f72 <main+0x172>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 3f6e: 88 e0 ldi r24, 0x08 ; 8
+ 3f70: 2c d0 rcall .+88 ; 0x3fca <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 3f72: 36 d0 rcall .+108 ; 0x3fe0 <verifySpace>
+ }
+ putch(STK_OK);
+ 3f74: 80 e1 ldi r24, 0x10 ; 16
+ 3f76: 01 d0 rcall .+2 ; 0x3f7a <putch>
+ 3f78: 63 cf rjmp .-314 ; 0x3e40 <main+0x40>
+
+00003f7a <putch>:
+void putch(char ch) {
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+#else
+ __asm__ __volatile__ (
+ 3f7a: 2a e0 ldi r18, 0x0A ; 10
+ 3f7c: 30 e0 ldi r19, 0x00 ; 0
+ 3f7e: 80 95 com r24
+ 3f80: 08 94 sec
+ 3f82: 10 f4 brcc .+4 ; 0x3f88 <putch+0xe>
+ 3f84: 59 98 cbi 0x0b, 1 ; 11
+ 3f86: 02 c0 rjmp .+4 ; 0x3f8c <putch+0x12>
+ 3f88: 59 9a sbi 0x0b, 1 ; 11
+ 3f8a: 00 00 nop
+ 3f8c: 15 d0 rcall .+42 ; 0x3fb8 <uartDelay>
+ 3f8e: 14 d0 rcall .+40 ; 0x3fb8 <uartDelay>
+ 3f90: 86 95 lsr r24
+ 3f92: 2a 95 dec r18
+ 3f94: b1 f7 brne .-20 ; 0x3f82 <putch+0x8>
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 3f96: 08 95 ret
+
+00003f98 <getch>:
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3f98: a8 95 wdr
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+ 3f9a: 29 e0 ldi r18, 0x09 ; 9
+ 3f9c: 30 e0 ldi r19, 0x00 ; 0
+ 3f9e: 48 99 sbic 0x09, 0 ; 9
+ 3fa0: fe cf rjmp .-4 ; 0x3f9e <getch+0x6>
+ 3fa2: 0a d0 rcall .+20 ; 0x3fb8 <uartDelay>
+ 3fa4: 09 d0 rcall .+18 ; 0x3fb8 <uartDelay>
+ 3fa6: 08 d0 rcall .+16 ; 0x3fb8 <uartDelay>
+ 3fa8: 88 94 clc
+ 3faa: 48 99 sbic 0x09, 0 ; 9
+ 3fac: 08 94 sec
+ 3fae: 2a 95 dec r18
+ 3fb0: 11 f0 breq .+4 ; 0x3fb6 <getch+0x1e>
+ 3fb2: 87 95 ror r24
+ 3fb4: f7 cf rjmp .-18 ; 0x3fa4 <getch+0xc>
+ 3fb6: 08 95 ret
+
+00003fb8 <uartDelay>:
+#if UART_B_VALUE > 255
+#error Baud rate too slow for soft UART
+#endif
+
+void uartDelay() {
+ __asm__ __volatile__ (
+ 3fb8: 98 e0 ldi r25, 0x08 ; 8
+ 3fba: 9a 95 dec r25
+ 3fbc: f1 f7 brne .-4 ; 0x3fba <uartDelay+0x2>
+ 3fbe: 08 95 ret
+
+00003fc0 <getLen>:
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ 3fc0: eb df rcall .-42 ; 0x3f98 <getch>
+ length = getch();
+ 3fc2: ea df rcall .-44 ; 0x3f98 <getch>
+ 3fc4: 80 93 02 02 sts 0x0202, r24
+ return getch();
+}
+ 3fc8: e7 cf rjmp .-50 ; 0x3f98 <getch>
+
+00003fca <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 3fca: e0 e6 ldi r30, 0x60 ; 96
+ 3fcc: f0 e0 ldi r31, 0x00 ; 0
+ 3fce: 98 e1 ldi r25, 0x18 ; 24
+ 3fd0: 90 83 st Z, r25
+ WDTCSR = x;
+ 3fd2: 80 83 st Z, r24
+}
+ 3fd4: 08 95 ret
+
+00003fd6 <appStart>:
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 3fd6: 80 e0 ldi r24, 0x00 ; 0
+ 3fd8: f8 df rcall .-16 ; 0x3fca <watchdogConfig>
+ __asm__ __volatile__ (
+ 3fda: ee 27 eor r30, r30
+ 3fdc: ff 27 eor r31, r31
+ 3fde: 09 94 ijmp
+
+00003fe0 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ 3fe0: db df rcall .-74 ; 0x3f98 <getch>
+ 3fe2: 80 32 cpi r24, 0x20 ; 32
+ 3fe4: 09 f0 breq .+2 ; 0x3fe8 <verifySpace+0x8>
+ 3fe6: f7 df rcall .-18 ; 0x3fd6 <appStart>
+ putch(STK_INSYNC);
+ 3fe8: 84 e1 ldi r24, 0x14 ; 20
+}
+ 3fea: c7 cf rjmp .-114 ; 0x3f7a <putch>
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 3fec: 1f 93 push r17
+ 3fee: 18 2f mov r17, r24
+
+00003ff0 <getNch>:
+ do getch(); while (--count);
+ 3ff0: d3 df rcall .-90 ; 0x3f98 <getch>
+ 3ff2: 11 50 subi r17, 0x01 ; 1
+ 3ff4: e9 f7 brne .-6 ; 0x3ff0 <getNch>
+ verifySpace();
+ 3ff6: f4 df rcall .-24 ; 0x3fe0 <verifySpace>
+}
+ 3ff8: 1f 91 pop r17
+ 3ffa: 08 95 ret
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_luminet.hex b/test/ardmake/hardware/bootloaders/optiboot/optiboot_luminet.hex
new file mode 100644
index 0000000..0e51124
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_luminet.hex
@@ -0,0 +1,42 @@
+:101D000085E08EBD84B714BE81FF27D18DE021D13F
+:101D1000D49AD29A86E023EC3FEF91E03DBD2CBDF2
+:101D20009BB9589BFECFCC9AA8958150B9F7CC248B
+:101D3000C39485E0E82E0FE7D02E1EECF12EF0D0F4
+:101D4000813421F481E014D183E024C0823411F481
+:101D500084E103C0853419F485E00AD1CFC085350C
+:101D6000A1F4DED0082F10E01093010200930002CE
+:101D7000D7D090E0982F8827802B912B880F991F20
+:101D80009093010280930002B8C0863529F484E064
+:101D9000EFD080E0B6D0B2C0843609F06EC0D4D0A7
+:101DA000E0910002F091010283E080935700E895F2
+:101DB000C0E0D1E0B5D08993809102028150809338
+:101DC00002028823B9F7CED007B600FCFDCF809180
+:101DD000000290910102892B41F580910001209130
+:101DE000010130E0322F222790E0282B392B30934D
+:101DF00005022093040240910A0180910B0190E0BA
+:101E0000982F882750E0842B952B9093070280937E
+:101E100006022450304020930A01232F33272093B9
+:101E20000B01D0920001F09201014091000250910B
+:101E30000102A0E0B1E02C9130E011968C91119755
+:101E400090E0982F8827822B932B1296FA010C0191
+:101E5000C0925700E89511244E5F5F4FF1E0A03427
+:101E6000BF0749F7E0910002F0910102E0925700AC
+:101E7000E89507B600FCFDCF41C0843789F564D0F2
+:101E800071D0E0910002F0910102309719F4209195
+:101E9000040213C0E130F10519F4209105020DC0D0
+:101EA000EA30F10519F42091060207C0EB30F10584
+:101EB00019F42091070201C02491809100029091B1
+:101EC000010201969093010280930002822F19D0A3
+:101ED00080910202815080930202882391F60EC005
+:101EE000853739F43FD08EE10CD083E90AD08CE0FD
+:101EF00051CF813511F488E02CD034D080E101D06D
+:101F00001ECF2AE030E08095089410F4DA9802C0E1
+:101F1000DA9A000015D014D086952A95B1F7089565
+:101F2000A89529E030E0CB99FECF0AD009D008D09F
+:101F30008894CB9908942A9511F08795F7CF089546
+:101F40009EE09A95F1F70895EBDFEADF80930202B5
+:101F5000E7CF98E191BD81BD089580E0FADFE5E02B
+:101F6000FF270994DDDF803209F0F7DF84E1C9CF74
+:101F70001F93182FD5DF1150E9F7F4DF1F91089553
+:0400000300001D00DC
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_luminet.lst b/test/ardmake/hardware/bootloaders/optiboot/optiboot_luminet.lst
new file mode 100644
index 0000000..59468cb
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_luminet.lst
@@ -0,0 +1,604 @@
+
+optiboot_luminet.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 00000280 00001d00 00001d00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .debug_aranges 00000028 00000000 00000000 000002d4 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 2 .debug_pubnames 00000078 00000000 00000000 000002fc 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_info 00000289 00000000 00000000 00000374 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_abbrev 000001a1 00000000 00000000 000005fd 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_line 00000435 00000000 00000000 0000079e 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_frame 000000a0 00000000 00000000 00000bd4 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_str 00000144 00000000 00000000 00000c74 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_loc 00000194 00000000 00000000 00000db8 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_ranges 00000088 00000000 00000000 00000f4c 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00001d00 <main>:
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 1d00: 85 e0 ldi r24, 0x05 ; 5
+ 1d02: 8e bd out 0x2e, r24 ; 46
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 1d04: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 1d06: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 1d08: 81 ff sbrs r24, 1
+ 1d0a: 27 d1 rcall .+590 ; 0x1f5a <appStart>
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+ 1d0c: 8d e0 ldi r24, 0x0D ; 13
+ 1d0e: 21 d1 rcall .+578 ; 0x1f52 <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 1d10: d4 9a sbi 0x1a, 4 ; 26
+
+#ifdef SOFT_UART
+ /* Set TX pin as output */
+ UART_DDR |= _BV(UART_TX_BIT);
+ 1d12: d2 9a sbi 0x1a, 2 ; 26
+ 1d14: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 1d16: 23 ec ldi r18, 0xC3 ; 195
+ 1d18: 3f ef ldi r19, 0xFF ; 255
+ TIFR1 = _BV(TOV1);
+ 1d1a: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 1d1c: 3d bd out 0x2d, r19 ; 45
+ 1d1e: 2c bd out 0x2c, r18 ; 44
+ TIFR1 = _BV(TOV1);
+ 1d20: 9b b9 out 0x0b, r25 ; 11
+ while(!(TIFR1 & _BV(TOV1)));
+ 1d22: 58 9b sbis 0x0b, 0 ; 11
+ 1d24: fe cf rjmp .-4 ; 0x1d22 <main+0x22>
+ LED_PIN |= _BV(LED);
+ 1d26: cc 9a sbi 0x19, 4 ; 25
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 1d28: a8 95 wdr
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+ 1d2a: 81 50 subi r24, 0x01 ; 1
+ 1d2c: b9 f7 brne .-18 ; 0x1d1c <main+0x1c>
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 1d2e: cc 24 eor r12, r12
+ 1d30: c3 94 inc r12
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 1d32: 85 e0 ldi r24, 0x05 ; 5
+ 1d34: e8 2e mov r14, r24
+ vect -= 4; // Instruction is a relative jump (rjmp), so recalculate.
+ buff[10] = vect & 0xff;
+ buff[11] = vect >> 8;
+
+ // Add jump to bootloader at RESET vector
+ buff[0] = 0x7f;
+ 1d36: 0f e7 ldi r16, 0x7F ; 127
+ 1d38: d0 2e mov r13, r16
+ buff[1] = 0xce; // rjmp 0x1d00 instruction
+ 1d3a: 1e ec ldi r17, 0xCE ; 206
+ 1d3c: f1 2e mov r15, r17
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 1d3e: f0 d0 rcall .+480 ; 0x1f20 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 1d40: 81 34 cpi r24, 0x41 ; 65
+ 1d42: 21 f4 brne .+8 ; 0x1d4c <main+0x4c>
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 1d44: 81 e0 ldi r24, 0x01 ; 1
+ 1d46: 14 d1 rcall .+552 ; 0x1f70 <verifySpace+0xc>
+ putch(0x03);
+ 1d48: 83 e0 ldi r24, 0x03 ; 3
+ 1d4a: 24 c0 rjmp .+72 ; 0x1d94 <main+0x94>
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 1d4c: 82 34 cpi r24, 0x42 ; 66
+ 1d4e: 11 f4 brne .+4 ; 0x1d54 <main+0x54>
+ // SET DEVICE is ignored
+ getNch(20);
+ 1d50: 84 e1 ldi r24, 0x14 ; 20
+ 1d52: 03 c0 rjmp .+6 ; 0x1d5a <main+0x5a>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 1d54: 85 34 cpi r24, 0x45 ; 69
+ 1d56: 19 f4 brne .+6 ; 0x1d5e <main+0x5e>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 1d58: 85 e0 ldi r24, 0x05 ; 5
+ 1d5a: 0a d1 rcall .+532 ; 0x1f70 <verifySpace+0xc>
+ 1d5c: cf c0 rjmp .+414 ; 0x1efc <main+0x1fc>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 1d5e: 85 35 cpi r24, 0x55 ; 85
+ 1d60: a1 f4 brne .+40 ; 0x1d8a <main+0x8a>
+ // LOAD ADDRESS
+ address = getch();
+ 1d62: de d0 rcall .+444 ; 0x1f20 <getch>
+ 1d64: 08 2f mov r16, r24
+ 1d66: 10 e0 ldi r17, 0x00 ; 0
+ 1d68: 10 93 01 02 sts 0x0201, r17
+ 1d6c: 00 93 00 02 sts 0x0200, r16
+ address = (address & 0xff) | (getch() << 8);
+ 1d70: d7 d0 rcall .+430 ; 0x1f20 <getch>
+ 1d72: 90 e0 ldi r25, 0x00 ; 0
+ 1d74: 98 2f mov r25, r24
+ 1d76: 88 27 eor r24, r24
+ 1d78: 80 2b or r24, r16
+ 1d7a: 91 2b or r25, r17
+ address += address; // Convert from word address to byte address
+ 1d7c: 88 0f add r24, r24
+ 1d7e: 99 1f adc r25, r25
+ 1d80: 90 93 01 02 sts 0x0201, r25
+ 1d84: 80 93 00 02 sts 0x0200, r24
+ 1d88: b8 c0 rjmp .+368 ; 0x1efa <main+0x1fa>
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 1d8a: 86 35 cpi r24, 0x56 ; 86
+ 1d8c: 29 f4 brne .+10 ; 0x1d98 <main+0x98>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 1d8e: 84 e0 ldi r24, 0x04 ; 4
+ 1d90: ef d0 rcall .+478 ; 0x1f70 <verifySpace+0xc>
+ putch(0x00);
+ 1d92: 80 e0 ldi r24, 0x00 ; 0
+ 1d94: b6 d0 rcall .+364 ; 0x1f02 <putch>
+ 1d96: b2 c0 rjmp .+356 ; 0x1efc <main+0x1fc>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 1d98: 84 36 cpi r24, 0x64 ; 100
+ 1d9a: 09 f0 breq .+2 ; 0x1d9e <main+0x9e>
+ 1d9c: 6e c0 rjmp .+220 ; 0x1e7a <main+0x17a>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+ 1d9e: d4 d0 rcall .+424 ; 0x1f48 <getLen>
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+ 1da0: e0 91 00 02 lds r30, 0x0200
+ 1da4: f0 91 01 02 lds r31, 0x0201
+ 1da8: 83 e0 ldi r24, 0x03 ; 3
+ 1daa: 80 93 57 00 sts 0x0057, r24
+ 1dae: e8 95 spm
+ 1db0: c0 e0 ldi r28, 0x00 ; 0
+ 1db2: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 1db4: b5 d0 rcall .+362 ; 0x1f20 <getch>
+ 1db6: 89 93 st Y+, r24
+ while (--length);
+ 1db8: 80 91 02 02 lds r24, 0x0202
+ 1dbc: 81 50 subi r24, 0x01 ; 1
+ 1dbe: 80 93 02 02 sts 0x0202, r24
+ 1dc2: 88 23 and r24, r24
+ 1dc4: b9 f7 brne .-18 ; 0x1db4 <main+0xb4>
+
+ // Read command terminator, start reply
+ verifySpace();
+ 1dc6: ce d0 rcall .+412 ; 0x1f64 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 1dc8: 07 b6 in r0, 0x37 ; 55
+ 1dca: 00 fc sbrc r0, 0
+ 1dcc: fd cf rjmp .-6 ; 0x1dc8 <main+0xc8>
+
+#ifdef VIRTUAL_BOOT_PARTITION
+ if ((uint16_t)(void*)address == 0) {
+ 1dce: 80 91 00 02 lds r24, 0x0200
+ 1dd2: 90 91 01 02 lds r25, 0x0201
+ 1dd6: 89 2b or r24, r25
+ 1dd8: 41 f5 brne .+80 ; 0x1e2a <main+0x12a>
+ // This is the reset vector page. We need to live-patch the code so the
+ // bootloader runs.
+ //
+ // Move RESET vector to WDT vector
+ uint16_t vect = buff[0] | (buff[1]<<8);
+ 1dda: 80 91 00 01 lds r24, 0x0100
+ 1dde: 20 91 01 01 lds r18, 0x0101
+ 1de2: 30 e0 ldi r19, 0x00 ; 0
+ 1de4: 32 2f mov r19, r18
+ 1de6: 22 27 eor r18, r18
+ 1de8: 90 e0 ldi r25, 0x00 ; 0
+ 1dea: 28 2b or r18, r24
+ 1dec: 39 2b or r19, r25
+ rstVect = vect;
+ 1dee: 30 93 05 02 sts 0x0205, r19
+ 1df2: 20 93 04 02 sts 0x0204, r18
+ wdtVect = buff[10] | (buff[11]<<8);
+ 1df6: 40 91 0a 01 lds r20, 0x010A
+ 1dfa: 80 91 0b 01 lds r24, 0x010B
+ 1dfe: 90 e0 ldi r25, 0x00 ; 0
+ 1e00: 98 2f mov r25, r24
+ 1e02: 88 27 eor r24, r24
+ 1e04: 50 e0 ldi r21, 0x00 ; 0
+ 1e06: 84 2b or r24, r20
+ 1e08: 95 2b or r25, r21
+ 1e0a: 90 93 07 02 sts 0x0207, r25
+ 1e0e: 80 93 06 02 sts 0x0206, r24
+ vect -= 4; // Instruction is a relative jump (rjmp), so recalculate.
+ 1e12: 24 50 subi r18, 0x04 ; 4
+ 1e14: 30 40 sbci r19, 0x00 ; 0
+ buff[10] = vect & 0xff;
+ 1e16: 20 93 0a 01 sts 0x010A, r18
+ buff[11] = vect >> 8;
+ 1e1a: 23 2f mov r18, r19
+ 1e1c: 33 27 eor r19, r19
+ 1e1e: 20 93 0b 01 sts 0x010B, r18
+
+ // Add jump to bootloader at RESET vector
+ buff[0] = 0x7f;
+ 1e22: d0 92 00 01 sts 0x0100, r13
+ buff[1] = 0xce; // rjmp 0x1d00 instruction
+ 1e26: f0 92 01 01 sts 0x0101, r15
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ 1e2a: 40 91 00 02 lds r20, 0x0200
+ 1e2e: 50 91 01 02 lds r21, 0x0201
+ 1e32: a0 e0 ldi r26, 0x00 ; 0
+ 1e34: b1 e0 ldi r27, 0x01 ; 1
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 1e36: 2c 91 ld r18, X
+ 1e38: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 1e3a: 11 96 adiw r26, 0x01 ; 1
+ 1e3c: 8c 91 ld r24, X
+ 1e3e: 11 97 sbiw r26, 0x01 ; 1
+ 1e40: 90 e0 ldi r25, 0x00 ; 0
+ 1e42: 98 2f mov r25, r24
+ 1e44: 88 27 eor r24, r24
+ 1e46: 82 2b or r24, r18
+ 1e48: 93 2b or r25, r19
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 1e4a: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 1e4c: fa 01 movw r30, r20
+ 1e4e: 0c 01 movw r0, r24
+ 1e50: c0 92 57 00 sts 0x0057, r12
+ 1e54: e8 95 spm
+ 1e56: 11 24 eor r1, r1
+ addrPtr += 2;
+ 1e58: 4e 5f subi r20, 0xFE ; 254
+ 1e5a: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 1e5c: f1 e0 ldi r31, 0x01 ; 1
+ 1e5e: a0 34 cpi r26, 0x40 ; 64
+ 1e60: bf 07 cpc r27, r31
+ 1e62: 49 f7 brne .-46 ; 0x1e36 <main+0x136>
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 1e64: e0 91 00 02 lds r30, 0x0200
+ 1e68: f0 91 01 02 lds r31, 0x0201
+ 1e6c: e0 92 57 00 sts 0x0057, r14
+ 1e70: e8 95 spm
+ boot_spm_busy_wait();
+ 1e72: 07 b6 in r0, 0x37 ; 55
+ 1e74: 00 fc sbrc r0, 0
+ 1e76: fd cf rjmp .-6 ; 0x1e72 <main+0x172>
+ 1e78: 41 c0 rjmp .+130 ; 0x1efc <main+0x1fc>
+ boot_rww_enable();
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 1e7a: 84 37 cpi r24, 0x74 ; 116
+ 1e7c: 89 f5 brne .+98 ; 0x1ee0 <main+0x1e0>
+ // READ PAGE - we only read flash
+ getLen();
+ 1e7e: 64 d0 rcall .+200 ; 0x1f48 <getLen>
+ verifySpace();
+ 1e80: 71 d0 rcall .+226 ; 0x1f64 <verifySpace>
+#ifdef VIRTUAL_BOOT_PARTITION
+ do {
+ // Undo vector patch in bottom page so verify passes
+ if (address == 0) ch=rstVect & 0xff;
+ 1e82: e0 91 00 02 lds r30, 0x0200
+ 1e86: f0 91 01 02 lds r31, 0x0201
+ 1e8a: 30 97 sbiw r30, 0x00 ; 0
+ 1e8c: 19 f4 brne .+6 ; 0x1e94 <main+0x194>
+ 1e8e: 20 91 04 02 lds r18, 0x0204
+ 1e92: 13 c0 rjmp .+38 ; 0x1eba <main+0x1ba>
+ else if (address == 1) ch=rstVect >> 8;
+ 1e94: e1 30 cpi r30, 0x01 ; 1
+ 1e96: f1 05 cpc r31, r1
+ 1e98: 19 f4 brne .+6 ; 0x1ea0 <main+0x1a0>
+ 1e9a: 20 91 05 02 lds r18, 0x0205
+ 1e9e: 0d c0 rjmp .+26 ; 0x1eba <main+0x1ba>
+ else if (address == 10) ch=wdtVect & 0xff;
+ 1ea0: ea 30 cpi r30, 0x0A ; 10
+ 1ea2: f1 05 cpc r31, r1
+ 1ea4: 19 f4 brne .+6 ; 0x1eac <main+0x1ac>
+ 1ea6: 20 91 06 02 lds r18, 0x0206
+ 1eaa: 07 c0 rjmp .+14 ; 0x1eba <main+0x1ba>
+ else if (address == 11) ch=wdtVect >> 8;
+ 1eac: eb 30 cpi r30, 0x0B ; 11
+ 1eae: f1 05 cpc r31, r1
+ 1eb0: 19 f4 brne .+6 ; 0x1eb8 <main+0x1b8>
+ 1eb2: 20 91 07 02 lds r18, 0x0207
+ 1eb6: 01 c0 rjmp .+2 ; 0x1eba <main+0x1ba>
+ else ch = pgm_read_byte_near(address);
+ 1eb8: 24 91 lpm r18, Z+
+ address++;
+ 1eba: 80 91 00 02 lds r24, 0x0200
+ 1ebe: 90 91 01 02 lds r25, 0x0201
+ 1ec2: 01 96 adiw r24, 0x01 ; 1
+ 1ec4: 90 93 01 02 sts 0x0201, r25
+ 1ec8: 80 93 00 02 sts 0x0200, r24
+ putch(ch);
+ 1ecc: 82 2f mov r24, r18
+ 1ece: 19 d0 rcall .+50 ; 0x1f02 <putch>
+ } while (--length);
+ 1ed0: 80 91 02 02 lds r24, 0x0202
+ 1ed4: 81 50 subi r24, 0x01 ; 1
+ 1ed6: 80 93 02 02 sts 0x0202, r24
+ 1eda: 88 23 and r24, r24
+ 1edc: 91 f6 brne .-92 ; 0x1e82 <main+0x182>
+ 1ede: 0e c0 rjmp .+28 ; 0x1efc <main+0x1fc>
+ while (--length);
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 1ee0: 85 37 cpi r24, 0x75 ; 117
+ 1ee2: 39 f4 brne .+14 ; 0x1ef2 <main+0x1f2>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 1ee4: 3f d0 rcall .+126 ; 0x1f64 <verifySpace>
+ putch(SIGNATURE_0);
+ 1ee6: 8e e1 ldi r24, 0x1E ; 30
+ 1ee8: 0c d0 rcall .+24 ; 0x1f02 <putch>
+ putch(SIGNATURE_1);
+ 1eea: 83 e9 ldi r24, 0x93 ; 147
+ 1eec: 0a d0 rcall .+20 ; 0x1f02 <putch>
+ putch(SIGNATURE_2);
+ 1eee: 8c e0 ldi r24, 0x0C ; 12
+ 1ef0: 51 cf rjmp .-350 ; 0x1d94 <main+0x94>
+ }
+ else if (ch == 'Q') {
+ 1ef2: 81 35 cpi r24, 0x51 ; 81
+ 1ef4: 11 f4 brne .+4 ; 0x1efa <main+0x1fa>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 1ef6: 88 e0 ldi r24, 0x08 ; 8
+ 1ef8: 2c d0 rcall .+88 ; 0x1f52 <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 1efa: 34 d0 rcall .+104 ; 0x1f64 <verifySpace>
+ }
+ putch(STK_OK);
+ 1efc: 80 e1 ldi r24, 0x10 ; 16
+ 1efe: 01 d0 rcall .+2 ; 0x1f02 <putch>
+ 1f00: 1e cf rjmp .-452 ; 0x1d3e <main+0x3e>
+
+00001f02 <putch>:
+void putch(char ch) {
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+#else
+ __asm__ __volatile__ (
+ 1f02: 2a e0 ldi r18, 0x0A ; 10
+ 1f04: 30 e0 ldi r19, 0x00 ; 0
+ 1f06: 80 95 com r24
+ 1f08: 08 94 sec
+ 1f0a: 10 f4 brcc .+4 ; 0x1f10 <putch+0xe>
+ 1f0c: da 98 cbi 0x1b, 2 ; 27
+ 1f0e: 02 c0 rjmp .+4 ; 0x1f14 <putch+0x12>
+ 1f10: da 9a sbi 0x1b, 2 ; 27
+ 1f12: 00 00 nop
+ 1f14: 15 d0 rcall .+42 ; 0x1f40 <uartDelay>
+ 1f16: 14 d0 rcall .+40 ; 0x1f40 <uartDelay>
+ 1f18: 86 95 lsr r24
+ 1f1a: 2a 95 dec r18
+ 1f1c: b1 f7 brne .-20 ; 0x1f0a <putch+0x8>
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 1f1e: 08 95 ret
+
+00001f20 <getch>:
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 1f20: a8 95 wdr
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+ 1f22: 29 e0 ldi r18, 0x09 ; 9
+ 1f24: 30 e0 ldi r19, 0x00 ; 0
+ 1f26: cb 99 sbic 0x19, 3 ; 25
+ 1f28: fe cf rjmp .-4 ; 0x1f26 <getch+0x6>
+ 1f2a: 0a d0 rcall .+20 ; 0x1f40 <uartDelay>
+ 1f2c: 09 d0 rcall .+18 ; 0x1f40 <uartDelay>
+ 1f2e: 08 d0 rcall .+16 ; 0x1f40 <uartDelay>
+ 1f30: 88 94 clc
+ 1f32: cb 99 sbic 0x19, 3 ; 25
+ 1f34: 08 94 sec
+ 1f36: 2a 95 dec r18
+ 1f38: 11 f0 breq .+4 ; 0x1f3e <getch+0x1e>
+ 1f3a: 87 95 ror r24
+ 1f3c: f7 cf rjmp .-18 ; 0x1f2c <getch+0xc>
+ 1f3e: 08 95 ret
+
+00001f40 <uartDelay>:
+#if UART_B_VALUE > 255
+#error Baud rate too slow for soft UART
+#endif
+
+void uartDelay() {
+ __asm__ __volatile__ (
+ 1f40: 9e e0 ldi r25, 0x0E ; 14
+ 1f42: 9a 95 dec r25
+ 1f44: f1 f7 brne .-4 ; 0x1f42 <uartDelay+0x2>
+ 1f46: 08 95 ret
+
+00001f48 <getLen>:
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ 1f48: eb df rcall .-42 ; 0x1f20 <getch>
+ length = getch();
+ 1f4a: ea df rcall .-44 ; 0x1f20 <getch>
+ 1f4c: 80 93 02 02 sts 0x0202, r24
+ return getch();
+}
+ 1f50: e7 cf rjmp .-50 ; 0x1f20 <getch>
+
+00001f52 <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 1f52: 98 e1 ldi r25, 0x18 ; 24
+ 1f54: 91 bd out 0x21, r25 ; 33
+ WDTCSR = x;
+ 1f56: 81 bd out 0x21, r24 ; 33
+}
+ 1f58: 08 95 ret
+
+00001f5a <appStart>:
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 1f5a: 80 e0 ldi r24, 0x00 ; 0
+ 1f5c: fa df rcall .-12 ; 0x1f52 <watchdogConfig>
+ __asm__ __volatile__ (
+ 1f5e: e5 e0 ldi r30, 0x05 ; 5
+ 1f60: ff 27 eor r31, r31
+ 1f62: 09 94 ijmp
+
+00001f64 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ 1f64: dd df rcall .-70 ; 0x1f20 <getch>
+ 1f66: 80 32 cpi r24, 0x20 ; 32
+ 1f68: 09 f0 breq .+2 ; 0x1f6c <verifySpace+0x8>
+ 1f6a: f7 df rcall .-18 ; 0x1f5a <appStart>
+ putch(STK_INSYNC);
+ 1f6c: 84 e1 ldi r24, 0x14 ; 20
+}
+ 1f6e: c9 cf rjmp .-110 ; 0x1f02 <putch>
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 1f70: 1f 93 push r17
+ 1f72: 18 2f mov r17, r24
+
+00001f74 <getNch>:
+ do getch(); while (--count);
+ 1f74: d5 df rcall .-86 ; 0x1f20 <getch>
+ 1f76: 11 50 subi r17, 0x01 ; 1
+ 1f78: e9 f7 brne .-6 ; 0x1f74 <getNch>
+ verifySpace();
+ 1f7a: f4 df rcall .-24 ; 0x1f64 <verifySpace>
+}
+ 1f7c: 1f 91 pop r17
+ 1f7e: 08 95 ret
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_16MHz.hex b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_16MHz.hex
new file mode 100644
index 0000000..1e93414
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_16MHz.hex
@@ -0,0 +1,33 @@
+:103E000085E08093810082E08093C00088E1809308
+:103E1000C10086E08093C20080E18093C40084B733
+:103E200014BE81FFD0D08DE0C8D0259A86E020E373
+:103E30003CEF91E0309385002093840096BBB09BCB
+:103E4000FECF1D9AA8958150A9F7DD24D394A5E053
+:103E5000EA2EF1E1FF2EA4D0813421F481E0BED01E
+:103E600083E024C0823411F484E103C0853419F462
+:103E700085E0B4D08AC08535A1F492D0082F10E037
+:103E800010930102009300028BD090E0982F8827B6
+:103E9000802B912B880F991F909301028093000231
+:103EA00073C0863529F484E099D080E071D06DC06C
+:103EB000843609F043C07CD0E0910002F091010209
+:103EC00083E080935700E895C0E0D1E069D0899302
+:103ED000809102028150809302028823B9F778D042
+:103EE00007B600FCFDCF4091000250910102A0E016
+:103EF000B1E02C9130E011968C91119790E0982FC1
+:103F00008827822B932B1296FA010C01D09257002E
+:103F1000E89511244E5F5F4FF1E0A038BF0749F7E5
+:103F2000E0910002F0910102E0925700E89507B697
+:103F300000FCFDCFF0925700E89527C08437B9F414
+:103F400037D046D0E0910002F09101023196F09313
+:103F50000102E09300023197E4918E2F19D08091F5
+:103F60000202815080930202882361F70EC08537D8
+:103F700039F42ED08EE10CD084E90AD086E096CFB9
+:103F8000813511F488E019D023D080E101D063CFCE
+:103F9000982F8091C00085FFFCCF9093C6000895B4
+:103FA000A8958091C00087FFFCCF8091C60008953E
+:103FB000F7DFF6DF80930202F3CFE0E6F0E098E16E
+:103FC00090838083089580E0F8DFEE27FF2709942F
+:103FD000E7DF803209F0F7DF84E1DACF1F93182F93
+:0C3FE000DFDF1150E9F7F4DF1F910895B6
+:0400000300003E00BB
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_16MHz.lst b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_16MHz.lst
new file mode 100644
index 0000000..9920a76
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_16MHz.lst
@@ -0,0 +1,520 @@
+
+optiboot_pro_16MHz.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001ec 00003e00 00003e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .debug_aranges 00000028 00000000 00000000 00000240 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 2 .debug_pubnames 0000006a 00000000 00000000 00000268 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_info 00000269 00000000 00000000 000002d2 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_abbrev 00000196 00000000 00000000 0000053b 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_line 000003d3 00000000 00000000 000006d1 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_frame 00000090 00000000 00000000 00000aa4 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_str 00000135 00000000 00000000 00000b34 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_loc 000001d1 00000000 00000000 00000c69 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_ranges 00000068 00000000 00000000 00000e3a 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00003e00 <main>:
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3e00: 85 e0 ldi r24, 0x05 ; 5
+ 3e02: 80 93 81 00 sts 0x0081, r24
+#if LED_START_FLASHES > 0
+ // Set up Timer 1 for timeout counter
+ TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
+#endif
+#ifndef SOFT_UART
+ UCSR0A = _BV(U2X0); //Double speed mode USART0
+ 3e06: 82 e0 ldi r24, 0x02 ; 2
+ 3e08: 80 93 c0 00 sts 0x00C0, r24
+ UCSR0B = _BV(RXEN0) | _BV(TXEN0);
+ 3e0c: 88 e1 ldi r24, 0x18 ; 24
+ 3e0e: 80 93 c1 00 sts 0x00C1, r24
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ 3e12: 86 e0 ldi r24, 0x06 ; 6
+ 3e14: 80 93 c2 00 sts 0x00C2, r24
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+ 3e18: 80 e1 ldi r24, 0x10 ; 16
+ 3e1a: 80 93 c4 00 sts 0x00C4, r24
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 3e1e: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 3e20: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 3e22: 81 ff sbrs r24, 1
+ 3e24: d0 d0 rcall .+416 ; 0x3fc6 <appStart>
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+ 3e26: 8d e0 ldi r24, 0x0D ; 13
+ 3e28: c8 d0 rcall .+400 ; 0x3fba <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 3e2a: 25 9a sbi 0x04, 5 ; 4
+ 3e2c: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e2e: 20 e3 ldi r18, 0x30 ; 48
+ 3e30: 3c ef ldi r19, 0xFC ; 252
+ TIFR1 = _BV(TOV1);
+ 3e32: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e34: 30 93 85 00 sts 0x0085, r19
+ 3e38: 20 93 84 00 sts 0x0084, r18
+ TIFR1 = _BV(TOV1);
+ 3e3c: 96 bb out 0x16, r25 ; 22
+ while(!(TIFR1 & _BV(TOV1)));
+ 3e3e: b0 9b sbis 0x16, 0 ; 22
+ 3e40: fe cf rjmp .-4 ; 0x3e3e <main+0x3e>
+ LED_PIN |= _BV(LED);
+ 3e42: 1d 9a sbi 0x03, 5 ; 3
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3e44: a8 95 wdr
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+ 3e46: 81 50 subi r24, 0x01 ; 1
+ 3e48: a9 f7 brne .-22 ; 0x3e34 <main+0x34>
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e4a: dd 24 eor r13, r13
+ 3e4c: d3 94 inc r13
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3e4e: a5 e0 ldi r26, 0x05 ; 5
+ 3e50: ea 2e mov r14, r26
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3e52: f1 e1 ldi r31, 0x11 ; 17
+ 3e54: ff 2e mov r15, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 3e56: a4 d0 rcall .+328 ; 0x3fa0 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 3e58: 81 34 cpi r24, 0x41 ; 65
+ 3e5a: 21 f4 brne .+8 ; 0x3e64 <main+0x64>
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e5c: 81 e0 ldi r24, 0x01 ; 1
+ 3e5e: be d0 rcall .+380 ; 0x3fdc <verifySpace+0xc>
+ putch(0x03);
+ 3e60: 83 e0 ldi r24, 0x03 ; 3
+ 3e62: 24 c0 rjmp .+72 ; 0x3eac <main+0xac>
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 3e64: 82 34 cpi r24, 0x42 ; 66
+ 3e66: 11 f4 brne .+4 ; 0x3e6c <main+0x6c>
+ // SET DEVICE is ignored
+ getNch(20);
+ 3e68: 84 e1 ldi r24, 0x14 ; 20
+ 3e6a: 03 c0 rjmp .+6 ; 0x3e72 <main+0x72>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 3e6c: 85 34 cpi r24, 0x45 ; 69
+ 3e6e: 19 f4 brne .+6 ; 0x3e76 <main+0x76>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 3e70: 85 e0 ldi r24, 0x05 ; 5
+ 3e72: b4 d0 rcall .+360 ; 0x3fdc <verifySpace+0xc>
+ 3e74: 8a c0 rjmp .+276 ; 0x3f8a <main+0x18a>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 3e76: 85 35 cpi r24, 0x55 ; 85
+ 3e78: a1 f4 brne .+40 ; 0x3ea2 <main+0xa2>
+ // LOAD ADDRESS
+ address = getch();
+ 3e7a: 92 d0 rcall .+292 ; 0x3fa0 <getch>
+ 3e7c: 08 2f mov r16, r24
+ 3e7e: 10 e0 ldi r17, 0x00 ; 0
+ 3e80: 10 93 01 02 sts 0x0201, r17
+ 3e84: 00 93 00 02 sts 0x0200, r16
+ address = (address & 0xff) | (getch() << 8);
+ 3e88: 8b d0 rcall .+278 ; 0x3fa0 <getch>
+ 3e8a: 90 e0 ldi r25, 0x00 ; 0
+ 3e8c: 98 2f mov r25, r24
+ 3e8e: 88 27 eor r24, r24
+ 3e90: 80 2b or r24, r16
+ 3e92: 91 2b or r25, r17
+ address += address; // Convert from word address to byte address
+ 3e94: 88 0f add r24, r24
+ 3e96: 99 1f adc r25, r25
+ 3e98: 90 93 01 02 sts 0x0201, r25
+ 3e9c: 80 93 00 02 sts 0x0200, r24
+ 3ea0: 73 c0 rjmp .+230 ; 0x3f88 <main+0x188>
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 3ea2: 86 35 cpi r24, 0x56 ; 86
+ 3ea4: 29 f4 brne .+10 ; 0x3eb0 <main+0xb0>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 3ea6: 84 e0 ldi r24, 0x04 ; 4
+ 3ea8: 99 d0 rcall .+306 ; 0x3fdc <verifySpace+0xc>
+ putch(0x00);
+ 3eaa: 80 e0 ldi r24, 0x00 ; 0
+ 3eac: 71 d0 rcall .+226 ; 0x3f90 <putch>
+ 3eae: 6d c0 rjmp .+218 ; 0x3f8a <main+0x18a>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 3eb0: 84 36 cpi r24, 0x64 ; 100
+ 3eb2: 09 f0 breq .+2 ; 0x3eb6 <main+0xb6>
+ 3eb4: 43 c0 rjmp .+134 ; 0x3f3c <main+0x13c>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+ 3eb6: 7c d0 rcall .+248 ; 0x3fb0 <getLen>
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+ 3eb8: e0 91 00 02 lds r30, 0x0200
+ 3ebc: f0 91 01 02 lds r31, 0x0201
+ 3ec0: 83 e0 ldi r24, 0x03 ; 3
+ 3ec2: 80 93 57 00 sts 0x0057, r24
+ 3ec6: e8 95 spm
+ 3ec8: c0 e0 ldi r28, 0x00 ; 0
+ 3eca: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 3ecc: 69 d0 rcall .+210 ; 0x3fa0 <getch>
+ 3ece: 89 93 st Y+, r24
+ while (--length);
+ 3ed0: 80 91 02 02 lds r24, 0x0202
+ 3ed4: 81 50 subi r24, 0x01 ; 1
+ 3ed6: 80 93 02 02 sts 0x0202, r24
+ 3eda: 88 23 and r24, r24
+ 3edc: b9 f7 brne .-18 ; 0x3ecc <main+0xcc>
+
+ // Read command terminator, start reply
+ verifySpace();
+ 3ede: 78 d0 rcall .+240 ; 0x3fd0 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 3ee0: 07 b6 in r0, 0x37 ; 55
+ 3ee2: 00 fc sbrc r0, 0
+ 3ee4: fd cf rjmp .-6 ; 0x3ee0 <main+0xe0>
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ 3ee6: 40 91 00 02 lds r20, 0x0200
+ 3eea: 50 91 01 02 lds r21, 0x0201
+ 3eee: a0 e0 ldi r26, 0x00 ; 0
+ 3ef0: b1 e0 ldi r27, 0x01 ; 1
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 3ef2: 2c 91 ld r18, X
+ 3ef4: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 3ef6: 11 96 adiw r26, 0x01 ; 1
+ 3ef8: 8c 91 ld r24, X
+ 3efa: 11 97 sbiw r26, 0x01 ; 1
+ 3efc: 90 e0 ldi r25, 0x00 ; 0
+ 3efe: 98 2f mov r25, r24
+ 3f00: 88 27 eor r24, r24
+ 3f02: 82 2b or r24, r18
+ 3f04: 93 2b or r25, r19
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3f06: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 3f08: fa 01 movw r30, r20
+ 3f0a: 0c 01 movw r0, r24
+ 3f0c: d0 92 57 00 sts 0x0057, r13
+ 3f10: e8 95 spm
+ 3f12: 11 24 eor r1, r1
+ addrPtr += 2;
+ 3f14: 4e 5f subi r20, 0xFE ; 254
+ 3f16: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 3f18: f1 e0 ldi r31, 0x01 ; 1
+ 3f1a: a0 38 cpi r26, 0x80 ; 128
+ 3f1c: bf 07 cpc r27, r31
+ 3f1e: 49 f7 brne .-46 ; 0x3ef2 <main+0xf2>
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3f20: e0 91 00 02 lds r30, 0x0200
+ 3f24: f0 91 01 02 lds r31, 0x0201
+ 3f28: e0 92 57 00 sts 0x0057, r14
+ 3f2c: e8 95 spm
+ boot_spm_busy_wait();
+ 3f2e: 07 b6 in r0, 0x37 ; 55
+ 3f30: 00 fc sbrc r0, 0
+ 3f32: fd cf rjmp .-6 ; 0x3f2e <main+0x12e>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3f34: f0 92 57 00 sts 0x0057, r15
+ 3f38: e8 95 spm
+ 3f3a: 27 c0 rjmp .+78 ; 0x3f8a <main+0x18a>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 3f3c: 84 37 cpi r24, 0x74 ; 116
+ 3f3e: b9 f4 brne .+46 ; 0x3f6e <main+0x16e>
+ // READ PAGE - we only read flash
+ getLen();
+ 3f40: 37 d0 rcall .+110 ; 0x3fb0 <getLen>
+ verifySpace();
+ 3f42: 46 d0 rcall .+140 ; 0x3fd0 <verifySpace>
+ else ch = pgm_read_byte_near(address);
+ address++;
+ putch(ch);
+ } while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 3f44: e0 91 00 02 lds r30, 0x0200
+ 3f48: f0 91 01 02 lds r31, 0x0201
+ 3f4c: 31 96 adiw r30, 0x01 ; 1
+ 3f4e: f0 93 01 02 sts 0x0201, r31
+ 3f52: e0 93 00 02 sts 0x0200, r30
+ 3f56: 31 97 sbiw r30, 0x01 ; 1
+ 3f58: e4 91 lpm r30, Z+
+ 3f5a: 8e 2f mov r24, r30
+ 3f5c: 19 d0 rcall .+50 ; 0x3f90 <putch>
+ while (--length);
+ 3f5e: 80 91 02 02 lds r24, 0x0202
+ 3f62: 81 50 subi r24, 0x01 ; 1
+ 3f64: 80 93 02 02 sts 0x0202, r24
+ 3f68: 88 23 and r24, r24
+ 3f6a: 61 f7 brne .-40 ; 0x3f44 <main+0x144>
+ 3f6c: 0e c0 rjmp .+28 ; 0x3f8a <main+0x18a>
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 3f6e: 85 37 cpi r24, 0x75 ; 117
+ 3f70: 39 f4 brne .+14 ; 0x3f80 <main+0x180>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 3f72: 2e d0 rcall .+92 ; 0x3fd0 <verifySpace>
+ putch(SIGNATURE_0);
+ 3f74: 8e e1 ldi r24, 0x1E ; 30
+ 3f76: 0c d0 rcall .+24 ; 0x3f90 <putch>
+ putch(SIGNATURE_1);
+ 3f78: 84 e9 ldi r24, 0x94 ; 148
+ 3f7a: 0a d0 rcall .+20 ; 0x3f90 <putch>
+ putch(SIGNATURE_2);
+ 3f7c: 86 e0 ldi r24, 0x06 ; 6
+ 3f7e: 96 cf rjmp .-212 ; 0x3eac <main+0xac>
+ }
+ else if (ch == 'Q') {
+ 3f80: 81 35 cpi r24, 0x51 ; 81
+ 3f82: 11 f4 brne .+4 ; 0x3f88 <main+0x188>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 3f84: 88 e0 ldi r24, 0x08 ; 8
+ 3f86: 19 d0 rcall .+50 ; 0x3fba <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 3f88: 23 d0 rcall .+70 ; 0x3fd0 <verifySpace>
+ }
+ putch(STK_OK);
+ 3f8a: 80 e1 ldi r24, 0x10 ; 16
+ 3f8c: 01 d0 rcall .+2 ; 0x3f90 <putch>
+ 3f8e: 63 cf rjmp .-314 ; 0x3e56 <main+0x56>
+
+00003f90 <putch>:
+ }
+}
+
+void putch(char ch) {
+ 3f90: 98 2f mov r25, r24
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ 3f92: 80 91 c0 00 lds r24, 0x00C0
+ 3f96: 85 ff sbrs r24, 5
+ 3f98: fc cf rjmp .-8 ; 0x3f92 <putch+0x2>
+ UDR0 = ch;
+ 3f9a: 90 93 c6 00 sts 0x00C6, r25
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 3f9e: 08 95 ret
+
+00003fa0 <getch>:
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3fa0: a8 95 wdr
+ [uartBit] "I" (UART_RX_BIT)
+ :
+ "r25"
+);
+#else
+ while(!(UCSR0A & _BV(RXC0)));
+ 3fa2: 80 91 c0 00 lds r24, 0x00C0
+ 3fa6: 87 ff sbrs r24, 7
+ 3fa8: fc cf rjmp .-8 ; 0x3fa2 <getch+0x2>
+ ch = UDR0;
+ 3faa: 80 91 c6 00 lds r24, 0x00C6
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+ 3fae: 08 95 ret
+
+00003fb0 <getLen>:
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ 3fb0: f7 df rcall .-18 ; 0x3fa0 <getch>
+ length = getch();
+ 3fb2: f6 df rcall .-20 ; 0x3fa0 <getch>
+ 3fb4: 80 93 02 02 sts 0x0202, r24
+ return getch();
+}
+ 3fb8: f3 cf rjmp .-26 ; 0x3fa0 <getch>
+
+00003fba <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 3fba: e0 e6 ldi r30, 0x60 ; 96
+ 3fbc: f0 e0 ldi r31, 0x00 ; 0
+ 3fbe: 98 e1 ldi r25, 0x18 ; 24
+ 3fc0: 90 83 st Z, r25
+ WDTCSR = x;
+ 3fc2: 80 83 st Z, r24
+}
+ 3fc4: 08 95 ret
+
+00003fc6 <appStart>:
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 3fc6: 80 e0 ldi r24, 0x00 ; 0
+ 3fc8: f8 df rcall .-16 ; 0x3fba <watchdogConfig>
+ __asm__ __volatile__ (
+ 3fca: ee 27 eor r30, r30
+ 3fcc: ff 27 eor r31, r31
+ 3fce: 09 94 ijmp
+
+00003fd0 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ 3fd0: e7 df rcall .-50 ; 0x3fa0 <getch>
+ 3fd2: 80 32 cpi r24, 0x20 ; 32
+ 3fd4: 09 f0 breq .+2 ; 0x3fd8 <verifySpace+0x8>
+ 3fd6: f7 df rcall .-18 ; 0x3fc6 <appStart>
+ putch(STK_INSYNC);
+ 3fd8: 84 e1 ldi r24, 0x14 ; 20
+}
+ 3fda: da cf rjmp .-76 ; 0x3f90 <putch>
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 3fdc: 1f 93 push r17
+ 3fde: 18 2f mov r17, r24
+
+00003fe0 <getNch>:
+ do getch(); while (--count);
+ 3fe0: df df rcall .-66 ; 0x3fa0 <getch>
+ 3fe2: 11 50 subi r17, 0x01 ; 1
+ 3fe4: e9 f7 brne .-6 ; 0x3fe0 <getNch>
+ verifySpace();
+ 3fe6: f4 df rcall .-24 ; 0x3fd0 <verifySpace>
+}
+ 3fe8: 1f 91 pop r17
+ 3fea: 08 95 ret
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_20mhz.hex b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_20mhz.hex
new file mode 100644
index 0000000..19c9ae4
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_20mhz.hex
@@ -0,0 +1,33 @@
+:103E000085E08093810082E08093C00088E1809308
+:103E1000C10086E08093C20085E18093C40084B72E
+:103E200014BE81FFD0D08DE0C8D0259A86E02CE367
+:103E30003BEF91E0309385002093840096BBB09BCC
+:103E4000FECF1D9AA8958150A9F7DD24D394A5E053
+:103E5000EA2EF1E1FF2EA4D0813421F481E0BED01E
+:103E600083E024C0823411F484E103C0853419F462
+:103E700085E0B4D08AC08535A1F492D0082F10E037
+:103E800010930102009300028BD090E0982F8827B6
+:103E9000802B912B880F991F909301028093000231
+:103EA00073C0863529F484E099D080E071D06DC06C
+:103EB000843609F043C07CD0E0910002F091010209
+:103EC00083E080935700E895C0E0D1E069D0899302
+:103ED000809102028150809302028823B9F778D042
+:103EE00007B600FCFDCF4091000250910102A0E016
+:103EF000B1E02C9130E011968C91119790E0982FC1
+:103F00008827822B932B1296FA010C01D09257002E
+:103F1000E89511244E5F5F4FF1E0A038BF0749F7E5
+:103F2000E0910002F0910102E0925700E89507B697
+:103F300000FCFDCFF0925700E89527C08437B9F414
+:103F400037D046D0E0910002F09101023196F09313
+:103F50000102E09300023197E4918E2F19D08091F5
+:103F60000202815080930202882361F70EC08537D8
+:103F700039F42ED08EE10CD084E90AD086E096CFB9
+:103F8000813511F488E019D023D080E101D063CFCE
+:103F9000982F8091C00085FFFCCF9093C6000895B4
+:103FA000A8958091C00087FFFCCF8091C60008953E
+:103FB000F7DFF6DF80930202F3CFE0E6F0E098E16E
+:103FC00090838083089580E0F8DFEE27FF2709942F
+:103FD000E7DF803209F0F7DF84E1DACF1F93182F93
+:0C3FE000DFDF1150E9F7F4DF1F910895B6
+:0400000300003E00BB
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_20mhz.lst b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_20mhz.lst
new file mode 100644
index 0000000..62178d3
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_20mhz.lst
@@ -0,0 +1,520 @@
+
+optiboot_pro_20mhz.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001ec 00003e00 00003e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .debug_aranges 00000028 00000000 00000000 00000240 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 2 .debug_pubnames 0000006a 00000000 00000000 00000268 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_info 00000269 00000000 00000000 000002d2 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_abbrev 00000196 00000000 00000000 0000053b 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_line 000003d3 00000000 00000000 000006d1 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_frame 00000090 00000000 00000000 00000aa4 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_str 00000135 00000000 00000000 00000b34 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_loc 000001d1 00000000 00000000 00000c69 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_ranges 00000068 00000000 00000000 00000e3a 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00003e00 <main>:
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3e00: 85 e0 ldi r24, 0x05 ; 5
+ 3e02: 80 93 81 00 sts 0x0081, r24
+#if LED_START_FLASHES > 0
+ // Set up Timer 1 for timeout counter
+ TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
+#endif
+#ifndef SOFT_UART
+ UCSR0A = _BV(U2X0); //Double speed mode USART0
+ 3e06: 82 e0 ldi r24, 0x02 ; 2
+ 3e08: 80 93 c0 00 sts 0x00C0, r24
+ UCSR0B = _BV(RXEN0) | _BV(TXEN0);
+ 3e0c: 88 e1 ldi r24, 0x18 ; 24
+ 3e0e: 80 93 c1 00 sts 0x00C1, r24
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ 3e12: 86 e0 ldi r24, 0x06 ; 6
+ 3e14: 80 93 c2 00 sts 0x00C2, r24
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+ 3e18: 85 e1 ldi r24, 0x15 ; 21
+ 3e1a: 80 93 c4 00 sts 0x00C4, r24
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 3e1e: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 3e20: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 3e22: 81 ff sbrs r24, 1
+ 3e24: d0 d0 rcall .+416 ; 0x3fc6 <appStart>
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+ 3e26: 8d e0 ldi r24, 0x0D ; 13
+ 3e28: c8 d0 rcall .+400 ; 0x3fba <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 3e2a: 25 9a sbi 0x04, 5 ; 4
+ 3e2c: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e2e: 2c e3 ldi r18, 0x3C ; 60
+ 3e30: 3b ef ldi r19, 0xFB ; 251
+ TIFR1 = _BV(TOV1);
+ 3e32: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e34: 30 93 85 00 sts 0x0085, r19
+ 3e38: 20 93 84 00 sts 0x0084, r18
+ TIFR1 = _BV(TOV1);
+ 3e3c: 96 bb out 0x16, r25 ; 22
+ while(!(TIFR1 & _BV(TOV1)));
+ 3e3e: b0 9b sbis 0x16, 0 ; 22
+ 3e40: fe cf rjmp .-4 ; 0x3e3e <main+0x3e>
+ LED_PIN |= _BV(LED);
+ 3e42: 1d 9a sbi 0x03, 5 ; 3
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3e44: a8 95 wdr
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+ 3e46: 81 50 subi r24, 0x01 ; 1
+ 3e48: a9 f7 brne .-22 ; 0x3e34 <main+0x34>
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e4a: dd 24 eor r13, r13
+ 3e4c: d3 94 inc r13
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3e4e: a5 e0 ldi r26, 0x05 ; 5
+ 3e50: ea 2e mov r14, r26
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3e52: f1 e1 ldi r31, 0x11 ; 17
+ 3e54: ff 2e mov r15, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 3e56: a4 d0 rcall .+328 ; 0x3fa0 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 3e58: 81 34 cpi r24, 0x41 ; 65
+ 3e5a: 21 f4 brne .+8 ; 0x3e64 <main+0x64>
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e5c: 81 e0 ldi r24, 0x01 ; 1
+ 3e5e: be d0 rcall .+380 ; 0x3fdc <verifySpace+0xc>
+ putch(0x03);
+ 3e60: 83 e0 ldi r24, 0x03 ; 3
+ 3e62: 24 c0 rjmp .+72 ; 0x3eac <main+0xac>
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 3e64: 82 34 cpi r24, 0x42 ; 66
+ 3e66: 11 f4 brne .+4 ; 0x3e6c <main+0x6c>
+ // SET DEVICE is ignored
+ getNch(20);
+ 3e68: 84 e1 ldi r24, 0x14 ; 20
+ 3e6a: 03 c0 rjmp .+6 ; 0x3e72 <main+0x72>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 3e6c: 85 34 cpi r24, 0x45 ; 69
+ 3e6e: 19 f4 brne .+6 ; 0x3e76 <main+0x76>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 3e70: 85 e0 ldi r24, 0x05 ; 5
+ 3e72: b4 d0 rcall .+360 ; 0x3fdc <verifySpace+0xc>
+ 3e74: 8a c0 rjmp .+276 ; 0x3f8a <main+0x18a>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 3e76: 85 35 cpi r24, 0x55 ; 85
+ 3e78: a1 f4 brne .+40 ; 0x3ea2 <main+0xa2>
+ // LOAD ADDRESS
+ address = getch();
+ 3e7a: 92 d0 rcall .+292 ; 0x3fa0 <getch>
+ 3e7c: 08 2f mov r16, r24
+ 3e7e: 10 e0 ldi r17, 0x00 ; 0
+ 3e80: 10 93 01 02 sts 0x0201, r17
+ 3e84: 00 93 00 02 sts 0x0200, r16
+ address = (address & 0xff) | (getch() << 8);
+ 3e88: 8b d0 rcall .+278 ; 0x3fa0 <getch>
+ 3e8a: 90 e0 ldi r25, 0x00 ; 0
+ 3e8c: 98 2f mov r25, r24
+ 3e8e: 88 27 eor r24, r24
+ 3e90: 80 2b or r24, r16
+ 3e92: 91 2b or r25, r17
+ address += address; // Convert from word address to byte address
+ 3e94: 88 0f add r24, r24
+ 3e96: 99 1f adc r25, r25
+ 3e98: 90 93 01 02 sts 0x0201, r25
+ 3e9c: 80 93 00 02 sts 0x0200, r24
+ 3ea0: 73 c0 rjmp .+230 ; 0x3f88 <main+0x188>
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 3ea2: 86 35 cpi r24, 0x56 ; 86
+ 3ea4: 29 f4 brne .+10 ; 0x3eb0 <main+0xb0>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 3ea6: 84 e0 ldi r24, 0x04 ; 4
+ 3ea8: 99 d0 rcall .+306 ; 0x3fdc <verifySpace+0xc>
+ putch(0x00);
+ 3eaa: 80 e0 ldi r24, 0x00 ; 0
+ 3eac: 71 d0 rcall .+226 ; 0x3f90 <putch>
+ 3eae: 6d c0 rjmp .+218 ; 0x3f8a <main+0x18a>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 3eb0: 84 36 cpi r24, 0x64 ; 100
+ 3eb2: 09 f0 breq .+2 ; 0x3eb6 <main+0xb6>
+ 3eb4: 43 c0 rjmp .+134 ; 0x3f3c <main+0x13c>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+ 3eb6: 7c d0 rcall .+248 ; 0x3fb0 <getLen>
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+ 3eb8: e0 91 00 02 lds r30, 0x0200
+ 3ebc: f0 91 01 02 lds r31, 0x0201
+ 3ec0: 83 e0 ldi r24, 0x03 ; 3
+ 3ec2: 80 93 57 00 sts 0x0057, r24
+ 3ec6: e8 95 spm
+ 3ec8: c0 e0 ldi r28, 0x00 ; 0
+ 3eca: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 3ecc: 69 d0 rcall .+210 ; 0x3fa0 <getch>
+ 3ece: 89 93 st Y+, r24
+ while (--length);
+ 3ed0: 80 91 02 02 lds r24, 0x0202
+ 3ed4: 81 50 subi r24, 0x01 ; 1
+ 3ed6: 80 93 02 02 sts 0x0202, r24
+ 3eda: 88 23 and r24, r24
+ 3edc: b9 f7 brne .-18 ; 0x3ecc <main+0xcc>
+
+ // Read command terminator, start reply
+ verifySpace();
+ 3ede: 78 d0 rcall .+240 ; 0x3fd0 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 3ee0: 07 b6 in r0, 0x37 ; 55
+ 3ee2: 00 fc sbrc r0, 0
+ 3ee4: fd cf rjmp .-6 ; 0x3ee0 <main+0xe0>
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ 3ee6: 40 91 00 02 lds r20, 0x0200
+ 3eea: 50 91 01 02 lds r21, 0x0201
+ 3eee: a0 e0 ldi r26, 0x00 ; 0
+ 3ef0: b1 e0 ldi r27, 0x01 ; 1
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 3ef2: 2c 91 ld r18, X
+ 3ef4: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 3ef6: 11 96 adiw r26, 0x01 ; 1
+ 3ef8: 8c 91 ld r24, X
+ 3efa: 11 97 sbiw r26, 0x01 ; 1
+ 3efc: 90 e0 ldi r25, 0x00 ; 0
+ 3efe: 98 2f mov r25, r24
+ 3f00: 88 27 eor r24, r24
+ 3f02: 82 2b or r24, r18
+ 3f04: 93 2b or r25, r19
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3f06: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 3f08: fa 01 movw r30, r20
+ 3f0a: 0c 01 movw r0, r24
+ 3f0c: d0 92 57 00 sts 0x0057, r13
+ 3f10: e8 95 spm
+ 3f12: 11 24 eor r1, r1
+ addrPtr += 2;
+ 3f14: 4e 5f subi r20, 0xFE ; 254
+ 3f16: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 3f18: f1 e0 ldi r31, 0x01 ; 1
+ 3f1a: a0 38 cpi r26, 0x80 ; 128
+ 3f1c: bf 07 cpc r27, r31
+ 3f1e: 49 f7 brne .-46 ; 0x3ef2 <main+0xf2>
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3f20: e0 91 00 02 lds r30, 0x0200
+ 3f24: f0 91 01 02 lds r31, 0x0201
+ 3f28: e0 92 57 00 sts 0x0057, r14
+ 3f2c: e8 95 spm
+ boot_spm_busy_wait();
+ 3f2e: 07 b6 in r0, 0x37 ; 55
+ 3f30: 00 fc sbrc r0, 0
+ 3f32: fd cf rjmp .-6 ; 0x3f2e <main+0x12e>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3f34: f0 92 57 00 sts 0x0057, r15
+ 3f38: e8 95 spm
+ 3f3a: 27 c0 rjmp .+78 ; 0x3f8a <main+0x18a>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 3f3c: 84 37 cpi r24, 0x74 ; 116
+ 3f3e: b9 f4 brne .+46 ; 0x3f6e <main+0x16e>
+ // READ PAGE - we only read flash
+ getLen();
+ 3f40: 37 d0 rcall .+110 ; 0x3fb0 <getLen>
+ verifySpace();
+ 3f42: 46 d0 rcall .+140 ; 0x3fd0 <verifySpace>
+ else ch = pgm_read_byte_near(address);
+ address++;
+ putch(ch);
+ } while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 3f44: e0 91 00 02 lds r30, 0x0200
+ 3f48: f0 91 01 02 lds r31, 0x0201
+ 3f4c: 31 96 adiw r30, 0x01 ; 1
+ 3f4e: f0 93 01 02 sts 0x0201, r31
+ 3f52: e0 93 00 02 sts 0x0200, r30
+ 3f56: 31 97 sbiw r30, 0x01 ; 1
+ 3f58: e4 91 lpm r30, Z+
+ 3f5a: 8e 2f mov r24, r30
+ 3f5c: 19 d0 rcall .+50 ; 0x3f90 <putch>
+ while (--length);
+ 3f5e: 80 91 02 02 lds r24, 0x0202
+ 3f62: 81 50 subi r24, 0x01 ; 1
+ 3f64: 80 93 02 02 sts 0x0202, r24
+ 3f68: 88 23 and r24, r24
+ 3f6a: 61 f7 brne .-40 ; 0x3f44 <main+0x144>
+ 3f6c: 0e c0 rjmp .+28 ; 0x3f8a <main+0x18a>
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 3f6e: 85 37 cpi r24, 0x75 ; 117
+ 3f70: 39 f4 brne .+14 ; 0x3f80 <main+0x180>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 3f72: 2e d0 rcall .+92 ; 0x3fd0 <verifySpace>
+ putch(SIGNATURE_0);
+ 3f74: 8e e1 ldi r24, 0x1E ; 30
+ 3f76: 0c d0 rcall .+24 ; 0x3f90 <putch>
+ putch(SIGNATURE_1);
+ 3f78: 84 e9 ldi r24, 0x94 ; 148
+ 3f7a: 0a d0 rcall .+20 ; 0x3f90 <putch>
+ putch(SIGNATURE_2);
+ 3f7c: 86 e0 ldi r24, 0x06 ; 6
+ 3f7e: 96 cf rjmp .-212 ; 0x3eac <main+0xac>
+ }
+ else if (ch == 'Q') {
+ 3f80: 81 35 cpi r24, 0x51 ; 81
+ 3f82: 11 f4 brne .+4 ; 0x3f88 <main+0x188>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 3f84: 88 e0 ldi r24, 0x08 ; 8
+ 3f86: 19 d0 rcall .+50 ; 0x3fba <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 3f88: 23 d0 rcall .+70 ; 0x3fd0 <verifySpace>
+ }
+ putch(STK_OK);
+ 3f8a: 80 e1 ldi r24, 0x10 ; 16
+ 3f8c: 01 d0 rcall .+2 ; 0x3f90 <putch>
+ 3f8e: 63 cf rjmp .-314 ; 0x3e56 <main+0x56>
+
+00003f90 <putch>:
+ }
+}
+
+void putch(char ch) {
+ 3f90: 98 2f mov r25, r24
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ 3f92: 80 91 c0 00 lds r24, 0x00C0
+ 3f96: 85 ff sbrs r24, 5
+ 3f98: fc cf rjmp .-8 ; 0x3f92 <putch+0x2>
+ UDR0 = ch;
+ 3f9a: 90 93 c6 00 sts 0x00C6, r25
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 3f9e: 08 95 ret
+
+00003fa0 <getch>:
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3fa0: a8 95 wdr
+ [uartBit] "I" (UART_RX_BIT)
+ :
+ "r25"
+);
+#else
+ while(!(UCSR0A & _BV(RXC0)));
+ 3fa2: 80 91 c0 00 lds r24, 0x00C0
+ 3fa6: 87 ff sbrs r24, 7
+ 3fa8: fc cf rjmp .-8 ; 0x3fa2 <getch+0x2>
+ ch = UDR0;
+ 3faa: 80 91 c6 00 lds r24, 0x00C6
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+ 3fae: 08 95 ret
+
+00003fb0 <getLen>:
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ 3fb0: f7 df rcall .-18 ; 0x3fa0 <getch>
+ length = getch();
+ 3fb2: f6 df rcall .-20 ; 0x3fa0 <getch>
+ 3fb4: 80 93 02 02 sts 0x0202, r24
+ return getch();
+}
+ 3fb8: f3 cf rjmp .-26 ; 0x3fa0 <getch>
+
+00003fba <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 3fba: e0 e6 ldi r30, 0x60 ; 96
+ 3fbc: f0 e0 ldi r31, 0x00 ; 0
+ 3fbe: 98 e1 ldi r25, 0x18 ; 24
+ 3fc0: 90 83 st Z, r25
+ WDTCSR = x;
+ 3fc2: 80 83 st Z, r24
+}
+ 3fc4: 08 95 ret
+
+00003fc6 <appStart>:
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 3fc6: 80 e0 ldi r24, 0x00 ; 0
+ 3fc8: f8 df rcall .-16 ; 0x3fba <watchdogConfig>
+ __asm__ __volatile__ (
+ 3fca: ee 27 eor r30, r30
+ 3fcc: ff 27 eor r31, r31
+ 3fce: 09 94 ijmp
+
+00003fd0 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ 3fd0: e7 df rcall .-50 ; 0x3fa0 <getch>
+ 3fd2: 80 32 cpi r24, 0x20 ; 32
+ 3fd4: 09 f0 breq .+2 ; 0x3fd8 <verifySpace+0x8>
+ 3fd6: f7 df rcall .-18 ; 0x3fc6 <appStart>
+ putch(STK_INSYNC);
+ 3fd8: 84 e1 ldi r24, 0x14 ; 20
+}
+ 3fda: da cf rjmp .-76 ; 0x3f90 <putch>
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 3fdc: 1f 93 push r17
+ 3fde: 18 2f mov r17, r24
+
+00003fe0 <getNch>:
+ do getch(); while (--count);
+ 3fe0: df df rcall .-66 ; 0x3fa0 <getch>
+ 3fe2: 11 50 subi r17, 0x01 ; 1
+ 3fe4: e9 f7 brne .-6 ; 0x3fe0 <getNch>
+ verifySpace();
+ 3fe6: f4 df rcall .-24 ; 0x3fd0 <verifySpace>
+}
+ 3fe8: 1f 91 pop r17
+ 3fea: 08 95 ret
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_8MHz.hex b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_8MHz.hex
new file mode 100644
index 0000000..9d31a7a
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_8MHz.hex
@@ -0,0 +1,34 @@
+:103E000085E08093810084B714BE81FFE4D08DE00B
+:103E1000DCD0259A519A86E028E13EEF91E030937C
+:103E200085002093840096BBB09BFECF1D9AA89579
+:103E30008150A9F7DD24D394A5E0EA2EF1E1FF2E0D
+:103E4000ABD0813421F481E0D1D083E024C082342E
+:103E500011F484E103C0853419F485E0C7D08AC029
+:103E60008535A1F499D0082F10E01093010200933A
+:103E7000000292D090E0982F8827802B912B880FFA
+:103E8000991F909301028093000273C0863529F434
+:103E900084E0ACD080E071D06DC0843609F043C0BE
+:103EA0008FD0E0910002F091010283E080935700EF
+:103EB000E895C0E0D1E070D08993809102028150F2
+:103EC000809302028823B9F78BD007B600FCFDCFA0
+:103ED0004091000250910102A0E0B1E02C9130E04D
+:103EE00011968C91119790E0982F8827822B932B15
+:103EF0001296FA010C01D0925700E89511244E5FFA
+:103F00005F4FF1E0A038BF0749F7E0910002F09160
+:103F10000102E0925700E89507B600FCFDCFF09251
+:103F20005700E89527C08437B9F44AD059D0E091BA
+:103F30000002F09101023196F0930102E093000239
+:103F40003197E4918E2F19D0809102028150809395
+:103F50000202882361F70EC0853739F441D08EE123
+:103F60000CD084E90AD086E096CF813511F488E040
+:103F70002CD036D080E101D063CF2AE030E08095AC
+:103F8000089410F4599802C0599A000015D014D022
+:103F900086952A95B1F70895A89529E030E04899CB
+:103FA000FECF0AD009D008D08894489908942A9561
+:103FB00011F08795F7CF089598E09A95F1F7089555
+:103FC000EBDFEADF80930202E7CFE0E6F0E098E182
+:103FD00090838083089580E0F8DFEE27FF2709941F
+:103FE000DBDF803209F0F7DF84E1C7CF1F93182FA2
+:0C3FF000D3DF1150E9F7F4DF1F910895B2
+:0400000300003E00BB
+:00000001FF
diff --git a/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_8MHz.lst b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_8MHz.lst
new file mode 100644
index 0000000..94603e2
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/optiboot/optiboot_pro_8MHz.lst
@@ -0,0 +1,533 @@
+
+optiboot_pro_8MHz.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001fc 00003e00 00003e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .debug_aranges 00000028 00000000 00000000 00000250 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 2 .debug_pubnames 00000078 00000000 00000000 00000278 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_info 00000277 00000000 00000000 000002f0 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_abbrev 00000194 00000000 00000000 00000567 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_line 000003bb 00000000 00000000 000006fb 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_frame 000000a0 00000000 00000000 00000ab8 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_str 0000013f 00000000 00000000 00000b58 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_loc 000001a0 00000000 00000000 00000c97 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_ranges 00000070 00000000 00000000 00000e37 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00003e00 <main>:
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3e00: 85 e0 ldi r24, 0x05 ; 5
+ 3e02: 80 93 81 00 sts 0x0081, r24
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 3e06: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 3e08: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 3e0a: 81 ff sbrs r24, 1
+ 3e0c: e4 d0 rcall .+456 ; 0x3fd6 <appStart>
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_500MS);
+ 3e0e: 8d e0 ldi r24, 0x0D ; 13
+ 3e10: dc d0 rcall .+440 ; 0x3fca <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 3e12: 25 9a sbi 0x04, 5 ; 4
+
+#ifdef SOFT_UART
+ /* Set TX pin as output */
+ UART_DDR |= _BV(UART_TX_BIT);
+ 3e14: 51 9a sbi 0x0a, 1 ; 10
+ 3e16: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e18: 28 e1 ldi r18, 0x18 ; 24
+ 3e1a: 3e ef ldi r19, 0xFE ; 254
+ TIFR1 = _BV(TOV1);
+ 3e1c: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e1e: 30 93 85 00 sts 0x0085, r19
+ 3e22: 20 93 84 00 sts 0x0084, r18
+ TIFR1 = _BV(TOV1);
+ 3e26: 96 bb out 0x16, r25 ; 22
+ while(!(TIFR1 & _BV(TOV1)));
+ 3e28: b0 9b sbis 0x16, 0 ; 22
+ 3e2a: fe cf rjmp .-4 ; 0x3e28 <main+0x28>
+ LED_PIN |= _BV(LED);
+ 3e2c: 1d 9a sbi 0x03, 5 ; 3
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3e2e: a8 95 wdr
+ TCNT1 = -(F_CPU/(1024*16));
+ TIFR1 = _BV(TOV1);
+ while(!(TIFR1 & _BV(TOV1)));
+ LED_PIN |= _BV(LED);
+ watchdogReset();
+ } while (--count);
+ 3e30: 81 50 subi r24, 0x01 ; 1
+ 3e32: a9 f7 brne .-22 ; 0x3e1e <main+0x1e>
+ /* get character from UART */
+ ch = getch();
+
+ if(ch == STK_GET_PARAMETER) {
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e34: dd 24 eor r13, r13
+ 3e36: d3 94 inc r13
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3e38: a5 e0 ldi r26, 0x05 ; 5
+ 3e3a: ea 2e mov r14, r26
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3e3c: f1 e1 ldi r31, 0x11 ; 17
+ 3e3e: ff 2e mov r15, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 3e40: ab d0 rcall .+342 ; 0x3f98 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 3e42: 81 34 cpi r24, 0x41 ; 65
+ 3e44: 21 f4 brne .+8 ; 0x3e4e <main+0x4e>
+ // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
+ getNch(1);
+ 3e46: 81 e0 ldi r24, 0x01 ; 1
+ 3e48: d1 d0 rcall .+418 ; 0x3fec <verifySpace+0xc>
+ putch(0x03);
+ 3e4a: 83 e0 ldi r24, 0x03 ; 3
+ 3e4c: 24 c0 rjmp .+72 ; 0x3e96 <main+0x96>
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 3e4e: 82 34 cpi r24, 0x42 ; 66
+ 3e50: 11 f4 brne .+4 ; 0x3e56 <main+0x56>
+ // SET DEVICE is ignored
+ getNch(20);
+ 3e52: 84 e1 ldi r24, 0x14 ; 20
+ 3e54: 03 c0 rjmp .+6 ; 0x3e5c <main+0x5c>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 3e56: 85 34 cpi r24, 0x45 ; 69
+ 3e58: 19 f4 brne .+6 ; 0x3e60 <main+0x60>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 3e5a: 85 e0 ldi r24, 0x05 ; 5
+ 3e5c: c7 d0 rcall .+398 ; 0x3fec <verifySpace+0xc>
+ 3e5e: 8a c0 rjmp .+276 ; 0x3f74 <main+0x174>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 3e60: 85 35 cpi r24, 0x55 ; 85
+ 3e62: a1 f4 brne .+40 ; 0x3e8c <main+0x8c>
+ // LOAD ADDRESS
+ address = getch();
+ 3e64: 99 d0 rcall .+306 ; 0x3f98 <getch>
+ 3e66: 08 2f mov r16, r24
+ 3e68: 10 e0 ldi r17, 0x00 ; 0
+ 3e6a: 10 93 01 02 sts 0x0201, r17
+ 3e6e: 00 93 00 02 sts 0x0200, r16
+ address = (address & 0xff) | (getch() << 8);
+ 3e72: 92 d0 rcall .+292 ; 0x3f98 <getch>
+ 3e74: 90 e0 ldi r25, 0x00 ; 0
+ 3e76: 98 2f mov r25, r24
+ 3e78: 88 27 eor r24, r24
+ 3e7a: 80 2b or r24, r16
+ 3e7c: 91 2b or r25, r17
+ address += address; // Convert from word address to byte address
+ 3e7e: 88 0f add r24, r24
+ 3e80: 99 1f adc r25, r25
+ 3e82: 90 93 01 02 sts 0x0201, r25
+ 3e86: 80 93 00 02 sts 0x0200, r24
+ 3e8a: 73 c0 rjmp .+230 ; 0x3f72 <main+0x172>
+ verifySpace();
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 3e8c: 86 35 cpi r24, 0x56 ; 86
+ 3e8e: 29 f4 brne .+10 ; 0x3e9a <main+0x9a>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 3e90: 84 e0 ldi r24, 0x04 ; 4
+ 3e92: ac d0 rcall .+344 ; 0x3fec <verifySpace+0xc>
+ putch(0x00);
+ 3e94: 80 e0 ldi r24, 0x00 ; 0
+ 3e96: 71 d0 rcall .+226 ; 0x3f7a <putch>
+ 3e98: 6d c0 rjmp .+218 ; 0x3f74 <main+0x174>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 3e9a: 84 36 cpi r24, 0x64 ; 100
+ 3e9c: 09 f0 breq .+2 ; 0x3ea0 <main+0xa0>
+ 3e9e: 43 c0 rjmp .+134 ; 0x3f26 <main+0x126>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getLen();
+ 3ea0: 8f d0 rcall .+286 ; 0x3fc0 <getLen>
+
+ // Immediately start page erase - this will 4.5ms
+ boot_page_erase((uint16_t)(void*)address);
+ 3ea2: e0 91 00 02 lds r30, 0x0200
+ 3ea6: f0 91 01 02 lds r31, 0x0201
+ 3eaa: 83 e0 ldi r24, 0x03 ; 3
+ 3eac: 80 93 57 00 sts 0x0057, r24
+ 3eb0: e8 95 spm
+ 3eb2: c0 e0 ldi r28, 0x00 ; 0
+ 3eb4: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 3eb6: 70 d0 rcall .+224 ; 0x3f98 <getch>
+ 3eb8: 89 93 st Y+, r24
+ while (--length);
+ 3eba: 80 91 02 02 lds r24, 0x0202
+ 3ebe: 81 50 subi r24, 0x01 ; 1
+ 3ec0: 80 93 02 02 sts 0x0202, r24
+ 3ec4: 88 23 and r24, r24
+ 3ec6: b9 f7 brne .-18 ; 0x3eb6 <main+0xb6>
+
+ // Read command terminator, start reply
+ verifySpace();
+ 3ec8: 8b d0 rcall .+278 ; 0x3fe0 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 3eca: 07 b6 in r0, 0x37 ; 55
+ 3ecc: 00 fc sbrc r0, 0
+ 3ece: fd cf rjmp .-6 ; 0x3eca <main+0xca>
+ }
+#endif
+
+ // Copy buffer into programming buffer
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ 3ed0: 40 91 00 02 lds r20, 0x0200
+ 3ed4: 50 91 01 02 lds r21, 0x0201
+ 3ed8: a0 e0 ldi r26, 0x00 ; 0
+ 3eda: b1 e0 ldi r27, 0x01 ; 1
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 3edc: 2c 91 ld r18, X
+ 3ede: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 3ee0: 11 96 adiw r26, 0x01 ; 1
+ 3ee2: 8c 91 ld r24, X
+ 3ee4: 11 97 sbiw r26, 0x01 ; 1
+ 3ee6: 90 e0 ldi r25, 0x00 ; 0
+ 3ee8: 98 2f mov r25, r24
+ 3eea: 88 27 eor r24, r24
+ 3eec: 82 2b or r24, r18
+ 3eee: 93 2b or r25, r19
+#ifdef VIRTUAL_BOOT_PARTITION
+#define rstVect (*(uint16_t*)(0x204))
+#define wdtVect (*(uint16_t*)(0x206))
+#endif
+/* main program starts here */
+int main(void) {
+ 3ef0: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 3ef2: fa 01 movw r30, r20
+ 3ef4: 0c 01 movw r0, r24
+ 3ef6: d0 92 57 00 sts 0x0057, r13
+ 3efa: e8 95 spm
+ 3efc: 11 24 eor r1, r1
+ addrPtr += 2;
+ 3efe: 4e 5f subi r20, 0xFE ; 254
+ 3f00: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 3f02: f1 e0 ldi r31, 0x01 ; 1
+ 3f04: a0 38 cpi r26, 0x80 ; 128
+ 3f06: bf 07 cpc r27, r31
+ 3f08: 49 f7 brne .-46 ; 0x3edc <main+0xdc>
+
+ // Write from programming buffer
+ boot_page_write((uint16_t)(void*)address);
+ 3f0a: e0 91 00 02 lds r30, 0x0200
+ 3f0e: f0 91 01 02 lds r31, 0x0201
+ 3f12: e0 92 57 00 sts 0x0057, r14
+ 3f16: e8 95 spm
+ boot_spm_busy_wait();
+ 3f18: 07 b6 in r0, 0x37 ; 55
+ 3f1a: 00 fc sbrc r0, 0
+ 3f1c: fd cf rjmp .-6 ; 0x3f18 <main+0x118>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3f1e: f0 92 57 00 sts 0x0057, r15
+ 3f22: e8 95 spm
+ 3f24: 27 c0 rjmp .+78 ; 0x3f74 <main+0x174>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 3f26: 84 37 cpi r24, 0x74 ; 116
+ 3f28: b9 f4 brne .+46 ; 0x3f58 <main+0x158>
+ // READ PAGE - we only read flash
+ getLen();
+ 3f2a: 4a d0 rcall .+148 ; 0x3fc0 <getLen>
+ verifySpace();
+ 3f2c: 59 d0 rcall .+178 ; 0x3fe0 <verifySpace>
+ else ch = pgm_read_byte_near(address);
+ address++;
+ putch(ch);
+ } while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 3f2e: e0 91 00 02 lds r30, 0x0200
+ 3f32: f0 91 01 02 lds r31, 0x0201
+ 3f36: 31 96 adiw r30, 0x01 ; 1
+ 3f38: f0 93 01 02 sts 0x0201, r31
+ 3f3c: e0 93 00 02 sts 0x0200, r30
+ 3f40: 31 97 sbiw r30, 0x01 ; 1
+ 3f42: e4 91 lpm r30, Z+
+ 3f44: 8e 2f mov r24, r30
+ 3f46: 19 d0 rcall .+50 ; 0x3f7a <putch>
+ while (--length);
+ 3f48: 80 91 02 02 lds r24, 0x0202
+ 3f4c: 81 50 subi r24, 0x01 ; 1
+ 3f4e: 80 93 02 02 sts 0x0202, r24
+ 3f52: 88 23 and r24, r24
+ 3f54: 61 f7 brne .-40 ; 0x3f2e <main+0x12e>
+ 3f56: 0e c0 rjmp .+28 ; 0x3f74 <main+0x174>
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 3f58: 85 37 cpi r24, 0x75 ; 117
+ 3f5a: 39 f4 brne .+14 ; 0x3f6a <main+0x16a>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 3f5c: 41 d0 rcall .+130 ; 0x3fe0 <verifySpace>
+ putch(SIGNATURE_0);
+ 3f5e: 8e e1 ldi r24, 0x1E ; 30
+ 3f60: 0c d0 rcall .+24 ; 0x3f7a <putch>
+ putch(SIGNATURE_1);
+ 3f62: 84 e9 ldi r24, 0x94 ; 148
+ 3f64: 0a d0 rcall .+20 ; 0x3f7a <putch>
+ putch(SIGNATURE_2);
+ 3f66: 86 e0 ldi r24, 0x06 ; 6
+ 3f68: 96 cf rjmp .-212 ; 0x3e96 <main+0x96>
+ }
+ else if (ch == 'Q') {
+ 3f6a: 81 35 cpi r24, 0x51 ; 81
+ 3f6c: 11 f4 brne .+4 ; 0x3f72 <main+0x172>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 3f6e: 88 e0 ldi r24, 0x08 ; 8
+ 3f70: 2c d0 rcall .+88 ; 0x3fca <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 3f72: 36 d0 rcall .+108 ; 0x3fe0 <verifySpace>
+ }
+ putch(STK_OK);
+ 3f74: 80 e1 ldi r24, 0x10 ; 16
+ 3f76: 01 d0 rcall .+2 ; 0x3f7a <putch>
+ 3f78: 63 cf rjmp .-314 ; 0x3e40 <main+0x40>
+
+00003f7a <putch>:
+void putch(char ch) {
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ UDR0 = ch;
+#else
+ __asm__ __volatile__ (
+ 3f7a: 2a e0 ldi r18, 0x0A ; 10
+ 3f7c: 30 e0 ldi r19, 0x00 ; 0
+ 3f7e: 80 95 com r24
+ 3f80: 08 94 sec
+ 3f82: 10 f4 brcc .+4 ; 0x3f88 <putch+0xe>
+ 3f84: 59 98 cbi 0x0b, 1 ; 11
+ 3f86: 02 c0 rjmp .+4 ; 0x3f8c <putch+0x12>
+ 3f88: 59 9a sbi 0x0b, 1 ; 11
+ 3f8a: 00 00 nop
+ 3f8c: 15 d0 rcall .+42 ; 0x3fb8 <uartDelay>
+ 3f8e: 14 d0 rcall .+40 ; 0x3fb8 <uartDelay>
+ 3f90: 86 95 lsr r24
+ 3f92: 2a 95 dec r18
+ 3f94: b1 f7 brne .-20 ; 0x3f82 <putch+0x8>
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 3f96: 08 95 ret
+
+00003f98 <getch>:
+ return getch();
+}
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3f98: a8 95 wdr
+#ifdef LED_DATA_FLASH
+ LED_PIN |= _BV(LED);
+#endif
+
+ return ch;
+}
+ 3f9a: 29 e0 ldi r18, 0x09 ; 9
+ 3f9c: 30 e0 ldi r19, 0x00 ; 0
+ 3f9e: 48 99 sbic 0x09, 0 ; 9
+ 3fa0: fe cf rjmp .-4 ; 0x3f9e <getch+0x6>
+ 3fa2: 0a d0 rcall .+20 ; 0x3fb8 <uartDelay>
+ 3fa4: 09 d0 rcall .+18 ; 0x3fb8 <uartDelay>
+ 3fa6: 08 d0 rcall .+16 ; 0x3fb8 <uartDelay>
+ 3fa8: 88 94 clc
+ 3faa: 48 99 sbic 0x09, 0 ; 9
+ 3fac: 08 94 sec
+ 3fae: 2a 95 dec r18
+ 3fb0: 11 f0 breq .+4 ; 0x3fb6 <getch+0x1e>
+ 3fb2: 87 95 ror r24
+ 3fb4: f7 cf rjmp .-18 ; 0x3fa4 <getch+0xc>
+ 3fb6: 08 95 ret
+
+00003fb8 <uartDelay>:
+#if UART_B_VALUE > 255
+#error Baud rate too slow for soft UART
+#endif
+
+void uartDelay() {
+ __asm__ __volatile__ (
+ 3fb8: 98 e0 ldi r25, 0x08 ; 8
+ 3fba: 9a 95 dec r25
+ 3fbc: f1 f7 brne .-4 ; 0x3fba <uartDelay+0x2>
+ 3fbe: 08 95 ret
+
+00003fc0 <getLen>:
+ } while (--count);
+}
+#endif
+
+uint8_t getLen() {
+ getch();
+ 3fc0: eb df rcall .-42 ; 0x3f98 <getch>
+ length = getch();
+ 3fc2: ea df rcall .-44 ; 0x3f98 <getch>
+ 3fc4: 80 93 02 02 sts 0x0202, r24
+ return getch();
+}
+ 3fc8: e7 cf rjmp .-50 ; 0x3f98 <getch>
+
+00003fca <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 3fca: e0 e6 ldi r30, 0x60 ; 96
+ 3fcc: f0 e0 ldi r31, 0x00 ; 0
+ 3fce: 98 e1 ldi r25, 0x18 ; 24
+ 3fd0: 90 83 st Z, r25
+ WDTCSR = x;
+ 3fd2: 80 83 st Z, r24
+}
+ 3fd4: 08 95 ret
+
+00003fd6 <appStart>:
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 3fd6: 80 e0 ldi r24, 0x00 ; 0
+ 3fd8: f8 df rcall .-16 ; 0x3fca <watchdogConfig>
+ __asm__ __volatile__ (
+ 3fda: ee 27 eor r30, r30
+ 3fdc: ff 27 eor r31, r31
+ 3fde: 09 94 ijmp
+
+00003fe0 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) appStart();
+ 3fe0: db df rcall .-74 ; 0x3f98 <getch>
+ 3fe2: 80 32 cpi r24, 0x20 ; 32
+ 3fe4: 09 f0 breq .+2 ; 0x3fe8 <verifySpace+0x8>
+ 3fe6: f7 df rcall .-18 ; 0x3fd6 <appStart>
+ putch(STK_INSYNC);
+ 3fe8: 84 e1 ldi r24, 0x14 ; 20
+}
+ 3fea: c7 cf rjmp .-114 ; 0x3f7a <putch>
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 3fec: 1f 93 push r17
+ 3fee: 18 2f mov r17, r24
+
+00003ff0 <getNch>:
+ do getch(); while (--count);
+ 3ff0: d3 df rcall .-90 ; 0x3f98 <getch>
+ 3ff2: 11 50 subi r17, 0x01 ; 1
+ 3ff4: e9 f7 brne .-6 ; 0x3ff0 <getNch>
+ verifySpace();
+ 3ff6: f4 df rcall .-24 ; 0x3fe0 <verifySpace>
+}
+ 3ff8: 1f 91 pop r17
+ 3ffa: 08 95 ret
diff --git a/test/ardmake/hardware/bootloaders/stk500v2/Makefile b/test/ardmake/hardware/bootloaders/stk500v2/Makefile
new file mode 100644
index 0000000..54c5f85
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/stk500v2/Makefile
@@ -0,0 +1,588 @@
+# ----------------------------------------------------------------------------
+# Makefile to compile and link stk500boot bootloader
+# Author: Peter Fleury
+# File: $Id: Makefile,v 1.3 2006/03/04 19:26:17 peter Exp $
+# based on WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.
+#
+# Adjust F_CPU below to the clock frequency in Mhz of your AVR target
+# Adjust BOOTLOADER_ADDRESS to your AVR target
+#
+#----------------------------------------------------------------------------
+# 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".
+#----------------------------------------------------------------------------
+# <MLS> = Mark Sproul msproul-at-skychariot.com
+
+
+# MCU name
+#MCU = atmega128
+
+
+# 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.
+#F_CPU = 16000000
+
+
+# Bootloader
+# Please adjust if using a different AVR
+# 0x0e00*2=0x1C00 for ATmega8 512 words Boot Size
+# 0xFC00*2=0x1F800 for ATmega128 1024 words Boot Size
+# 0xF800*2=0x1F000 for ATmega1280
+# 0xF000*2=0x1E000 for ATmega1280
+#BOOTLOADER_ADDRESS = 1E000
+
+
+# Output format. (can be srec, ihex, binary)
+FORMAT = ihex
+
+
+# Target file name (without extension).
+TARGET = stk500boot
+
+
+# List C source files here. (C dependencies are automatically generated.)
+SRC = stk500boot.c
+
+
+# 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 =
+
+
+# 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 =
+
+
+
+#---------------- Compiler Options ----------------
+# -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) $(CINCS)
+CFLAGS += -O$(OPT)
+CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -mno-tablejump
+CFLAGS += -Wall -Wstrict-prototypes
+CFLAGS += -Wa,-adhlns=$(<:.c=.lst)
+CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
+CFLAGS += $(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=.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)
+
+
+#--------------- bootloader linker Options -------
+# BOOTLOADER_ADDRESS (=Start of Boot Loader section
+# in bytes - not words) is defined above.
+#LDFLAGS += -Wl,--section-start=.text=$(BOOTLOADER_ADDRESS) -nostartfiles -nodefaultlibs
+#LDFLAGS += -Wl,--section-start=.text=$(BOOTLOADER_ADDRESS) -nostartfiles
+LDFLAGS += -Wl,--section-start=.text=$(BOOTLOADER_ADDRESS)
+
+#---------------- 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 = stk500v2
+
+# com1 = serial port. Use lpt1 to connect to parallel port.
+AVRDUDE_PORT = com1 # 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 <http://savannah.nongnu.org/projects/avrdude>
+# to submit bug reports.
+#AVRDUDE_VERBOSE = -v -v
+
+AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
+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 = avrdude
+REMOVE = rm -f
+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:
+MSG_ASSEMBLING = Assembling:
+MSG_CLEANING = Cleaning project:
+
+
+
+
+# Define all object files.
+OBJ = $(SRC:.c=.o) $(ASRC:.S=.o)
+
+# Define all listing files.
+LST = $(SRC:.c=.lst) $(ASRC:.S=.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_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
+
+
+
+############################################################
+# May 25, 2010 <MLS> Adding 1280 support
+mega1280: MCU = atmega1280
+mega1280: F_CPU = 16000000
+mega1280: BOOTLOADER_ADDRESS = 1E000
+mega1280: CFLAGS += -D_MEGA_BOARD_
+mega1280: begin gccversion sizebefore build sizeafter end
+ mv $(TARGET).hex stk500boot_v2_mega1280.hex
+
+
+############################################################
+# Jul 6, 2010 <MLS> Adding 2560 support
+mega2560: MCU = atmega2560
+mega2560: F_CPU = 16000000
+mega2560: BOOTLOADER_ADDRESS = 3E000
+mega2560: CFLAGS += -D_MEGA_BOARD_
+mega2560: begin gccversion sizebefore build sizeafter end
+ mv $(TARGET).hex stk500boot_v2_mega2560.hex
+
+
+############################################################
+#Initial config on Amber128 board
+# avrdude: Device signature = 0x1e9702
+# avrdude: safemode: lfuse reads as 8F
+# avrdude: safemode: hfuse reads as CB
+# avrdude: safemode: efuse reads as FF
+# Jul 17, 2010 <MLS> Adding 128 support
+############################################################
+amber128: MCU = atmega128
+#amber128: F_CPU = 16000000
+amber128: F_CPU = 14745600
+amber128: BOOTLOADER_ADDRESS = 1E000
+amber128: CFLAGS += -D_BOARD_AMBER128_
+amber128: begin gccversion sizebefore build sizeafter end
+ mv $(TARGET).hex stk500boot_v2_amber128.hex
+
+############################################################
+# Aug 23, 2010 <MLS> Adding atmega2561 support
+m2561: MCU = atmega2561
+m2561: F_CPU = 8000000
+m2561: BOOTLOADER_ADDRESS = 3E000
+m2561: CFLAGS += -D_ANDROID_2561_ -DBAUDRATE=57600
+m2561: begin gccversion sizebefore build sizeafter end
+ mv $(TARGET).hex stk500boot_v2_android2561.hex
+
+
+############################################################
+# avrdude: Device signature = 0x1e9801
+# avrdude: safemode: lfuse reads as EC
+# avrdude: safemode: hfuse reads as 18
+# avrdude: safemode: efuse reads as FD
+# Aug 23, 2010 <MLS> Adding cerebot 2560 @ 8mhz
+#avrdude -P usb -c usbtiny -p m2560 -v -U flash:w:/Arduino/WiringBootV2_upd1/stk500boot_v2_cerebotplus.hex
+############################################################
+cerebot: MCU = atmega2560
+cerebot: F_CPU = 8000000
+cerebot: BOOTLOADER_ADDRESS = 3E000
+cerebot: CFLAGS += -D_CEREBOTPLUS_BOARD_ -DBAUDRATE=38400 -DUART_BAUDRATE_DOUBLE_SPEED=1
+cerebot: begin gccversion sizebefore build sizeafter end
+ mv $(TARGET).hex stk500boot_v2_cerebotplus.hex
+
+
+############################################################
+# Aug 23, 2010 <MLS> Adding atmega2561 support
+penguino: MCU = atmega32
+penguino: F_CPU = 16000000
+penguino: BOOTLOADER_ADDRESS = 7800
+penguino: CFLAGS += -D_PENGUINO_ -DBAUDRATE=57600
+penguino: begin gccversion sizebefore build sizeafter end
+ mv $(TARGET).hex stk500boot_v2_penguino.hex
+
+
+# Default target.
+all: begin gccversion sizebefore build sizeafter end
+
+build: elf hex eep lss sym
+#build: hex eep lss sym
+
+elf: $(TARGET).elf
+hex: $(TARGET).hex
+eep: $(TARGET).eep
+lss: $(TARGET).lss
+sym: $(TARGET).sym
+
+
+
+# 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) --format=avr --mcu=$(MCU) $(TARGET).elf
+
+sizebefore:
+ @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \
+ 2>/dev/null; echo; fi
+
+sizeafter:
+ @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
+ 2>/dev/null; echo; fi
+
+
+
+# Display compiler version information.
+gccversion :
+ @$(CC) --version
+
+
+
+# Program the device.
+program: $(TARGET).hex $(TARGET).eep
+ $(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 \
+--change-section-address .data-0x800000 \
+--change-section-address .bss-0x800000 \
+--change-section-address .noinit-0x800000 \
+--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 $< > $@
+
+
+
+# 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.
+%.o : %.c
+ @echo
+ @echo $(MSG_COMPILING) $<
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
+
+
+# Compile: create assembler files from C source files.
+%.s : %.c
+ $(CC) -S $(ALL_CFLAGS) $< -o $@
+
+
+# Assemble: create object files from assembler source files.
+%.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) *.hex
+ $(REMOVE) *.eep
+ $(REMOVE) *.cof
+ $(REMOVE) *.elf
+ $(REMOVE) *.map
+ $(REMOVE) *.sym
+ $(REMOVE) *.lss
+ $(REMOVE) $(OBJ)
+ $(REMOVE) $(LST)
+ $(REMOVE) $(SRC:.c=.s)
+ $(REMOVE) $(SRC:.c=.d)
+ $(REMOVE) .dep/*
+
+
+
+# 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
+
diff --git a/test/ardmake/hardware/bootloaders/stk500v2/STK500V2.pnproj b/test/ardmake/hardware/bootloaders/stk500v2/STK500V2.pnproj
new file mode 100644
index 0000000..d935019
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/stk500v2/STK500V2.pnproj
@@ -0,0 +1 @@
+<Project name="STK500V2"><File path="License.txt"></File><File path="Makefile"></File><File path="stk500boot.c"></File><File path="command.h"></File><File path="Readme.txt"></File></Project> \ No newline at end of file
diff --git a/test/ardmake/hardware/bootloaders/stk500v2/STK500V2.pnps b/test/ardmake/hardware/bootloaders/stk500v2/STK500V2.pnps
new file mode 100644
index 0000000..f85cde5
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/stk500v2/STK500V2.pnps
@@ -0,0 +1 @@
+<pd><ViewState><e p="STK500V2" x="true"></e></ViewState></pd> \ No newline at end of file
diff --git a/test/ardmake/hardware/bootloaders/stk500v2/avrinterruptnames.h b/test/ardmake/hardware/bootloaders/stk500v2/avrinterruptnames.h
new file mode 100644
index 0000000..0ae80f9
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/stk500v2/avrinterruptnames.h
@@ -0,0 +1,742 @@
+//**************************************************************************************************
+//*
+//* interrupt vector names
+//*
+//* It is important to note that the vector numbers listed here
+//* are the ATMEL documentation numbers. The Arduino numbers are 1 less
+//* This is because the Atmel docs start numbering the interrupts at 1
+//* when it is actually vector #0 in the table.
+//**************************************************************************************************
+//* Jun 1, 2010 <MLS> Added support for ATmega1281
+//* Jun 30, 2010 <MLS> Putting in more ifdefs to conserve space
+//* Jul 3, 2010 <MLS> More #ifdefs to conserve space and testing on most of my boards
+//* Jul 4, 2010 <MLS> Started using vector defs for #ifdefs as defined in <avr/io.h>
+//* Jul 13, 2010 <MLS> Added support for __AVR_ATmega128__
+//* Aug 26, 2010 <MLS> Added support for __AVR_ATmega2561__
+//**************************************************************************************************
+
+//#include "avrinterruptnames.h"
+
+//**************************************************************************************************
+//* this defines the interrupt vectors and allows us to compile ONLY those strings that are actually
+//* in the target CPU. This way we do not have to keep making changes based on cpu, it will be
+//* automatic even if we add a new CPU
+#ifndef _AVR_IO_H_
+ #include <avr/io.h>
+#endif
+//**************************************************************************************************
+
+#ifdef __MWERKS__
+ #define prog_char char
+ #define PGM_P char *
+#endif
+
+ prog_char gAvrInt_RESET[] PROGMEM = "RESET";
+#ifdef INT0_vect
+ prog_char gAvrInt_INT0[] PROGMEM = "INT0";
+#endif
+#ifdef INT1_vect
+ prog_char gAvrInt_INT1[] PROGMEM = "INT1";
+#endif
+#ifdef INT2_vect
+ prog_char gAvrInt_INT2[] PROGMEM = "INT2";
+#endif
+#ifdef INT3_vect
+ prog_char gAvrInt_INT3[] PROGMEM = "INT3";
+#endif
+#ifdef INT4_vect
+ prog_char gAvrInt_INT4[] PROGMEM = "INT4";
+#endif
+#ifdef INT5_vect
+ prog_char gAvrInt_INT5[] PROGMEM = "INT5";
+#endif
+#ifdef INT6_vect
+ prog_char gAvrInt_INT6[] PROGMEM = "INT6";
+#endif
+#ifdef INT7_vect
+ prog_char gAvrInt_INT7[] PROGMEM = "INT7";
+#endif
+#ifdef PCINT0_vect
+ prog_char gAvrInt_PCINT0[] PROGMEM = "PCINT0";
+#endif
+#ifdef PCINT1_vect
+ prog_char gAvrInt_PCINT1[] PROGMEM = "PCINT1";
+#endif
+#ifdef PCINT2_vect
+ prog_char gAvrInt_PCINT2[] PROGMEM = "PCINT2";
+#endif
+#ifdef PCINT3_vect
+ prog_char gAvrInt_PCINT3[] PROGMEM = "PCINT3";
+#endif
+#ifdef WDT_vect
+ prog_char gAvrInt_WDT[] PROGMEM = "WDT";
+#endif
+#ifdef TIMER0_COMP_vect
+ prog_char gAvrInt_TIMER0_COMP[] PROGMEM = "TIMER0 COMP";
+#endif
+#ifdef TIMER0_COMPA_vect
+ prog_char gAvrInt_TIMER0_COMPA[] PROGMEM = "TIMER0 COMPA";
+#endif
+#ifdef TIMER0_COMPB_vect
+ prog_char gAvrInt_TIMER0_COMPB[] PROGMEM = "TIMER0 COMPB";
+#endif
+#ifdef TIMER0_OVF_vect
+ prog_char gAvrInt_TIMER0_OVF[] PROGMEM = "TIMER0 OVF";
+#endif
+#ifdef TIMER1_CAPT_vect
+ prog_char gAvrInt_TIMER1_CAPT[] PROGMEM = "TIMER1 CAPT";
+#endif
+#ifdef TIMER1_COMPA_vect
+ prog_char gAvrInt_TIMER1_COMPA[] PROGMEM = "TIMER1 COMPA";
+#endif
+#ifdef TIMER1_COMPB_vect
+ prog_char gAvrInt_TIMER1_COMPB[] PROGMEM = "TIMER1 COMPB";
+#endif
+#ifdef TIMER1_COMPC_vect
+ prog_char gAvrInt_TIMER1_COMPC[] PROGMEM = "TIMER1 COMPC";
+#endif
+#ifdef TIMER1_OVF_vect
+ prog_char gAvrInt_TIMER1_OVF[] PROGMEM = "TIMER1 OVF";
+#endif
+#ifdef TIMER2_COMP_vect
+ prog_char gAvrInt_TIMER2_COMP[] PROGMEM = "TIMER2 COMP";
+#endif
+#ifdef TIMER2_COMPA_vect
+ prog_char gAvrInt_TIMER2_COMPA[] PROGMEM = "TIMER2 COMPA";
+#endif
+#ifdef TIMER2_COMPB_vect
+ prog_char gAvrInt_TIMER2_COMPB[] PROGMEM = "TIMER2 COMPB";
+#endif
+#ifdef TIMER2_OVF_vect
+ prog_char gAvrInt_TIMER2_OVF[] PROGMEM = "TIMER2 OVF";
+#endif
+#ifdef TIMER3_CAPT_vect
+ prog_char gAvrInt_TIMER3_CAPT[] PROGMEM = "TIMER3 CAPT";
+#endif
+#ifdef TIMER3_COMPA_vect
+ prog_char gAvrInt_TIMER3_COMPA[] PROGMEM = "TIMER3 COMPA";
+#endif
+#ifdef TIMER3_COMPB_vect
+ prog_char gAvrInt_TIMER3_COMPB[] PROGMEM = "TIMER3 COMPB";
+#endif
+#ifdef TIMER3_COMPC_vect
+ prog_char gAvrInt_TIMER3_COMPC[] PROGMEM = "TIMER3 COMPC";
+#endif
+#ifdef TIMER3_OVF_vect
+ prog_char gAvrInt_TIMER3_OVF[] PROGMEM = "TIMER3 OVF";
+#endif
+#ifdef TIMER4_CAPT_vect
+ prog_char gAvrInt_TIMER4_CAPT[] PROGMEM = "TIMER4 CAPT";
+#endif
+#ifdef TIMER4_COMPA_vect
+ prog_char gAvrInt_TIMER4_COMPA[] PROGMEM = "TIMER4 COMPA";
+#endif
+#ifdef TIMER4_COMPB_vect
+ prog_char gAvrInt_TIMER4_COMPB[] PROGMEM = "TIMER4 COMPB";
+#endif
+#ifdef TIMER4_COMPC_vect
+ prog_char gAvrInt_TIMER4_COMPC[] PROGMEM = "TIMER4 COMPC";
+#endif
+#ifdef TIMER4_COMPD_vect
+ prog_char gAvrInt_TIMER4_COMPD[] PROGMEM = "TIMER4 COMPD";
+#endif
+#ifdef TIMER4_OVF_vect
+ prog_char gAvrInt_TIMER4_OVF[] PROGMEM = "TIMER4 OVF";
+#endif
+#ifdef TIMER4_FPF_vect
+ prog_char gAvrInt_TIMER4_FPF[] PROGMEM = "TIMER4 Fault Protection";
+#endif
+#ifdef TIMER5_CAPT_vect
+ prog_char gAvrInt_TIMER5_CAPT[] PROGMEM = "TIMER5 CAPT";
+#endif
+#ifdef TIMER5_COMPA_vect
+ prog_char gAvrInt_TIMER5_COMPA[] PROGMEM = "TIMER5 COMPA";
+#endif
+#ifdef TIMER5_COMPB_vect
+ prog_char gAvrInt_TIMER5_COMPB[] PROGMEM = "TIMER5 COMPB";
+#endif
+#ifdef TIMER5_COMPC_vect
+ prog_char gAvrInt_TIMER5_COMPC[] PROGMEM = "TIMER5 COMPC";
+#endif
+#ifdef TIMER5_OVF_vect
+ prog_char gAvrInt_TIMER5_OVF[] PROGMEM = "TIMER5 OVF";
+#endif
+
+//* when there is only 1 usart
+#if defined(USART_RX_vect) || defined(USART_RXC_vect)
+ prog_char gAvrInt_USART_RX[] PROGMEM = "USART RX";
+#endif
+#if defined(USART_UDRE_vect)
+ prog_char gAvrInt_USART_UDRE[] PROGMEM = "USART UDRE";
+#endif
+#if defined(USART_TX_vect) || defined(USART_TXC_vect)
+ prog_char gAvrInt_USART_TX[] PROGMEM = "USART TX";
+#endif
+
+
+//* usart 0
+#if defined(USART0_RX_vect)
+ prog_char gAvrInt_USART0_RX[] PROGMEM = "USART0 RX";
+#endif
+#if defined(USART0_UDRE_vect)
+ prog_char gAvrInt_USART0_UDRE[] PROGMEM = "USART0 UDRE";
+#endif
+#if defined(USART0_TX_vect)
+ prog_char gAvrInt_USART0_TX[] PROGMEM = "USART0 TX";
+#endif
+
+
+//* usart 1
+#ifdef USART1_RX_vect
+ prog_char gAvrInt_USART1_RX[] PROGMEM = "USART1 RX";
+#endif
+#ifdef USART1_UDRE_vect
+ prog_char gAvrInt_USART1_UDRE[] PROGMEM = "USART1 UDRE";
+#endif
+#ifdef USART1_TX_vect
+ prog_char gAvrInt_USART1_TX[] PROGMEM = "USART1 TX";
+#endif
+
+//* usart 2
+#ifdef USART2_RX_vect
+ prog_char gAvrInt_USART2_RX[] PROGMEM = "USART2 RX";
+#endif
+#ifdef USART2_UDRE_vect
+ prog_char gAvrInt_USART2_UDRE[] PROGMEM = "USART2 UDRE";
+#endif
+#ifdef USART2_TX_vect
+ prog_char gAvrInt_USART2_TX[] PROGMEM = "USART2 TX";
+#endif
+
+//* usart 3
+#ifdef USART3_RX_vect
+ prog_char gAvrInt_USART3_RX[] PROGMEM = "USART3 RX";
+#endif
+#ifdef USART3_UDRE_vect
+ prog_char gAvrInt_USART3_UDRE[] PROGMEM = "USART3 UDRE";
+#endif
+#ifdef USART3_TX_vect
+ prog_char gAvrInt_USART3_TX[] PROGMEM = "USART3 TX";
+#endif
+#ifdef SPI_STC_vect
+ prog_char gAvrInt_SPI_STC[] PROGMEM = "SPI STC";
+#endif
+#ifdef ADC_vect
+ prog_char gAvrInt_ADC[] PROGMEM = "ADC";
+#endif
+#if defined(ANALOG_COMP_vect) || defined(ANA_COMP_vect)
+ prog_char gAvrInt_ANALOG_COMP[] PROGMEM = "ANALOG COMP";
+#endif
+#if defined(EE_READY_vect) || defined(EE_RDY_vect)
+ prog_char gAvrInt_EE_READY[] PROGMEM = "EE READY";
+#endif
+#ifdef TWI_vect
+ prog_char gAvrInt_TWI[] PROGMEM = "TWI";
+#endif
+#if defined(SPM_READY_vect) || defined(SPM_RDY_vect)
+ prog_char gAvrInt_SPM_READY[] PROGMEM = "SPM READY";
+#endif
+#ifdef USI_START_vect
+ prog_char gAvrInt_USI_START[] PROGMEM = "USI START";
+#endif
+#ifdef USI_OVERFLOW_vect
+ prog_char gAvrInt_USI_OVERFLOW[] PROGMEM = "USI OVERFLOW";
+#endif
+#ifdef USB_GEN_vect
+ prog_char gAvrInt_USB_General[] PROGMEM = "USB General";
+#endif
+#ifdef USB_COM_vect
+ prog_char gAvrInt_USB_Endpoint[] PROGMEM = "USB Endpoint";
+#endif
+
+#ifdef LCD_vect
+ prog_char gAvrInt_LCD_StartFrame[] PROGMEM = "LCD Start of Frame";
+#endif
+
+
+//**************************************************************************************************
+//* these do not have vector defs and have to be done by CPU type
+#if defined(__AVR_ATmega645__ ) || defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
+ prog_char gAvrInt_NOT_USED[] PROGMEM = "NOT_USED";
+#endif
+#if defined(__AVR_ATmega32U4__)
+ prog_char gAvrInt_RESERVED[] PROGMEM = "Reserved";
+#endif
+
+ prog_char gAvrInt_END[] PROGMEM = "*";
+
+
+
+
+
+//**************************************************************************************************
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
+#pragma mark __AVR_ATmega168__ / __AVR_ATmega328P__
+
+#define _INTERRUPT_NAMES_DEFINED_
+
+PGM_P gInterruptNameTable[] PROGMEM =
+{
+
+ gAvrInt_RESET, // 1
+ gAvrInt_INT0, // 2
+ gAvrInt_INT1, // 3
+ gAvrInt_PCINT0, // 4
+ gAvrInt_PCINT1, // 5
+ gAvrInt_PCINT2, // 6
+ gAvrInt_WDT, // 7
+ gAvrInt_TIMER2_COMPA, // 8
+ gAvrInt_TIMER2_COMPB, // 9
+ gAvrInt_TIMER2_OVF, // 10
+ gAvrInt_TIMER1_CAPT, // 11
+ gAvrInt_TIMER1_COMPA, // 12
+ gAvrInt_TIMER1_COMPB, // 13
+ gAvrInt_TIMER1_OVF, // 14
+ gAvrInt_TIMER0_COMPA, // 15
+ gAvrInt_TIMER0_COMPB, // 16
+ gAvrInt_TIMER0_OVF, // 17
+ gAvrInt_SPI_STC, // 18
+ gAvrInt_USART_RX, // 19
+ gAvrInt_USART_UDRE, // 20
+ gAvrInt_USART_TX, // 21
+ gAvrInt_ADC, // 22
+ gAvrInt_EE_READY, // 23
+ gAvrInt_ANALOG_COMP, // 24
+ gAvrInt_TWI, // 25
+ gAvrInt_SPM_READY, // 26
+};
+
+#endif
+
+//**************************************************************************************************
+#pragma mark __AVR_ATmega169__
+#if defined(__AVR_ATmega169__)
+
+#define _INTERRUPT_NAMES_DEFINED_
+
+PGM_P gInterruptNameTable[] PROGMEM =
+{
+
+ gAvrInt_RESET, // 1
+ gAvrInt_INT0, // 2
+ gAvrInt_PCINT0, // 3
+ gAvrInt_PCINT1, // 4
+ gAvrInt_TIMER2_COMP, // 5
+ gAvrInt_TIMER2_OVF, // 6
+ gAvrInt_TIMER1_CAPT, // 7
+ gAvrInt_TIMER1_COMPA, // 8
+ gAvrInt_TIMER1_COMPB, // 9
+ gAvrInt_TIMER1_OVF, // 10
+ gAvrInt_TIMER0_COMP, // 11
+ gAvrInt_TIMER0_OVF, // 12
+ gAvrInt_SPI_STC, // 13
+ gAvrInt_USART0_RX, // 14
+ gAvrInt_USART0_UDRE, // 15
+ gAvrInt_USART0_TX, // 16
+ gAvrInt_USI_START, // 17
+ gAvrInt_USI_OVERFLOW, // 18
+ gAvrInt_ANALOG_COMP, // 19
+ gAvrInt_ADC, // 20
+ gAvrInt_EE_READY, // 21
+ gAvrInt_SPM_READY, // 22
+ gAvrInt_LCD_StartFrame, // 23
+
+};
+
+#endif
+
+
+//**************************************************************************************************
+#if defined(__AVR_ATmega640__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__)
+#pragma mark __AVR_ATmega640__ __AVR_ATmega1280__ __AVR_ATmega1281__ __AVR_ATmega2560__ __AVR_ATmega2561__
+
+#define _INTERRUPT_NAMES_DEFINED_
+
+PGM_P gInterruptNameTable[] PROGMEM =
+{
+
+ gAvrInt_RESET, // 1
+ gAvrInt_INT0, // 2
+ gAvrInt_INT1, // 3
+ gAvrInt_INT2, // 4
+ gAvrInt_INT3, // 5
+ gAvrInt_INT4, // 6
+ gAvrInt_INT5, // 7
+ gAvrInt_INT6, // 8
+ gAvrInt_INT7, // 9
+ gAvrInt_PCINT0, // 10
+ gAvrInt_PCINT1, // 11
+#if defined(__AVR_ATmega640__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+ gAvrInt_PCINT2, // 12
+#else
+ gAvrInt_NOT_USED, // 12
+#endif
+ gAvrInt_WDT, // 13
+ gAvrInt_TIMER2_COMPA, // 14
+ gAvrInt_TIMER2_COMPB, // 15
+ gAvrInt_TIMER2_OVF, // 16
+ gAvrInt_TIMER1_CAPT, // 17
+ gAvrInt_TIMER1_COMPA, // 18
+ gAvrInt_TIMER1_COMPB, // 19
+ gAvrInt_TIMER1_COMPC, // 20
+ gAvrInt_TIMER1_OVF, // 21
+ gAvrInt_TIMER0_COMPA, // 22
+ gAvrInt_TIMER0_COMPB, // 23
+ gAvrInt_TIMER0_OVF, // 24
+ gAvrInt_SPI_STC, // 25
+
+ gAvrInt_USART0_RX, // 26
+ gAvrInt_USART0_UDRE, // 27
+ gAvrInt_USART0_TX, // 28
+ gAvrInt_ANALOG_COMP, // 29
+ gAvrInt_ADC, // 30
+ gAvrInt_EE_READY, // 31
+
+ gAvrInt_TIMER3_CAPT, // 32
+ gAvrInt_TIMER3_COMPA, // 33
+ gAvrInt_TIMER3_COMPB, // 34
+ gAvrInt_TIMER3_COMPC, // 35
+ gAvrInt_TIMER3_OVF, // 36
+
+ gAvrInt_USART1_RX, // 37
+ gAvrInt_USART1_UDRE, // 38
+ gAvrInt_USART1_TX, // 39
+ gAvrInt_TWI, // 40
+ gAvrInt_SPM_READY, // 41
+#if defined(__AVR_ATmega640__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+ gAvrInt_TIMER4_CAPT, // 42
+#else
+ gAvrInt_NOT_USED, // 42
+#endif
+ gAvrInt_TIMER4_COMPA, // 43
+ gAvrInt_TIMER4_COMPB, // 44
+ gAvrInt_TIMER4_COMPC, // 45
+ gAvrInt_TIMER4_OVF, // 46
+#if defined(__AVR_ATmega640__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+ gAvrInt_TIMER5_CAPT, // 47
+#else
+ gAvrInt_NOT_USED, // 47
+#endif
+ gAvrInt_TIMER5_COMPA, // 48
+ gAvrInt_TIMER5_COMPB, // 49
+ gAvrInt_TIMER5_COMPC, // 50
+ gAvrInt_TIMER5_OVF, // 51
+
+#if defined(__AVR_ATmega640__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+ gAvrInt_USART2_RX, // 52
+ gAvrInt_USART2_UDRE, // 53
+ gAvrInt_USART2_TX, // 54
+
+ gAvrInt_USART3_RX, // 55
+ gAvrInt_USART3_UDRE, // 56
+ gAvrInt_USART3_TX, // 57
+#endif
+
+};
+
+#endif
+
+
+
+//**************************************************************************************************
+#if defined(__AVR_ATmega324P__ ) || defined(__AVR_ATmega644__ ) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)
+#pragma mark __AVR_ATmega324P__ __AVR_ATmega644__ __AVR_ATmega644P__ __AVR_ATmega1284P__
+
+#define _INTERRUPT_NAMES_DEFINED_
+
+PGM_P gInterruptNameTable[] PROGMEM =
+{
+
+ gAvrInt_RESET, // 1
+ gAvrInt_INT0, // 2
+ gAvrInt_INT1, // 3
+ gAvrInt_INT2, // 4
+ gAvrInt_PCINT0, // 5
+ gAvrInt_PCINT1, // 6
+ gAvrInt_PCINT2, // 7
+ gAvrInt_PCINT3, // 8
+ gAvrInt_WDT, // 9
+ gAvrInt_TIMER2_COMPA, // 10
+ gAvrInt_TIMER2_COMPB, // 11
+ gAvrInt_TIMER2_OVF, // 12
+ gAvrInt_TIMER1_CAPT, // 13
+ gAvrInt_TIMER1_COMPA, // 14
+ gAvrInt_TIMER1_COMPB, // 15
+ gAvrInt_TIMER1_OVF, // 16
+ gAvrInt_TIMER0_COMPA, // 17
+ gAvrInt_TIMER0_COMPB, // 18
+ gAvrInt_TIMER0_OVF, // 19
+ gAvrInt_SPI_STC, // 20
+ gAvrInt_USART0_RX, // 21
+ gAvrInt_USART0_UDRE, // 22
+ gAvrInt_USART0_TX, // 23
+ gAvrInt_ANALOG_COMP, // 24
+ gAvrInt_ADC, // 25
+ gAvrInt_EE_READY, // 26
+ gAvrInt_TWI, // 27
+ gAvrInt_SPM_READY, // 28
+
+#if defined(__AVR_ATmega324P__ ) || defined(__AVR_ATmega644P__)
+ gAvrInt_USART1_RX, // 29
+ gAvrInt_USART1_UDRE, // 30
+ gAvrInt_USART1_TX, // 31
+#endif
+
+};
+
+
+#endif
+
+//**************************************************************************************************
+#if defined(__AVR_ATmega645__ )
+#pragma mark __AVR_ATmega645__
+
+#define _INTERRUPT_NAMES_DEFINED_
+
+PGM_P gInterruptNameTable[] PROGMEM =
+{
+
+ gAvrInt_RESET, // 1
+ gAvrInt_INT0, // 2
+ gAvrInt_PCINT0, // 3
+ gAvrInt_PCINT1, // 4
+ gAvrInt_TIMER2_COMP, // 5
+ gAvrInt_TIMER2_OVF, // 6
+ gAvrInt_TIMER1_CAPT, // 7
+ gAvrInt_TIMER1_COMPA, // 8
+ gAvrInt_TIMER1_COMPB, // 9
+ gAvrInt_TIMER1_OVF, // 10
+ gAvrInt_TIMER0_COMP, // 11
+ gAvrInt_TIMER0_OVF, // 12
+ gAvrInt_SPI_STC, // 13
+ gAvrInt_USART0_RX, // 14
+ gAvrInt_USART0_UDRE, // 15
+ gAvrInt_USART0_TX, // 16
+ gAvrInt_USI_START, // 17
+ gAvrInt_USI_OVERFLOW, // 18
+ gAvrInt_ANALOG_COMP, // 19
+ gAvrInt_ADC, // 20
+ gAvrInt_EE_READY, // 21
+ gAvrInt_SPM_READY, // 22
+ gAvrInt_NOT_USED, // 23
+
+#if defined(__AVR_ATmega3250__) || defined(__AVR_ATmega6450__)
+ gAvrInt_PCINT2, // 24
+ gAvrInt_PCINT3, // 25
+#endif
+};
+
+
+#endif
+
+
+//**************************************************************************************************
+#if defined(__AVR_ATmega32__ )
+#pragma mark __AVR_ATmega32__
+
+#define _INTERRUPT_NAMES_DEFINED_
+
+PGM_P gInterruptNameTable[] PROGMEM =
+{
+
+ gAvrInt_RESET, // 1
+ gAvrInt_INT0, // 2
+ gAvrInt_INT1, // 3
+ gAvrInt_INT2, // 4
+ gAvrInt_TIMER2_COMP, // 5
+ gAvrInt_TIMER2_OVF, // 6
+ gAvrInt_TIMER1_CAPT, // 7
+ gAvrInt_TIMER1_COMPA, // 8
+ gAvrInt_TIMER1_COMPB, // 9
+ gAvrInt_TIMER1_OVF, // 10
+ gAvrInt_TIMER0_COMP, // 11
+ gAvrInt_TIMER0_OVF, // 12
+ gAvrInt_SPI_STC, // 13
+ gAvrInt_USART_RX, // 14
+ gAvrInt_USART_UDRE, // 15
+ gAvrInt_USART_TX, // 16
+ gAvrInt_ADC, // 17
+ gAvrInt_EE_READY, // 18
+ gAvrInt_ANALOG_COMP, // 19
+ gAvrInt_TWI, // 20
+ gAvrInt_SPM_READY, // 21
+
+};
+
+
+#endif
+
+//**************************************************************************************************
+#if defined(__AVR_ATmega32U4__)
+#pragma mark __AVR_ATmega32U4__
+//* teensy 2.0
+//* http://www.pjrc.com/teensy/pinout.html
+#define _INTERRUPT_NAMES_DEFINED_
+
+
+PGM_P gInterruptNameTable[] PROGMEM =
+{
+
+ gAvrInt_RESET, // 1
+ gAvrInt_INT0, // 2
+ gAvrInt_INT1, // 3
+ gAvrInt_INT2, // 4
+ gAvrInt_INT3, // 5
+ gAvrInt_RESERVED, // 6
+ gAvrInt_RESERVED, // 7
+ gAvrInt_INT6, // 8
+ gAvrInt_RESERVED, // 9
+ gAvrInt_PCINT0, // 10
+ gAvrInt_USB_General, // 11
+ gAvrInt_USB_Endpoint, // 12
+ gAvrInt_WDT, // 13
+ gAvrInt_RESERVED, // 14
+ gAvrInt_RESERVED, // 15
+ gAvrInt_RESERVED, // 16
+ gAvrInt_TIMER1_CAPT, // 17
+ gAvrInt_TIMER1_COMPA, // 18
+ gAvrInt_TIMER1_COMPB, // 19
+ gAvrInt_TIMER1_COMPC, // 20
+ gAvrInt_TIMER1_OVF, // 21
+ gAvrInt_TIMER0_COMPA, // 22
+ gAvrInt_TIMER0_COMPB, // 23
+ gAvrInt_TIMER0_OVF, // 24
+ gAvrInt_SPI_STC, // 25
+
+ gAvrInt_USART1_RX, // 26
+ gAvrInt_USART1_UDRE, // 27
+ gAvrInt_USART1_TX, // 28
+ gAvrInt_ANALOG_COMP, // 29
+
+ gAvrInt_ADC, // 30
+ gAvrInt_EE_READY, // 31
+
+ gAvrInt_TIMER3_CAPT, // 32
+ gAvrInt_TIMER3_COMPA, // 33
+ gAvrInt_TIMER3_COMPB, // 34
+ gAvrInt_TIMER3_COMPC, // 35
+ gAvrInt_TIMER3_OVF, // 36
+ gAvrInt_TWI, // 37
+ gAvrInt_SPM_READY, // 38
+
+ gAvrInt_TIMER4_COMPA, // 39
+ gAvrInt_TIMER4_COMPB, // 40
+ gAvrInt_TIMER4_COMPD, // 41
+ gAvrInt_TIMER4_OVF, // 42
+ gAvrInt_TIMER4_FPF, // 43
+};
+
+#endif
+
+//**************************************************************************************************
+#if defined(__AVR_AT90USB1286__)
+#pragma mark __AVR_AT90USB1286__
+//* teensy++ 2.0
+//* http://www.pjrc.com/teensy/pinout.html
+#define _INTERRUPT_NAMES_DEFINED_
+
+
+PGM_P gInterruptNameTable[] PROGMEM =
+{
+
+ gAvrInt_RESET, // 1
+ gAvrInt_INT0, // 2
+ gAvrInt_INT1, // 3
+ gAvrInt_INT2, // 4
+ gAvrInt_INT3, // 5
+ gAvrInt_INT4, // 6
+ gAvrInt_INT5, // 7
+ gAvrInt_INT6, // 8
+ gAvrInt_INT7, // 9
+ gAvrInt_PCINT0, // 10
+ gAvrInt_USB_General, // 11
+ gAvrInt_USB_Endpoint, // 12
+ gAvrInt_WDT, // 13
+ gAvrInt_TIMER2_COMPA, // 14
+ gAvrInt_TIMER2_COMPB, // 15
+ gAvrInt_TIMER2_OVF, // 16
+ gAvrInt_TIMER1_CAPT, // 17
+ gAvrInt_TIMER1_COMPA, // 18
+ gAvrInt_TIMER1_COMPB, // 19
+ gAvrInt_TIMER1_COMPC, // 20
+ gAvrInt_TIMER1_OVF, // 21
+ gAvrInt_TIMER0_COMPA, // 22
+ gAvrInt_TIMER0_COMPB, // 23
+ gAvrInt_TIMER0_OVF, // 24
+ gAvrInt_SPI_STC, // 25
+
+ gAvrInt_USART1_RX, // 26
+ gAvrInt_USART1_UDRE, // 27
+ gAvrInt_USART1_TX, // 28
+ gAvrInt_ANALOG_COMP, // 29
+
+ gAvrInt_ADC, // 30
+ gAvrInt_EE_READY, // 31
+
+ gAvrInt_TIMER3_CAPT, // 32
+ gAvrInt_TIMER3_COMPA, // 33
+ gAvrInt_TIMER3_COMPB, // 34
+ gAvrInt_TIMER3_COMPC, // 35
+ gAvrInt_TIMER3_OVF, // 36
+ gAvrInt_TWI, // 37
+ gAvrInt_SPM_READY, // 38
+
+};
+
+#endif
+
+
+
+
+//**************************************************************************************************
+#if defined(__AVR_ATmega128__)
+#pragma mark __AVR_ATmega128__
+#define _INTERRUPT_NAMES_DEFINED_
+
+
+PGM_P gInterruptNameTable[] PROGMEM =
+{
+
+ gAvrInt_RESET, // 1
+ gAvrInt_INT0, // 2
+ gAvrInt_INT1, // 3
+ gAvrInt_INT2, // 4
+ gAvrInt_INT3, // 5
+ gAvrInt_INT4, // 6
+ gAvrInt_INT5, // 7
+ gAvrInt_INT6, // 8
+ gAvrInt_INT7, // 9
+ gAvrInt_TIMER2_COMP, // 10
+ gAvrInt_TIMER2_OVF, // 11
+ gAvrInt_TIMER1_CAPT, // 12
+ gAvrInt_TIMER1_COMPA, // 13
+ gAvrInt_TIMER1_COMPB, // 14
+ gAvrInt_TIMER1_OVF, // 15
+ gAvrInt_TIMER0_COMP, // 16
+ gAvrInt_TIMER0_OVF, // 17
+ gAvrInt_SPI_STC, // 18
+ gAvrInt_USART0_RX, // 19
+ gAvrInt_USART0_UDRE, // 20
+ gAvrInt_USART0_TX, // 21
+ gAvrInt_ADC, // 22
+ gAvrInt_EE_READY, // 23
+ gAvrInt_ANALOG_COMP, // 24
+ gAvrInt_TIMER1_COMPC, // 25
+ gAvrInt_TIMER3_CAPT, // 26
+ gAvrInt_TIMER3_COMPA, // 27
+ gAvrInt_TIMER3_COMPB, // 28
+ gAvrInt_TIMER3_COMPC, // 29
+ gAvrInt_TIMER3_OVF, // 30
+ gAvrInt_USART1_RX, // 31
+ gAvrInt_USART1_UDRE, // 32
+ gAvrInt_USART1_TX, // 33
+ gAvrInt_TWI, // 34
+ gAvrInt_SPM_READY, // 35
+
+};
+
+#endif
+
+#if !defined(_INTERRUPT_NAMES_DEFINED_)
+ #warning No interrupt string defs for this cpu
+#endif \ No newline at end of file
diff --git a/test/ardmake/hardware/bootloaders/stk500v2/command.h b/test/ardmake/hardware/bootloaders/stk500v2/command.h
new file mode 100644
index 0000000..03b1b38
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/stk500v2/command.h
@@ -0,0 +1,114 @@
+//**** ATMEL AVR - A P P L I C A T I O N N O T E ************************
+//*
+//* Title: AVR068 - STK500 Communication Protocol
+//* Filename: command.h
+//* Version: 1.0
+//* Last updated: 31.01.2005
+//*
+//* Support E-mail: avr@atmel.com
+//*
+//**************************************************************************
+
+// *****************[ STK message constants ]***************************
+
+#define MESSAGE_START 0x1B //= ESC = 27 decimal
+#define TOKEN 0x0E
+
+// *****************[ STK general command constants ]**************************
+
+#define CMD_SIGN_ON 0x01
+#define CMD_SET_PARAMETER 0x02
+#define CMD_GET_PARAMETER 0x03
+#define CMD_SET_DEVICE_PARAMETERS 0x04
+#define CMD_OSCCAL 0x05
+#define CMD_LOAD_ADDRESS 0x06
+#define CMD_FIRMWARE_UPGRADE 0x07
+
+
+// *****************[ STK ISP command constants ]******************************
+
+#define CMD_ENTER_PROGMODE_ISP 0x10
+#define CMD_LEAVE_PROGMODE_ISP 0x11
+#define CMD_CHIP_ERASE_ISP 0x12
+#define CMD_PROGRAM_FLASH_ISP 0x13
+#define CMD_READ_FLASH_ISP 0x14
+#define CMD_PROGRAM_EEPROM_ISP 0x15
+#define CMD_READ_EEPROM_ISP 0x16
+#define CMD_PROGRAM_FUSE_ISP 0x17
+#define CMD_READ_FUSE_ISP 0x18
+#define CMD_PROGRAM_LOCK_ISP 0x19
+#define CMD_READ_LOCK_ISP 0x1A
+#define CMD_READ_SIGNATURE_ISP 0x1B
+#define CMD_READ_OSCCAL_ISP 0x1C
+#define CMD_SPI_MULTI 0x1D
+
+// *****************[ STK PP command constants ]*******************************
+
+#define CMD_ENTER_PROGMODE_PP 0x20
+#define CMD_LEAVE_PROGMODE_PP 0x21
+#define CMD_CHIP_ERASE_PP 0x22
+#define CMD_PROGRAM_FLASH_PP 0x23
+#define CMD_READ_FLASH_PP 0x24
+#define CMD_PROGRAM_EEPROM_PP 0x25
+#define CMD_READ_EEPROM_PP 0x26
+#define CMD_PROGRAM_FUSE_PP 0x27
+#define CMD_READ_FUSE_PP 0x28
+#define CMD_PROGRAM_LOCK_PP 0x29
+#define CMD_READ_LOCK_PP 0x2A
+#define CMD_READ_SIGNATURE_PP 0x2B
+#define CMD_READ_OSCCAL_PP 0x2C
+
+#define CMD_SET_CONTROL_STACK 0x2D
+
+// *****************[ STK HVSP command constants ]*****************************
+
+#define CMD_ENTER_PROGMODE_HVSP 0x30
+#define CMD_LEAVE_PROGMODE_HVSP 0x31
+#define CMD_CHIP_ERASE_HVSP 0x32
+#define CMD_PROGRAM_FLASH_HVSP ` 0x33
+#define CMD_READ_FLASH_HVSP 0x34
+#define CMD_PROGRAM_EEPROM_HVSP 0x35
+#define CMD_READ_EEPROM_HVSP 0x36
+#define CMD_PROGRAM_FUSE_HVSP 0x37
+#define CMD_READ_FUSE_HVSP 0x38
+#define CMD_PROGRAM_LOCK_HVSP 0x39
+#define CMD_READ_LOCK_HVSP 0x3A
+#define CMD_READ_SIGNATURE_HVSP 0x3B
+#define CMD_READ_OSCCAL_HVSP 0x3C
+
+// *****************[ STK status constants ]***************************
+
+// Success
+#define STATUS_CMD_OK 0x00
+
+// Warnings
+#define STATUS_CMD_TOUT 0x80
+#define STATUS_RDY_BSY_TOUT 0x81
+#define STATUS_SET_PARAM_MISSING 0x82
+
+// Errors
+#define STATUS_CMD_FAILED 0xC0
+#define STATUS_CKSUM_ERROR 0xC1
+#define STATUS_CMD_UNKNOWN 0xC9
+
+// *****************[ STK parameter constants ]***************************
+#define PARAM_BUILD_NUMBER_LOW 0x80
+#define PARAM_BUILD_NUMBER_HIGH 0x81
+#define PARAM_HW_VER 0x90
+#define PARAM_SW_MAJOR 0x91
+#define PARAM_SW_MINOR 0x92
+#define PARAM_VTARGET 0x94
+#define PARAM_VADJUST 0x95
+#define PARAM_OSC_PSCALE 0x96
+#define PARAM_OSC_CMATCH 0x97
+#define PARAM_SCK_DURATION 0x98
+#define PARAM_TOPCARD_DETECT 0x9A
+#define PARAM_STATUS 0x9C
+#define PARAM_DATA 0x9D
+#define PARAM_RESET_POLARITY 0x9E
+#define PARAM_CONTROLLER_INIT 0x9F
+
+// *****************[ STK answer constants ]***************************
+
+#define ANSWER_CKSUM_ERROR 0xB0
+
diff --git a/test/ardmake/hardware/bootloaders/stk500v2/stk500boot.c b/test/ardmake/hardware/bootloaders/stk500v2/stk500boot.c
new file mode 100644
index 0000000..13dec89
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/stk500v2/stk500boot.c
@@ -0,0 +1,1996 @@
+/*****************************************************************************
+Title: STK500v2 compatible bootloader
+ Modified for Wiring board ATMega128-16MHz
+Author: Peter Fleury <pfleury@gmx.ch> http://jump.to/fleury
+File: $Id: stk500boot.c,v 1.11 2006/06/25 12:39:17 peter Exp $
+Compiler: avr-gcc 3.4.5 or 4.1 / avr-libc 1.4.3
+Hardware: All AVRs with bootloader support, tested with ATmega8
+License: GNU General Public License
+
+Modified: Worapoht Kornkaewwattanakul <dev@avride.com> http://www.avride.com
+Date: 17 October 2007
+Update: 1st, 29 Dec 2007 : Enable CMD_SPI_MULTI but ignore unused command by return 0x00 byte response..
+Compiler: WINAVR20060421
+Description: add timeout feature like previous Wiring bootloader
+
+DESCRIPTION:
+ This program allows an AVR with bootloader capabilities to
+ read/write its own Flash/EEprom. To enter Programming mode
+ an input pin is checked. If this pin is pulled low, programming mode
+ is entered. If not, normal execution is done from $0000
+ "reset" vector in Application area.
+ Size fits into a 1024 word bootloader section
+ when compiled with avr-gcc 4.1
+ (direct replace on Wiring Board without fuse setting changed)
+
+USAGE:
+ - Set AVR MCU type and clock-frequency (F_CPU) in the Makefile.
+ - Set baud rate below (AVRISP only works with 115200 bps)
+ - compile/link the bootloader with the supplied Makefile
+ - program the "Boot Flash section size" (BOOTSZ fuses),
+ for boot-size 1024 words: program BOOTSZ01
+ - enable the BOOT Reset Vector (program BOOTRST)
+ - Upload the hex file to the AVR using any ISP programmer
+ - Program Boot Lock Mode 3 (program BootLock 11 and BootLock 12 lock bits) // (leave them)
+ - Reset your AVR while keeping PROG_PIN pulled low // (for enter bootloader by switch)
+ - Start AVRISP Programmer (AVRStudio/Tools/Program AVR)
+ - AVRISP will detect the bootloader
+ - Program your application FLASH file and optional EEPROM file using AVRISP
+
+Note:
+ Erasing the device without flashing, through AVRISP GUI button "Erase Device"
+ is not implemented, due to AVRStudio limitations.
+ Flash is always erased before programming.
+
+ AVRdude:
+ Please uncomment #define REMOVE_CMD_SPI_MULTI when using AVRdude.
+ Comment #define REMOVE_PROGRAM_LOCK_BIT_SUPPORT to reduce code size
+ Read Fuse Bits and Read/Write Lock Bits is not supported
+
+NOTES:
+ Based on Atmel Application Note AVR109 - Self-programming
+ Based on Atmel Application Note AVR068 - STK500v2 Protocol
+
+LICENSE:
+ Copyright (C) 2006 Peter Fleury
+
+ 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 2 of the License, or
+ 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.
+
+*****************************************************************************/
+
+//************************************************************************
+//* Edit History
+//************************************************************************
+//* Jul 7, 2010 <MLS> = Mark Sproul msproul@skycharoit.com
+//* Jul 7, 2010 <MLS> Working on mega2560. No Auto-restart
+//* Jul 7, 2010 <MLS> Switched to 8K bytes (4K words) so that we have room for the monitor
+//* Jul 8, 2010 <MLS> Found older version of source that had auto restart, put that code back in
+//* Jul 8, 2010 <MLS> Adding monitor code
+//* Jul 11, 2010 <MLS> Added blinking LED while waiting for download to start
+//* Jul 11, 2010 <MLS> Added EEPROM test
+//* Jul 29, 2010 <MLS> Added recchar_timeout for timing out on bootloading
+//* Aug 23, 2010 <MLS> Added support for atmega2561
+//* Aug 26, 2010 <MLS> Removed support for BOOT_BY_SWITCH
+//************************************************************************
+
+
+
+#include <inttypes.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/boot.h>
+#include <avr/pgmspace.h>
+#include <util/delay.h>
+#include <avr/eeprom.h>
+#include <avr/common.h>
+#include <stdlib.h>
+#include "command.h"
+
+
+#if defined(_MEGA_BOARD_) || defined(_BOARD_AMBER128_) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__)
+ #define ENABLE_MONITOR
+ static void RunMonitor(void);
+#endif
+
+//#define _DEBUG_SERIAL_
+//#define _DEBUG_WITH_LEDS_
+
+
+/*
+ * Uncomment the following lines to save code space
+ */
+//#define REMOVE_PROGRAM_LOCK_BIT_SUPPORT // disable program lock bits
+//#define REMOVE_BOOTLOADER_LED // no LED to show active bootloader
+//#define REMOVE_CMD_SPI_MULTI // disable processing of SPI_MULTI commands, Remark this line for AVRDUDE <Worapoht>
+//
+
+
+
+//************************************************************************
+//* LED on pin "PROGLED_PIN" on port "PROGLED_PORT"
+//* indicates that bootloader is active
+//* PG2 -> LED on Wiring board
+//************************************************************************
+#define BLINK_LED_WHILE_WAITING
+
+#ifdef _MEGA_BOARD_
+ #define PROGLED_PORT PORTB
+ #define PROGLED_DDR DDRB
+ #define PROGLED_PIN PINB7
+#elif defined( _BOARD_AMBER128_ )
+ //* this is for the amber 128 http://www.soc-robotics.com/
+ //* onbarod led is PORTE4
+ #define PROGLED_PORT PORTD
+ #define PROGLED_DDR DDRD
+ #define PROGLED_PIN PINE7
+#elif defined( _CEREBOTPLUS_BOARD_ )
+ //* this is for the Cerebot 2560 board
+ //* onbarod leds are on PORTE4-7
+ #define PROGLED_PORT PORTE
+ #define PROGLED_DDR DDRE
+ #define PROGLED_PIN PINE7
+#elif defined( _PENGUINO_ )
+ //* this is for the Penguino
+ //* onbarod led is PORTE4
+ #define PROGLED_PORT PORTC
+ #define PROGLED_DDR DDRC
+ #define PROGLED_PIN PINC6
+#elif defined( _ANDROID_2561_ ) || defined( __AVR_ATmega2561__ )
+ //* this is for the Boston Android 2561
+ //* onbarod led is PORTE4
+ #define PROGLED_PORT PORTA
+ #define PROGLED_DDR DDRA
+ #define PROGLED_PIN PINA3
+#else
+ #define PROGLED_PORT PORTG
+ #define PROGLED_DDR DDRG
+ #define PROGLED_PIN PING2
+#endif
+
+
+
+/*
+ * define CPU frequency in Mhz here if not defined in Makefile
+ */
+#ifndef F_CPU
+ #define F_CPU 16000000UL
+#endif
+
+/*
+ * UART Baudrate, AVRStudio AVRISP only accepts 115200 bps
+ */
+
+#ifndef BAUDRATE
+ #define BAUDRATE 115200
+#endif
+
+/*
+ * Enable (1) or disable (0) USART double speed operation
+ */
+#ifndef UART_BAUDRATE_DOUBLE_SPEED
+ #if defined (__AVR_ATmega32__)
+ #define UART_BAUDRATE_DOUBLE_SPEED 0
+ #else
+ #define UART_BAUDRATE_DOUBLE_SPEED 1
+ #endif
+#endif
+
+/*
+ * HW and SW version, reported to AVRISP, must match version of AVRStudio
+ */
+#define CONFIG_PARAM_BUILD_NUMBER_LOW 0
+#define CONFIG_PARAM_BUILD_NUMBER_HIGH 0
+#define CONFIG_PARAM_HW_VER 0x0F
+#define CONFIG_PARAM_SW_MAJOR 2
+#define CONFIG_PARAM_SW_MINOR 0x0A
+
+/*
+ * Calculate the address where the bootloader starts from FLASHEND and BOOTSIZE
+ * (adjust BOOTSIZE below and BOOTLOADER_ADDRESS in Makefile if you want to change the size of the bootloader)
+ */
+//#define BOOTSIZE 1024
+#if FLASHEND > 0x0F000
+ #define BOOTSIZE 8192
+#else
+ #define BOOTSIZE 2048
+#endif
+
+#define APP_END (FLASHEND -(2*BOOTSIZE) + 1)
+
+/*
+ * Signature bytes are not available in avr-gcc io_xxx.h
+ */
+#if defined (__AVR_ATmega8__)
+ #define SIGNATURE_BYTES 0x1E9307
+#elif defined (__AVR_ATmega16__)
+ #define SIGNATURE_BYTES 0x1E9403
+#elif defined (__AVR_ATmega32__)
+ #define SIGNATURE_BYTES 0x1E9502
+#elif defined (__AVR_ATmega8515__)
+ #define SIGNATURE_BYTES 0x1E9306
+#elif defined (__AVR_ATmega8535__)
+ #define SIGNATURE_BYTES 0x1E9308
+#elif defined (__AVR_ATmega162__)
+ #define SIGNATURE_BYTES 0x1E9404
+#elif defined (__AVR_ATmega128__)
+ #define SIGNATURE_BYTES 0x1E9702
+#elif defined (__AVR_ATmega1280__)
+ #define SIGNATURE_BYTES 0x1E9703
+#elif defined (__AVR_ATmega2560__)
+ #define SIGNATURE_BYTES 0x1E9801
+#elif defined (__AVR_ATmega2561__)
+ #define SIGNATURE_BYTES 0x1e9802
+#else
+ #error "no signature definition for MCU available"
+#endif
+
+
+#if defined(__AVR_ATmega8__) || defined(__AVR_ATmega16__) || defined(__AVR_ATmega32__) \
+ || defined(__AVR_ATmega8515__) || defined(__AVR_ATmega8535__)
+ /* ATMega8 with one USART */
+ #define UART_BAUD_RATE_LOW UBRRL
+ #define UART_STATUS_REG UCSRA
+ #define UART_CONTROL_REG UCSRB
+ #define UART_ENABLE_TRANSMITTER TXEN
+ #define UART_ENABLE_RECEIVER RXEN
+ #define UART_TRANSMIT_COMPLETE TXC
+ #define UART_RECEIVE_COMPLETE RXC
+ #define UART_DATA_REG UDR
+ #define UART_DOUBLE_SPEED U2X
+
+#elif defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__) || defined(__AVR_ATmega162__) \
+ || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__)
+ /* ATMega with two USART, use UART0 */
+ #define UART_BAUD_RATE_LOW UBRR0L
+ #define UART_STATUS_REG UCSR0A
+ #define UART_CONTROL_REG UCSR0B
+ #define UART_ENABLE_TRANSMITTER TXEN0
+ #define UART_ENABLE_RECEIVER RXEN0
+ #define UART_TRANSMIT_COMPLETE TXC0
+ #define UART_RECEIVE_COMPLETE RXC0
+ #define UART_DATA_REG UDR0
+ #define UART_DOUBLE_SPEED U2X0
+#else
+ #error "no UART definition for MCU available"
+#endif
+
+
+
+/*
+ * Macro to calculate UBBR from XTAL and baudrate
+ */
+#if defined(__AVR_ATmega32__) && UART_BAUDRATE_DOUBLE_SPEED
+ #define UART_BAUD_SELECT(baudRate,xtalCpu) ((xtalCpu / 4 / baudRate - 1) / 2)
+#elif defined(__AVR_ATmega32__)
+ #define UART_BAUD_SELECT(baudRate,xtalCpu) ((xtalCpu / 8 / baudRate - 1) / 2)
+#elif UART_BAUDRATE_DOUBLE_SPEED
+ #define UART_BAUD_SELECT(baudRate,xtalCpu) (((float)(xtalCpu))/(((float)(baudRate))*8.0)-1.0+0.5)
+#else
+ #define UART_BAUD_SELECT(baudRate,xtalCpu) (((float)(xtalCpu))/(((float)(baudRate))*16.0)-1.0+0.5)
+#endif
+
+
+/*
+ * States used in the receive state machine
+ */
+#define ST_START 0
+#define ST_GET_SEQ_NUM 1
+#define ST_MSG_SIZE_1 2
+#define ST_MSG_SIZE_2 3
+#define ST_GET_TOKEN 4
+#define ST_GET_DATA 5
+#define ST_GET_CHECK 6
+#define ST_PROCESS 7
+
+/*
+ * use 16bit address variable for ATmegas with <= 64K flash
+ */
+#if defined(RAMPZ)
+ typedef uint32_t address_t;
+#else
+ typedef uint16_t address_t;
+#endif
+
+/*
+ * function prototypes
+ */
+static void sendchar(char c);
+static unsigned char recchar(void);
+
+/*
+ * since this bootloader is not linked against the avr-gcc crt1 functions,
+ * to reduce the code size, we need to provide our own initialization
+ */
+void __jumpMain (void) __attribute__ ((naked)) __attribute__ ((section (".init9")));
+#include <avr/sfr_defs.h>
+
+//#define SPH_REG 0x3E
+//#define SPL_REG 0x3D
+
+//*****************************************************************************
+void __jumpMain(void)
+{
+//* July 17, 2010 <MLS> Added stack pointer initialzation
+//* the first line did not do the job on the ATmega128
+
+ asm volatile ( ".set __stack, %0" :: "i" (RAMEND) );
+
+// ldi r16,high(RAMEND)
+// out SPH,r16 ; Set stack pointer to top of RAM
+
+// asm volatile ( "ldi 16, 0x10");
+ asm volatile ( "ldi 16, %0" :: "i" (RAMEND >> 8) );
+// asm volatile ( "out 0x3E,16");
+// asm volatile ( "out %0,16" :: "i" (SPH_REG) );
+ asm volatile ( "out %0,16" :: "i" (AVR_STACK_POINTER_HI_ADDR) );
+
+// asm volatile ( "ldi 16, 0x00");
+ asm volatile ( "ldi 16, %0" :: "i" (RAMEND & 0x0ff) );
+// asm volatile ( "out 0x3d,16");
+// asm volatile ( "out %0,16" :: "i" (SPL_REG) );
+ asm volatile ( "out %0,16" :: "i" (AVR_STACK_POINTER_LO_ADDR) );
+
+
+
+ asm volatile ( "clr __zero_reg__" ); // GCC depends on register r1 set to 0
+ asm volatile ( "out %0, __zero_reg__" :: "I" (_SFR_IO_ADDR(SREG)) ); // set SREG to 0
+// asm volatile ( "rjmp main"); // jump to main()
+ asm volatile ( "jmp main"); // jump to main()
+}
+
+
+//*****************************************************************************
+void delay_ms(unsigned int timedelay)
+{
+ unsigned int i;
+ for (i=0;i<timedelay;i++)
+ {
+ _delay_ms(0.5);
+ }
+}
+
+
+//*****************************************************************************
+/*
+ * send single byte to USART, wait until transmission is completed
+ */
+static void sendchar(char c)
+{
+ UART_DATA_REG = c; // prepare transmission
+ while (!(UART_STATUS_REG & (1 << UART_TRANSMIT_COMPLETE))); // wait until byte sent
+ UART_STATUS_REG |= (1 << UART_TRANSMIT_COMPLETE); // delete TXCflag
+}
+
+
+//************************************************************************
+static int Serial_Available(void)
+{
+ return(UART_STATUS_REG & (1 << UART_RECEIVE_COMPLETE)); // wait for data
+}
+
+
+//*****************************************************************************
+/*
+ * Read single byte from USART, block if no data available
+ */
+static unsigned char recchar(void)
+{
+ while (!(UART_STATUS_REG & (1 << UART_RECEIVE_COMPLETE)))
+ {
+ // wait for data
+ }
+ return UART_DATA_REG;
+}
+
+#define MAX_TIME_COUNT (F_CPU >> 1)
+//*****************************************************************************
+static unsigned char recchar_timeout(void)
+{
+uint32_t count = 0;
+
+ while (!(UART_STATUS_REG & (1 << UART_RECEIVE_COMPLETE)))
+ {
+ // wait for data
+ count++;
+ if (count > MAX_TIME_COUNT)
+ {
+ unsigned int data;
+ #if (FLASHEND > 0x0FFFF)
+ data = pgm_read_word_far(0); //* get the first word of the user program
+ #else
+ data = pgm_read_word_near(0); //* get the first word of the user program
+ #endif
+ if (data != 0xffff) //* make sure its valid before jumping to it.
+ {
+ asm volatile(
+ "clr r30 \n\t"
+ "clr r31 \n\t"
+ "ijmp \n\t"
+ );
+ }
+ count = 0;
+ }
+ }
+ return UART_DATA_REG;
+}
+
+
+
+//*****************************************************************************
+int main(void)
+{
+ address_t address = 0;
+ address_t eraseAddress = 0;
+ unsigned char msgParseState;
+ unsigned int ii = 0;
+ unsigned char checksum = 0;
+ unsigned char seqNum = 0;
+ unsigned int msgLength = 0;
+ unsigned char msgBuffer[285];
+ unsigned char c, *p;
+ unsigned char isLeave = 0;
+
+ unsigned long boot_timeout;
+ unsigned long boot_timer;
+ unsigned int boot_state;
+#ifdef ENABLE_MONITOR
+ unsigned int exPointCntr = 0;
+#endif
+
+
+ boot_timer = 0;
+ boot_state = 0;
+
+#ifdef BLINK_LED_WHILE_WAITING
+ boot_timeout = 20000; //* should be about 1 second
+// boot_timeout = 170000;
+#else
+ boot_timeout = 3500000; // 7 seconds , approx 2us per step when optimize "s"
+#endif
+ /*
+ * Branch to bootloader or application code ?
+ */
+
+#ifndef REMOVE_BOOTLOADER_LED
+ /* PROG_PIN pulled low, indicate with LED that bootloader is active */
+ PROGLED_DDR |= (1<<PROGLED_PIN);
+// PROGLED_PORT &= ~(1<<PROGLED_PIN); // active low LED ON
+ PROGLED_PORT |= (1<<PROGLED_PIN); // active high LED ON
+
+#ifdef _DEBUG_WITH_LEDS_
+ for (ii=0; ii<3; ii++)
+ {
+ PROGLED_PORT &= ~(1<<PROGLED_PIN); // turn LED off
+ delay_ms(100);
+ PROGLED_PORT |= (1<<PROGLED_PIN); // turn LED on
+ delay_ms(100);
+ }
+#endif
+
+#endif
+ /*
+ * Init UART
+ * set baudrate and enable USART receiver and transmiter without interrupts
+ */
+#if UART_BAUDRATE_DOUBLE_SPEED
+ UART_STATUS_REG |= (1 <<UART_DOUBLE_SPEED);
+#endif
+ UART_BAUD_RATE_LOW = UART_BAUD_SELECT(BAUDRATE,F_CPU);
+ UART_CONTROL_REG = (1 << UART_ENABLE_RECEIVER) | (1 << UART_ENABLE_TRANSMITTER);
+
+ asm volatile ("nop"); // wait until port has changed
+
+#ifdef _DEBUG_SERIAL_
+// delay_ms(500);
+
+ sendchar('s');
+ sendchar('t');
+ sendchar('k');
+// sendchar('5');
+// sendchar('0');
+// sendchar('0');
+ sendchar('v');
+ sendchar('2');
+ sendchar(0x0d);
+ sendchar(0x0a);
+
+ delay_ms(100);
+#endif
+
+ while (boot_state==0)
+ {
+ while ((!(Serial_Available())) && (boot_state == 0)) // wait for data
+ {
+ _delay_ms(0.001);
+ boot_timer++;
+ if (boot_timer > boot_timeout)
+ {
+ boot_state = 1; // (after ++ -> boot_state=2 bootloader timeout, jump to main 0x00000 )
+ }
+ #ifdef BLINK_LED_WHILE_WAITING
+ if ((boot_timer % 7000) == 0)
+ {
+ //* toggle the LED
+ PROGLED_PORT ^= (1<<PROGLED_PIN); // turn LED ON
+ }
+ #endif
+ }
+ boot_state++; // ( if boot_state=1 bootloader received byte from UART, enter bootloader mode)
+ }
+
+
+ if (boot_state==1)
+ {
+ //* main loop
+ while (!isLeave)
+ {
+ /*
+ * Collect received bytes to a complete message
+ */
+ msgParseState = ST_START;
+ while ( msgParseState != ST_PROCESS )
+ {
+ if (boot_state==1)
+ {
+ boot_state = 0;
+ c = UART_DATA_REG;
+ }
+ else
+ {
+ // c = recchar();
+ c = recchar_timeout();
+ }
+
+ #ifdef ENABLE_MONITOR
+ if (c == '!')
+ {
+ exPointCntr++;
+ if (exPointCntr == 3)
+ {
+ RunMonitor();
+ exPointCntr = 0; // reset back to zero so we dont get in an endless loop
+ isLeave = 1;
+ msgParseState = 99; //* we dont want it do anything
+ break;
+ }
+ }
+ else
+ {
+ exPointCntr = 0;
+ }
+ #endif
+
+ switch (msgParseState)
+ {
+ case ST_START:
+ if ( c == MESSAGE_START )
+ {
+ msgParseState = ST_GET_SEQ_NUM;
+ checksum = MESSAGE_START^0;
+ }
+ break;
+
+ case ST_GET_SEQ_NUM:
+ if ( (c == 1) || (c == seqNum) )
+ {
+ seqNum = c;
+ msgParseState = ST_MSG_SIZE_1;
+ checksum ^= c;
+ }
+ else
+ {
+ msgParseState = ST_START;
+ }
+ break;
+
+ case ST_MSG_SIZE_1:
+ msgLength = c<<8;
+ msgParseState = ST_MSG_SIZE_2;
+ checksum ^= c;
+ break;
+
+ case ST_MSG_SIZE_2:
+ msgLength |= c;
+ msgParseState = ST_GET_TOKEN;
+ checksum ^= c;
+ break;
+
+ case ST_GET_TOKEN:
+ if ( c == TOKEN )
+ {
+ msgParseState = ST_GET_DATA;
+ checksum ^= c;
+ ii = 0;
+ }
+ else
+ {
+ msgParseState = ST_START;
+ }
+ break;
+
+ case ST_GET_DATA:
+ msgBuffer[ii++] = c;
+ checksum ^= c;
+ if (ii == msgLength )
+ {
+ msgParseState = ST_GET_CHECK;
+ }
+ break;
+
+ case ST_GET_CHECK:
+ if ( c == checksum )
+ {
+ msgParseState = ST_PROCESS;
+ }
+ else
+ {
+ msgParseState = ST_START;
+ }
+ break;
+ } // switch
+ } // while(msgParseState)
+
+ /*
+ * Now process the STK500 commands, see Atmel Appnote AVR068
+ */
+
+ switch (msgBuffer[0])
+ {
+ #ifndef REMOVE_CMD_SPI_MULTI
+ case CMD_SPI_MULTI:
+ {
+ unsigned char answerByte;
+ unsigned char flag=0;
+
+ if ( msgBuffer[4]== 0x30 )
+ {
+ unsigned char signatureIndex = msgBuffer[6];
+
+ if ( signatureIndex == 0 )
+ answerByte = (SIGNATURE_BYTES >>16) & 0x000000FF;
+ else if ( signatureIndex == 1 )
+ answerByte = (SIGNATURE_BYTES >> 8) & 0x000000FF;
+ else
+ answerByte = SIGNATURE_BYTES & 0x000000FF;
+ }
+ else if ( msgBuffer[4] & 0x50 )
+ {
+ answerByte = 0; //read fuse/lock bits not implemented, return dummy value
+ }
+ else
+ {
+ answerByte = 0; // for all others command are not implemented, return dummy value for AVRDUDE happy <Worapoht>
+ // flag = 1; // Remark this line for AVRDUDE <Worapoht>
+ }
+ if ( !flag )
+ {
+ msgLength = 7;
+ msgBuffer[1] = STATUS_CMD_OK;
+ msgBuffer[2] = 0;
+ msgBuffer[3] = msgBuffer[4];
+ msgBuffer[4] = 0;
+ msgBuffer[5] = answerByte;
+ msgBuffer[6] = STATUS_CMD_OK;
+ }
+ }
+ break;
+ #endif
+ case CMD_SIGN_ON:
+ msgLength = 11;
+ msgBuffer[1] = STATUS_CMD_OK;
+ msgBuffer[2] = 8;
+ msgBuffer[3] = 'A';
+ msgBuffer[4] = 'V';
+ msgBuffer[5] = 'R';
+ msgBuffer[6] = 'I';
+ msgBuffer[7] = 'S';
+ msgBuffer[8] = 'P';
+ msgBuffer[9] = '_';
+ msgBuffer[10] = '2';
+ break;
+
+ case CMD_GET_PARAMETER:
+ {
+ unsigned char value;
+
+ switch(msgBuffer[1])
+ {
+ case PARAM_BUILD_NUMBER_LOW:
+ value = CONFIG_PARAM_BUILD_NUMBER_LOW;
+ break;
+ case PARAM_BUILD_NUMBER_HIGH:
+ value = CONFIG_PARAM_BUILD_NUMBER_HIGH;
+ break;
+ case PARAM_HW_VER:
+ value = CONFIG_PARAM_HW_VER;
+ break;
+ case PARAM_SW_MAJOR:
+ value = CONFIG_PARAM_SW_MAJOR;
+ break;
+ case PARAM_SW_MINOR:
+ value = CONFIG_PARAM_SW_MINOR;
+ break;
+ default:
+ value = 0;
+ break;
+ }
+ msgLength = 3;
+ msgBuffer[1] = STATUS_CMD_OK;
+ msgBuffer[2] = value;
+ }
+ break;
+
+ case CMD_LEAVE_PROGMODE_ISP:
+ isLeave = 1;
+ //* fall thru
+
+ case CMD_SET_PARAMETER:
+ case CMD_ENTER_PROGMODE_ISP:
+ msgLength = 2;
+ msgBuffer[1] = STATUS_CMD_OK;
+ break;
+
+ case CMD_READ_SIGNATURE_ISP:
+ {
+ unsigned char signatureIndex = msgBuffer[4];
+ unsigned char signature;
+
+ if ( signatureIndex == 0 )
+ signature = (SIGNATURE_BYTES >>16) & 0x000000FF;
+ else if ( signatureIndex == 1 )
+ signature = (SIGNATURE_BYTES >> 8) & 0x000000FF;
+ else
+ signature = SIGNATURE_BYTES & 0x000000FF;
+
+ msgLength = 4;
+ msgBuffer[1] = STATUS_CMD_OK;
+ msgBuffer[2] = signature;
+ msgBuffer[3] = STATUS_CMD_OK;
+ }
+ break;
+
+ case CMD_READ_LOCK_ISP:
+ msgLength = 4;
+ msgBuffer[1] = STATUS_CMD_OK;
+ msgBuffer[2] = boot_lock_fuse_bits_get( GET_LOCK_BITS );
+ msgBuffer[3] = STATUS_CMD_OK;
+ break;
+
+ case CMD_READ_FUSE_ISP:
+ {
+ unsigned char fuseBits;
+
+ if ( msgBuffer[2] == 0x50 )
+ {
+ if ( msgBuffer[3] == 0x08 )
+ fuseBits = boot_lock_fuse_bits_get( GET_EXTENDED_FUSE_BITS );
+ else
+ fuseBits = boot_lock_fuse_bits_get( GET_LOW_FUSE_BITS );
+ }
+ else
+ {
+ fuseBits = boot_lock_fuse_bits_get( GET_HIGH_FUSE_BITS );
+ }
+ msgLength = 4;
+ msgBuffer[1] = STATUS_CMD_OK;
+ msgBuffer[2] = fuseBits;
+ msgBuffer[3] = STATUS_CMD_OK;
+ }
+ break;
+
+ #ifndef REMOVE_PROGRAM_LOCK_BIT_SUPPORT
+ case CMD_PROGRAM_LOCK_ISP:
+ {
+ unsigned char lockBits = msgBuffer[4];
+
+ lockBits = (~lockBits) & 0x3C; // mask BLBxx bits
+ boot_lock_bits_set(lockBits); // and program it
+ boot_spm_busy_wait();
+
+ msgLength = 3;
+ msgBuffer[1] = STATUS_CMD_OK;
+ msgBuffer[2] = STATUS_CMD_OK;
+ }
+ break;
+ #endif
+ case CMD_CHIP_ERASE_ISP:
+ eraseAddress = 0;
+ msgLength = 2;
+ msgBuffer[1] = STATUS_CMD_OK;
+ break;
+
+ case CMD_LOAD_ADDRESS:
+ #if defined(RAMPZ)
+ address = ( ((address_t)(msgBuffer[1])<<24)|((address_t)(msgBuffer[2])<<16)|((address_t)(msgBuffer[3])<<8)|(msgBuffer[4]) )<<1;
+ #else
+ address = ( ((msgBuffer[3])<<8)|(msgBuffer[4]) )<<1; //convert word to byte address
+ #endif
+ msgLength = 2;
+ msgBuffer[1] = STATUS_CMD_OK;
+ break;
+
+ case CMD_PROGRAM_FLASH_ISP:
+ case CMD_PROGRAM_EEPROM_ISP:
+ {
+ unsigned int size = ((msgBuffer[1])<<8) | msgBuffer[2];
+ unsigned char *p = msgBuffer+10;
+ unsigned int data;
+ unsigned char highByte, lowByte;
+ address_t tempaddress = address;
+
+
+ if ( msgBuffer[0] == CMD_PROGRAM_FLASH_ISP )
+ {
+ // erase only main section (bootloader protection)
+ if (eraseAddress < APP_END )
+ {
+ boot_page_erase(eraseAddress); // Perform page erase
+ boot_spm_busy_wait(); // Wait until the memory is erased.
+ eraseAddress += SPM_PAGESIZE; // point to next page to be erase
+ }
+
+ /* Write FLASH */
+ do {
+ lowByte = *p++;
+ highByte = *p++;
+
+ data = (highByte << 8) | lowByte;
+ boot_page_fill(address,data);
+
+ address = address + 2; // Select next word in memory
+ size -= 2; // Reduce number of bytes to write by two
+ } while (size); // Loop until all bytes written
+
+ boot_page_write(tempaddress);
+ boot_spm_busy_wait();
+ boot_rww_enable(); // Re-enable the RWW section
+ }
+ else
+ {
+ #if (!defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega2561__))
+ /* write EEPROM */
+ do {
+ EEARL = address; // Setup EEPROM address
+ EEARH = (address >> 8);
+ address++; // Select next EEPROM byte
+
+ EEDR = *p++; // get byte from buffer
+ EECR |= (1<<EEMWE); // Write data into EEPROM
+ EECR |= (1<<EEWE);
+
+ while (EECR & (1<<EEWE)); // Wait for write operation to finish
+ size--; // Decrease number of bytes to write
+ } while (size); // Loop until all bytes written
+ #endif
+ }
+ msgLength = 2;
+ msgBuffer[1] = STATUS_CMD_OK;
+ }
+ break;
+
+ case CMD_READ_FLASH_ISP:
+ case CMD_READ_EEPROM_ISP:
+ {
+ unsigned int size = ((msgBuffer[1])<<8) | msgBuffer[2];
+ unsigned char *p = msgBuffer+1;
+ msgLength = size+3;
+
+ *p++ = STATUS_CMD_OK;
+ if (msgBuffer[0] == CMD_READ_FLASH_ISP )
+ {
+ unsigned int data;
+
+ // Read FLASH
+ do {
+ #if defined(RAMPZ)
+ data = pgm_read_word_far(address);
+ #else
+ data = pgm_read_word_near(address);
+ #endif
+ *p++ = (unsigned char)data; //LSB
+ *p++ = (unsigned char)(data >> 8); //MSB
+ address += 2; // Select next word in memory
+ size -= 2;
+ }while (size);
+ }
+ else
+ {
+ /* Read EEPROM */
+ do {
+ EEARL = address; // Setup EEPROM address
+ EEARH = ((address >> 8));
+ address++; // Select next EEPROM byte
+ EECR |= (1<<EERE); // Read EEPROM
+ *p++ = EEDR; // Send EEPROM data
+ size--;
+ } while (size);
+ }
+ *p++ = STATUS_CMD_OK;
+ }
+ break;
+
+ default:
+ msgLength = 2;
+ msgBuffer[1] = STATUS_CMD_FAILED;
+ break;
+ }
+
+ /*
+ * Now send answer message back
+ */
+ sendchar(MESSAGE_START);
+ checksum = MESSAGE_START^0;
+
+ sendchar(seqNum);
+ checksum ^= seqNum;
+
+ c = ((msgLength>>8)&0xFF);
+ sendchar(c);
+ checksum ^= c;
+
+ c = msgLength&0x00FF;
+ sendchar(c);
+ checksum ^= c;
+
+ sendchar(TOKEN);
+ checksum ^= TOKEN;
+
+ p = msgBuffer;
+ while ( msgLength )
+ {
+ c = *p++;
+ sendchar(c);
+ checksum ^=c;
+ msgLength--;
+ }
+ sendchar(checksum);
+ seqNum++;
+
+ #ifndef REMOVE_BOOTLOADER_LED
+ //* <MLS> toggle the LED
+ PROGLED_PORT ^= (1<<PROGLED_PIN); // active high LED ON
+ #endif
+
+ }
+ }
+
+#ifdef _DEBUG_WITH_LEDS_
+ //* this is for debugging it can be removed
+ for (ii=0; ii<10; ii++)
+ {
+ PROGLED_PORT &= ~(1<<PROGLED_PIN); // turn LED off
+ delay_ms(200);
+ PROGLED_PORT |= (1<<PROGLED_PIN); // turn LED on
+ delay_ms(200);
+ }
+ PROGLED_PORT &= ~(1<<PROGLED_PIN); // turn LED off
+#endif
+
+#ifdef _DEBUG_SERIAL_
+ sendchar('j');
+// sendchar('u');
+// sendchar('m');
+// sendchar('p');
+// sendchar(' ');
+// sendchar('u');
+// sendchar('s');
+// sendchar('r');
+ sendchar(0x0d);
+ sendchar(0x0a);
+
+ delay_ms(100);
+#endif
+
+
+#ifndef REMOVE_BOOTLOADER_LED
+ PROGLED_DDR &= ~(1<<PROGLED_PIN); // set to default
+ PROGLED_PORT &= ~(1<<PROGLED_PIN); // active low LED OFF
+// PROGLED_PORT |= (1<<PROGLED_PIN); // active high LED OFf
+ delay_ms(100); // delay after exit
+#endif
+
+
+ asm volatile ("nop"); // wait until port has changed
+
+ /*
+ * Now leave bootloader
+ */
+
+ UART_STATUS_REG &= 0xfd;
+ boot_rww_enable(); // enable application section
+
+
+ asm volatile(
+ "clr r30 \n\t"
+ "clr r31 \n\t"
+ "ijmp \n\t"
+ );
+// asm volatile ( "push r1" "\n\t" // Jump to Reset vector in Application Section
+// "push r1" "\n\t"
+// "ret" "\n\t"
+// ::);
+
+ /*
+ * Never return to stop GCC to generate exit return code
+ * Actually we will never reach this point, but the compiler doesn't
+ * understand this
+ */
+ for(;;);
+}
+
+/*
+base address = f800
+
+avrdude: Device signature = 0x1e9703
+avrdude: safemode: lfuse reads as FF
+avrdude: safemode: hfuse reads as DA
+avrdude: safemode: efuse reads as F5
+avrdude>
+
+
+base address = f000
+avrdude: Device signature = 0x1e9703
+avrdude: safemode: lfuse reads as FF
+avrdude: safemode: hfuse reads as D8
+avrdude: safemode: efuse reads as F5
+avrdude>
+*/
+
+//************************************************************************
+#ifdef ENABLE_MONITOR
+#include <math.h>
+
+unsigned long gRamIndex;
+unsigned long gFlashIndex;
+unsigned long gEepromIndex;
+
+
+#define true 1
+#define false 0
+
+#if defined(__AVR_ATmega128__)
+ #define kCPU_NAME "ATmega128"
+#elif defined(__AVR_ATmega1280__)
+ #define kCPU_NAME "ATmega1280"
+#elif defined(__AVR_ATmega1281__)
+ #define kCPU_NAME "ATmega1281"
+#elif defined(__AVR_ATmega2560__)
+ #define kCPU_NAME "ATmega2560"
+#elif defined(__AVR_ATmega2561__)
+ #define kCPU_NAME "ATmega2561"
+#endif
+
+#ifdef _VECTORS_SIZE
+ #define kInterruptVectorCount (_VECTORS_SIZE / 4)
+#else
+ #define kInterruptVectorCount 23
+#endif
+
+
+void PrintDecInt(int theNumber, int digitCnt);
+
+#ifdef kCPU_NAME
+ prog_char gTextMsg_CPU_Name[] PROGMEM = kCPU_NAME;
+#else
+ prog_char gTextMsg_CPU_Name[] PROGMEM = "UNKNOWN";
+#endif
+
+ prog_char gTextMsg_Explorer[] PROGMEM = "Arduino explorer stk500V2 by MLS";
+ prog_char gTextMsg_Prompt[] PROGMEM = "Bootloader>";
+ prog_char gTextMsg_HUH[] PROGMEM = "Huh?";
+ prog_char gTextMsg_COMPILED_ON[] PROGMEM = "Compiled on = ";
+ prog_char gTextMsg_CPU_Type[] PROGMEM = "CPU Type = ";
+ prog_char gTextMsg_AVR_ARCH[] PROGMEM = "__AVR_ARCH__ = ";
+ prog_char gTextMsg_AVR_LIBC[] PROGMEM = "AVR LibC Ver = ";
+ prog_char gTextMsg_GCC_VERSION[] PROGMEM = "GCC Version = ";
+ prog_char gTextMsg_CPU_SIGNATURE[] PROGMEM = "CPU signature= ";
+ prog_char gTextMsg_FUSE_BYTE_LOW[] PROGMEM = "Low fuse = ";
+ prog_char gTextMsg_FUSE_BYTE_HIGH[] PROGMEM = "High fuse = ";
+ prog_char gTextMsg_FUSE_BYTE_EXT[] PROGMEM = "Ext fuse = ";
+ prog_char gTextMsg_FUSE_BYTE_LOCK[] PROGMEM = "Lock fuse = ";
+ prog_char gTextMsg_GCC_DATE_STR[] PROGMEM = __DATE__;
+ prog_char gTextMsg_AVR_LIBC_VER_STR[] PROGMEM = __AVR_LIBC_VERSION_STRING__;
+ prog_char gTextMsg_GCC_VERSION_STR[] PROGMEM = __VERSION__;
+ prog_char gTextMsg_VECTOR_HEADER[] PROGMEM = "V# ADDR op code instruction addr Interrupt";
+ prog_char gTextMsg_noVector[] PROGMEM = "no vector";
+ prog_char gTextMsg_rjmp[] PROGMEM = "rjmp ";
+ prog_char gTextMsg_jmp[] PROGMEM = "jmp ";
+ prog_char gTextMsg_WHAT_PORT[] PROGMEM = "What port:";
+ prog_char gTextMsg_PortNotSupported[] PROGMEM = "Port not supported";
+ prog_char gTextMsg_MustBeLetter[] PROGMEM = "Must be a letter";
+ prog_char gTextMsg_SPACE[] PROGMEM = " ";
+ prog_char gTextMsg_WriteToEEprom[] PROGMEM = "Writting EE";
+ prog_char gTextMsg_ReadingEEprom[] PROGMEM = "Reading EE";
+ prog_char gTextMsg_EEPROMerrorCnt[] PROGMEM = "eeprom error count=";
+ prog_char gTextMsg_PORT[] PROGMEM = "PORT";
+
+
+//************************************************************************
+//* Help messages
+ prog_char gTextMsg_HELP_MSG_0[] PROGMEM = "0=Zero address ctrs";
+ prog_char gTextMsg_HELP_MSG_QM[] PROGMEM = "?=CPU stats";
+ prog_char gTextMsg_HELP_MSG_AT[] PROGMEM = "@=EEPROM test";
+ prog_char gTextMsg_HELP_MSG_B[] PROGMEM = "B=Blink LED";
+ prog_char gTextMsg_HELP_MSG_E[] PROGMEM = "E=Dump EEPROM";
+ prog_char gTextMsg_HELP_MSG_F[] PROGMEM = "F=Dump FLASH";
+ prog_char gTextMsg_HELP_MSG_H[] PROGMEM = "H=Help";
+ prog_char gTextMsg_HELP_MSG_L[] PROGMEM = "L=List I/O Ports";
+ prog_char gTextMsg_HELP_MSG_Q[] PROGMEM = "Q=Quit & jump to user pgm";
+ prog_char gTextMsg_HELP_MSG_R[] PROGMEM = "R=Dump RAM";
+ prog_char gTextMsg_HELP_MSG_V[] PROGMEM = "V=show interrupt Vectors";
+ prog_char gTextMsg_HELP_MSG_Y[] PROGMEM = "Y=Port blink";
+
+ prog_char gTextMsg_END[] PROGMEM = "*";
+
+
+//************************************************************************
+void PrintFromPROGMEM(void *dataPtr, unsigned char offset)
+{
+uint8_t ii;
+char theChar;
+
+ ii = offset;
+ theChar = 1;
+
+ while (theChar != 0)
+ {
+ theChar = pgm_read_byte_far((uint32_t)dataPtr + ii);
+ if (theChar != 0)
+ {
+ sendchar(theChar);
+ }
+ ii++;
+ }
+}
+
+//************************************************************************
+void PrintNewLine(void)
+{
+ sendchar(0x0d);
+ sendchar(0x0a);
+}
+
+
+//************************************************************************
+void PrintFromPROGMEMln(void *dataPtr, unsigned char offset)
+{
+ PrintFromPROGMEM(dataPtr, offset);
+
+ PrintNewLine();
+}
+
+
+//************************************************************************
+void PrintString(char *textString)
+{
+char theChar;
+int ii;
+
+ theChar = 1;
+ ii = 0;
+ while (theChar != 0)
+ {
+ theChar = textString[ii];
+ if (theChar != 0)
+ {
+ sendchar(theChar);
+ }
+ ii++;
+ }
+}
+
+//************************************************************************
+void PrintHexByte(unsigned char theByte)
+{
+char theChar;
+
+ theChar = 0x30 + ((theByte >> 4) & 0x0f);
+ if (theChar > 0x39)
+ {
+ theChar += 7;
+ }
+ sendchar(theChar );
+
+ theChar = 0x30 + (theByte & 0x0f);
+ if (theChar > 0x39)
+ {
+ theChar += 7;
+ }
+ sendchar(theChar );
+}
+
+//************************************************************************
+void PrintDecInt(int theNumber, int digitCnt)
+{
+int theChar;
+int myNumber;
+
+ myNumber = theNumber;
+
+ if ((myNumber > 100) || (digitCnt >= 3))
+ {
+ theChar = 0x30 + myNumber / 100;
+ sendchar(theChar );
+ }
+
+ if ((myNumber > 10) || (digitCnt >= 2))
+ {
+ theChar = 0x30 + ((myNumber % 100) / 10 );
+ sendchar(theChar );
+ }
+ theChar = 0x30 + (myNumber % 10);
+ sendchar(theChar );
+}
+
+
+
+
+//************************************************************************
+static void PrintCPUstats(void)
+{
+unsigned char fuseByte;
+
+ PrintFromPROGMEMln(gTextMsg_Explorer, 0);
+
+ PrintFromPROGMEM(gTextMsg_COMPILED_ON, 0);
+ PrintFromPROGMEMln(gTextMsg_GCC_DATE_STR, 0);
+
+ PrintFromPROGMEM(gTextMsg_CPU_Type, 0);
+ PrintFromPROGMEMln(gTextMsg_CPU_Name, 0);
+
+ PrintFromPROGMEM(gTextMsg_AVR_ARCH, 0);
+ PrintDecInt(__AVR_ARCH__, 1);
+ PrintNewLine();
+
+ PrintFromPROGMEM(gTextMsg_GCC_VERSION, 0);
+ PrintFromPROGMEMln(gTextMsg_GCC_VERSION_STR, 0);
+
+ //* these can be found in avr/version.h
+ PrintFromPROGMEM(gTextMsg_AVR_LIBC, 0);
+ PrintFromPROGMEMln(gTextMsg_AVR_LIBC_VER_STR, 0);
+
+#if defined(SIGNATURE_0)
+ PrintFromPROGMEM(gTextMsg_CPU_SIGNATURE, 0);
+ //* these can be found in avr/iomxxx.h
+ PrintHexByte(SIGNATURE_0);
+ PrintHexByte(SIGNATURE_1);
+ PrintHexByte(SIGNATURE_2);
+ PrintNewLine();
+#endif
+
+
+#if defined(GET_LOW_FUSE_BITS)
+ //* fuse settings
+ PrintFromPROGMEM(gTextMsg_FUSE_BYTE_LOW, 0);
+ fuseByte = boot_lock_fuse_bits_get(GET_LOW_FUSE_BITS);
+ PrintHexByte(fuseByte);
+ PrintNewLine();
+
+ PrintFromPROGMEM(gTextMsg_FUSE_BYTE_HIGH, 0);
+ fuseByte = boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS);
+ PrintHexByte(fuseByte);
+ PrintNewLine();
+
+ PrintFromPROGMEM(gTextMsg_FUSE_BYTE_EXT, 0);
+ fuseByte = boot_lock_fuse_bits_get(GET_EXTENDED_FUSE_BITS);
+ PrintHexByte(fuseByte);
+ PrintNewLine();
+
+ PrintFromPROGMEM(gTextMsg_FUSE_BYTE_LOCK, 0);
+ fuseByte = boot_lock_fuse_bits_get(GET_LOCK_BITS);
+ PrintHexByte(fuseByte);
+ PrintNewLine();
+
+#endif
+
+}
+
+#ifndef sbi
+ #define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+#endif
+
+//************************************************************************
+int analogRead(uint8_t pin)
+{
+uint8_t low, high;
+
+ // set the analog reference (high two bits of ADMUX) and select the
+ // channel (low 4 bits). this also sets ADLAR (left-adjust result)
+ // to 0 (the default).
+// ADMUX = (analog_reference << 6) | (pin & 0x07);
+ ADMUX = (1 << 6) | (pin & 0x07);
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+ // the MUX5 bit of ADCSRB selects whether we're reading from channels
+ // 0 to 7 (MUX5 low) or 8 to 15 (MUX5 high).
+ ADCSRB = (ADCSRB & ~(1 << MUX5)) | (((pin >> 3) & 0x01) << MUX5);
+#endif
+
+ // without a delay, we seem to read from the wrong channel
+ //delay(1);
+
+ // start the conversion
+ sbi(ADCSRA, ADSC);
+
+ // ADSC is cleared when the conversion finishes
+ while (bit_is_set(ADCSRA, ADSC));
+
+ // we have to read ADCL first; doing so locks both ADCL
+ // and ADCH until ADCH is read. reading ADCL second would
+ // cause the results of each conversion to be discarded,
+ // as ADCL and ADCH would be locked when it completed.
+ low = ADCL;
+ high = ADCH;
+
+ // combine the two bytes
+ return (high << 8) | low;
+}
+
+//************************************************************************
+static void BlinkLED(void)
+{
+ PROGLED_DDR |= (1<<PROGLED_PIN);
+ PROGLED_PORT |= (1<<PROGLED_PIN); // active high LED ON
+
+ while (!Serial_Available())
+ {
+ PROGLED_PORT &= ~(1<<PROGLED_PIN); // turn LED off
+ delay_ms(100);
+ PROGLED_PORT |= (1<<PROGLED_PIN); // turn LED on
+ delay_ms(100);
+ }
+ recchar(); // get the char out of the buffer
+}
+
+enum
+{
+ kDUMP_FLASH = 0,
+ kDUMP_EEPROM,
+ kDUMP_RAM
+};
+
+//************************************************************************
+static void DumpHex(unsigned char dumpWhat, unsigned long startAddress, unsigned char numRows)
+{
+unsigned long myAddressPointer;
+uint8_t ii;
+unsigned char theValue;
+char asciiDump[18];
+unsigned char *ramPtr;
+
+
+ ramPtr = 0;
+ theValue = 0;
+ myAddressPointer = startAddress;
+ while (numRows > 0)
+ {
+ if (myAddressPointer > 0x10000)
+ {
+ PrintHexByte((myAddressPointer >> 16) & 0x00ff);
+ }
+ PrintHexByte((myAddressPointer >> 8) & 0x00ff);
+ PrintHexByte(myAddressPointer & 0x00ff);
+ sendchar(0x20);
+ sendchar('-');
+ sendchar(0x20);
+
+ asciiDump[0] = 0;
+ for (ii=0; ii<16; ii++)
+ {
+ switch(dumpWhat)
+ {
+ case kDUMP_FLASH:
+ theValue = pgm_read_byte_far(myAddressPointer);
+ break;
+
+ case kDUMP_EEPROM:
+ theValue = eeprom_read_byte((void *)myAddressPointer);
+ break;
+
+ case kDUMP_RAM:
+ theValue = ramPtr[myAddressPointer];
+ break;
+
+ }
+ PrintHexByte(theValue);
+ sendchar(0x20);
+ if ((theValue >= 0x20) && (theValue < 0x7f))
+ {
+ asciiDump[ii % 16] = theValue;
+ }
+ else
+ {
+ asciiDump[ii % 16] = '.';
+ }
+
+ myAddressPointer++;
+ }
+ asciiDump[16] = 0;
+ PrintString(asciiDump);
+ PrintNewLine();
+
+ numRows--;
+ }
+}
+
+
+
+//************************************************************************
+//* returns amount of extended memory
+static void EEPROMtest(void)
+{
+int ii;
+char theChar;
+char theEEPROMchar;
+int errorCount;
+
+ PrintFromPROGMEMln(gTextMsg_WriteToEEprom, 0);
+ PrintNewLine();
+ ii = 0;
+ while (((theChar = pgm_read_byte_far(gTextMsg_Explorer + ii)) != '*') && (ii < 512))
+ {
+ eeprom_write_byte((uint8_t *)ii, theChar);
+ if (theChar == 0)
+ {
+ PrintFromPROGMEM(gTextMsg_SPACE, 0);
+ }
+ else
+ {
+ sendchar(theChar);
+ }
+ ii++;
+ }
+
+ //* no go back through and test
+ PrintNewLine();
+ PrintNewLine();
+ PrintFromPROGMEMln(gTextMsg_ReadingEEprom, 0);
+ PrintNewLine();
+ errorCount = 0;
+ ii = 0;
+ while (((theChar = pgm_read_byte_far(gTextMsg_Explorer + ii)) != '*') && (ii < 512))
+ {
+ theEEPROMchar = eeprom_read_byte((uint8_t *)ii);
+ if (theEEPROMchar == 0)
+ {
+ PrintFromPROGMEM(gTextMsg_SPACE, 0);
+ }
+ else
+ {
+ sendchar(theEEPROMchar);
+ }
+ if (theEEPROMchar != theChar)
+ {
+ errorCount++;
+ }
+ ii++;
+ }
+ PrintNewLine();
+ PrintNewLine();
+ PrintFromPROGMEM(gTextMsg_EEPROMerrorCnt, 0);
+ PrintDecInt(errorCount, 1);
+ PrintNewLine();
+ PrintNewLine();
+
+ gEepromIndex = 0; //* set index back to zero for next eeprom dump
+
+}
+
+
+
+#if (FLASHEND > 0x08000)
+ #include "avrinterruptnames.h"
+ #ifndef _INTERRUPT_NAMES_DEFINED_
+ #warning Interrupt vectors not defined
+ #endif
+#endif
+
+//************************************************************************
+static void VectorDisplay(void)
+{
+unsigned long byte1;
+unsigned long byte2;
+unsigned long byte3;
+unsigned long byte4;
+unsigned long word1;
+unsigned long word2;
+int vectorIndex;
+unsigned long myMemoryPtr;
+unsigned long wordMemoryAddress;
+unsigned long realitiveAddr;
+unsigned long myFullAddress;
+unsigned long absoluteAddr;
+#if defined(_INTERRUPT_NAMES_DEFINED_)
+ long stringPointer;
+#endif
+
+ myMemoryPtr = 0;
+ vectorIndex = 0;
+ PrintFromPROGMEMln(gTextMsg_CPU_Name, 0);
+ PrintFromPROGMEMln(gTextMsg_VECTOR_HEADER, 0);
+ // V# ADDR op code
+ // 1 - 0000 = C3 BB 00 00 rjmp 03BB >000776 RESET
+ while (vectorIndex < kInterruptVectorCount)
+ {
+ wordMemoryAddress = myMemoryPtr / 2;
+ // 01 - 0000 = 12 34
+ PrintDecInt(vectorIndex + 1, 2);
+ sendchar(0x20);
+ sendchar('-');
+ sendchar(0x20);
+ PrintHexByte((wordMemoryAddress >> 8) & 0x00ff);
+ PrintHexByte((wordMemoryAddress) & 0x00ff);
+ sendchar(0x20);
+ sendchar('=');
+ sendchar(0x20);
+
+
+ //* the AVR is LITTLE ENDIAN, swap the byte order
+ byte1 = pgm_read_byte_far(myMemoryPtr++);
+ byte2 = pgm_read_byte_far(myMemoryPtr++);
+ word1 = (byte2 << 8) + byte1;
+
+ byte3 = pgm_read_byte_far(myMemoryPtr++);
+ byte4 = pgm_read_byte_far(myMemoryPtr++);
+ word2 = (byte4 << 8) + byte3;
+
+
+ PrintHexByte(byte2);
+ sendchar(0x20);
+ PrintHexByte(byte1);
+ sendchar(0x20);
+ PrintHexByte(byte4);
+ sendchar(0x20);
+ PrintHexByte(byte3);
+ sendchar(0x20);
+
+ if (word1 == 0xffff)
+ {
+ PrintFromPROGMEM(gTextMsg_noVector, 0);
+ }
+ else if ((word1 & 0xc000) == 0xc000)
+ {
+ //* rjmp instruction
+ realitiveAddr = word1 & 0x3FFF;
+ absoluteAddr = wordMemoryAddress + realitiveAddr; //* add the offset to the current address
+ absoluteAddr = absoluteAddr << 1; //* multiply by 2 for byte address
+
+ PrintFromPROGMEM(gTextMsg_rjmp, 0);
+ PrintHexByte((realitiveAddr >> 8) & 0x00ff);
+ PrintHexByte((realitiveAddr) & 0x00ff);
+ sendchar(0x20);
+ sendchar('>');
+ PrintHexByte((absoluteAddr >> 16) & 0x00ff);
+ PrintHexByte((absoluteAddr >> 8) & 0x00ff);
+ PrintHexByte((absoluteAddr) & 0x00ff);
+
+ }
+ else if ((word1 & 0xfE0E) == 0x940c)
+ {
+ //* jmp instruction, this is REALLY complicated, refer to the instruction manual (JMP)
+ myFullAddress = ((byte1 & 0x01) << 16) +
+ ((byte1 & 0xf0) << 17) +
+ ((byte2 & 0x01) << 21) +
+ word2;
+
+ absoluteAddr = myFullAddress << 1;
+
+ PrintFromPROGMEM(gTextMsg_jmp, 0);
+ PrintHexByte((myFullAddress >> 16) & 0x00ff);
+ PrintHexByte((myFullAddress >> 8) & 0x00ff);
+ PrintHexByte((myFullAddress) & 0x00ff);
+ sendchar(0x20);
+ sendchar('>');
+ PrintHexByte((absoluteAddr >> 16) & 0x00ff);
+ PrintHexByte((absoluteAddr >> 8) & 0x00ff);
+ PrintHexByte((absoluteAddr) & 0x00ff);
+ }
+
+ #if defined(_INTERRUPT_NAMES_DEFINED_)
+ sendchar(0x20);
+ stringPointer = pgm_read_word_far(&(gInterruptNameTable[vectorIndex]));
+ PrintFromPROGMEM((char *)stringPointer, 0);
+ #endif
+ PrintNewLine();
+
+ vectorIndex++;
+ }
+}
+
+//************************************************************************
+static void PrintAvailablePort(char thePortLetter)
+{
+ PrintFromPROGMEM(gTextMsg_PORT, 0);
+ sendchar(thePortLetter);
+ PrintNewLine();
+}
+
+//************************************************************************
+static void ListAvailablePorts(void)
+{
+
+#ifdef DDRA
+ PrintAvailablePort('A');
+#endif
+
+#ifdef DDRB
+ PrintAvailablePort('B');
+#endif
+
+#ifdef DDRC
+ PrintAvailablePort('C');
+#endif
+
+#ifdef DDRD
+ PrintAvailablePort('D');
+#endif
+
+#ifdef DDRE
+ PrintAvailablePort('E');
+#endif
+
+#ifdef DDRF
+ PrintAvailablePort('F');
+#endif
+
+#ifdef DDRG
+ PrintAvailablePort('G');
+#endif
+
+#ifdef DDRH
+ PrintAvailablePort('H');
+#endif
+
+#ifdef DDRI
+ PrintAvailablePort('I');
+#endif
+
+#ifdef DDRJ
+ PrintAvailablePort('J');
+#endif
+
+#ifdef DDRK
+ PrintAvailablePort('K');
+#endif
+
+#ifdef DDRL
+ PrintAvailablePort('L');
+#endif
+
+}
+
+//************************************************************************
+static void AVR_PortOutput(void)
+{
+char portLetter;
+char getCharFlag;
+
+ PrintFromPROGMEM(gTextMsg_WHAT_PORT, 0);
+
+ portLetter = recchar();
+ portLetter = portLetter & 0x5f;
+ sendchar(portLetter);
+ PrintNewLine();
+
+ if ((portLetter >= 'A') && (portLetter <= 'Z'))
+ {
+ getCharFlag = true;
+ switch(portLetter)
+ {
+ #ifdef DDRA
+ case 'A':
+ DDRA = 0xff;
+ while (!Serial_Available())
+ {
+ PORTA ^= 0xff;
+ delay_ms(200);
+ }
+ PORTA = 0;
+ break;
+ #endif
+
+ #ifdef DDRB
+ case 'B':
+ DDRB = 0xff;
+ while (!Serial_Available())
+ {
+ PORTB ^= 0xff;
+ delay_ms(200);
+ }
+ PORTB = 0;
+ break;
+ #endif
+
+ #ifdef DDRC
+ case 'C':
+ DDRC = 0xff;
+ while (!Serial_Available())
+ {
+ PORTC ^= 0xff;
+ delay_ms(200);
+ }
+ PORTC = 0;
+ break;
+ #endif
+
+ #ifdef DDRD
+ case 'D':
+ DDRD = 0xff;
+ while (!Serial_Available())
+ {
+ PORTD ^= 0xff;
+ delay_ms(200);
+ }
+ PORTD = 0;
+ break;
+ #endif
+
+ #ifdef DDRE
+ case 'E':
+ DDRE = 0xff;
+ while (!Serial_Available())
+ {
+ PORTE ^= 0xff;
+ delay_ms(200);
+ }
+ PORTE = 0;
+ break;
+ #endif
+
+ #ifdef DDRF
+ case 'F':
+ DDRF = 0xff;
+ while (!Serial_Available())
+ {
+ PORTF ^= 0xff;
+ delay_ms(200);
+ }
+ PORTF = 0;
+ break;
+ #endif
+
+ #ifdef DDRG
+ case 'G':
+ DDRG = 0xff;
+ while (!Serial_Available())
+ {
+ PORTG ^= 0xff;
+ delay_ms(200);
+ }
+ PORTG = 0;
+ break;
+ #endif
+
+ #ifdef DDRH
+ case 'H':
+ DDRH = 0xff;
+ while (!Serial_Available())
+ {
+ PORTH ^= 0xff;
+ delay_ms(200);
+ }
+ PORTH = 0;
+ break;
+ #endif
+
+ #ifdef DDRI
+ case 'I':
+ DDRI = 0xff;
+ while (!Serial_Available())
+ {
+ PORTI ^= 0xff;
+ delay_ms(200);
+ }
+ PORTI = 0;
+ break;
+ #endif
+
+ #ifdef DDRJ
+ case 'J':
+ DDRJ = 0xff;
+ while (!Serial_Available())
+ {
+ PORTJ ^= 0xff;
+ delay_ms(200);
+ }
+ PORTJ = 0;
+ break;
+ #endif
+
+ #ifdef DDRK
+ case 'K':
+ DDRK = 0xff;
+ while (!Serial_Available())
+ {
+ PORTK ^= 0xff;
+ delay_ms(200);
+ }
+ PORTK = 0;
+ break;
+ #endif
+
+ #ifdef DDRL
+ case 'L':
+ DDRL = 0xff;
+ while (!Serial_Available())
+ {
+ PORTL ^= 0xff;
+ delay_ms(200);
+ }
+ PORTL = 0;
+ break;
+ #endif
+
+ default:
+ PrintFromPROGMEMln(gTextMsg_PortNotSupported, 0);
+ getCharFlag = false;
+ break;
+ }
+ if (getCharFlag)
+ {
+ recchar();
+ }
+ }
+ else
+ {
+ PrintFromPROGMEMln(gTextMsg_MustBeLetter, 0);
+ }
+}
+
+
+//*******************************************************************
+static void PrintHelp(void)
+{
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_0, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_QM, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_AT, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_B, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_E, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_F, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_H, 0);
+
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_L, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_Q, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_R, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_V, 0);
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_Y, 0);
+}
+
+//************************************************************************
+static void RunMonitor(void)
+{
+char keepGoing;
+unsigned char theChar;
+int ii, jj;
+
+ for (ii=0; ii<5; ii++)
+ {
+ for (jj=0; jj<25; jj++)
+ {
+ sendchar('!');
+ }
+ PrintNewLine();
+ }
+
+ gRamIndex = 0;
+ gFlashIndex = 0;
+ gEepromIndex = 0;
+
+ PrintFromPROGMEMln(gTextMsg_Explorer, 0);
+
+ keepGoing = 1;
+ while (keepGoing)
+ {
+ PrintFromPROGMEM(gTextMsg_Prompt, 0);
+ theChar = recchar();
+ if (theChar >= 0x60)
+ {
+ theChar = theChar & 0x5F;
+ }
+ #if defined( _CEREBOTPLUS_BOARD_ )
+ if (theChar == 0x5F)
+ {
+
+ }
+ else
+ #endif
+ if (theChar >= 0x20)
+ {
+ sendchar(theChar);
+ sendchar(0x20);
+ }
+
+ switch(theChar)
+ {
+ case '0':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_0, 2);
+ gFlashIndex = 0;
+ gRamIndex = 0;
+ gEepromIndex = 0;
+ break;
+
+ case '?':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_QM, 2);
+ PrintCPUstats();
+ break;
+
+ case '@':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_AT, 2);
+ EEPROMtest();
+ break;
+
+ case 'B':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_B, 2);
+ BlinkLED();
+ break;
+
+ case 'E':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_E, 2);
+ DumpHex(kDUMP_EEPROM, gEepromIndex, 16);
+ gEepromIndex += 256;
+ if (gEepromIndex > E2END)
+ {
+ gEepromIndex = 0;
+ }
+ break;
+
+ case 'F':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_F, 2);
+ DumpHex(kDUMP_FLASH, gFlashIndex, 16);
+ gFlashIndex += 256;
+ break;
+
+ case 'H':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_H, 2);
+ PrintHelp();
+ break;
+
+ case 'L':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_L, 2);
+ ListAvailablePorts();
+ break;
+
+ case 'Q':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_Q, 2);
+ keepGoing = false;
+ break;
+
+ case 'R':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_R, 2);
+ DumpHex(kDUMP_RAM, gRamIndex, 16);
+ gRamIndex += 256;
+ break;
+
+ case 'V':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_V, 2);
+ VectorDisplay();
+ break;
+
+ case 'Y':
+ PrintFromPROGMEMln(gTextMsg_HELP_MSG_Y, 2);
+ AVR_PortOutput();
+ break;
+
+ #if defined( _CEREBOTPLUS_BOARD_ )
+ case 0x5F:
+ //* do nothing
+ break;
+ #endif
+
+ default:
+ PrintFromPROGMEMln(gTextMsg_HUH, 0);
+ break;
+ }
+ }
+}
+
+#endif
+
diff --git a/test/ardmake/hardware/bootloaders/stk500v2/stk500boot.ppg b/test/ardmake/hardware/bootloaders/stk500v2/stk500boot.ppg
new file mode 100644
index 0000000..a8929d7
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/stk500v2/stk500boot.ppg
@@ -0,0 +1 @@
+<Workspace name="Bootloader"><Project path="STK500V2.pnproj"></Project></Workspace> \ No newline at end of file
diff --git a/test/ardmake/hardware/bootloaders/stk500v2/stk500boot_v2_mega2560.hex b/test/ardmake/hardware/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
new file mode 100644
index 0000000..4f36699
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
@@ -0,0 +1,513 @@
+:020000023000CC
+:10E000000D94F6F20D941FF30D941FF30D941FF36E
+:10E010000D941FF30D941FF30D941FF30D941FF334
+:10E020000D941FF30D941FF30D941FF30D941FF324
+:10E030000D941FF30D941FF30D941FF30D941FF314
+:10E040000D941FF30D941FF30D941FF30D941FF304
+:10E050000D941FF30D941FF30D941FF30D941FF3F4
+:10E060000D941FF30D941FF30D941FF30D941FF3E4
+:10E070000D941FF30D941FF30D941FF30D941FF3D4
+:10E080000D941FF30D941FF30D941FF30D941FF3C4
+:10E090000D941FF30D941FF30D941FF30D941FF3B4
+:10E0A0000D941FF30D941FF30D941FF30D941FF3A4
+:10E0B0000D941FF30D941FF30D941FF30D941FF394
+:10E0C0000D941FF30D941FF30D941FF30D941FF384
+:10E0D0000D941FF30D941FF30D941FF30D941FF374
+:10E0E0000D941FF341546D65676132353630004140
+:10E0F000726475696E6F206578706C6F72657220DE
+:10E1000073746B3530305632206279204D4C530099
+:10E11000426F6F746C6F616465723E004875683F52
+:10E1200000436F6D70696C6564206F6E20203D2028
+:10E1300000435055205479706520202020203D2038
+:10E14000005F5F4156525F415243485F5F203D2070
+:10E1500000415652204C69624320566572203D2092
+:10E16000004743432056657273696F6E20203D203F
+:10E1700000435055207369676E61747572653D2068
+:10E18000004C6F77206675736520202020203D208D
+:10E1900000486967682066757365202020203D204F
+:10E1A00000457874206675736520202020203D206E
+:10E1B000004C6F636B2066757365202020203D2026
+:10E1C00000536570202039203230313000312E3636
+:10E1D0002E3700342E332E33005623202020414486
+:10E1E00044522020206F7020636F6465202020201F
+:10E1F00020696E737472756374696F6E20616464F4
+:10E2000072202020496E74657272757074006E6F92
+:10E2100020766563746F7200726A6D702020006AE8
+:10E220006D7020005768617420706F72743A0050EE
+:10E230006F7274206E6F7420737570706F72746576
+:10E2400064004D7573742062652061206C65747480
+:10E2500065720020005772697474696E67204545C5
+:10E260000052656164696E6720454500656570729E
+:10E270006F6D206572726F7220636F756E743D00F2
+:10E28000504F525400303D5A65726F206164647281
+:10E290006573732063747273003F3D435055207360
+:10E2A0007461747300403D454550524F4D20746574
+:10E2B000737400423D426C696E6B204C45440045CE
+:10E2C0003D44756D7020454550524F4D00463D44CC
+:10E2D000756D7020464C41534800483D48656C7050
+:10E2E000004C3D4C69737420492F4F20506F72745D
+:10E2F0007300513D517569742026206A756D702038
+:10E30000746F20757365722070676D00523D44759F
+:10E310006D702052414D00563D73686F7720696ED5
+:10E320007465727275707420566563746F727300D1
+:10E33000593D506F727420626C696E6B002A0052F6
+:10E340004553455400494E543000494E543100491C
+:10E350004E543200494E543300494E543400494E15
+:10E36000543500494E543600494E54370050434905
+:10E370004E5430005043494E5431005043494E549E
+:10E3800032005744540054494D45523020434F4DBC
+:10E3900050410054494D45523020434F4D504200AA
+:10E3A00054494D455230204F56460054494D455230
+:10E3B0003120434150540054494D45523120434F80
+:10E3C0004D50410054494D45523120434F4D50422C
+:10E3D0000054494D45523120434F4D50430054495C
+:10E3E0004D455231204F56460054494D455232203A
+:10E3F000434F4D50410054494D45523220434F4DFB
+:10E4000050420054494D455232204F56460054491F
+:10E410004D45523320434150540054494D455233E9
+:10E4200020434F4D50410054494D45523320434FF6
+:10E430004D50420054494D45523320434F4D5043B7
+:10E440000054494D455233204F56460054494D45DE
+:10E45000523420434150540054494D4552342043D6
+:10E460004F4D50410054494D45523420434F4D507B
+:10E47000420054494D45523420434F4D50430054BF
+:10E48000494D455234204F56460054494D4552356A
+:10E4900020434150540054494D45523520434F4D7F
+:10E4A00050410054494D45523520434F4D50420094
+:10E4B00054494D45523520434F4D50430054494D2A
+:10E4C000455235204F564600555341525430205244
+:10E4D000580055534152543020554452450055532D
+:10E4E0004152543020545800555341525431205217
+:10E4F000580055534152543120554452450055530C
+:10E5000041525431205458005553415254322052F4
+:10E5100058005553415254322055445245005553EA
+:10E5200041525432205458005553415254332052D2
+:10E5300058005553415254332055445245005553C9
+:10E5400041525433205458005350492053544300EF
+:10E5500041444300414E414C4F4720434F4D5000F2
+:10E560004545205245414459005457490053504DA8
+:10E57000205245414459002A003FE345E34AE34F16
+:10E58000E354E359E35EE363E368E36DE374E37B41
+:10E59000E382E3E9E3F6E303E4ABE3B7E3C4E3D107
+:10E5A000E3DEE386E393E3A0E348E5C8E4D2E4DEF8
+:10E5B000E454E550E560E50EE41AE427E434E44170
+:10E5C000E4E8E4F2E4FEE469E56DE54CE458E46572
+:10E5D000E472E47FE48AE496E4A3E4B0E4BDE408F2
+:10E5E000E512E51EE528E532E53EE50011241FBEF3
+:10E5F000CFEFD1E2DEBFCDBF01E00CBF12E0A0E063
+:10E60000B2E0EAEDFFEF03E00BBF02C007900D920E
+:10E61000A030B107D9F712E0A0E0B2E001C01D922E
+:10E62000AC30B107E1F70F94FBF40D94EBFF01E27E
+:10E630000EBF0FEF0DBF11241FBE0D94FBF40D9400
+:10E6400000F020E030E040ED57E005C0FA013197DE
+:10E65000F1F72F5F3F4F28173907C0F308959C014A
+:10E66000442737FD4095542FDA01C901860F911DCB
+:10E67000A11DB11DABBFFC018791882369F0809378
+:10E68000C6008091C00086FFFCCF8091C0008064EE
+:10E690008093C0006F5FE8CF08958DE08093C6003F
+:10E6A0008091C00086FFFCCF8091C0008064809381
+:10E6B000C0008AE08093C6008091C00086FFFCCF36
+:10E6C0008091C00080648093C00008950F942FF360
+:10E6D0000F944DF30895FC019081992359F0909384
+:10E6E000C6008091C00086FFFCCF8091C00080648E
+:10E6F0008093C0003196992379F70895282F982F99
+:10E7000092959F70892F805D8A3308F0895F80938E
+:10E71000C6008091C00086FFFCCF8091C00080645D
+:10E720008093C000822F8F70982F905D9A3308F0ED
+:10E73000995F9093C6008091C00086FFFCCF8091C6
+:10E74000C00080648093C00008959C01FB01853661
+:10E7500091051CF46330710594F0C90164E670E022
+:10E760000F948CFF605D7F4F6093C6008091C00066
+:10E7700086FFFCCF8091C00080648093C0002B3066
+:10E78000310514F43297B4F0C90164E670E00F94D7
+:10E790008CFF6AE070E00F948CFF605D7F4F6093A8
+:10E7A000C6008091C00086FFFCCF8091C0008064CD
+:10E7B0008093C000C9016AE070E00F948CFFC0969E
+:10E7C0008093C6008091C00086FFFCCF8091C0007E
+:10E7D00080648093C0000895282F277020642093C0
+:10E7E0007C0020917B0086958695869590E08170CF
+:10E7F000907033E0880F991F3A95E1F7277F282B17
+:10E8000020937B0080917A00806480937A008091CD
+:10E810007A0086FDFCCF2091780040917900942FFA
+:10E8200080E030E0282B392BC90108951F93182F61
+:10E8300080E892EE60E00F942FF31093C600809171
+:10E84000C00086FFFCCF8091C00080648093C00030
+:10E850000F944DF31F9108952F923F924F925F9224
+:10E860006F927F928F929F92AF92BF92CF92DF92E0
+:10E87000EF92FF920F931F93DF93CF93CDB7DEB745
+:10E8800062970FB6F894DEBF0FBECDBF382E622E52
+:10E89000CA01DB015C016D01772460E2262E2E01A6
+:10E8A0000894411C511C8BC081E0A81680E0B8067A
+:10E8B00081E0C80680E0D80628F0C601AA27BB2759
+:10E8C0000F947EF3BB27AD2D9C2D8B2D0F947EF3E3
+:10E8D0008A2D0F947EF32092C6008091C00086FF9F
+:10E8E000FCCF8091C00080648093C0009DE2909333
+:10E8F000C6008091C00086FFFCCF8091C00080647C
+:10E900008093C0002092C6008091C00086FFFCCF9B
+:10E910008091C00080648093C000198286017501D7
+:10E9200088249924A1E03A1651F03A1620F0B2E07A
+:10E930003B1661F409C00BBFF701779007C0C70110
+:10E940000F94D5FF782E02C0F7017080872D0F94A9
+:10E950007EF32092C6008091C00086FFFCCF80919C
+:10E96000C00080648093C000872D8052F401EF7056
+:10E97000F0708F3520F4E40DF51D708204C0E40DB5
+:10E98000F51D8EE280830894E11CF11C011D111D10
+:10E990000894811C911C90E18916910409F0C2CF62
+:10E9A00080E190E0A0E0B0E0A80EB91ECA1EDB1E18
+:10E9B000198AC2010F946BF30F944DF36A94662089
+:10E9C00009F072CF62960FB6F894DEBF0FBECDBFCE
+:10E9D000CF91DF911F910F91FF90EF90DF90CF903B
+:10E9E000BF90AF909F908F907F906F905F904F906F
+:10E9F0003F902F9008952F923F924F925F926F9287
+:10EA00007F928F929F92AF92BF92CF92DF92EF92BE
+:10EA1000FF920F931F93DF93CF93CDB7DEB7CD5304
+:10EA2000D1400FB6F894DEBF0FBECDBF279A2F9A04
+:10EA30008091C00082608093C00080E18093C40018
+:10EA400088E18093C1000000EE24FF248701B4E038
+:10EA5000AB2EB12CCC24DD2424C0C5010197F1F7E5
+:10EA60000894E11CF11C011D111D21E2E2162EE4A7
+:10EA7000F20620E0020720E0120718F0A1E0CA2EFB
+:10EA8000D12CC801B70128E53BE140E050E00F94EC
+:10EA90009FFF611571058105910519F485B18058B5
+:10EAA00085B98091C00087FD03C0C114D104A9F2CB
+:10EAB000A6014F5F5F4FC25EDE4F59834883CE5140
+:10EAC000D140C25EDE4F68817981CE51D140613044
+:10EAD000710511F00D946EFFC05DDE4F1982188232
+:10EAE000C053D14060E0C15DDE4F1882CF52D140AB
+:10EAF000AA24BB24C05EDE4F188219821A821B82B0
+:10EB0000C052D140CE5CDE4F188219821A821B821D
+:10EB1000C253D14080E090E0A0E0B0E0ABBFFC0188
+:10EB2000A791B691C45CDE4FB983A883CC53D14082
+:10EB30000D9469FFC25EDE4FE881F981CE51D1406C
+:10EB4000319709F52091C600C25EDE4F1982188206
+:10EB5000CE51D14022C02F5F3F4F4F4F5F4F2130EA
+:10EB6000F2E13F07FAE74F07F0E05F0780F0C45C8F
+:10EB7000DE4F08811981CC53D1400F5F1F4F19F030
+:10EB8000EE27FF27099420E030E040E050E080913C
+:10EB9000C00087FFE0CF2091C600213209F094C663
+:10EBA0000894A11CB11C33E0A316B10409F08EC671
+:10EBB00000E010E018C041E24093C6008091C00020
+:10EBC00086FFFCCF8091C00080648093C0002F5FDF
+:10EBD0003F4F2931310579F70F944DF30F5F1F4FE8
+:10EBE0000530110519F020E030E0E5CF1092080261
+:10EBF0001092090210920A0210920B021092040263
+:10EC00001092050210920602109207021092000262
+:10EC10001092010210920202109203028FEE90EE07
+:10EC200060E00F9466F380E191EE60E00F942FF3C3
+:10EC30008091C00087FFFCCF9091C600903608F00D
+:10EC40009F759032B8F09093C6008091C00086FF07
+:10EC5000FCCF8091C00080648093C00080E28093EC
+:10EC6000C6008091C00086FFFCCF8091C000806408
+:10EC70008093C000983409F4DBC19934B8F492341D
+:10EC800009F45DC1933458F4903319F1903308F4CA
+:10EC900018C69F33A1F1903409F013C6BDC0953456
+:10ECA00009F474C1963409F00CC69CC1923509F47C
+:10ECB0002FC2933538F49C3409F4F9C1913509F029
+:10ECC00000C61CC2963509F449C2993509F0F9C548
+:10ECD0009CC485E892EE62E00F9466F31092040201
+:10ECE000109205021092060210920702109208027A
+:10ECF0001092090210920A0210920B0217C189E9C0
+:10ED000092EE62E00F9466F38FEE90EE60E00F9467
+:10ED100066F381E291EE60E00F942FF381EC91EEC7
+:10ED200060E00F9466F381E391EE60E00F942FF3BF
+:10ED300084EE90EE60E00F9466F381E491EE60E083
+:10ED40000F942FF386E090E061E070E00F94A5F35C
+:10ED50000F944DF381E691EE60E00F942FF383ED75
+:10ED600091EE60E00F9466F381E591EE60E00F9420
+:10ED70002FF38DEC91EE60E00F9466F381E791EE56
+:10ED800060E00F942FF38EE10F947EF388E90F94E7
+:10ED90007EF381E00F947EF30F944DF381E891EEC2
+:10EDA00060E00F942FF319E0E0E0F0E010935700DB
+:10EDB000E4918E2F0F947EF30F944DF381E991EE41
+:10EDC00060E00F942FF3E3E0F0E010935700E4913C
+:10EDD0008E2F0F947EF30F944DF381EA91EE60E055
+:10EDE0000F942FF3E2E0F0E010935700E4918E2FA0
+:10EDF0000F947EF30F944DF381EB91EE60E00F944E
+:10EE00002FF3E1E0F0E0109357001491812F0F945D
+:10EE10007EF30F944DF307CF85EA92EE62E00F94F4
+:10EE200066F385E592EE60E00F9466F30F944DF380
+:10EE300000E010E019C0C8016F2D0F94DDFFFF2026
+:10EE400031F483E592EE60E00F942FF30BC0F09263
+:10EE5000C6008091C00086FFFCCF8091C000806416
+:10EE60008093C0000F5F1F4FC80181519F41AA27A7
+:10EE700097FDA095BA2FABBFFC01F7905AE2F516AB
+:10EE800021F062E000301607B1F60F944DF30F94B5
+:10EE90004DF381E692EE60E00F9466F30F944DF32C
+:10EEA000CC24DD2400E010E01EC0C8010F94D5FF83
+:10EEB000F82E882331F483E592EE60E00F942FF36F
+:10EEC0000BC08093C6008091C00086FFFCCF80916C
+:10EED000C00080648093C000FE1419F00894C11C27
+:10EEE000D11C0F5F1F4FC80181519F41AA2797FD79
+:10EEF000A095BA2FABBFFC01E7907AE2E71621F0AC
+:10EF000082E00030180789F60F944DF30F944DF30B
+:10EF10008CE692EE60E00F942FF3C60161E070E0A2
+:10EF20000F94A5F30F944DF30F944DF3109200023C
+:10EF300010920102109202021092030274CE83EB2F
+:10EF400092EE62E00F9466F3279A2F9A16C02F98DC
+:10EF500080E090E0E0EDF7E03197F1F7019684363C
+:10EF60009105C1F72F9A80E090E0E0EDF7E031974E
+:10EF7000F1F7019684369105C1F78091C00087FFB3
+:10EF8000E6CF8091C00087FFFCCF95C48FEB92EE57
+:10EF900062E00F9466F3409100025091010260918B
+:10EFA00002027091030281E020E10F942CF4809121
+:10EFB000000290910102A0910202B09103028050E0
+:10EFC0009F4FAF4FBF4F8093000290930102A093D9
+:10EFD0000202B093030280509041A040B04008F478
+:10EFE00022CEA4CF8DEC92EE62E00F9466F34091B6
+:10EFF000040250910502609106027091070280E0C0
+:10F0000020E10F942CF48091040290910502A091CC
+:10F010000602B091070280509F4FAF4FBF4F8093C1
+:10F02000040290930502A0930602B0930702FBCD61
+:10F030008AED92EE62E00F9466F385E892EE60E06E
+:10F040000F9466F389E992EE60E00F9466F385EA27
+:10F0500092EE60E00F9466F383EB92EE60E00F9423
+:10F0600066F38FEB92EE60E00F9466F38DEC92EE18
+:10F0700060E00F9466F38AED92EE60E00F9466F321
+:10F0800081EE92EE60E00F9466F382EF92EE60E024
+:10F090000F9466F38CE093EE60E00F9466F387E1E3
+:10F0A00093EE60E00F9466F380E393EEB9CD81EECA
+:10F0B00092EE62E00F9466F381E40F9416F482E41A
+:10F0C0000F9416F483E40F9416F484E40F9416F46A
+:10F0D00085E40F9416F486E40F9416F487E40F94F5
+:10F0E00016F488E40F9416F48AE40F9416F48BE473
+:10F0F0000F9416F48CE40F9416F495CD82EF92EEF3
+:10F1000062E00F9466F399249394AA24BB2445C427
+:10F110008CE093EE62E00F9466F340910802509108
+:10F12000090260910A0270910B0282E020E10F94C3
+:10F130002CF48091080290910902A0910A02B091EA
+:10F140000B0280509F4FAF4FBF4F809308029093A8
+:10F150000902A0930A02B0930B0265CD87E193EEFA
+:10F1600062E00F9466F384EE90EE60E00F9466F335
+:10F1700089ED91EE60E00F9466F309E715EECC5D42
+:10F18000DE4F19830883C452D1406624772443019B
+:10F19000CA5DDE4F19821882C652D140A401930184
+:10F1A0005695479537952795C85DDE4F2883398357
+:10F1B0004A835B83C852D140CA5DDE4F4881598182
+:10F1C000C652D1404F5F5F4FCA5DDE4F59834883BF
+:10F1D000C652D140CA0162E070E00F94A5F350E23C
+:10F1E0005093C6008091C00086FFFCCF8091C00084
+:10F1F00080648093C0006DE26093C6008091C0007F
+:10F2000086FFFCCF8091C00080648093C00070E2D4
+:10F210007093C6008091C00086FFFCCF8091C00033
+:10F2200080648093C000C85DDE4FE880F9800A8169
+:10F230001B81C852D140BB27A12F902F8F2D0F9437
+:10F240007EF3C85DDE4F8881C852D1400F947EF3B3
+:10F2500070E2F72EF092C6008091C00086FFFCCFCE
+:10F260008091C00080648093C0000DE30093C600CD
+:10F270008091C00086FFFCCF8091C00080648093A5
+:10F28000C00010E21093C6008091C00086FFFCCF42
+:10F290008091C00080648093C0008BBEF3012791F1
+:10F2A000C45DDE4F2883CC52D140A22EBB24CC2497
+:10F2B000DD240894611C711C811C911C8BBEF30120
+:10F2C0008791282E332444245524142D032DF22C09
+:10F2D000EE24EA0CFB1C0C1D1D1D0894611C711C06
+:10F2E000811C911C8BBEF3013791C35DDE4F3883C7
+:10F2F000CD52D1400894611C711C811C911C8BBEA5
+:10F30000F3014791C25DDE4F4883CE52D1402DEFCD
+:10F310003FEF4FEF5FEF620E731E841E951E0F943A
+:10F320007EF330E23093C6008091C00086FFFCCFB0
+:10F330008091C00080648093C000C45DDE4F8881EE
+:10F34000CC52D1400F947EF340E24093C6008091AE
+:10F35000C00086FFFCCF8091C00080648093C00015
+:10F36000C25DDE4F8881CE52D1400F947EF350E2D1
+:10F370005093C6008091C00086FFFCCF8091C000F2
+:10F3800080648093C000C35DDE4F8881CD52D14040
+:10F390000F947EF360E26093C6008091C00086FF08
+:10F3A000FCCF8091C00080648093C0007FEFE7169F
+:10F3B0007FEFF70670E0070770E0170731F48EE083
+:10F3C00092EE60E00F942FF3DFC0D801C701807088
+:10F3D000907CA070B0708050904CA040B040D1F5AF
+:10F3E0002FEF3FE340E050E0E222F3220423152315
+:10F3F000C85DDE4FA880B980CA80DB80C852D1408A
+:10F40000AE0CBF1CC01ED11EAA0CBB1CCC1CDD1C2C
+:10F4100088E192EE60E00F942FF3BB27A12F902F8D
+:10F420008F2D0F947EF38E2D0F947EF330E2309368
+:10F43000C6008091C00086FFFCCF8091C000806430
+:10F440008093C0004EE34093C6008091C00086FFC9
+:10F45000FCCF87C06EE07EEF80E090E0E622F722EE
+:10F46000082319237CE0E71674E9F70670E0070724
+:10F4700070E0170709F088C0C25DDE4F8881CE5268
+:10F48000D140E82EFF2400E010E0102F0F2DFE2CBD
+:10F49000EE24C35DDE4F9881CD52D140E90EF11CC0
+:10F4A000011D111DD601C50181709070A070B07052
+:10F4B000DC0199278827E80EF91E0A1F1B1F20EF81
+:10F4C00030E040E050E0A222B322C422D522F1E194
+:10F4D000AA0CBB1CCC1CDD1CFA95D1F7EA0CFB1C5A
+:10F4E0000C1D1D1D41E050E060E070E0242235223B
+:10F4F00046225722E5E1220C331C441C551CEA9598
+:10F50000D1F7E20CF31C041D151D57016801AA0C6C
+:10F51000BB1CCC1CDD1C8FE192EE60E00F942FF33E
+:10F52000C801AA27BB270F947EF3BB27A12F902FDA
+:10F530008F2D0F947EF38E2D0F947EF350E2509317
+:10F54000C6008091C00086FFFCCF8091C00080641F
+:10F550008093C0006EE36093C6008091C00086FF78
+:10F56000FCCF8091C00080648093C000C601AA27B0
+:10F57000BB270F947EF3BB27AD2D9C2D8B2D0F94B5
+:10F580007EF38A2D0F947EF370E27093C600809113
+:10F59000C00086FFFCCF8091C00080648093C000D3
+:10F5A000CC5DDE4FE881F981C452D140CF01AA275A
+:10F5B00097FDA095BA2FABBFFC018791969160E0B3
+:10F5C0000F942FF30F944DF3CC5DDE4F088119811A
+:10F5D000C452D1400E5F1F4FCC5DDE4F19830883AC
+:10F5E000C452D140CA5DDE4F28813981C652D14014
+:10F5F0002933310509F417CB44E050E060E070E0B6
+:10F60000640E751E861E971EC9CD80E393EE62E0E0
+:10F610000F9466F384E292EE60E00F942FF38091F2
+:10F62000C00087FFFCCF1091C6001F751093C60065
+:10F630008091C00086FFFCCF8091C00080648093E1
+:10F64000C0000F944DF3812F81548A3108F036C1E8
+:10F65000163409F495C0173490F4133409F44EC0ED
+:10F66000143430F41134F1F0123409F01DC130C0FB
+:10F67000143409F459C0153409F016C16BC01A349A
+:10F6800009F4C4C01B3438F4173409F48FC018349B
+:10F6900009F00AC1A1C01B3409F4D2C01C3409F01E
+:10F6A00003C1E8C08FEF81B90DC082B1809582B9E6
+:10F6B00080E090E0E0EDF7E03197F1F70196883CCB
+:10F6C0009105C1F78091C00087FFEFCF12B8EFC05E
+:10F6D0008FEF84B90DC085B1809585B980E090E049
+:10F6E000E0EDF7E03197F1F70196883C9105C1F71D
+:10F6F0008091C00087FFEFCF15B8D9C08FEF87B9D1
+:10F700000DC088B1809588B980E090E0E0EDF7E029
+:10F710003197F1F70196883C9105C1F78091C000BF
+:10F7200087FFEFCF18B8C3C08FEF8AB90DC08BB178
+:10F7300080958BB980E090E0E0EDF7E03197F1F74C
+:10F740000196883C9105C1F78091C00087FFEFCFFB
+:10F750001BB8ADC08FEF8DB90DC08EB180958EB93D
+:10F7600080E090E0E0EDF7E03197F1F70196883C1A
+:10F770009105C1F78091C00087FFEFCF1EB897C0F9
+:10F780008FEF80BB0DC081B3809581BB80E090E09E
+:10F79000E0EDF7E03197F1F70196883C9105C1F76C
+:10F7A0008091C00087FFEFCF11BA81C08FEF83BB7C
+:10F7B0000DC084B3809584BB80E090E0E0EDF7E07D
+:10F7C0003197F1F70196883C9105C1F78091C0000F
+:10F7D00087FFEFCF14BA6BC08FEF809301010FC08A
+:10F7E0008091020180958093020180E090E0E0ED3D
+:10F7F000F7E03197F1F70196883C9105C1F78091C8
+:10F80000C00087FFEDCF1092020151C08FEF8093AF
+:10F8100004010FC08091050180958093050180E06F
+:10F8200090E0E0EDF7E03197F1F70196883C910523
+:10F83000C1F78091C00087FFEDCF1092050137C05E
+:10F840008FEF809307010FC080910801809580930E
+:10F85000080180E090E0E0EDF7E03197F1F70196E4
+:10F86000883C9105C1F78091C00087FFEDCF1092D1
+:10F8700008011DC08FEF80930A010FC080910B011A
+:10F88000809580930B0180E090E0E0EDF7E0319708
+:10F89000F1F70196883C9105C1F78091C00087FF80
+:10F8A000EDCF10920B0103C08FE292EEB9C98091A7
+:10F8B000C00087FFFCCF8091C600B5C982E492EEFC
+:10F8C000AFC98CE191EEACC9AA24BB24933061F19D
+:10F8D000943028F4913089F0923008F508C09530C2
+:10F8E000B1F1953040F1963009F053C04EC02B3144
+:10F8F00009F020C991E06BE11DC9213041F0C15DE3
+:10F90000DE4F5881CF52D140251709F002C362273C
+:10F91000C15DDE4F2883CF52D14092E00BC9B22F98
+:10F92000A0E0622793E006C9822F90E0A82BB92BB4
+:10F93000622794E0FFC82E3009F0EBC2622795E001
+:10F94000C05DDE4F19821882C053D140F3C8E1E098
+:10F95000F0E0EC0FFD1FC05DDE4FE880F980C05382
+:10F96000D140EE0DFF1D208387010F5F1F4FC05D4B
+:10F97000DE4F19830883C053D14062270A171B0743
+:10F9800009F0D8C8D80196E0D5C8261709F0C1C239
+:10F9900003C0973009F0CEC899248981833109F4D6
+:10F9A000FCC08431C8F4863009F4C2C0873050F4FA
+:10F9B000823009F4F0C0833009F458C0813009F076
+:10F9C0000AC23EC0813109F462C0823108F0A6C08B
+:10F9D000803109F000C2DFC0883109F472C089317A
+:10F9E00050F4853109F4D9C0853108F477C18631E6
+:10F9F00009F0F1C173C18A3109F457C08A3108F4A2
+:10FA00007CC08B3109F446C08D3109F0E4C18D8191
+:10FA1000803311F090E00AC08F81882311F49EE1B9
+:10FA200005C0813011F091E001C098E91A821B8273
+:10FA30008D818C831D829E831F8227E030E0CFC1A1
+:10FA40001A8288E08B8381E48C8386E58D8382E54E
+:10FA50008E8389E48F8383E5888780E589878FE5B6
+:10FA60008A8782E38B872BE030E0B9C18A818139B4
+:10FA700041F0823941F0803911F48FE005C080E017
+:10FA800003C082E001C08AE01A828B8344C09924BB
+:10FA9000939481C08D81882311F48EE12CC0813034
+:10FAA00011F081E028C088E926C01A82E1E0F0E088
+:10FAB00089E08093570084918B831C8224E030E09E
+:10FAC0008EC18B81803589F48C81883039F4E2E0F5
+:10FAD000F0E089E08093570084910DC0E0E0F0E011
+:10FAE00089E080935700849106C0E3E0F0E089E06C
+:10FAF0008093570084911A82DFCF8D81836C99E0C7
+:10FB0000E1E0F0E0082E90935700E89507B600FC7E
+:10FB1000FDCF1A821B8223E030E061C11A82CE5CE5
+:10FB2000DE4F188219821A821B82C253D14055C1FE
+:10FB30008A8190E0A0E0B0E0582F442733272227A5
+:10FB40008B8190E0A0E0B0E0DC0199278827282B8A
+:10FB5000392B4A2B5B2B8D8190E0A0E0B0E0282B65
+:10FB6000392B4A2B5B2B8C8190E0A0E0B0E0BA2FC0
+:10FB7000A92F982F8827282B392B4A2B5B2B220F54
+:10FB8000331F441F551FC05EDE4F288339834A83CD
+:10FB90005B83C052D1401A8220C19A812B8183316C
+:10FBA00049F0C05EDE4F488159816A817B81C05235
+:10FBB000D1408AC0CE5CDE4F488159816A817B8109
+:10FBC000C253D140403080EC580783E0680780E0A2
+:10FBD0007807F0F483E0FA0160935B0080935700AC
+:10FBE000E89507B600FCFDCFCE5CDE4F4881598119
+:10FBF0006A817B81C253D14040505F4F6F4F7F4F2E
+:10FC0000CE5CDE4F488359836A837B83C253D140E5
+:10FC1000C95CDE4F9883C753D140CA5CDE4F18825F
+:10FC2000C653D140022F10E0CA5CDE4F6881798153
+:10FC3000C653D140062B172BC05EDE4F4881598139
+:10FC40006A817B81C052D140DE011B9631E08C91EC
+:10FC500011962C9111971296C75CDE4F2883C953D9
+:10FC6000D140C85CDE4F1882C853D14090E0C85CD8
+:10FC7000DE4FE881F981C853D1408E2B9F2B0C01B8
+:10FC8000FA0160935B0030935700E89511244E5FB2
+:10FC90005F4F6F4F7F4F02501040C9F685E0C05E46
+:10FCA000DE4FE880F9800A811B81C052D140F70104
+:10FCB00000935B0080935700E89507B600FCFDCFEA
+:10FCC00081E180935700E8951A82C05EDE4F488339
+:10FCD00059836A837B83C052D1407FC0FA80C55C60
+:10FCE000DE4FF882CB53D140C65CDE4F1882CA5338
+:10FCF000D1408B81C82EDD24C65CDE4F088119817E
+:10FD0000CA53D140C02AD12A1A828981BE016D5FAF
+:10FD10007F4F843121F59601C05EDE4FE880F98087
+:10FD20000A811B81C052D1400BBFF7018791969188
+:10FD3000DB018C9311969C936E5F7F4FD801C701B6
+:10FD40000296A11DB11DC05EDE4F88839983AA83F0
+:10FD5000BB83C052D14022503040F1F636C0C05E65
+:10FD6000DE4F288139814A815B81C052D14008949D
+:10FD7000C108D108760100E010E00894C11CD11C34
+:10FD80000894E11CF11C011D111DE20EF31E041F5D
+:10FD9000151F21BDBB27A52F942F832F82BD2F5F59
+:10FDA0003F4F4F4F5F4FF89A80B5DB018D93BD01F8
+:10FDB0002E153F054007510761F7C05EDE4F2883CF
+:10FDC00039834A835B83C052D14096012D5F3F4FF8
+:10FDD000FB01108204C080EC8A8322E030E08BE1DA
+:10FDE0008093C6008091C00086FFFCCF8091C00048
+:10FDF00080648093C000C15DDE4FF881CF52D14056
+:10FE0000F093C6008091C00086FFFCCF8091C000B7
+:10FE100080648093C000432F3093C6008091C0005F
+:10FE200086FFFCCF8091C00080648093C000922F39
+:10FE30002093C6008091C00086FFFCCF8091C00057
+:10FE400080648093C0008EE08093C6008091C000E3
+:10FE500086FFFCCF8091C00080648093C00065E184
+:10FE6000C15DDE4FE880CF52D1406E2569276427FF
+:10FE7000FE01319610C090819093C6008091C00021
+:10FE800086FFFCCF31968091C00080648093C000D3
+:10FE90006927215030402115310569F76093C6006C
+:10FEA0008091C00086FFFCCF8091C0008064809369
+:10FEB000C00085B1805885B9992081F4C15DDE4FBD
+:10FEC0000881CF52D1400F5FC15DDE4F0883CF5212
+:10FED000D14090E0A0E0B0E00D949AF527982F98DB
+:10FEE00080E090E020ED37E0F9013197F1F70196DD
+:10FEF00084369105C9F700008091C0008D7F809302
+:10FF0000C00081E180935700E895EE27FF27099410
+:10FF1000FFCF90E00D949AF597FB092E07260AD0A3
+:10FF200077FD04D02ED006D000201AF4709561958C
+:10FF30007F4F0895F6F7909581959F4F0895A1E220
+:10FF40001A2EAA1BBB1BFD010DC0AA1FBB1FEE1F53
+:10FF5000FF1FA217B307E407F50720F0A21BB30B9E
+:10FF6000E40BF50B661F771F881F991F1A9469F71A
+:10FF700060957095809590959B01AC01BD01CF0176
+:10FF80000895AA1BBB1B51E107C0AA1FBB1FA617E0
+:10FF9000B70710F0A61BB70B881F991F5A95A9F732
+:10FFA00080959095BC01CD010895F999FECF92BD41
+:10FFB00081BDF89A992780B50895262FF999FECF2B
+:10FFC0001FBA92BD81BD20BD0FB6F894FA9AF99A76
+:0AFFD0000FBE01960895F894FFCFCC
+:040000033000E000E9
+:00000001FF
diff --git a/test/ardmake/hardware/cores/arduino/HardwareSerial.cpp b/test/ardmake/hardware/cores/arduino/HardwareSerial.cpp
new file mode 100644
index 0000000..4397efb
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/HardwareSerial.cpp
@@ -0,0 +1,303 @@
+/*
+ HardwareSerial.cpp - Hardware serial library for Wiring
+ Copyright (c) 2006 Nicholas Zambetti. All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Modified 23 November 2006 by David A. Mellis
+ Modified 28 September 2010 by Mark Sproul
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <inttypes.h>
+#include "wiring.h"
+#include "wiring_private.h"
+
+// this next line disables the entire HardwareSerial.cpp,
+// this is so I can support Attiny series and any other chip without a uart
+#if defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H)
+
+#include "HardwareSerial.h"
+
+// Define constants and variables for buffering incoming serial data. We're
+// using a ring buffer (I think), in which rx_buffer_head is the index of the
+// location to which to write the next incoming character and rx_buffer_tail
+// is the index of the location from which to read.
+#if (RAMEND < 1000)
+ #define RX_BUFFER_SIZE 32
+#else
+ #define RX_BUFFER_SIZE 128
+#endif
+
+struct ring_buffer
+{
+ unsigned char buffer[RX_BUFFER_SIZE];
+ int head;
+ int tail;
+};
+
+#if defined(UBRRH) || defined(UBRR0H)
+ ring_buffer rx_buffer = { { 0 }, 0, 0 };
+#endif
+#if defined(UBRR1H)
+ ring_buffer rx_buffer1 = { { 0 }, 0, 0 };
+#endif
+#if defined(UBRR2H)
+ ring_buffer rx_buffer2 = { { 0 }, 0, 0 };
+#endif
+#if defined(UBRR3H)
+ ring_buffer rx_buffer3 = { { 0 }, 0, 0 };
+#endif
+
+inline void store_char(unsigned char c, ring_buffer *rx_buffer)
+{
+ int i = (unsigned int)(rx_buffer->head + 1) % RX_BUFFER_SIZE;
+
+ // if we should be storing the received character into the location
+ // just before the tail (meaning that the head would advance to the
+ // current location of the tail), we're about to overflow the buffer
+ // and so we don't write the character or advance the head.
+ if (i != rx_buffer->tail) {
+ rx_buffer->buffer[rx_buffer->head] = c;
+ rx_buffer->head = i;
+ }
+}
+
+#if defined(USART_RX_vect)
+ SIGNAL(USART_RX_vect)
+ {
+ #if defined(UDR0)
+ unsigned char c = UDR0;
+ #elif defined(UDR)
+ unsigned char c = UDR; // atmega8535
+ #else
+ #error UDR not defined
+ #endif
+ store_char(c, &rx_buffer);
+ }
+#elif defined(SIG_USART0_RECV) && defined(UDR0)
+ SIGNAL(SIG_USART0_RECV)
+ {
+ unsigned char c = UDR0;
+ store_char(c, &rx_buffer);
+ }
+#elif defined(SIG_UART0_RECV) && defined(UDR0)
+ SIGNAL(SIG_UART0_RECV)
+ {
+ unsigned char c = UDR0;
+ store_char(c, &rx_buffer);
+ }
+//#elif defined(SIG_USART_RECV)
+#elif defined(USART0_RX_vect)
+ // fixed by Mark Sproul this is on the 644/644p
+ //SIGNAL(SIG_USART_RECV)
+ SIGNAL(USART0_RX_vect)
+ {
+ #if defined(UDR0)
+ unsigned char c = UDR0;
+ #elif defined(UDR)
+ unsigned char c = UDR; // atmega8, atmega32
+ #else
+ #error UDR not defined
+ #endif
+ store_char(c, &rx_buffer);
+ }
+#elif defined(SIG_UART_RECV)
+ // this is for atmega8
+ SIGNAL(SIG_UART_RECV)
+ {
+ #if defined(UDR0)
+ unsigned char c = UDR0; // atmega645
+ #elif defined(UDR)
+ unsigned char c = UDR; // atmega8
+ #endif
+ store_char(c, &rx_buffer);
+ }
+#elif defined(USBCON)
+ #warning No interrupt handler for usart 0
+ #warning Serial(0) is on USB interface
+#else
+ #error No interrupt handler for usart 0
+#endif
+
+//#if defined(SIG_USART1_RECV)
+#if defined(USART1_RX_vect)
+ //SIGNAL(SIG_USART1_RECV)
+ SIGNAL(USART1_RX_vect)
+ {
+ unsigned char c = UDR1;
+ store_char(c, &rx_buffer1);
+ }
+#elif defined(SIG_USART1_RECV)
+ #error SIG_USART1_RECV
+#endif
+
+#if defined(USART2_RX_vect) && defined(UDR2)
+ SIGNAL(USART2_RX_vect)
+ {
+ unsigned char c = UDR2;
+ store_char(c, &rx_buffer2);
+ }
+#elif defined(SIG_USART2_RECV)
+ #error SIG_USART2_RECV
+#endif
+
+#if defined(USART3_RX_vect) && defined(UDR3)
+ SIGNAL(USART3_RX_vect)
+ {
+ unsigned char c = UDR3;
+ store_char(c, &rx_buffer3);
+ }
+#elif defined(SIG_USART3_RECV)
+ #error SIG_USART3_RECV
+#endif
+
+
+
+// Constructors ////////////////////////////////////////////////////////////////
+
+HardwareSerial::HardwareSerial(ring_buffer *rx_buffer,
+ volatile uint8_t *ubrrh, volatile uint8_t *ubrrl,
+ volatile uint8_t *ucsra, volatile uint8_t *ucsrb,
+ volatile uint8_t *udr,
+ uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udre, uint8_t u2x)
+{
+ _rx_buffer = rx_buffer;
+ _ubrrh = ubrrh;
+ _ubrrl = ubrrl;
+ _ucsra = ucsra;
+ _ucsrb = ucsrb;
+ _udr = udr;
+ _rxen = rxen;
+ _txen = txen;
+ _rxcie = rxcie;
+ _udre = udre;
+ _u2x = u2x;
+}
+
+// Public Methods //////////////////////////////////////////////////////////////
+
+void HardwareSerial::begin(long baud)
+{
+ uint16_t baud_setting;
+ bool use_u2x = true;
+
+#if F_CPU == 16000000UL
+ // hardcoded exception for compatibility with the bootloader shipped
+ // with the Duemilanove and previous boards and the firmware on the 8U2
+ // on the Uno and Mega 2560.
+ if (baud == 57600) {
+ use_u2x = false;
+ }
+#endif
+
+ if (use_u2x) {
+ *_ucsra = 1 << _u2x;
+ baud_setting = (F_CPU / 4 / baud - 1) / 2;
+ } else {
+ *_ucsra = 0;
+ baud_setting = (F_CPU / 8 / baud - 1) / 2;
+ }
+
+ // assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register)
+ *_ubrrh = baud_setting >> 8;
+ *_ubrrl = baud_setting;
+
+ sbi(*_ucsrb, _rxen);
+ sbi(*_ucsrb, _txen);
+ sbi(*_ucsrb, _rxcie);
+}
+
+void HardwareSerial::end()
+{
+ cbi(*_ucsrb, _rxen);
+ cbi(*_ucsrb, _txen);
+ cbi(*_ucsrb, _rxcie);
+}
+
+int HardwareSerial::available(void)
+{
+ return (unsigned int)(RX_BUFFER_SIZE + _rx_buffer->head - _rx_buffer->tail) % RX_BUFFER_SIZE;
+}
+
+int HardwareSerial::peek(void)
+{
+ if (_rx_buffer->head == _rx_buffer->tail) {
+ return -1;
+ } else {
+ return _rx_buffer->buffer[_rx_buffer->tail];
+ }
+}
+
+int HardwareSerial::read(void)
+{
+ // if the head isn't ahead of the tail, we don't have any characters
+ if (_rx_buffer->head == _rx_buffer->tail) {
+ return -1;
+ } else {
+ unsigned char c = _rx_buffer->buffer[_rx_buffer->tail];
+ _rx_buffer->tail = (unsigned int)(_rx_buffer->tail + 1) % RX_BUFFER_SIZE;
+ return c;
+ }
+}
+
+void HardwareSerial::flush()
+{
+ // don't reverse this or there may be problems if the RX interrupt
+ // occurs after reading the value of rx_buffer_head but before writing
+ // the value to rx_buffer_tail; the previous value of rx_buffer_head
+ // may be written to rx_buffer_tail, making it appear as if the buffer
+ // don't reverse this or there may be problems if the RX interrupt
+ // occurs after reading the value of rx_buffer_head but before writing
+ // the value to rx_buffer_tail; the previous value of rx_buffer_head
+ // may be written to rx_buffer_tail, making it appear as if the buffer
+ // were full, not empty.
+ _rx_buffer->head = _rx_buffer->tail;
+}
+
+void HardwareSerial::write(uint8_t c)
+{
+ while (!((*_ucsra) & (1 << _udre)))
+ ;
+
+ *_udr = c;
+}
+
+// Preinstantiate Objects //////////////////////////////////////////////////////
+
+#if defined(UBRRH) && defined(UBRRL)
+ HardwareSerial Serial(&rx_buffer, &UBRRH, &UBRRL, &UCSRA, &UCSRB, &UDR, RXEN, TXEN, RXCIE, UDRE, U2X);
+#elif defined(UBRR0H) && defined(UBRR0L)
+ HardwareSerial Serial(&rx_buffer, &UBRR0H, &UBRR0L, &UCSR0A, &UCSR0B, &UDR0, RXEN0, TXEN0, RXCIE0, UDRE0, U2X0);
+#elif defined(USBCON)
+ #warning no serial port defined (port 0)
+#else
+ #error no serial port defined (port 0)
+#endif
+
+#if defined(UBRR1H)
+ HardwareSerial Serial1(&rx_buffer1, &UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UDR1, RXEN1, TXEN1, RXCIE1, UDRE1, U2X1);
+#endif
+#if defined(UBRR2H)
+ HardwareSerial Serial2(&rx_buffer2, &UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UDR2, RXEN2, TXEN2, RXCIE2, UDRE2, U2X2);
+#endif
+#if defined(UBRR3H)
+ HardwareSerial Serial3(&rx_buffer3, &UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UDR3, RXEN3, TXEN3, RXCIE3, UDRE3, U2X3);
+#endif
+
+#endif // whole file
+
diff --git a/test/ardmake/hardware/cores/arduino/HardwareSerial.d b/test/ardmake/hardware/cores/arduino/HardwareSerial.d
new file mode 100644
index 0000000..92f1cc9
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/HardwareSerial.d
@@ -0,0 +1,28 @@
+ardmake/hardware/cores/arduino/HardwareSerial.o ardmake/hardware/cores/arduino/HardwareSerial.d: ardmake/hardware/cores/arduino/HardwareSerial.cpp \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/string.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ ardmake/hardware/cores/arduino/HardwareSerial.h \
+ ardmake/hardware/cores/arduino/Stream.h \
+ ardmake/hardware/cores/arduino/Print.h \
+ ardmake/hardware/cores/arduino/WString.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/ctype.h
diff --git a/test/ardmake/hardware/cores/arduino/HardwareSerial.h b/test/ardmake/hardware/cores/arduino/HardwareSerial.h
new file mode 100644
index 0000000..3efa775
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/HardwareSerial.h
@@ -0,0 +1,76 @@
+/*
+ HardwareSerial.h - Hardware serial library for Wiring
+ Copyright (c) 2006 Nicholas Zambetti. All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Modified 28 September 2010 by Mark Sproul
+*/
+
+#ifndef HardwareSerial_h
+#define HardwareSerial_h
+
+#include <inttypes.h>
+
+#include "Stream.h"
+
+struct ring_buffer;
+
+class HardwareSerial : public Stream
+{
+ private:
+ ring_buffer *_rx_buffer;
+ volatile uint8_t *_ubrrh;
+ volatile uint8_t *_ubrrl;
+ volatile uint8_t *_ucsra;
+ volatile uint8_t *_ucsrb;
+ volatile uint8_t *_udr;
+ uint8_t _rxen;
+ uint8_t _txen;
+ uint8_t _rxcie;
+ uint8_t _udre;
+ uint8_t _u2x;
+ public:
+ HardwareSerial(ring_buffer *rx_buffer,
+ volatile uint8_t *ubrrh, volatile uint8_t *ubrrl,
+ volatile uint8_t *ucsra, volatile uint8_t *ucsrb,
+ volatile uint8_t *udr,
+ uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udre, uint8_t u2x);
+ void begin(long);
+ void end();
+ virtual int available(void);
+ virtual int peek(void);
+ virtual int read(void);
+ virtual void flush(void);
+ virtual void write(uint8_t);
+ using Print::write; // pull in write(str) and write(buf, size) from Print
+};
+
+#if defined(UBRRH) || defined(UBRR0H)
+ extern HardwareSerial Serial;
+#elif defined(USBCON)
+ #include "usb_api.h"
+#endif
+#if defined(UBRR1H)
+ extern HardwareSerial Serial1;
+#endif
+#if defined(UBRR2H)
+ extern HardwareSerial Serial2;
+#endif
+#if defined(UBRR3H)
+ extern HardwareSerial Serial3;
+#endif
+
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/Makefile b/test/ardmake/hardware/cores/arduino/Makefile
new file mode 100644
index 0000000..b606b39
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/Makefile
@@ -0,0 +1,250 @@
+# Arduino Makefile
+# Arduino adaptation by mellis, eighthave, oli.keller
+#
+# This makefile allows you to build sketches from the command line
+# without the Arduino environment (or Java).
+#
+# Note, this Makefile has been edited by the Debian package maintainer, so
+# there's a reasonable chance it'll simply work without the need to edit it
+# but just in case, here are the instructions:
+#
+# Detailed instructions for using the makefile:
+#
+# 1. Copy this file into the folder with your sketch. There should be a
+# file with the same name as the folder and with the extension .pde
+# (e.g. foo.pde in the foo/ folder).
+#
+# 2. Modify the line containg "INSTALL_DIR" to point to the directory that
+# contains the Arduino installation (for example, under Mac OS X, this
+# might be /Applications/arduino-0012).
+#
+# 3. Modify the line containing "PORT" to refer to the filename
+# representing the USB or serial connection to your Arduino board
+# (e.g. PORT = /dev/tty.USB0). If the exact name of this file
+# changes, you can use * as a wildcard (e.g. PORT = /dev/tty.usb*).
+#
+# 4. Set the line containing "MCU" to match your board's processor.
+# Older one's are atmega8 based, newer ones like Arduino Mini, Bluetooth
+# or Diecimila have the atmega168. If you're using a LilyPad Arduino,
+# change F_CPU to 8000000.
+#
+# 5. At the command line, change to the directory containing your
+# program's file and the makefile.
+#
+# 6. Type "make" and press enter to compile/verify your program.
+#
+# 7. Type "make upload", reset your Arduino board, and press enter to
+# upload your program to the Arduino board.
+#
+# $Id$
+
+TARGET = $(notdir $(CURDIR))
+#INSTALL_DIR = ../../..
+PORT = /dev/ttyUSB*
+UPLOAD_RATE = 57600
+AVRDUDE_PROGRAMMER = stk500v1
+MCU = atmega168
+F_CPU = 16000000
+
+############################################################################
+# Below here nothing should be changed...
+
+ARDUINO = /usr/share/arduino/hardware/arduino/cores/arduino
+AVR_TOOLS_PATH = /usr/bin
+SRC = $(ARDUINO)/pins_arduino.c $(ARDUINO)/wiring.c \
+$(ARDUINO)/wiring_analog.c $(ARDUINO)/wiring_digital.c \
+$(ARDUINO)/wiring_pulse.c $(ARDUINO)/wiring_shift.c \
+$(ARDUINO)/WInterrupts.c
+CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(ARDUINO)/WMath.cpp \
+$(ARDUINO)/Print.cpp
+FORMAT = ihex
+
+
+# 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
+
+OPT = s
+
+# Place -D or -U options here
+CDEFS = -DF_CPU=$(F_CPU)
+CXXDEFS = -DF_CPU=$(F_CPU)
+
+# Place -I options here
+CINCS = -I$(ARDUINO)
+CXXINCS = -I$(ARDUINO)
+
+# 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
+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)
+CXXFLAGS = $(CDEFS) $(CINCS) -O$(OPT)
+#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs
+LDFLAGS = -lm
+
+
+# Programming support using avrdude. Settings and variables.
+AVRDUDE_PORT = $(PORT)
+AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex
+AVRDUDE_FLAGS = -V -F \
+-p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
+-b $(UPLOAD_RATE)
+
+# Program settings
+CC = $(AVR_TOOLS_PATH)/avr-gcc
+CXX = $(AVR_TOOLS_PATH)/avr-g++
+OBJCOPY = $(AVR_TOOLS_PATH)/avr-objcopy
+OBJDUMP = $(AVR_TOOLS_PATH)/avr-objdump
+AR = $(AVR_TOOLS_PATH)/avr-ar
+SIZE = $(AVR_TOOLS_PATH)/avr-size
+NM = $(AVR_TOOLS_PATH)/avr-nm
+AVRDUDE = $(AVR_TOOLS_PATH)/avrdude
+REMOVE = rm -f
+MV = mv -f
+
+# Define all object files.
+OBJ = $(SRC:%.c=build/%.o) $(CXXSRC:%.cpp=build/%.o) $(ASRC:%.S=build/%.o)
+
+# Define all listing files.
+LST = $(ASRC:%.S=build/%.lst) $(CXXSRC:%.cpp=build/%.lst) $(SRC:%.c=build/%.lst)
+
+# Combine all necessary flags and optional flags.
+# Add target processor to flags.
+ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS)
+ALL_CXXFLAGS = -mmcu=$(MCU) -I. $(CXXFLAGS)
+ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
+
+
+# Default target.
+all: applet_files build sizeafter
+
+build: elf hex
+
+applet_files: $(TARGET).pde
+ # Here is the "preprocessing".
+ # It creates a .cpp file based with the same name as the .pde file.
+ # On top of the new .cpp file comes the WProgram.h header.
+ # At the end there is a generic main() function attached.
+ # Then the .cpp file will be compiled. Errors during compile will
+ # refer to this new, automatically generated, file.
+ # Not the original .pde file you actually edit...
+ test -d applet || mkdir applet
+ echo '#include "WProgram.h"' > applet/$(TARGET).cpp
+ cat $(TARGET).pde >> applet/$(TARGET).cpp
+ cat $(ARDUINO)/main.cxx >> applet/$(TARGET).cpp
+
+elf: applet/$(TARGET).elf
+hex: applet/$(TARGET).hex
+eep: applet/$(TARGET).eep
+lss: applet/$(TARGET).lss
+sym: applet/$(TARGET).sym
+
+# Program the device.
+upload: applet/$(TARGET).hex
+ stty -F $(AVRDUDE_PORT) hupcl ; sleep 0.1 ; stty -F $(AVRDUDE_PORT) -hupcl
+ $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
+
+
+ # Display size of file.
+HEXSIZE = $(SIZE) --target=$(FORMAT) applet/$(TARGET).hex
+ELFSIZE = $(SIZE) applet/$(TARGET).elf
+sizebefore:
+ @if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
+
+sizeafter:
+ @if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(HEXSIZE); echo; fi
+
+
+# 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: applet/$(TARGET).elf
+ $(COFFCONVERT) -O coff-avr applet/$(TARGET).elf $(TARGET).cof
+
+
+extcoff: $(TARGET).elf
+ $(COFFCONVERT) -O coff-ext-avr applet/$(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 library.
+applet/$(TARGET).elf: $(TARGET).pde applet/core.a
+ $(CXX) $(ALL_CXXFLAGS) -o $@ applet/$(TARGET).cpp -L. applet/core.a $(LDFLAGS)
+
+applet/core.a: $(OBJ)
+ @for i in $(OBJ); do echo $(AR) rcs applet/core.a $$i; $(AR) rcs applet/core.a $$i; done
+
+
+
+# Compile: create object files from C++ source files.
+build/%.o: %.cpp
+ mkdir -p $(dir $@)
+ $(CXX) -c $(ALL_CXXFLAGS) $< -o $@
+
+# Compile: create object files from C source files.
+build/%.o: %.c
+ mkdir -p $(dir $@)
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
+
+
+# Compile: create assembler files from C source files.
+build/%.s: %.c
+ $(CC) -S $(ALL_CFLAGS) $< -o $@
+
+
+# Assemble: create object files from assembler source files.
+.S.o:
+ $(CC) -c $(ALL_ASFLAGS) $< -o $@
+
+
+# Automatic dependencies
+build/%.d: %.c
+ $(CC) -M $(ALL_CFLAGS) $< | sed "s;$(notdir $*).o:;$*.o $*.d:;" > $@
+
+build/%.d: %.cpp
+ $(CXX) -M $(ALL_CXXFLAGS) $< | sed "s;$(notdir $*).o:;$*.o $*.d:;" > $@
+
+
+# Target: clean project.
+clean:
+ $(REMOVE) applet/$(TARGET).hex applet/$(TARGET).eep applet/$(TARGET).cof applet/$(TARGET).elf \
+ applet/$(TARGET).map applet/$(TARGET).sym applet/$(TARGET).lss applet/core.a \
+ $(OBJ) $(LST) $(SRC:%.c=build/%.s) $(SRC:%.c=build/%.d) $(CXXSRC:%.cpp=build/%.s) $(CXXSRC:%.cpp=build/%.d)
+
+.PHONY: all build elf hex eep lss sym program coff extcoff clean applet_files sizebefore sizeafter
+
+-include $(SRC:%.c=build/%.d)
+-include $(CXXSRC:%.cpp=build/%.d)
diff --git a/test/ardmake/hardware/cores/arduino/Print.cpp b/test/ardmake/hardware/cores/arduino/Print.cpp
new file mode 100644
index 0000000..4ee556d
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/Print.cpp
@@ -0,0 +1,220 @@
+/*
+ Print.cpp - Base class that provides print() and println()
+ Copyright (c) 2008 David A. Mellis. All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Modified 23 November 2006 by David A. Mellis
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include "wiring.h"
+
+#include "Print.h"
+
+// Public Methods //////////////////////////////////////////////////////////////
+
+/* default implementation: may be overridden */
+void Print::write(const char *str)
+{
+ while (*str)
+ write(*str++);
+}
+
+/* default implementation: may be overridden */
+void Print::write(const uint8_t *buffer, size_t size)
+{
+ while (size--)
+ write(*buffer++);
+}
+
+void Print::print(const String &s)
+{
+ for (int i = 0; i < s.length(); i++) {
+ write(s[i]);
+ }
+}
+
+void Print::print(const char str[])
+{
+ write(str);
+}
+
+void Print::print(char c, int base)
+{
+ print((long) c, base);
+}
+
+void Print::print(unsigned char b, int base)
+{
+ print((unsigned long) b, base);
+}
+
+void Print::print(int n, int base)
+{
+ print((long) n, base);
+}
+
+void Print::print(unsigned int n, int base)
+{
+ print((unsigned long) n, base);
+}
+
+void Print::print(long n, int base)
+{
+ if (base == 0) {
+ write(n);
+ } else if (base == 10) {
+ if (n < 0) {
+ print('-');
+ n = -n;
+ }
+ printNumber(n, 10);
+ } else {
+ printNumber(n, base);
+ }
+}
+
+void Print::print(unsigned long n, int base)
+{
+ if (base == 0) write(n);
+ else printNumber(n, base);
+}
+
+void Print::print(double n, int digits)
+{
+ printFloat(n, digits);
+}
+
+void Print::println(void)
+{
+ print('\r');
+ print('\n');
+}
+
+void Print::println(const String &s)
+{
+ print(s);
+ println();
+}
+
+void Print::println(const char c[])
+{
+ print(c);
+ println();
+}
+
+void Print::println(char c, int base)
+{
+ print(c, base);
+ println();
+}
+
+void Print::println(unsigned char b, int base)
+{
+ print(b, base);
+ println();
+}
+
+void Print::println(int n, int base)
+{
+ print(n, base);
+ println();
+}
+
+void Print::println(unsigned int n, int base)
+{
+ print(n, base);
+ println();
+}
+
+void Print::println(long n, int base)
+{
+ print(n, base);
+ println();
+}
+
+void Print::println(unsigned long n, int base)
+{
+ print(n, base);
+ println();
+}
+
+void Print::println(double n, int digits)
+{
+ print(n, digits);
+ println();
+}
+
+// Private Methods /////////////////////////////////////////////////////////////
+
+void Print::printNumber(unsigned long n, uint8_t base)
+{
+ unsigned char buf[8 * sizeof(long)]; // Assumes 8-bit chars.
+ unsigned long i = 0;
+
+ if (n == 0) {
+ print('0');
+ return;
+ }
+
+ while (n > 0) {
+ buf[i++] = n % base;
+ n /= base;
+ }
+
+ for (; i > 0; i--)
+ print((char) (buf[i - 1] < 10 ?
+ '0' + buf[i - 1] :
+ 'A' + buf[i - 1] - 10));
+}
+
+void Print::printFloat(double number, uint8_t digits)
+{
+ // Handle negative numbers
+ if (number < 0.0)
+ {
+ print('-');
+ number = -number;
+ }
+
+ // Round correctly so that print(1.999, 2) prints as "2.00"
+ double rounding = 0.5;
+ for (uint8_t i=0; i<digits; ++i)
+ rounding /= 10.0;
+
+ number += rounding;
+
+ // Extract the integer part of the number and print it
+ unsigned long int_part = (unsigned long)number;
+ double remainder = number - (double)int_part;
+ print(int_part);
+
+ // Print the decimal point, but only if there are digits beyond
+ if (digits > 0)
+ print(".");
+
+ // Extract digits from the remainder one at a time
+ while (digits-- > 0)
+ {
+ remainder *= 10.0;
+ int toPrint = int(remainder);
+ print(toPrint);
+ remainder -= toPrint;
+ }
+}
diff --git a/test/ardmake/hardware/cores/arduino/Print.d b/test/ardmake/hardware/cores/arduino/Print.d
new file mode 100644
index 0000000..bf5b85f
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/Print.d
@@ -0,0 +1,22 @@
+ardmake/hardware/cores/arduino/Print.o ardmake/hardware/cores/arduino/Print.d: ardmake/hardware/cores/arduino/Print.cpp \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/string.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/math.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/Print.h \
+ ardmake/hardware/cores/arduino/WString.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/ctype.h
diff --git a/test/ardmake/hardware/cores/arduino/Print.h b/test/ardmake/hardware/cores/arduino/Print.h
new file mode 100644
index 0000000..b092ae5
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/Print.h
@@ -0,0 +1,66 @@
+/*
+ Print.h - Base class that provides print() and println()
+ Copyright (c) 2008 David A. Mellis. All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef Print_h
+#define Print_h
+
+#include <inttypes.h>
+#include <stdio.h> // for size_t
+
+#include "WString.h"
+
+#define DEC 10
+#define HEX 16
+#define OCT 8
+#define BIN 2
+#define BYTE 0
+
+class Print
+{
+ private:
+ void printNumber(unsigned long, uint8_t);
+ void printFloat(double, uint8_t);
+ public:
+ virtual void write(uint8_t) = 0;
+ virtual void write(const char *str);
+ virtual void write(const uint8_t *buffer, size_t size);
+
+ void print(const String &);
+ void print(const char[]);
+ void print(char, int = BYTE);
+ void print(unsigned char, int = BYTE);
+ void print(int, int = DEC);
+ void print(unsigned int, int = DEC);
+ void print(long, int = DEC);
+ void print(unsigned long, int = DEC);
+ void print(double, int = 2);
+
+ void println(const String &s);
+ void println(const char[]);
+ void println(char, int = BYTE);
+ void println(unsigned char, int = BYTE);
+ void println(int, int = DEC);
+ void println(unsigned int, int = DEC);
+ void println(long, int = DEC);
+ void println(unsigned long, int = DEC);
+ void println(double, int = 2);
+ void println(void);
+};
+
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/README.Makefile b/test/ardmake/hardware/cores/arduino/README.Makefile
new file mode 100644
index 0000000..01f3c4a
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/README.Makefile
@@ -0,0 +1,11 @@
+The Makefile here is based on the one that was in Arduino 0017
+but has since been dropped by the upstream developers.
+
+It is preserved in the Debian package to allow command-line usage without
+introducing java dependancies, so if you want to report bugs against
+it, please report them against whichever distribution you are using,
+and NOT against the upstream source, as that would be pointless, and
+will irritate the developers who dropped the file in order to eliminate
+bug reports against the Makefile.
+
+The same goes for the main.cxx file.
diff --git a/test/ardmake/hardware/cores/arduino/Stream.h b/test/ardmake/hardware/cores/arduino/Stream.h
new file mode 100644
index 0000000..93d8275
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/Stream.h
@@ -0,0 +1,35 @@
+/*
+ Stream.h - base class for character-based streams.
+ Copyright (c) 2010 David A. Mellis. All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef Stream_h
+#define Stream_h
+
+#include <inttypes.h>
+#include "Print.h"
+
+class Stream : public Print
+{
+ public:
+ virtual int available() = 0;
+ virtual int read() = 0;
+ virtual int peek() = 0;
+ virtual void flush() = 0;
+};
+
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/Tone.cpp b/test/ardmake/hardware/cores/arduino/Tone.cpp
new file mode 100644
index 0000000..c3910e7
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/Tone.cpp
@@ -0,0 +1,601 @@
+/* Tone.cpp
+
+ A Tone Generator Library
+
+ Written by Brett Hagman
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Version Modified By Date Comments
+------- ----------- -------- --------
+0001 B Hagman 09/08/02 Initial coding
+0002 B Hagman 09/08/18 Multiple pins
+0003 B Hagman 09/08/18 Moved initialization from constructor to begin()
+0004 B Hagman 09/09/26 Fixed problems with ATmega8
+0005 B Hagman 09/11/23 Scanned prescalars for best fit on 8 bit timers
+ 09/11/25 Changed pin toggle method to XOR
+ 09/11/25 Fixed timer0 from being excluded
+0006 D Mellis 09/12/29 Replaced objects with functions
+0007 M Sproul 10/08/29 Changed #ifdefs from cpu to register
+*************************************************/
+
+#include <avr/interrupt.h>
+#include <avr/pgmspace.h>
+#include "wiring.h"
+#include "pins_arduino.h"
+
+#if defined(__AVR_ATmega8__) || defined(__AVR_ATmega128__)
+#define TCCR2A TCCR2
+#define TCCR2B TCCR2
+#define COM2A1 COM21
+#define COM2A0 COM20
+#define OCR2A OCR2
+#define TIMSK2 TIMSK
+#define OCIE2A OCIE2
+#define TIMER2_COMPA_vect TIMER2_COMP_vect
+#define TIMSK1 TIMSK
+#endif
+
+// timerx_toggle_count:
+// > 0 - duration specified
+// = 0 - stopped
+// < 0 - infinitely (until stop() method called, or new play() called)
+
+#if !defined(__AVR_ATmega8__)
+volatile long timer0_toggle_count;
+volatile uint8_t *timer0_pin_port;
+volatile uint8_t timer0_pin_mask;
+#endif
+
+volatile long timer1_toggle_count;
+volatile uint8_t *timer1_pin_port;
+volatile uint8_t timer1_pin_mask;
+volatile long timer2_toggle_count;
+volatile uint8_t *timer2_pin_port;
+volatile uint8_t timer2_pin_mask;
+
+#if defined(TIMSK3)
+volatile long timer3_toggle_count;
+volatile uint8_t *timer3_pin_port;
+volatile uint8_t timer3_pin_mask;
+#endif
+
+#if defined(TIMSK4)
+volatile long timer4_toggle_count;
+volatile uint8_t *timer4_pin_port;
+volatile uint8_t timer4_pin_mask;
+#endif
+
+#if defined(TIMSK5)
+volatile long timer5_toggle_count;
+volatile uint8_t *timer5_pin_port;
+volatile uint8_t timer5_pin_mask;
+#endif
+
+
+// MLS: This does not make sense, the 3 options are the same
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+
+#define AVAILABLE_TONE_PINS 1
+
+const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 3, 4, 5, 1, 0 */ };
+static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255, 255, 255, 255, 255 */ };
+
+#elif defined(__AVR_ATmega8__)
+
+#define AVAILABLE_TONE_PINS 1
+
+const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 1 */ };
+static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255 */ };
+
+#else
+
+#define AVAILABLE_TONE_PINS 1
+
+// Leave timer 0 to last.
+const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 1, 0 */ };
+static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255, 255 */ };
+
+#endif
+
+
+
+static int8_t toneBegin(uint8_t _pin)
+{
+ int8_t _timer = -1;
+
+ // if we're already using the pin, the timer should be configured.
+ for (int i = 0; i < AVAILABLE_TONE_PINS; i++) {
+ if (tone_pins[i] == _pin) {
+ return pgm_read_byte(tone_pin_to_timer_PGM + i);
+ }
+ }
+
+ // search for an unused timer.
+ for (int i = 0; i < AVAILABLE_TONE_PINS; i++) {
+ if (tone_pins[i] == 255) {
+ tone_pins[i] = _pin;
+ _timer = pgm_read_byte(tone_pin_to_timer_PGM + i);
+ break;
+ }
+ }
+
+ if (_timer != -1)
+ {
+ // Set timer specific stuff
+ // All timers in CTC mode
+ // 8 bit timers will require changing prescalar values,
+ // whereas 16 bit timers are set to either ck/1 or ck/64 prescalar
+ switch (_timer)
+ {
+ #if defined(TCCR0A) && defined(TCCR0B)
+ case 0:
+ // 8 bit timer
+ TCCR0A = 0;
+ TCCR0B = 0;
+ bitWrite(TCCR0A, WGM01, 1);
+ bitWrite(TCCR0B, CS00, 1);
+ timer0_pin_port = portOutputRegister(digitalPinToPort(_pin));
+ timer0_pin_mask = digitalPinToBitMask(_pin);
+ break;
+ #endif
+
+ #if defined(TCCR1A) && defined(TCCR1B) && defined(WGM12)
+ case 1:
+ // 16 bit timer
+ TCCR1A = 0;
+ TCCR1B = 0;
+ bitWrite(TCCR1B, WGM12, 1);
+ bitWrite(TCCR1B, CS10, 1);
+ timer1_pin_port = portOutputRegister(digitalPinToPort(_pin));
+ timer1_pin_mask = digitalPinToBitMask(_pin);
+ break;
+ #endif
+
+ #if defined(TCCR2A) && defined(TCCR2B)
+ case 2:
+ // 8 bit timer
+ TCCR2A = 0;
+ TCCR2B = 0;
+ bitWrite(TCCR2A, WGM21, 1);
+ bitWrite(TCCR2B, CS20, 1);
+ timer2_pin_port = portOutputRegister(digitalPinToPort(_pin));
+ timer2_pin_mask = digitalPinToBitMask(_pin);
+ break;
+ #endif
+
+ #if defined(TCCR3A) && defined(TCCR3B) && defined(TIMSK3)
+ case 3:
+ // 16 bit timer
+ TCCR3A = 0;
+ TCCR3B = 0;
+ bitWrite(TCCR3B, WGM32, 1);
+ bitWrite(TCCR3B, CS30, 1);
+ timer3_pin_port = portOutputRegister(digitalPinToPort(_pin));
+ timer3_pin_mask = digitalPinToBitMask(_pin);
+ break;
+ #endif
+
+ #if defined(TCCR4A) && defined(TCCR4B) && defined(TIMSK4)
+ case 4:
+ // 16 bit timer
+ TCCR4A = 0;
+ TCCR4B = 0;
+ #if defined(WGM42)
+ bitWrite(TCCR4B, WGM42, 1);
+ #elif defined(CS43)
+ #warning this may not be correct
+ // atmega32u4
+ bitWrite(TCCR4B, CS43, 1);
+ #endif
+ bitWrite(TCCR4B, CS40, 1);
+ timer4_pin_port = portOutputRegister(digitalPinToPort(_pin));
+ timer4_pin_mask = digitalPinToBitMask(_pin);
+ break;
+ #endif
+
+ #if defined(TCCR5A) && defined(TCCR5B) && defined(TIMSK5)
+ case 5:
+ // 16 bit timer
+ TCCR5A = 0;
+ TCCR5B = 0;
+ bitWrite(TCCR5B, WGM52, 1);
+ bitWrite(TCCR5B, CS50, 1);
+ timer5_pin_port = portOutputRegister(digitalPinToPort(_pin));
+ timer5_pin_mask = digitalPinToBitMask(_pin);
+ break;
+ #endif
+ }
+ }
+
+ return _timer;
+}
+
+
+
+// frequency (in hertz) and duration (in milliseconds).
+
+void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
+{
+ uint8_t prescalarbits = 0b001;
+ long toggle_count = 0;
+ uint32_t ocr = 0;
+ int8_t _timer;
+
+ _timer = toneBegin(_pin);
+
+ if (_timer >= 0)
+ {
+ // Set the pinMode as OUTPUT
+ pinMode(_pin, OUTPUT);
+
+ // if we are using an 8 bit timer, scan through prescalars to find the best fit
+ if (_timer == 0 || _timer == 2)
+ {
+ ocr = F_CPU / frequency / 2 - 1;
+ prescalarbits = 0b001; // ck/1: same for both timers
+ if (ocr > 255)
+ {
+ ocr = F_CPU / frequency / 2 / 8 - 1;
+ prescalarbits = 0b010; // ck/8: same for both timers
+
+ if (_timer == 2 && ocr > 255)
+ {
+ ocr = F_CPU / frequency / 2 / 32 - 1;
+ prescalarbits = 0b011;
+ }
+
+ if (ocr > 255)
+ {
+ ocr = F_CPU / frequency / 2 / 64 - 1;
+ prescalarbits = _timer == 0 ? 0b011 : 0b100;
+
+ if (_timer == 2 && ocr > 255)
+ {
+ ocr = F_CPU / frequency / 2 / 128 - 1;
+ prescalarbits = 0b101;
+ }
+
+ if (ocr > 255)
+ {
+ ocr = F_CPU / frequency / 2 / 256 - 1;
+ prescalarbits = _timer == 0 ? 0b100 : 0b110;
+ if (ocr > 255)
+ {
+ // can't do any better than /1024
+ ocr = F_CPU / frequency / 2 / 1024 - 1;
+ prescalarbits = _timer == 0 ? 0b101 : 0b111;
+ }
+ }
+ }
+ }
+
+#if defined(TCCR0B)
+ if (_timer == 0)
+ {
+ TCCR0B = prescalarbits;
+ }
+ else
+#endif
+#if defined(TCCR2B)
+ {
+ TCCR2B = prescalarbits;
+ }
+#else
+ {
+ // dummy place holder to make the above ifdefs work
+ }
+#endif
+ }
+ else
+ {
+ // two choices for the 16 bit timers: ck/1 or ck/64
+ ocr = F_CPU / frequency / 2 - 1;
+
+ prescalarbits = 0b001;
+ if (ocr > 0xffff)
+ {
+ ocr = F_CPU / frequency / 2 / 64 - 1;
+ prescalarbits = 0b011;
+ }
+
+ if (_timer == 1)
+ {
+#if defined(TCCR1B)
+ TCCR1B = (TCCR1B & 0b11111000) | prescalarbits;
+#endif
+ }
+#if defined(TCCR3B)
+ else if (_timer == 3)
+ TCCR3B = (TCCR3B & 0b11111000) | prescalarbits;
+#endif
+#if defined(TCCR4B)
+ else if (_timer == 4)
+ TCCR4B = (TCCR4B & 0b11111000) | prescalarbits;
+#endif
+#if defined(TCCR5B)
+ else if (_timer == 5)
+ TCCR5B = (TCCR5B & 0b11111000) | prescalarbits;
+#endif
+
+ }
+
+
+ // Calculate the toggle count
+ if (duration > 0)
+ {
+ toggle_count = 2 * frequency * duration / 1000;
+ }
+ else
+ {
+ toggle_count = -1;
+ }
+
+ // Set the OCR for the given timer,
+ // set the toggle count,
+ // then turn on the interrupts
+ switch (_timer)
+ {
+
+#if defined(OCR0A) && defined(TIMSK0) && defined(OCIE0A)
+ case 0:
+ OCR0A = ocr;
+ timer0_toggle_count = toggle_count;
+ bitWrite(TIMSK0, OCIE0A, 1);
+ break;
+#endif
+
+ case 1:
+#if defined(OCR1A) && defined(TIMSK1) && defined(OCIE1A)
+ OCR1A = ocr;
+ timer1_toggle_count = toggle_count;
+ bitWrite(TIMSK1, OCIE1A, 1);
+#elif defined(OCR1A) && defined(TIMSK) && defined(OCIE1A)
+ // this combination is for at least the ATmega32
+ OCR1A = ocr;
+ timer1_toggle_count = toggle_count;
+ bitWrite(TIMSK, OCIE1A, 1);
+#endif
+ break;
+
+#if defined(OCR2A) && defined(TIMSK2) && defined(OCIE2A)
+ case 2:
+ OCR2A = ocr;
+ timer2_toggle_count = toggle_count;
+ bitWrite(TIMSK2, OCIE2A, 1);
+ break;
+#endif
+
+#if defined(TIMSK3)
+ case 3:
+ OCR3A = ocr;
+ timer3_toggle_count = toggle_count;
+ bitWrite(TIMSK3, OCIE3A, 1);
+ break;
+#endif
+
+#if defined(TIMSK4)
+ case 4:
+ OCR4A = ocr;
+ timer4_toggle_count = toggle_count;
+ bitWrite(TIMSK4, OCIE4A, 1);
+ break;
+#endif
+
+#if defined(OCR5A) && defined(TIMSK5) && defined(OCIE5A)
+ case 5:
+ OCR5A = ocr;
+ timer5_toggle_count = toggle_count;
+ bitWrite(TIMSK5, OCIE5A, 1);
+ break;
+#endif
+
+ }
+ }
+}
+
+
+// XXX: this function only works properly for timer 2 (the only one we use
+// currently). for the others, it should end the tone, but won't restore
+// proper PWM functionality for the timer.
+void disableTimer(uint8_t _timer)
+{
+ switch (_timer)
+ {
+ case 0:
+ #if defined(TIMSK0)
+ TIMSK0 = 0;
+ #elif defined(TIMSK)
+ TIMSK = 0; // atmega32
+ #endif
+ break;
+
+#if defined(TIMSK1) && defined(OCIE1A)
+ case 1:
+ bitWrite(TIMSK1, OCIE1A, 0);
+ break;
+#endif
+
+ case 2:
+ #if defined(TIMSK2) && defined(OCIE2A)
+ bitWrite(TIMSK2, OCIE2A, 0); // disable interrupt
+ #endif
+ #if defined(TCCR2A) && defined(WGM20)
+ TCCR2A = (1 << WGM20);
+ #endif
+ #if defined(TCCR2B) && defined(CS22)
+ TCCR2B = (TCCR2B & 0b11111000) | (1 << CS22);
+ #endif
+ #if defined(OCR2A)
+ OCR2A = 0;
+ #endif
+ break;
+
+#if defined(TIMSK3)
+ case 3:
+ TIMSK3 = 0;
+ break;
+#endif
+
+#if defined(TIMSK4)
+ case 4:
+ TIMSK4 = 0;
+ break;
+#endif
+
+#if defined(TIMSK5)
+ case 5:
+ TIMSK5 = 0;
+ break;
+#endif
+ }
+}
+
+
+void noTone(uint8_t _pin)
+{
+ int8_t _timer = -1;
+
+ for (int i = 0; i < AVAILABLE_TONE_PINS; i++) {
+ if (tone_pins[i] == _pin) {
+ _timer = pgm_read_byte(tone_pin_to_timer_PGM + i);
+ tone_pins[i] = 255;
+ }
+ }
+
+ disableTimer(_timer);
+
+ digitalWrite(_pin, 0);
+}
+
+#if 0
+#if !defined(__AVR_ATmega8__)
+ISR(TIMER0_COMPA_vect)
+{
+ if (timer0_toggle_count != 0)
+ {
+ // toggle the pin
+ *timer0_pin_port ^= timer0_pin_mask;
+
+ if (timer0_toggle_count > 0)
+ timer0_toggle_count--;
+ }
+ else
+ {
+ disableTimer(0);
+ *timer0_pin_port &= ~(timer0_pin_mask); // keep pin low after stop
+ }
+}
+#endif
+
+
+ISR(TIMER1_COMPA_vect)
+{
+ if (timer1_toggle_count != 0)
+ {
+ // toggle the pin
+ *timer1_pin_port ^= timer1_pin_mask;
+
+ if (timer1_toggle_count > 0)
+ timer1_toggle_count--;
+ }
+ else
+ {
+ disableTimer(1);
+ *timer1_pin_port &= ~(timer1_pin_mask); // keep pin low after stop
+ }
+}
+#endif
+
+
+ISR(TIMER2_COMPA_vect)
+{
+
+ if (timer2_toggle_count != 0)
+ {
+ // toggle the pin
+ *timer2_pin_port ^= timer2_pin_mask;
+
+ if (timer2_toggle_count > 0)
+ timer2_toggle_count--;
+ }
+ else
+ {
+ // need to call noTone() so that the tone_pins[] entry is reset, so the
+ // timer gets initialized next time we call tone().
+ // XXX: this assumes timer 2 is always the first one used.
+ noTone(tone_pins[0]);
+// disableTimer(2);
+// *timer2_pin_port &= ~(timer2_pin_mask); // keep pin low after stop
+ }
+}
+
+
+
+//#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#if 0
+
+ISR(TIMER3_COMPA_vect)
+{
+ if (timer3_toggle_count != 0)
+ {
+ // toggle the pin
+ *timer3_pin_port ^= timer3_pin_mask;
+
+ if (timer3_toggle_count > 0)
+ timer3_toggle_count--;
+ }
+ else
+ {
+ disableTimer(3);
+ *timer3_pin_port &= ~(timer3_pin_mask); // keep pin low after stop
+ }
+}
+
+ISR(TIMER4_COMPA_vect)
+{
+ if (timer4_toggle_count != 0)
+ {
+ // toggle the pin
+ *timer4_pin_port ^= timer4_pin_mask;
+
+ if (timer4_toggle_count > 0)
+ timer4_toggle_count--;
+ }
+ else
+ {
+ disableTimer(4);
+ *timer4_pin_port &= ~(timer4_pin_mask); // keep pin low after stop
+ }
+}
+
+ISR(TIMER5_COMPA_vect)
+{
+ if (timer5_toggle_count != 0)
+ {
+ // toggle the pin
+ *timer5_pin_port ^= timer5_pin_mask;
+
+ if (timer5_toggle_count > 0)
+ timer5_toggle_count--;
+ }
+ else
+ {
+ disableTimer(5);
+ *timer5_pin_port &= ~(timer5_pin_mask); // keep pin low after stop
+ }
+}
+
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/WCharacter.h b/test/ardmake/hardware/cores/arduino/WCharacter.h
new file mode 100644
index 0000000..79733b5
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/WCharacter.h
@@ -0,0 +1,168 @@
+/*
+ WCharacter.h - Character utility functions for Wiring & Arduino
+ Copyright (c) 2010 Hernando Barragan. All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef Character_h
+#define Character_h
+
+#include <ctype.h>
+
+// WCharacter.h prototypes
+inline boolean isAlphaNumeric(int c) __attribute__((always_inline));
+inline boolean isAlpha(int c) __attribute__((always_inline));
+inline boolean isAscii(int c) __attribute__((always_inline));
+inline boolean isWhitespace(int c) __attribute__((always_inline));
+inline boolean isControl(int c) __attribute__((always_inline));
+inline boolean isDigit(int c) __attribute__((always_inline));
+inline boolean isGraph(int c) __attribute__((always_inline));
+inline boolean isLowerCase(int c) __attribute__((always_inline));
+inline boolean isPrintable(int c) __attribute__((always_inline));
+inline boolean isPunct(int c) __attribute__((always_inline));
+inline boolean isSpace(int c) __attribute__((always_inline));
+inline boolean isUpperCase(int c) __attribute__((always_inline));
+inline boolean isHexadecimalDigit(int c) __attribute__((always_inline));
+inline int toAscii(int c) __attribute__((always_inline));
+inline int toLowerCase(int c) __attribute__((always_inline));
+inline int toUpperCase(int c)__attribute__((always_inline));
+
+
+// Checks for an alphanumeric character.
+// It is equivalent to (isalpha(c) || isdigit(c)).
+inline boolean isAlphaNumeric(int c)
+{
+ return ( isalnum(c) == 0 ? false : true);
+}
+
+
+// Checks for an alphabetic character.
+// It is equivalent to (isupper(c) || islower(c)).
+inline boolean isAlpha(int c)
+{
+ return ( isalpha(c) == 0 ? false : true);
+}
+
+
+// Checks whether c is a 7-bit unsigned char value
+// that fits into the ASCII character set.
+inline boolean isAscii(int c)
+{
+ return ( isascii (c) == 0 ? false : true);
+}
+
+
+// Checks for a blank character, that is, a space or a tab.
+inline boolean isWhitespace(int c)
+{
+ return ( isblank (c) == 0 ? false : true);
+}
+
+
+// Checks for a control character.
+inline boolean isControl(int c)
+{
+ return ( iscntrl (c) == 0 ? false : true);
+}
+
+
+// Checks for a digit (0 through 9).
+inline boolean isDigit(int c)
+{
+ return ( isdigit (c) == 0 ? false : true);
+}
+
+
+// Checks for any printable character except space.
+inline boolean isGraph(int c)
+{
+ return ( isgraph (c) == 0 ? false : true);
+}
+
+
+// Checks for a lower-case character.
+inline boolean isLowerCase(int c)
+{
+ return (islower (c) == 0 ? false : true);
+}
+
+
+// Checks for any printable character including space.
+inline boolean isPrintable(int c)
+{
+ return ( isprint (c) == 0 ? false : true);
+}
+
+
+// Checks for any printable character which is not a space
+// or an alphanumeric character.
+inline boolean isPunct(int c)
+{
+ return ( ispunct (c) == 0 ? false : true);
+}
+
+
+// Checks for white-space characters. For the avr-libc library,
+// these are: space, formfeed ('\f'), newline ('\n'), carriage
+// return ('\r'), horizontal tab ('\t'), and vertical tab ('\v').
+inline boolean isSpace(int c)
+{
+ return ( isspace (c) == 0 ? false : true);
+}
+
+
+// Checks for an uppercase letter.
+inline boolean isUpperCase(int c)
+{
+ return ( isupper (c) == 0 ? false : true);
+}
+
+
+// Checks for a hexadecimal digits, i.e. one of 0 1 2 3 4 5 6 7
+// 8 9 a b c d e f A B C D E F.
+inline boolean isHexadecimalDigit(int c)
+{
+ return ( isxdigit (c) == 0 ? false : true);
+}
+
+
+// Converts c to a 7-bit unsigned char value that fits into the
+// ASCII character set, by clearing the high-order bits.
+inline int toAscii(int c)
+{
+ return toascii (c);
+}
+
+
+// Warning:
+// Many people will be unhappy if you use this function.
+// This function will convert accented letters into random
+// characters.
+
+// Converts the letter c to lower case, if possible.
+inline int toLowerCase(int c)
+{
+ return tolower (c);
+}
+
+
+// Converts the letter c to upper case, if possible.
+inline int toUpperCase(int c)
+{
+ return toupper (c);
+}
+
+#endif \ No newline at end of file
diff --git a/test/ardmake/hardware/cores/arduino/WConstants.h b/test/ardmake/hardware/cores/arduino/WConstants.h
new file mode 100644
index 0000000..3e19ac4
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/WConstants.h
@@ -0,0 +1 @@
+#include "wiring.h"
diff --git a/test/ardmake/hardware/cores/arduino/WInterrupts.c b/test/ardmake/hardware/cores/arduino/WInterrupts.c
new file mode 100644
index 0000000..3b3e0c9
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/WInterrupts.c
@@ -0,0 +1,249 @@
+/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+ Part of the Wiring project - http://wiring.uniandes.edu.co
+
+ Copyright (c) 2004-05 Hernando Barragan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ Modified 24 November 2006 by David A. Mellis
+ Modified 1 August 2010 by Mark Sproul
+*/
+
+#include <inttypes.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/pgmspace.h>
+#include <stdio.h>
+
+#include "WConstants.h"
+#include "wiring_private.h"
+
+volatile static voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
+// volatile static voidFuncPtr twiIntFunc;
+
+void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) {
+ if(interruptNum < EXTERNAL_NUM_INTERRUPTS) {
+ intFunc[interruptNum] = userFunc;
+
+ // Configure the interrupt mode (trigger on low input, any change, rising
+ // edge, or falling edge). The mode constants were chosen to correspond
+ // to the configuration bits in the hardware register, so we simply shift
+ // the mode into place.
+
+ // Enable the interrupt.
+
+ switch (interruptNum) {
+#if defined(EICRA) && defined(EICRB) && defined(EIMSK)
+ case 2:
+ EICRA = (EICRA & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
+ EIMSK |= (1 << INT0);
+ break;
+ case 3:
+ EICRA = (EICRA & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
+ EIMSK |= (1 << INT1);
+ break;
+ case 4:
+ EICRA = (EICRA & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
+ EIMSK |= (1 << INT2);
+ break;
+ case 5:
+ EICRA = (EICRA & ~((1 << ISC30) | (1 << ISC31))) | (mode << ISC30);
+ EIMSK |= (1 << INT3);
+ break;
+ case 0:
+ EICRB = (EICRB & ~((1 << ISC40) | (1 << ISC41))) | (mode << ISC40);
+ EIMSK |= (1 << INT4);
+ break;
+ case 1:
+ EICRB = (EICRB & ~((1 << ISC50) | (1 << ISC51))) | (mode << ISC50);
+ EIMSK |= (1 << INT5);
+ break;
+ case 6:
+ EICRB = (EICRB & ~((1 << ISC60) | (1 << ISC61))) | (mode << ISC60);
+ EIMSK |= (1 << INT6);
+ break;
+ case 7:
+ EICRB = (EICRB & ~((1 << ISC70) | (1 << ISC71))) | (mode << ISC70);
+ EIMSK |= (1 << INT7);
+ break;
+#else
+ case 0:
+ #if defined(EICRA) && defined(ISC00) && defined(EIMSK)
+ EICRA = (EICRA & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
+ EIMSK |= (1 << INT0);
+ #elif defined(MCUCR) && defined(ISC00) && defined(GICR)
+ MCUCR = (MCUCR & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
+ GICR |= (1 << INT0);
+ #elif defined(MCUCR) && defined(ISC00) && defined(GIMSK)
+ MCUCR = (MCUCR & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
+ GIMSK |= (1 << INT0);
+ #else
+ #error attachInterrupt not finished for this CPU (case 0)
+ #endif
+ break;
+
+ case 1:
+ #if defined(EICRA) && defined(ISC10) && defined(ISC11) && defined(EIMSK)
+ EICRA = (EICRA & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
+ EIMSK |= (1 << INT1);
+ #elif defined(MCUCR) && defined(ISC10) && defined(ISC11) && defined(GICR)
+ MCUCR = (MCUCR & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
+ GICR |= (1 << INT1);
+ #elif defined(MCUCR) && defined(ISC10) && defined(GIMSK) && defined(GIMSK)
+ MCUCR = (MCUCR & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
+ GIMSK |= (1 << INT1);
+ #else
+ #warning attachInterrupt may need some more work for this cpu (case 1)
+ #endif
+ break;
+#endif
+ }
+ }
+}
+
+void detachInterrupt(uint8_t interruptNum) {
+ if(interruptNum < EXTERNAL_NUM_INTERRUPTS) {
+ // Disable the interrupt. (We can't assume that interruptNum is equal
+ // to the number of the EIMSK bit to clear, as this isn't true on the
+ // ATmega8. There, INT0 is 6 and INT1 is 7.)
+ switch (interruptNum) {
+#if defined(EICRA) && defined(EICRB) && defined(EIMSK)
+ case 2:
+ EIMSK &= ~(1 << INT0);
+ break;
+ case 3:
+ EIMSK &= ~(1 << INT1);
+ break;
+ case 4:
+ EIMSK &= ~(1 << INT2);
+ break;
+ case 5:
+ EIMSK &= ~(1 << INT3);
+ break;
+ case 0:
+ EIMSK &= ~(1 << INT4);
+ break;
+ case 1:
+ EIMSK &= ~(1 << INT5);
+ break;
+ case 6:
+ EIMSK &= ~(1 << INT6);
+ break;
+ case 7:
+ EIMSK &= ~(1 << INT7);
+ break;
+#else
+ case 0:
+ #if defined(EIMSK) && defined(INT0)
+ EIMSK &= ~(1 << INT0);
+ #elif defined(GICR) && defined(ISC00)
+ GICR &= ~(1 << INT0); // atmega32
+ #elif defined(GIMSK) && defined(INT0)
+ GIMSK &= ~(1 << INT0);
+ #else
+ #error detachInterrupt not finished for this cpu
+ #endif
+ break;
+
+ case 1:
+ #if defined(EIMSK) && defined(INT1)
+ EIMSK &= ~(1 << INT1);
+ #elif defined(GICR) && defined(INT1)
+ GICR &= ~(1 << INT1); // atmega32
+ #elif defined(GIMSK) && defined(INT1)
+ GIMSK &= ~(1 << INT1);
+ #else
+ #warning detachInterrupt may need some more work for this cpu (case 1)
+ #endif
+ break;
+#endif
+ }
+
+ intFunc[interruptNum] = 0;
+ }
+}
+
+/*
+void attachInterruptTwi(void (*userFunc)(void) ) {
+ twiIntFunc = userFunc;
+}
+*/
+
+#if defined(EICRA) && defined(EICRB)
+
+SIGNAL(INT0_vect) {
+ if(intFunc[EXTERNAL_INT_2])
+ intFunc[EXTERNAL_INT_2]();
+}
+
+SIGNAL(INT1_vect) {
+ if(intFunc[EXTERNAL_INT_3])
+ intFunc[EXTERNAL_INT_3]();
+}
+
+SIGNAL(INT2_vect) {
+ if(intFunc[EXTERNAL_INT_4])
+ intFunc[EXTERNAL_INT_4]();
+}
+
+SIGNAL(INT3_vect) {
+ if(intFunc[EXTERNAL_INT_5])
+ intFunc[EXTERNAL_INT_5]();
+}
+
+SIGNAL(INT4_vect) {
+ if(intFunc[EXTERNAL_INT_0])
+ intFunc[EXTERNAL_INT_0]();
+}
+
+SIGNAL(INT5_vect) {
+ if(intFunc[EXTERNAL_INT_1])
+ intFunc[EXTERNAL_INT_1]();
+}
+
+SIGNAL(INT6_vect) {
+ if(intFunc[EXTERNAL_INT_6])
+ intFunc[EXTERNAL_INT_6]();
+}
+
+SIGNAL(INT7_vect) {
+ if(intFunc[EXTERNAL_INT_7])
+ intFunc[EXTERNAL_INT_7]();
+}
+
+#else
+
+SIGNAL(INT0_vect) {
+ if(intFunc[EXTERNAL_INT_0])
+ intFunc[EXTERNAL_INT_0]();
+}
+
+SIGNAL(INT1_vect) {
+ if(intFunc[EXTERNAL_INT_1])
+ intFunc[EXTERNAL_INT_1]();
+}
+
+#endif
+
+/*
+SIGNAL(SIG_2WIRE_SERIAL) {
+ if(twiIntFunc)
+ twiIntFunc();
+}
+*/
+
diff --git a/test/ardmake/hardware/cores/arduino/WInterrupts.d b/test/ardmake/hardware/cores/arduino/WInterrupts.d
new file mode 100644
index 0000000..73a0256
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/WInterrupts.d
@@ -0,0 +1,24 @@
+ardmake/hardware/cores/arduino/WInterrupts.o ardmake/hardware/cores/arduino/WInterrupts.d: ardmake/hardware/cores/arduino/WInterrupts.c \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ ardmake/hardware/cores/arduino/WConstants.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h
diff --git a/test/ardmake/hardware/cores/arduino/WMath.cpp b/test/ardmake/hardware/cores/arduino/WMath.cpp
new file mode 100644
index 0000000..2120c4c
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/WMath.cpp
@@ -0,0 +1,60 @@
+/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+ Part of the Wiring project - http://wiring.org.co
+ Copyright (c) 2004-06 Hernando Barragan
+ Modified 13 August 2006, David A. Mellis for Arduino - http://www.arduino.cc/
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ $Id$
+*/
+
+extern "C" {
+ #include "stdlib.h"
+}
+
+void randomSeed(unsigned int seed)
+{
+ if (seed != 0) {
+ srandom(seed);
+ }
+}
+
+long random(long howbig)
+{
+ if (howbig == 0) {
+ return 0;
+ }
+ return random() % howbig;
+}
+
+long random(long howsmall, long howbig)
+{
+ if (howsmall >= howbig) {
+ return howsmall;
+ }
+ long diff = howbig - howsmall;
+ return random(diff) + howsmall;
+}
+
+long map(long x, long in_min, long in_max, long out_min, long out_max)
+{
+ return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
+
+unsigned int makeWord(unsigned int w) { return w; }
+unsigned int makeWord(unsigned char h, unsigned char l) { return (h << 8) | l; } \ No newline at end of file
diff --git a/test/ardmake/hardware/cores/arduino/WMath.d b/test/ardmake/hardware/cores/arduino/WMath.d
new file mode 100644
index 0000000..dd4d873
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/WMath.d
@@ -0,0 +1,3 @@
+ardmake/hardware/cores/arduino/WMath.o ardmake/hardware/cores/arduino/WMath.d: ardmake/hardware/cores/arduino/WMath.cpp \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h
diff --git a/test/ardmake/hardware/cores/arduino/WProgram.h b/test/ardmake/hardware/cores/arduino/WProgram.h
new file mode 100644
index 0000000..f73e760
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/WProgram.h
@@ -0,0 +1,63 @@
+#ifndef WProgram_h
+#define WProgram_h
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <avr/interrupt.h>
+
+#include "wiring.h"
+
+#ifdef __cplusplus
+#include "WCharacter.h"
+#include "WString.h"
+#include "HardwareSerial.h"
+
+uint16_t makeWord(uint16_t w);
+uint16_t makeWord(byte h, byte l);
+
+#define word(...) makeWord(__VA_ARGS__)
+
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
+
+void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
+void noTone(uint8_t _pin);
+
+// WMath prototypes
+long random(long);
+long random(long, long);
+void randomSeed(unsigned int);
+long map(long, long, long, long, long);
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+const static uint8_t A0 = 54;
+const static uint8_t A1 = 55;
+const static uint8_t A2 = 56;
+const static uint8_t A3 = 57;
+const static uint8_t A4 = 58;
+const static uint8_t A5 = 59;
+const static uint8_t A6 = 60;
+const static uint8_t A7 = 61;
+const static uint8_t A8 = 62;
+const static uint8_t A9 = 63;
+const static uint8_t A10 = 64;
+const static uint8_t A11 = 65;
+const static uint8_t A12 = 66;
+const static uint8_t A13 = 67;
+const static uint8_t A14 = 68;
+const static uint8_t A15 = 69;
+#else
+const static uint8_t A0 = 14;
+const static uint8_t A1 = 15;
+const static uint8_t A2 = 16;
+const static uint8_t A3 = 17;
+const static uint8_t A4 = 18;
+const static uint8_t A5 = 19;
+const static uint8_t A6 = 20;
+const static uint8_t A7 = 21;
+#endif
+
+#endif
+
+#endif \ No newline at end of file
diff --git a/test/ardmake/hardware/cores/arduino/WString.cpp b/test/ardmake/hardware/cores/arduino/WString.cpp
new file mode 100644
index 0000000..db5a441
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/WString.cpp
@@ -0,0 +1,443 @@
+/*
+ WString.cpp - String library for Wiring & Arduino
+ Copyright (c) 2009-10 Hernando Barragan. All rights reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include <stdlib.h>
+#include "WProgram.h"
+#include "WString.h"
+
+
+String::String( const char *value )
+{
+ if ( value == NULL )
+ value = "";
+ getBuffer( _length = strlen( value ) );
+ if ( _buffer != NULL )
+ strcpy( _buffer, value );
+}
+
+String::String( const String &value )
+{
+ getBuffer( _length = value._length );
+ if ( _buffer != NULL )
+ strcpy( _buffer, value._buffer );
+}
+
+String::String( const char value )
+{
+ _length = 1;
+ getBuffer(1);
+ if ( _buffer != NULL ) {
+ _buffer[0] = value;
+ _buffer[1] = 0;
+ }
+}
+
+String::String( const unsigned char value )
+{
+ _length = 1;
+ getBuffer(1);
+ if ( _buffer != NULL) {
+ _buffer[0] = value;
+ _buffer[1] = 0;
+ }
+}
+
+String::String( const int value, const int base )
+{
+ char buf[33];
+ itoa((signed long)value, buf, base);
+ getBuffer( _length = strlen(buf) );
+ if ( _buffer != NULL )
+ strcpy( _buffer, buf );
+}
+
+String::String( const unsigned int value, const int base )
+{
+ char buf[33];
+ ultoa((unsigned long)value, buf, base);
+ getBuffer( _length = strlen(buf) );
+ if ( _buffer != NULL )
+ strcpy( _buffer, buf );
+}
+
+String::String( const long value, const int base )
+{
+ char buf[33];
+ ltoa(value, buf, base);
+ getBuffer( _length = strlen(buf) );
+ if ( _buffer != NULL )
+ strcpy( _buffer, buf );
+}
+
+String::String( const unsigned long value, const int base )
+{
+ char buf[33];
+ ultoa(value, buf, 10);
+ getBuffer( _length = strlen(buf) );
+ if ( _buffer != NULL )
+ strcpy( _buffer, buf );
+}
+
+char String::charAt( unsigned int loc ) const
+{
+ return operator[]( loc );
+}
+
+void String::setCharAt( unsigned int loc, const char aChar )
+{
+ if(_buffer == NULL) return;
+ if(_length > loc) {
+ _buffer[loc] = aChar;
+ }
+}
+
+int String::compareTo( const String &s2 ) const
+{
+ return strcmp( _buffer, s2._buffer );
+}
+
+const String & String::concat( const String &s2 )
+{
+ return (*this) += s2;
+}
+
+const String & String::operator=( const String &rhs )
+{
+ if ( this == &rhs )
+ return *this;
+
+ if ( rhs._length > _length )
+ {
+ free(_buffer);
+ getBuffer( rhs._length );
+ }
+
+ if ( _buffer != NULL ) {
+ _length = rhs._length;
+ strcpy( _buffer, rhs._buffer );
+ }
+ return *this;
+}
+
+//const String & String::operator+=( const char aChar )
+//{
+// if ( _length == _capacity )
+// doubleBuffer();
+//
+// _buffer[ _length++ ] = aChar;
+// _buffer[ _length ] = '\0';
+// return *this;
+//}
+
+const String & String::operator+=( const String &other )
+{
+ _length += other._length;
+ if ( _length > _capacity )
+ {
+ char *temp = (char *)realloc(_buffer, _length + 1);
+ if ( temp != NULL ) {
+ _buffer = temp;
+ _capacity = _length;
+ } else {
+ _length -= other._length;
+ return *this;
+ }
+ }
+ strcat( _buffer, other._buffer );
+ return *this;
+}
+
+
+int String::operator==( const String &rhs ) const
+{
+ return ( _length == rhs._length && strcmp( _buffer, rhs._buffer ) == 0 );
+}
+
+int String::operator!=( const String &rhs ) const
+{
+ return ( _length != rhs.length() || strcmp( _buffer, rhs._buffer ) != 0 );
+}
+
+int String::operator<( const String &rhs ) const
+{
+ return strcmp( _buffer, rhs._buffer ) < 0;
+}
+
+int String::operator>( const String &rhs ) const
+{
+ return strcmp( _buffer, rhs._buffer ) > 0;
+}
+
+int String::operator<=( const String &rhs ) const
+{
+ return strcmp( _buffer, rhs._buffer ) <= 0;
+}
+
+int String::operator>=( const String & rhs ) const
+{
+ return strcmp( _buffer, rhs._buffer ) >= 0;
+}
+
+char & String::operator[]( unsigned int index )
+{
+ static char dummy_writable_char;
+ if (index >= _length || !_buffer) {
+ dummy_writable_char = 0;
+ return dummy_writable_char;
+ }
+ return _buffer[ index ];
+}
+
+char String::operator[]( unsigned int index ) const
+{
+ // need to check for valid index, to do later
+ return _buffer[ index ];
+}
+
+boolean String::endsWith( const String &s2 ) const
+{
+ if ( _length < s2._length )
+ return 0;
+
+ return strcmp( &_buffer[ _length - s2._length], s2._buffer ) == 0;
+}
+
+boolean String::equals( const String &s2 ) const
+{
+ return ( _length == s2._length && strcmp( _buffer,s2._buffer ) == 0 );
+}
+
+boolean String::equalsIgnoreCase( const String &s2 ) const
+{
+ if ( this == &s2 )
+ return true; //1;
+ else if ( _length != s2._length )
+ return false; //0;
+
+ return strcmp(toLowerCase()._buffer, s2.toLowerCase()._buffer) == 0;
+}
+
+String String::replace( char findChar, char replaceChar )
+{
+ if ( _buffer == NULL ) return *this;
+ String theReturn = _buffer;
+ char* temp = theReturn._buffer;
+ while( (temp = strchr( temp, findChar )) != 0 )
+ *temp = replaceChar;
+
+ return theReturn;
+}
+
+String String::replace( const String& match, const String& replace )
+{
+ if ( _buffer == NULL ) return *this;
+ String temp = _buffer, newString;
+
+ int loc;
+ while ( (loc = temp.indexOf( match )) != -1 )
+ {
+ newString += temp.substring( 0, loc );
+ newString += replace;
+ temp = temp.substring( loc + match._length );
+ }
+ newString += temp;
+ return newString;
+}
+
+int String::indexOf( char temp ) const
+{
+ return indexOf( temp, 0 );
+}
+
+int String::indexOf( char ch, unsigned int fromIndex ) const
+{
+ if ( fromIndex >= _length )
+ return -1;
+
+ const char* temp = strchr( &_buffer[fromIndex], ch );
+ if ( temp == NULL )
+ return -1;
+
+ return temp - _buffer;
+}
+
+int String::indexOf( const String &s2 ) const
+{
+ return indexOf( s2, 0 );
+}
+
+int String::indexOf( const String &s2, unsigned int fromIndex ) const
+{
+ if ( fromIndex >= _length )
+ return -1;
+
+ const char *theFind = strstr( &_buffer[ fromIndex ], s2._buffer );
+
+ if ( theFind == NULL )
+ return -1;
+
+ return theFind - _buffer; // pointer subtraction
+}
+
+int String::lastIndexOf( char theChar ) const
+{
+ return lastIndexOf( theChar, _length - 1 );
+}
+
+int String::lastIndexOf( char ch, unsigned int fromIndex ) const
+{
+ if ( fromIndex >= _length )
+ return -1;
+
+ char tempchar = _buffer[fromIndex + 1];
+ _buffer[fromIndex + 1] = '\0';
+ char* temp = strrchr( _buffer, ch );
+ _buffer[fromIndex + 1] = tempchar;
+
+ if ( temp == NULL )
+ return -1;
+
+ return temp - _buffer;
+}
+
+int String::lastIndexOf( const String &s2 ) const
+{
+ return lastIndexOf( s2, _length - s2._length );
+}
+
+int String::lastIndexOf( const String &s2, unsigned int fromIndex ) const
+{
+ // check for empty strings
+ if ( s2._length == 0 || s2._length - 1 > fromIndex || fromIndex >= _length )
+ return -1;
+
+ // matching first character
+ char temp = s2[ 0 ];
+
+ for ( int i = fromIndex; i >= 0; i-- )
+ {
+ if ( _buffer[ i ] == temp && (*this).substring( i, i + s2._length ).equals( s2 ) )
+ return i;
+ }
+ return -1;
+}
+
+boolean String::startsWith( const String &s2 ) const
+{
+ if ( _length < s2._length )
+ return 0;
+
+ return startsWith( s2, 0 );
+}
+
+boolean String::startsWith( const String &s2, unsigned int offset ) const
+{
+ if ( offset > _length - s2._length )
+ return 0;
+
+ return strncmp( &_buffer[offset], s2._buffer, s2._length ) == 0;
+}
+
+String String::substring( unsigned int left ) const
+{
+ return substring( left, _length );
+}
+
+String String::substring( unsigned int left, unsigned int right ) const
+{
+ if ( left > right )
+ {
+ int temp = right;
+ right = left;
+ left = temp;
+ }
+
+ if ( right > _length )
+ {
+ right = _length;
+ }
+
+ char temp = _buffer[ right ]; // save the replaced character
+ _buffer[ right ] = '\0';
+ String outPut = ( _buffer + left ); // pointer arithmetic
+ _buffer[ right ] = temp; //restore character
+ return outPut;
+}
+
+String String::toLowerCase() const
+{
+ String temp = _buffer;
+
+ for ( unsigned int i = 0; i < _length; i++ )
+ temp._buffer[ i ] = (char)tolower( temp._buffer[ i ] );
+ return temp;
+}
+
+String String::toUpperCase() const
+{
+ String temp = _buffer;
+
+ for ( unsigned int i = 0; i < _length; i++ )
+ temp._buffer[ i ] = (char)toupper( temp._buffer[ i ] );
+ return temp;
+}
+
+String String::trim() const
+{
+ if ( _buffer == NULL ) return *this;
+ String temp = _buffer;
+ unsigned int i,j;
+
+ for ( i = 0; i < _length; i++ )
+ {
+ if ( !isspace(_buffer[i]) )
+ break;
+ }
+
+ for ( j = temp._length - 1; j > i; j-- )
+ {
+ if ( !isspace(_buffer[j]) )
+ break;
+ }
+
+ return temp.substring( i, j + 1);
+}
+
+void String::getBytes(unsigned char *buf, unsigned int bufsize)
+{
+ if (!bufsize || !buf) return;
+ unsigned int len = bufsize - 1;
+ if (len > _length) len = _length;
+ strncpy((char *)buf, _buffer, len);
+ buf[len] = 0;
+}
+
+void String::toCharArray(char *buf, unsigned int bufsize)
+{
+ if (!bufsize || !buf) return;
+ unsigned int len = bufsize - 1;
+ if (len > _length) len = _length;
+ strncpy(buf, _buffer, len);
+ buf[len] = 0;
+}
+
+
+long String::toInt() {
+ return atol(_buffer);
+}
diff --git a/test/ardmake/hardware/cores/arduino/WString.h b/test/ardmake/hardware/cores/arduino/WString.h
new file mode 100644
index 0000000..cadddb9
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/WString.h
@@ -0,0 +1,112 @@
+/*
+ WString.h - String library for Wiring & Arduino
+ Copyright (c) 2009-10 Hernando Barragan. All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef String_h
+#define String_h
+
+//#include "WProgram.h"
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+class String
+{
+ public:
+ // constructors
+ String( const char *value = "" );
+ String( const String &value );
+ String( const char );
+ String( const unsigned char );
+ String( const int, const int base=10);
+ String( const unsigned int, const int base=10 );
+ String( const long, const int base=10 );
+ String( const unsigned long, const int base=10 );
+ ~String() { free(_buffer); _length = _capacity = 0;} //added _length = _capacity = 0;
+
+ // operators
+ const String & operator = ( const String &rhs );
+ const String & operator +=( const String &rhs );
+ //const String & operator +=( const char );
+ int operator ==( const String &rhs ) const;
+ int operator !=( const String &rhs ) const;
+ int operator < ( const String &rhs ) const;
+ int operator > ( const String &rhs ) const;
+ int operator <=( const String &rhs ) const;
+ int operator >=( const String &rhs ) const;
+ char operator []( unsigned int index ) const;
+ char& operator []( unsigned int index );
+ //operator const char *() const { return _buffer; }
+
+ // general methods
+ char charAt( unsigned int index ) const;
+ int compareTo( const String &anotherString ) const;
+ unsigned char endsWith( const String &suffix ) const;
+ unsigned char equals( const String &anObject ) const;
+ unsigned char equalsIgnoreCase( const String &anotherString ) const;
+ int indexOf( char ch ) const;
+ int indexOf( char ch, unsigned int fromIndex ) const;
+ int indexOf( const String &str ) const;
+ int indexOf( const String &str, unsigned int fromIndex ) const;
+ int lastIndexOf( char ch ) const;
+ int lastIndexOf( char ch, unsigned int fromIndex ) const;
+ int lastIndexOf( const String &str ) const;
+ int lastIndexOf( const String &str, unsigned int fromIndex ) const;
+ const unsigned int length( ) const { return _length; }
+ void setCharAt(unsigned int index, const char ch);
+ unsigned char startsWith( const String &prefix ) const;
+ unsigned char startsWith( const String &prefix, unsigned int toffset ) const;
+ String substring( unsigned int beginIndex ) const;
+ String substring( unsigned int beginIndex, unsigned int endIndex ) const;
+ String toLowerCase( ) const;
+ String toUpperCase( ) const;
+ String trim( ) const;
+ void getBytes(unsigned char *buf, unsigned int bufsize);
+ void toCharArray(char *buf, unsigned int bufsize);
+ long toInt( );
+ const String& concat( const String &str );
+ String replace( char oldChar, char newChar );
+ String replace( const String& match, const String& replace );
+ friend String operator + ( String lhs, const String &rhs );
+
+ protected:
+ char *_buffer; // the actual char array
+ unsigned int _capacity; // the array length minus one (for the '\0')
+ unsigned int _length; // the String length (not counting the '\0')
+
+ void getBuffer(unsigned int maxStrLen);
+
+ private:
+
+};
+
+// allocate buffer space
+inline void String::getBuffer(unsigned int maxStrLen)
+{
+ _capacity = maxStrLen;
+ _buffer = (char *) malloc(_capacity + 1);
+ if (_buffer == NULL) _length = _capacity = 0;
+}
+
+inline String operator+( String lhs, const String &rhs )
+{
+ return lhs += rhs;
+}
+
+
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/binary.h b/test/ardmake/hardware/cores/arduino/binary.h
new file mode 100644
index 0000000..af14980
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/binary.h
@@ -0,0 +1,515 @@
+#ifndef Binary_h
+#define Binary_h
+
+#define B0 0
+#define B00 0
+#define B000 0
+#define B0000 0
+#define B00000 0
+#define B000000 0
+#define B0000000 0
+#define B00000000 0
+#define B1 1
+#define B01 1
+#define B001 1
+#define B0001 1
+#define B00001 1
+#define B000001 1
+#define B0000001 1
+#define B00000001 1
+#define B10 2
+#define B010 2
+#define B0010 2
+#define B00010 2
+#define B000010 2
+#define B0000010 2
+#define B00000010 2
+#define B11 3
+#define B011 3
+#define B0011 3
+#define B00011 3
+#define B000011 3
+#define B0000011 3
+#define B00000011 3
+#define B100 4
+#define B0100 4
+#define B00100 4
+#define B000100 4
+#define B0000100 4
+#define B00000100 4
+#define B101 5
+#define B0101 5
+#define B00101 5
+#define B000101 5
+#define B0000101 5
+#define B00000101 5
+#define B110 6
+#define B0110 6
+#define B00110 6
+#define B000110 6
+#define B0000110 6
+#define B00000110 6
+#define B111 7
+#define B0111 7
+#define B00111 7
+#define B000111 7
+#define B0000111 7
+#define B00000111 7
+#define B1000 8
+#define B01000 8
+#define B001000 8
+#define B0001000 8
+#define B00001000 8
+#define B1001 9
+#define B01001 9
+#define B001001 9
+#define B0001001 9
+#define B00001001 9
+#define B1010 10
+#define B01010 10
+#define B001010 10
+#define B0001010 10
+#define B00001010 10
+#define B1011 11
+#define B01011 11
+#define B001011 11
+#define B0001011 11
+#define B00001011 11
+#define B1100 12
+#define B01100 12
+#define B001100 12
+#define B0001100 12
+#define B00001100 12
+#define B1101 13
+#define B01101 13
+#define B001101 13
+#define B0001101 13
+#define B00001101 13
+#define B1110 14
+#define B01110 14
+#define B001110 14
+#define B0001110 14
+#define B00001110 14
+#define B1111 15
+#define B01111 15
+#define B001111 15
+#define B0001111 15
+#define B00001111 15
+#define B10000 16
+#define B010000 16
+#define B0010000 16
+#define B00010000 16
+#define B10001 17
+#define B010001 17
+#define B0010001 17
+#define B00010001 17
+#define B10010 18
+#define B010010 18
+#define B0010010 18
+#define B00010010 18
+#define B10011 19
+#define B010011 19
+#define B0010011 19
+#define B00010011 19
+#define B10100 20
+#define B010100 20
+#define B0010100 20
+#define B00010100 20
+#define B10101 21
+#define B010101 21
+#define B0010101 21
+#define B00010101 21
+#define B10110 22
+#define B010110 22
+#define B0010110 22
+#define B00010110 22
+#define B10111 23
+#define B010111 23
+#define B0010111 23
+#define B00010111 23
+#define B11000 24
+#define B011000 24
+#define B0011000 24
+#define B00011000 24
+#define B11001 25
+#define B011001 25
+#define B0011001 25
+#define B00011001 25
+#define B11010 26
+#define B011010 26
+#define B0011010 26
+#define B00011010 26
+#define B11011 27
+#define B011011 27
+#define B0011011 27
+#define B00011011 27
+#define B11100 28
+#define B011100 28
+#define B0011100 28
+#define B00011100 28
+#define B11101 29
+#define B011101 29
+#define B0011101 29
+#define B00011101 29
+#define B11110 30
+#define B011110 30
+#define B0011110 30
+#define B00011110 30
+#define B11111 31
+#define B011111 31
+#define B0011111 31
+#define B00011111 31
+#define B100000 32
+#define B0100000 32
+#define B00100000 32
+#define B100001 33
+#define B0100001 33
+#define B00100001 33
+#define B100010 34
+#define B0100010 34
+#define B00100010 34
+#define B100011 35
+#define B0100011 35
+#define B00100011 35
+#define B100100 36
+#define B0100100 36
+#define B00100100 36
+#define B100101 37
+#define B0100101 37
+#define B00100101 37
+#define B100110 38
+#define B0100110 38
+#define B00100110 38
+#define B100111 39
+#define B0100111 39
+#define B00100111 39
+#define B101000 40
+#define B0101000 40
+#define B00101000 40
+#define B101001 41
+#define B0101001 41
+#define B00101001 41
+#define B101010 42
+#define B0101010 42
+#define B00101010 42
+#define B101011 43
+#define B0101011 43
+#define B00101011 43
+#define B101100 44
+#define B0101100 44
+#define B00101100 44
+#define B101101 45
+#define B0101101 45
+#define B00101101 45
+#define B101110 46
+#define B0101110 46
+#define B00101110 46
+#define B101111 47
+#define B0101111 47
+#define B00101111 47
+#define B110000 48
+#define B0110000 48
+#define B00110000 48
+#define B110001 49
+#define B0110001 49
+#define B00110001 49
+#define B110010 50
+#define B0110010 50
+#define B00110010 50
+#define B110011 51
+#define B0110011 51
+#define B00110011 51
+#define B110100 52
+#define B0110100 52
+#define B00110100 52
+#define B110101 53
+#define B0110101 53
+#define B00110101 53
+#define B110110 54
+#define B0110110 54
+#define B00110110 54
+#define B110111 55
+#define B0110111 55
+#define B00110111 55
+#define B111000 56
+#define B0111000 56
+#define B00111000 56
+#define B111001 57
+#define B0111001 57
+#define B00111001 57
+#define B111010 58
+#define B0111010 58
+#define B00111010 58
+#define B111011 59
+#define B0111011 59
+#define B00111011 59
+#define B111100 60
+#define B0111100 60
+#define B00111100 60
+#define B111101 61
+#define B0111101 61
+#define B00111101 61
+#define B111110 62
+#define B0111110 62
+#define B00111110 62
+#define B111111 63
+#define B0111111 63
+#define B00111111 63
+#define B1000000 64
+#define B01000000 64
+#define B1000001 65
+#define B01000001 65
+#define B1000010 66
+#define B01000010 66
+#define B1000011 67
+#define B01000011 67
+#define B1000100 68
+#define B01000100 68
+#define B1000101 69
+#define B01000101 69
+#define B1000110 70
+#define B01000110 70
+#define B1000111 71
+#define B01000111 71
+#define B1001000 72
+#define B01001000 72
+#define B1001001 73
+#define B01001001 73
+#define B1001010 74
+#define B01001010 74
+#define B1001011 75
+#define B01001011 75
+#define B1001100 76
+#define B01001100 76
+#define B1001101 77
+#define B01001101 77
+#define B1001110 78
+#define B01001110 78
+#define B1001111 79
+#define B01001111 79
+#define B1010000 80
+#define B01010000 80
+#define B1010001 81
+#define B01010001 81
+#define B1010010 82
+#define B01010010 82
+#define B1010011 83
+#define B01010011 83
+#define B1010100 84
+#define B01010100 84
+#define B1010101 85
+#define B01010101 85
+#define B1010110 86
+#define B01010110 86
+#define B1010111 87
+#define B01010111 87
+#define B1011000 88
+#define B01011000 88
+#define B1011001 89
+#define B01011001 89
+#define B1011010 90
+#define B01011010 90
+#define B1011011 91
+#define B01011011 91
+#define B1011100 92
+#define B01011100 92
+#define B1011101 93
+#define B01011101 93
+#define B1011110 94
+#define B01011110 94
+#define B1011111 95
+#define B01011111 95
+#define B1100000 96
+#define B01100000 96
+#define B1100001 97
+#define B01100001 97
+#define B1100010 98
+#define B01100010 98
+#define B1100011 99
+#define B01100011 99
+#define B1100100 100
+#define B01100100 100
+#define B1100101 101
+#define B01100101 101
+#define B1100110 102
+#define B01100110 102
+#define B1100111 103
+#define B01100111 103
+#define B1101000 104
+#define B01101000 104
+#define B1101001 105
+#define B01101001 105
+#define B1101010 106
+#define B01101010 106
+#define B1101011 107
+#define B01101011 107
+#define B1101100 108
+#define B01101100 108
+#define B1101101 109
+#define B01101101 109
+#define B1101110 110
+#define B01101110 110
+#define B1101111 111
+#define B01101111 111
+#define B1110000 112
+#define B01110000 112
+#define B1110001 113
+#define B01110001 113
+#define B1110010 114
+#define B01110010 114
+#define B1110011 115
+#define B01110011 115
+#define B1110100 116
+#define B01110100 116
+#define B1110101 117
+#define B01110101 117
+#define B1110110 118
+#define B01110110 118
+#define B1110111 119
+#define B01110111 119
+#define B1111000 120
+#define B01111000 120
+#define B1111001 121
+#define B01111001 121
+#define B1111010 122
+#define B01111010 122
+#define B1111011 123
+#define B01111011 123
+#define B1111100 124
+#define B01111100 124
+#define B1111101 125
+#define B01111101 125
+#define B1111110 126
+#define B01111110 126
+#define B1111111 127
+#define B01111111 127
+#define B10000000 128
+#define B10000001 129
+#define B10000010 130
+#define B10000011 131
+#define B10000100 132
+#define B10000101 133
+#define B10000110 134
+#define B10000111 135
+#define B10001000 136
+#define B10001001 137
+#define B10001010 138
+#define B10001011 139
+#define B10001100 140
+#define B10001101 141
+#define B10001110 142
+#define B10001111 143
+#define B10010000 144
+#define B10010001 145
+#define B10010010 146
+#define B10010011 147
+#define B10010100 148
+#define B10010101 149
+#define B10010110 150
+#define B10010111 151
+#define B10011000 152
+#define B10011001 153
+#define B10011010 154
+#define B10011011 155
+#define B10011100 156
+#define B10011101 157
+#define B10011110 158
+#define B10011111 159
+#define B10100000 160
+#define B10100001 161
+#define B10100010 162
+#define B10100011 163
+#define B10100100 164
+#define B10100101 165
+#define B10100110 166
+#define B10100111 167
+#define B10101000 168
+#define B10101001 169
+#define B10101010 170
+#define B10101011 171
+#define B10101100 172
+#define B10101101 173
+#define B10101110 174
+#define B10101111 175
+#define B10110000 176
+#define B10110001 177
+#define B10110010 178
+#define B10110011 179
+#define B10110100 180
+#define B10110101 181
+#define B10110110 182
+#define B10110111 183
+#define B10111000 184
+#define B10111001 185
+#define B10111010 186
+#define B10111011 187
+#define B10111100 188
+#define B10111101 189
+#define B10111110 190
+#define B10111111 191
+#define B11000000 192
+#define B11000001 193
+#define B11000010 194
+#define B11000011 195
+#define B11000100 196
+#define B11000101 197
+#define B11000110 198
+#define B11000111 199
+#define B11001000 200
+#define B11001001 201
+#define B11001010 202
+#define B11001011 203
+#define B11001100 204
+#define B11001101 205
+#define B11001110 206
+#define B11001111 207
+#define B11010000 208
+#define B11010001 209
+#define B11010010 210
+#define B11010011 211
+#define B11010100 212
+#define B11010101 213
+#define B11010110 214
+#define B11010111 215
+#define B11011000 216
+#define B11011001 217
+#define B11011010 218
+#define B11011011 219
+#define B11011100 220
+#define B11011101 221
+#define B11011110 222
+#define B11011111 223
+#define B11100000 224
+#define B11100001 225
+#define B11100010 226
+#define B11100011 227
+#define B11100100 228
+#define B11100101 229
+#define B11100110 230
+#define B11100111 231
+#define B11101000 232
+#define B11101001 233
+#define B11101010 234
+#define B11101011 235
+#define B11101100 236
+#define B11101101 237
+#define B11101110 238
+#define B11101111 239
+#define B11110000 240
+#define B11110001 241
+#define B11110010 242
+#define B11110011 243
+#define B11110100 244
+#define B11110101 245
+#define B11110110 246
+#define B11110111 247
+#define B11111000 248
+#define B11111001 249
+#define B11111010 250
+#define B11111011 251
+#define B11111100 252
+#define B11111101 253
+#define B11111110 254
+#define B11111111 255
+
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/main.cpp b/test/ardmake/hardware/cores/arduino/main.cpp
new file mode 100644
index 0000000..cc6e81d
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/main.cpp
@@ -0,0 +1,14 @@
+#include <WProgram.h>
+
+int main(void)
+{
+ init();
+
+ setup();
+
+ for (;;)
+ loop();
+
+ return 0;
+}
+
diff --git a/test/ardmake/hardware/cores/arduino/main.cxx b/test/ardmake/hardware/cores/arduino/main.cxx
new file mode 100644
index 0000000..52351e4
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/main.cxx
@@ -0,0 +1,12 @@
+int main(void)
+{
+ init();
+
+ setup();
+
+ for (;;)
+ loop();
+
+ return 0;
+}
+
diff --git a/test/ardmake/hardware/cores/arduino/pins_arduino.c b/test/ardmake/hardware/cores/arduino/pins_arduino.c
new file mode 100644
index 0000000..0c816e9
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/pins_arduino.c
@@ -0,0 +1,465 @@
+/*
+ pins_arduino.c - pin definitions for the Arduino board
+ Part of Arduino / Wiring Lite
+
+ Copyright (c) 2005 David A. Mellis
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ $Id$
+*/
+
+#include <avr/io.h>
+#include "wiring_private.h"
+#include "pins_arduino.h"
+
+// On the Arduino board, digital pins are also used
+// for the analog output (software PWM). Analog input
+// pins are a separate set.
+
+// ATMEL ATMEGA8 & 168 / ARDUINO
+//
+// +-\/-+
+// PC6 1| |28 PC5 (AI 5)
+// (D 0) PD0 2| |27 PC4 (AI 4)
+// (D 1) PD1 3| |26 PC3 (AI 3)
+// (D 2) PD2 4| |25 PC2 (AI 2)
+// PWM+ (D 3) PD3 5| |24 PC1 (AI 1)
+// (D 4) PD4 6| |23 PC0 (AI 0)
+// VCC 7| |22 GND
+// GND 8| |21 AREF
+// PB6 9| |20 AVCC
+// PB7 10| |19 PB5 (D 13)
+// PWM+ (D 5) PD5 11| |18 PB4 (D 12)
+// PWM+ (D 6) PD6 12| |17 PB3 (D 11) PWM
+// (D 7) PD7 13| |16 PB2 (D 10) PWM
+// (D 8) PB0 14| |15 PB1 (D 9) PWM
+// +----+
+//
+// (PWM+ indicates the additional PWM pins on the ATmega168.)
+
+// ATMEL ATMEGA1280 / ARDUINO
+//
+// 0-7 PE0-PE7 works
+// 8-13 PB0-PB5 works
+// 14-21 PA0-PA7 works
+// 22-29 PH0-PH7 works
+// 30-35 PG5-PG0 works
+// 36-43 PC7-PC0 works
+// 44-51 PJ7-PJ0 works
+// 52-59 PL7-PL0 works
+// 60-67 PD7-PD0 works
+// A0-A7 PF0-PF7
+// A8-A15 PK0-PK7
+
+#define PA 1
+#define PB 2
+#define PC 3
+#define PD 4
+#define PE 5
+#define PF 6
+#define PG 7
+#define PH 8
+#define PJ 10
+#define PK 11
+#define PL 12
+
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+const uint16_t PROGMEM port_to_mode_PGM[] = {
+ NOT_A_PORT,
+ &DDRA,
+ &DDRB,
+ &DDRC,
+ &DDRD,
+ &DDRE,
+ &DDRF,
+ &DDRG,
+ &DDRH,
+ NOT_A_PORT,
+ &DDRJ,
+ &DDRK,
+ &DDRL,
+};
+
+const uint16_t PROGMEM port_to_output_PGM[] = {
+ NOT_A_PORT,
+ &PORTA,
+ &PORTB,
+ &PORTC,
+ &PORTD,
+ &PORTE,
+ &PORTF,
+ &PORTG,
+ &PORTH,
+ NOT_A_PORT,
+ &PORTJ,
+ &PORTK,
+ &PORTL,
+};
+
+const uint16_t PROGMEM port_to_input_PGM[] = {
+ NOT_A_PIN,
+ &PINA,
+ &PINB,
+ &PINC,
+ &PIND,
+ &PINE,
+ &PINF,
+ &PING,
+ &PINH,
+ NOT_A_PIN,
+ &PINJ,
+ &PINK,
+ &PINL,
+};
+
+const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
+ // PORTLIST
+ // -------------------------------------------
+ PE , // PE 0 ** 0 ** USART0_RX
+ PE , // PE 1 ** 1 ** USART0_TX
+ PE , // PE 4 ** 2 ** PWM2
+ PE , // PE 5 ** 3 ** PWM3
+ PG , // PG 5 ** 4 ** PWM4
+ PE , // PE 3 ** 5 ** PWM5
+ PH , // PH 3 ** 6 ** PWM6
+ PH , // PH 4 ** 7 ** PWM7
+ PH , // PH 5 ** 8 ** PWM8
+ PH , // PH 6 ** 9 ** PWM9
+ PB , // PB 4 ** 10 ** PWM10
+ PB , // PB 5 ** 11 ** PWM11
+ PB , // PB 6 ** 12 ** PWM12
+ PB , // PB 7 ** 13 ** PWM13
+ PJ , // PJ 1 ** 14 ** USART3_TX
+ PJ , // PJ 0 ** 15 ** USART3_RX
+ PH , // PH 1 ** 16 ** USART2_TX
+ PH , // PH 0 ** 17 ** USART2_RX
+ PD , // PD 3 ** 18 ** USART1_TX
+ PD , // PD 2 ** 19 ** USART1_RX
+ PD , // PD 1 ** 20 ** I2C_SDA
+ PD , // PD 0 ** 21 ** I2C_SCL
+ PA , // PA 0 ** 22 ** D22
+ PA , // PA 1 ** 23 ** D23
+ PA , // PA 2 ** 24 ** D24
+ PA , // PA 3 ** 25 ** D25
+ PA , // PA 4 ** 26 ** D26
+ PA , // PA 5 ** 27 ** D27
+ PA , // PA 6 ** 28 ** D28
+ PA , // PA 7 ** 29 ** D29
+ PC , // PC 7 ** 30 ** D30
+ PC , // PC 6 ** 31 ** D31
+ PC , // PC 5 ** 32 ** D32
+ PC , // PC 4 ** 33 ** D33
+ PC , // PC 3 ** 34 ** D34
+ PC , // PC 2 ** 35 ** D35
+ PC , // PC 1 ** 36 ** D36
+ PC , // PC 0 ** 37 ** D37
+ PD , // PD 7 ** 38 ** D38
+ PG , // PG 2 ** 39 ** D39
+ PG , // PG 1 ** 40 ** D40
+ PG , // PG 0 ** 41 ** D41
+ PL , // PL 7 ** 42 ** D42
+ PL , // PL 6 ** 43 ** D43
+ PL , // PL 5 ** 44 ** D44
+ PL , // PL 4 ** 45 ** D45
+ PL , // PL 3 ** 46 ** D46
+ PL , // PL 2 ** 47 ** D47
+ PL , // PL 1 ** 48 ** D48
+ PL , // PL 0 ** 49 ** D49
+ PB , // PB 3 ** 50 ** SPI_MISO
+ PB , // PB 2 ** 51 ** SPI_MOSI
+ PB , // PB 1 ** 52 ** SPI_SCK
+ PB , // PB 0 ** 53 ** SPI_SS
+ PF , // PF 0 ** 54 ** A0
+ PF , // PF 1 ** 55 ** A1
+ PF , // PF 2 ** 56 ** A2
+ PF , // PF 3 ** 57 ** A3
+ PF , // PF 4 ** 58 ** A4
+ PF , // PF 5 ** 59 ** A5
+ PF , // PF 6 ** 60 ** A6
+ PF , // PF 7 ** 61 ** A7
+ PK , // PK 0 ** 62 ** A8
+ PK , // PK 1 ** 63 ** A9
+ PK , // PK 2 ** 64 ** A10
+ PK , // PK 3 ** 65 ** A11
+ PK , // PK 4 ** 66 ** A12
+ PK , // PK 5 ** 67 ** A13
+ PK , // PK 6 ** 68 ** A14
+ PK , // PK 7 ** 69 ** A15
+};
+
+const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
+ // PIN IN PORT
+ // -------------------------------------------
+ _BV( 0 ) , // PE 0 ** 0 ** USART0_RX
+ _BV( 1 ) , // PE 1 ** 1 ** USART0_TX
+ _BV( 4 ) , // PE 4 ** 2 ** PWM2
+ _BV( 5 ) , // PE 5 ** 3 ** PWM3
+ _BV( 5 ) , // PG 5 ** 4 ** PWM4
+ _BV( 3 ) , // PE 3 ** 5 ** PWM5
+ _BV( 3 ) , // PH 3 ** 6 ** PWM6
+ _BV( 4 ) , // PH 4 ** 7 ** PWM7
+ _BV( 5 ) , // PH 5 ** 8 ** PWM8
+ _BV( 6 ) , // PH 6 ** 9 ** PWM9
+ _BV( 4 ) , // PB 4 ** 10 ** PWM10
+ _BV( 5 ) , // PB 5 ** 11 ** PWM11
+ _BV( 6 ) , // PB 6 ** 12 ** PWM12
+ _BV( 7 ) , // PB 7 ** 13 ** PWM13
+ _BV( 1 ) , // PJ 1 ** 14 ** USART3_TX
+ _BV( 0 ) , // PJ 0 ** 15 ** USART3_RX
+ _BV( 1 ) , // PH 1 ** 16 ** USART2_TX
+ _BV( 0 ) , // PH 0 ** 17 ** USART2_RX
+ _BV( 3 ) , // PD 3 ** 18 ** USART1_TX
+ _BV( 2 ) , // PD 2 ** 19 ** USART1_RX
+ _BV( 1 ) , // PD 1 ** 20 ** I2C_SDA
+ _BV( 0 ) , // PD 0 ** 21 ** I2C_SCL
+ _BV( 0 ) , // PA 0 ** 22 ** D22
+ _BV( 1 ) , // PA 1 ** 23 ** D23
+ _BV( 2 ) , // PA 2 ** 24 ** D24
+ _BV( 3 ) , // PA 3 ** 25 ** D25
+ _BV( 4 ) , // PA 4 ** 26 ** D26
+ _BV( 5 ) , // PA 5 ** 27 ** D27
+ _BV( 6 ) , // PA 6 ** 28 ** D28
+ _BV( 7 ) , // PA 7 ** 29 ** D29
+ _BV( 7 ) , // PC 7 ** 30 ** D30
+ _BV( 6 ) , // PC 6 ** 31 ** D31
+ _BV( 5 ) , // PC 5 ** 32 ** D32
+ _BV( 4 ) , // PC 4 ** 33 ** D33
+ _BV( 3 ) , // PC 3 ** 34 ** D34
+ _BV( 2 ) , // PC 2 ** 35 ** D35
+ _BV( 1 ) , // PC 1 ** 36 ** D36
+ _BV( 0 ) , // PC 0 ** 37 ** D37
+ _BV( 7 ) , // PD 7 ** 38 ** D38
+ _BV( 2 ) , // PG 2 ** 39 ** D39
+ _BV( 1 ) , // PG 1 ** 40 ** D40
+ _BV( 0 ) , // PG 0 ** 41 ** D41
+ _BV( 7 ) , // PL 7 ** 42 ** D42
+ _BV( 6 ) , // PL 6 ** 43 ** D43
+ _BV( 5 ) , // PL 5 ** 44 ** D44
+ _BV( 4 ) , // PL 4 ** 45 ** D45
+ _BV( 3 ) , // PL 3 ** 46 ** D46
+ _BV( 2 ) , // PL 2 ** 47 ** D47
+ _BV( 1 ) , // PL 1 ** 48 ** D48
+ _BV( 0 ) , // PL 0 ** 49 ** D49
+ _BV( 3 ) , // PB 3 ** 50 ** SPI_MISO
+ _BV( 2 ) , // PB 2 ** 51 ** SPI_MOSI
+ _BV( 1 ) , // PB 1 ** 52 ** SPI_SCK
+ _BV( 0 ) , // PB 0 ** 53 ** SPI_SS
+ _BV( 0 ) , // PF 0 ** 54 ** A0
+ _BV( 1 ) , // PF 1 ** 55 ** A1
+ _BV( 2 ) , // PF 2 ** 56 ** A2
+ _BV( 3 ) , // PF 3 ** 57 ** A3
+ _BV( 4 ) , // PF 4 ** 58 ** A4
+ _BV( 5 ) , // PF 5 ** 59 ** A5
+ _BV( 6 ) , // PF 6 ** 60 ** A6
+ _BV( 7 ) , // PF 7 ** 61 ** A7
+ _BV( 0 ) , // PK 0 ** 62 ** A8
+ _BV( 1 ) , // PK 1 ** 63 ** A9
+ _BV( 2 ) , // PK 2 ** 64 ** A10
+ _BV( 3 ) , // PK 3 ** 65 ** A11
+ _BV( 4 ) , // PK 4 ** 66 ** A12
+ _BV( 5 ) , // PK 5 ** 67 ** A13
+ _BV( 6 ) , // PK 6 ** 68 ** A14
+ _BV( 7 ) , // PK 7 ** 69 ** A15
+};
+
+const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
+ // TIMERS
+ // -------------------------------------------
+ NOT_ON_TIMER , // PE 0 ** 0 ** USART0_RX
+ NOT_ON_TIMER , // PE 1 ** 1 ** USART0_TX
+ TIMER3B , // PE 4 ** 2 ** PWM2
+ TIMER3C , // PE 5 ** 3 ** PWM3
+ TIMER0B , // PG 5 ** 4 ** PWM4
+ TIMER3A , // PE 3 ** 5 ** PWM5
+ TIMER4A , // PH 3 ** 6 ** PWM6
+ TIMER4B , // PH 4 ** 7 ** PWM7
+ TIMER4C , // PH 5 ** 8 ** PWM8
+ TIMER2B , // PH 6 ** 9 ** PWM9
+ TIMER2A , // PB 4 ** 10 ** PWM10
+ TIMER1A , // PB 5 ** 11 ** PWM11
+ TIMER1B , // PB 6 ** 12 ** PWM12
+ TIMER0A , // PB 7 ** 13 ** PWM13
+ NOT_ON_TIMER , // PJ 1 ** 14 ** USART3_TX
+ NOT_ON_TIMER , // PJ 0 ** 15 ** USART3_RX
+ NOT_ON_TIMER , // PH 1 ** 16 ** USART2_TX
+ NOT_ON_TIMER , // PH 0 ** 17 ** USART2_RX
+ NOT_ON_TIMER , // PD 3 ** 18 ** USART1_TX
+ NOT_ON_TIMER , // PD 2 ** 19 ** USART1_RX
+ NOT_ON_TIMER , // PD 1 ** 20 ** I2C_SDA
+ NOT_ON_TIMER , // PD 0 ** 21 ** I2C_SCL
+ NOT_ON_TIMER , // PA 0 ** 22 ** D22
+ NOT_ON_TIMER , // PA 1 ** 23 ** D23
+ NOT_ON_TIMER , // PA 2 ** 24 ** D24
+ NOT_ON_TIMER , // PA 3 ** 25 ** D25
+ NOT_ON_TIMER , // PA 4 ** 26 ** D26
+ NOT_ON_TIMER , // PA 5 ** 27 ** D27
+ NOT_ON_TIMER , // PA 6 ** 28 ** D28
+ NOT_ON_TIMER , // PA 7 ** 29 ** D29
+ NOT_ON_TIMER , // PC 7 ** 30 ** D30
+ NOT_ON_TIMER , // PC 6 ** 31 ** D31
+ NOT_ON_TIMER , // PC 5 ** 32 ** D32
+ NOT_ON_TIMER , // PC 4 ** 33 ** D33
+ NOT_ON_TIMER , // PC 3 ** 34 ** D34
+ NOT_ON_TIMER , // PC 2 ** 35 ** D35
+ NOT_ON_TIMER , // PC 1 ** 36 ** D36
+ NOT_ON_TIMER , // PC 0 ** 37 ** D37
+ NOT_ON_TIMER , // PD 7 ** 38 ** D38
+ NOT_ON_TIMER , // PG 2 ** 39 ** D39
+ NOT_ON_TIMER , // PG 1 ** 40 ** D40
+ NOT_ON_TIMER , // PG 0 ** 41 ** D41
+ NOT_ON_TIMER , // PL 7 ** 42 ** D42
+ NOT_ON_TIMER , // PL 6 ** 43 ** D43
+ TIMER5C , // PL 5 ** 44 ** D44
+ TIMER5B , // PL 4 ** 45 ** D45
+ TIMER5A , // PL 3 ** 46 ** D46
+ NOT_ON_TIMER , // PL 2 ** 47 ** D47
+ NOT_ON_TIMER , // PL 1 ** 48 ** D48
+ NOT_ON_TIMER , // PL 0 ** 49 ** D49
+ NOT_ON_TIMER , // PB 3 ** 50 ** SPI_MISO
+ NOT_ON_TIMER , // PB 2 ** 51 ** SPI_MOSI
+ NOT_ON_TIMER , // PB 1 ** 52 ** SPI_SCK
+ NOT_ON_TIMER , // PB 0 ** 53 ** SPI_SS
+ NOT_ON_TIMER , // PF 0 ** 54 ** A0
+ NOT_ON_TIMER , // PF 1 ** 55 ** A1
+ NOT_ON_TIMER , // PF 2 ** 56 ** A2
+ NOT_ON_TIMER , // PF 3 ** 57 ** A3
+ NOT_ON_TIMER , // PF 4 ** 58 ** A4
+ NOT_ON_TIMER , // PF 5 ** 59 ** A5
+ NOT_ON_TIMER , // PF 6 ** 60 ** A6
+ NOT_ON_TIMER , // PF 7 ** 61 ** A7
+ NOT_ON_TIMER , // PK 0 ** 62 ** A8
+ NOT_ON_TIMER , // PK 1 ** 63 ** A9
+ NOT_ON_TIMER , // PK 2 ** 64 ** A10
+ NOT_ON_TIMER , // PK 3 ** 65 ** A11
+ NOT_ON_TIMER , // PK 4 ** 66 ** A12
+ NOT_ON_TIMER , // PK 5 ** 67 ** A13
+ NOT_ON_TIMER , // PK 6 ** 68 ** A14
+ NOT_ON_TIMER , // PK 7 ** 69 ** A15
+};
+#else
+// these arrays map port names (e.g. port B) to the
+// appropriate addresses for various functions (e.g. reading
+// and writing)
+const uint16_t PROGMEM port_to_mode_PGM[] = {
+ NOT_A_PORT,
+ NOT_A_PORT,
+ &DDRB,
+ &DDRC,
+ &DDRD,
+};
+
+const uint16_t PROGMEM port_to_output_PGM[] = {
+ NOT_A_PORT,
+ NOT_A_PORT,
+ &PORTB,
+ &PORTC,
+ &PORTD,
+};
+
+const uint16_t PROGMEM port_to_input_PGM[] = {
+ NOT_A_PORT,
+ NOT_A_PORT,
+ &PINB,
+ &PINC,
+ &PIND,
+};
+
+const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
+ PD, /* 0 */
+ PD,
+ PD,
+ PD,
+ PD,
+ PD,
+ PD,
+ PD,
+ PB, /* 8 */
+ PB,
+ PB,
+ PB,
+ PB,
+ PB,
+ PC, /* 14 */
+ PC,
+ PC,
+ PC,
+ PC,
+ PC,
+};
+
+const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
+ _BV(0), /* 0, port D */
+ _BV(1),
+ _BV(2),
+ _BV(3),
+ _BV(4),
+ _BV(5),
+ _BV(6),
+ _BV(7),
+ _BV(0), /* 8, port B */
+ _BV(1),
+ _BV(2),
+ _BV(3),
+ _BV(4),
+ _BV(5),
+ _BV(0), /* 14, port C */
+ _BV(1),
+ _BV(2),
+ _BV(3),
+ _BV(4),
+ _BV(5),
+};
+
+const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
+ NOT_ON_TIMER, /* 0 - port D */
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+ // on the ATmega168, digital pin 3 has hardware pwm
+#if defined(__AVR_ATmega8__)
+ NOT_ON_TIMER,
+#else
+ TIMER2B,
+#endif
+ NOT_ON_TIMER,
+ // on the ATmega168, digital pins 5 and 6 have hardware pwm
+#if defined(__AVR_ATmega8__)
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+#else
+ TIMER0B,
+ TIMER0A,
+#endif
+ NOT_ON_TIMER,
+ NOT_ON_TIMER, /* 8 - port B */
+ TIMER1A,
+ TIMER1B,
+#if defined(__AVR_ATmega8__)
+ TIMER2,
+#else
+ TIMER2A,
+#endif
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+ NOT_ON_TIMER, /* 14 - port C */
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+};
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/pins_arduino.d b/test/ardmake/hardware/cores/arduino/pins_arduino.d
new file mode 100644
index 0000000..aef7639
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/pins_arduino.d
@@ -0,0 +1,24 @@
+ardmake/hardware/cores/arduino/pins_arduino.o ardmake/hardware/cores/arduino/pins_arduino.d: ardmake/hardware/cores/arduino/pins_arduino.c \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/pins_arduino.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h
diff --git a/test/ardmake/hardware/cores/arduino/pins_arduino.h b/test/ardmake/hardware/cores/arduino/pins_arduino.h
new file mode 100644
index 0000000..bc931c5
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/pins_arduino.h
@@ -0,0 +1,88 @@
+/*
+ pins_arduino.h - Pin definition functions for Arduino
+ Part of Arduino - http://www.arduino.cc/
+
+ Copyright (c) 2007 David A. Mellis
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
+*/
+
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <avr/pgmspace.h>
+
+#define NOT_A_PIN 0
+#define NOT_A_PORT 0
+
+#define NOT_ON_TIMER 0
+#define TIMER0A 1
+#define TIMER0B 2
+#define TIMER1A 3
+#define TIMER1B 4
+#define TIMER2 5
+#define TIMER2A 6
+#define TIMER2B 7
+
+#define TIMER3A 8
+#define TIMER3B 9
+#define TIMER3C 10
+#define TIMER4A 11
+#define TIMER4B 12
+#define TIMER4C 13
+#define TIMER5A 14
+#define TIMER5B 15
+#define TIMER5C 16
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+const static uint8_t SS = 53;
+const static uint8_t MOSI = 51;
+const static uint8_t MISO = 50;
+const static uint8_t SCK = 52;
+#else
+const static uint8_t SS = 10;
+const static uint8_t MOSI = 11;
+const static uint8_t MISO = 12;
+const static uint8_t SCK = 13;
+#endif
+
+// On the ATmega1280, the addresses of some of the port registers are
+// greater than 255, so we can't store them in uint8_t's.
+extern const uint16_t PROGMEM port_to_mode_PGM[];
+extern const uint16_t PROGMEM port_to_input_PGM[];
+extern const uint16_t PROGMEM port_to_output_PGM[];
+
+extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
+// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+//
+// These perform slightly better as macros compared to inline functions
+//
+#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
+#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
+#define digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
+#define analogInPinToBit(P) (P)
+#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
+#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
+#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
+
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/wiring.c b/test/ardmake/hardware/cores/arduino/wiring.c
new file mode 100644
index 0000000..b90d07e
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring.c
@@ -0,0 +1,289 @@
+/*
+ wiring.c - Partial implementation of the Wiring API for the ATmega8.
+ Part of Arduino - http://www.arduino.cc/
+
+ Copyright (c) 2005-2006 David A. Mellis
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ $Id$
+*/
+
+#include "wiring_private.h"
+
+// the prescaler is set so that timer0 ticks every 64 clock cycles, and the
+// the overflow handler is called every 256 ticks.
+#define MICROSECONDS_PER_TIMER0_OVERFLOW (clockCyclesToMicroseconds(64 * 256))
+
+// the whole number of milliseconds per timer0 overflow
+#define MILLIS_INC (MICROSECONDS_PER_TIMER0_OVERFLOW / 1000)
+
+// the fractional number of milliseconds per timer0 overflow. we shift right
+// by three to fit these numbers into a byte. (for the clock speeds we care
+// about - 8 and 16 MHz - this doesn't lose precision.)
+#define FRACT_INC ((MICROSECONDS_PER_TIMER0_OVERFLOW % 1000) >> 3)
+#define FRACT_MAX (1000 >> 3)
+
+volatile unsigned long timer0_overflow_count = 0;
+volatile unsigned long timer0_millis = 0;
+static unsigned char timer0_fract = 0;
+
+SIGNAL(TIMER0_OVF_vect)
+{
+ // copy these to local variables so they can be stored in registers
+ // (volatile variables must be read from memory on every access)
+ unsigned long m = timer0_millis;
+ unsigned char f = timer0_fract;
+
+ m += MILLIS_INC;
+ f += FRACT_INC;
+ if (f >= FRACT_MAX) {
+ f -= FRACT_MAX;
+ m += 1;
+ }
+
+ timer0_fract = f;
+ timer0_millis = m;
+ timer0_overflow_count++;
+}
+
+unsigned long millis()
+{
+ unsigned long m;
+ uint8_t oldSREG = SREG;
+
+ // disable interrupts while we read timer0_millis or we might get an
+ // inconsistent value (e.g. in the middle of a write to timer0_millis)
+ cli();
+ m = timer0_millis;
+ SREG = oldSREG;
+
+ return m;
+}
+
+unsigned long micros() {
+ unsigned long m;
+ uint8_t oldSREG = SREG, t;
+
+ cli();
+ m = timer0_overflow_count;
+#if defined(TCNT0)
+ t = TCNT0;
+#elif defined(TCNT0L)
+ t = TCNT0L;
+#else
+ #error TIMER 0 not defined
+#endif
+
+
+#ifdef TIFR0
+ if ((TIFR0 & _BV(TOV0)) && (t < 255))
+ m++;
+#else
+ if ((TIFR & _BV(TOV0)) && (t < 255))
+ m++;
+#endif
+
+ SREG = oldSREG;
+
+ return ((m << 8) + t) * (64 / clockCyclesPerMicrosecond());
+}
+
+void delay(unsigned long ms)
+{
+ uint16_t start = (uint16_t)micros();
+
+ while (ms > 0) {
+ if (((uint16_t)micros() - start) >= 1000) {
+ ms--;
+ start += 1000;
+ }
+ }
+}
+
+/* Delay for the given number of microseconds. Assumes a 8 or 16 MHz clock. */
+void delayMicroseconds(unsigned int us)
+{
+ // calling avrlib's delay_us() function with low values (e.g. 1 or
+ // 2 microseconds) gives delays longer than desired.
+ //delay_us(us);
+
+#if F_CPU >= 16000000L
+ // for the 16 MHz clock on most Arduino boards
+
+ // for a one-microsecond delay, simply return. the overhead
+ // of the function call yields a delay of approximately 1 1/8 us.
+ if (--us == 0)
+ return;
+
+ // the following loop takes a quarter of a microsecond (4 cycles)
+ // per iteration, so execute it four times for each microsecond of
+ // delay requested.
+ us <<= 2;
+
+ // account for the time taken in the preceeding commands.
+ us -= 2;
+#else
+ // for the 8 MHz internal clock on the ATmega168
+
+ // for a one- or two-microsecond delay, simply return. the overhead of
+ // the function calls takes more than two microseconds. can't just
+ // subtract two, since us is unsigned; we'd overflow.
+ if (--us == 0)
+ return;
+ if (--us == 0)
+ return;
+
+ // the following loop takes half of a microsecond (4 cycles)
+ // per iteration, so execute it twice for each microsecond of
+ // delay requested.
+ us <<= 1;
+
+ // partially compensate for the time taken by the preceeding commands.
+ // we can't subtract any more than this or we'd overflow w/ small delays.
+ us--;
+#endif
+
+ // busy wait
+ __asm__ __volatile__ (
+ "1: sbiw %0,1" "\n\t" // 2 cycles
+ "brne 1b" : "=w" (us) : "0" (us) // 2 cycles
+ );
+}
+
+void init()
+{
+ // this needs to be called before setup() or some functions won't
+ // work there
+ sei();
+
+ // on the ATmega168, timer 0 is also used for fast hardware pwm
+ // (using phase-correct PWM would mean that timer 0 overflowed half as often
+ // resulting in different millis() behavior on the ATmega8 and ATmega168)
+#if defined(TCCR0A) && defined(WGM01)
+ sbi(TCCR0A, WGM01);
+ sbi(TCCR0A, WGM00);
+#endif
+
+ // set timer 0 prescale factor to 64
+#if defined(__AVR_ATmega128__)
+ // CPU specific: different values for the ATmega128
+ sbi(TCCR0, CS02);
+#elif defined(TCCR0) && defined(CS01) && defined(CS00)
+ // this combination is for the standard atmega8
+ sbi(TCCR0, CS01);
+ sbi(TCCR0, CS00);
+#elif defined(TCCR0B) && defined(CS01) && defined(CS00)
+ // this combination is for the standard 168/328/1280/2560
+ sbi(TCCR0B, CS01);
+ sbi(TCCR0B, CS00);
+#elif defined(TCCR0A) && defined(CS01) && defined(CS00)
+ // this combination is for the __AVR_ATmega645__ series
+ sbi(TCCR0A, CS01);
+ sbi(TCCR0A, CS00);
+#else
+ #error Timer 0 prescale factor 64 not set correctly
+#endif
+
+ // enable timer 0 overflow interrupt
+#if defined(TIMSK) && defined(TOIE0)
+ sbi(TIMSK, TOIE0);
+#elif defined(TIMSK0) && defined(TOIE0)
+ sbi(TIMSK0, TOIE0);
+#else
+ #error Timer 0 overflow interrupt not set correctly
+#endif
+
+ // timers 1 and 2 are used for phase-correct hardware pwm
+ // this is better for motors as it ensures an even waveform
+ // note, however, that fast pwm mode can achieve a frequency of up
+ // 8 MHz (with a 16 MHz clock) at 50% duty cycle
+
+ TCCR1B = 0;
+
+ // set timer 1 prescale factor to 64
+#if defined(TCCR1B) && defined(CS11) && defined(CS10)
+ sbi(TCCR1B, CS11);
+ sbi(TCCR1B, CS10);
+#elif defined(TCCR1) && defined(CS11) && defined(CS10)
+ sbi(TCCR1, CS11);
+ sbi(TCCR1, CS10);
+#endif
+ // put timer 1 in 8-bit phase correct pwm mode
+#if defined(TCCR1A) && defined(WGM10)
+ sbi(TCCR1A, WGM10);
+#elif defined(TCCR1)
+ #warning this needs to be finished
+#endif
+
+ // set timer 2 prescale factor to 64
+#if defined(TCCR2) && defined(CS22)
+ sbi(TCCR2, CS22);
+#elif defined(TCCR2B) && defined(CS22)
+ sbi(TCCR2B, CS22);
+#else
+ #warning Timer 2 not finished (may not be present on this CPU)
+#endif
+
+ // configure timer 2 for phase correct pwm (8-bit)
+#if defined(TCCR2) && defined(WGM20)
+ sbi(TCCR2, WGM20);
+#elif defined(TCCR2A) && defined(WGM20)
+ sbi(TCCR2A, WGM20);
+#else
+ #warning Timer 2 not finished (may not be present on this CPU)
+#endif
+
+#if defined(TCCR3B) && defined(CS31) && defined(WGM30)
+ sbi(TCCR3B, CS31); // set timer 3 prescale factor to 64
+ sbi(TCCR3B, CS30);
+ sbi(TCCR3A, WGM30); // put timer 3 in 8-bit phase correct pwm mode
+#endif
+
+#if defined(TCCR4B) && defined(CS41) && defined(WGM40)
+ sbi(TCCR4B, CS41); // set timer 4 prescale factor to 64
+ sbi(TCCR4B, CS40);
+ sbi(TCCR4A, WGM40); // put timer 4 in 8-bit phase correct pwm mode
+#endif
+
+#if defined(TCCR5B) && defined(CS51) && defined(WGM50)
+ sbi(TCCR5B, CS51); // set timer 5 prescale factor to 64
+ sbi(TCCR5B, CS50);
+ sbi(TCCR5A, WGM50); // put timer 5 in 8-bit phase correct pwm mode
+#endif
+
+#if defined(ADCSRA)
+ // set a2d prescale factor to 128
+ // 16 MHz / 128 = 125 KHz, inside the desired 50-200 KHz range.
+ // XXX: this will not work properly for other clock speeds, and
+ // this code should use F_CPU to determine the prescale factor.
+ sbi(ADCSRA, ADPS2);
+ sbi(ADCSRA, ADPS1);
+ sbi(ADCSRA, ADPS0);
+
+ // enable a2d conversions
+ sbi(ADCSRA, ADEN);
+#endif
+
+ // the bootloader connects pins 0 and 1 to the USART; disconnect them
+ // here so they can be used as normal digital i/o; they will be
+ // reconnected in Serial.begin()
+#if defined(UCSRB)
+ UCSRB = 0;
+#elif defined(UCSR0B)
+ UCSR0B = 0;
+#endif
+}
diff --git a/test/ardmake/hardware/cores/arduino/wiring.d b/test/ardmake/hardware/cores/arduino/wiring.d
new file mode 100644
index 0000000..ea1b80f
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring.d
@@ -0,0 +1,22 @@
+ardmake/hardware/cores/arduino/wiring.o ardmake/hardware/cores/arduino/wiring.d: ardmake/hardware/cores/arduino/wiring.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h
diff --git a/test/ardmake/hardware/cores/arduino/wiring.h b/test/ardmake/hardware/cores/arduino/wiring.h
new file mode 100644
index 0000000..e29959b
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring.h
@@ -0,0 +1,135 @@
+/*
+ wiring.h - Partial implementation of the Wiring API for the ATmega8.
+ Part of Arduino - http://www.arduino.cc/
+
+ Copyright (c) 2005-2006 David A. Mellis
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ $Id$
+*/
+
+#ifndef Wiring_h
+#define Wiring_h
+
+#include <avr/io.h>
+#include <stdlib.h>
+#include "binary.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#define HIGH 0x1
+#define LOW 0x0
+
+#define INPUT 0x0
+#define OUTPUT 0x1
+
+#define true 0x1
+#define false 0x0
+
+#define PI 3.1415926535897932384626433832795
+#define HALF_PI 1.5707963267948966192313216916398
+#define TWO_PI 6.283185307179586476925286766559
+#define DEG_TO_RAD 0.017453292519943295769236907684886
+#define RAD_TO_DEG 57.295779513082320876798154814105
+
+#define SERIAL 0x0
+#define DISPLAY 0x1
+
+#define LSBFIRST 0
+#define MSBFIRST 1
+
+#define CHANGE 1
+#define FALLING 2
+#define RISING 3
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#define INTERNAL1V1 2
+#define INTERNAL2V56 3
+#else
+#define INTERNAL 3
+#endif
+#define DEFAULT 1
+#define EXTERNAL 0
+
+// undefine stdlib's abs if encountered
+#ifdef abs
+#undef abs
+#endif
+
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+#define abs(x) ((x)>0?(x):-(x))
+#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#define round(x) ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
+#define radians(deg) ((deg)*DEG_TO_RAD)
+#define degrees(rad) ((rad)*RAD_TO_DEG)
+#define sq(x) ((x)*(x))
+
+#define interrupts() sei()
+#define noInterrupts() cli()
+
+#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
+#define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (F_CPU / 1000L) )
+#define microsecondsToClockCycles(a) ( ((a) * (F_CPU / 1000L)) / 1000L )
+
+#define lowByte(w) ((uint8_t) ((w) & 0xff))
+#define highByte(w) ((uint8_t) ((w) >> 8))
+
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+
+
+typedef unsigned int word;
+
+#define bit(b) (1UL << (b))
+
+typedef uint8_t boolean;
+typedef uint8_t byte;
+
+void init(void);
+
+void pinMode(uint8_t, uint8_t);
+void digitalWrite(uint8_t, uint8_t);
+int digitalRead(uint8_t);
+int analogRead(uint8_t);
+void analogReference(uint8_t mode);
+void analogWrite(uint8_t, int);
+
+unsigned long millis(void);
+unsigned long micros(void);
+void delay(unsigned long);
+void delayMicroseconds(unsigned int us);
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+
+void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+
+void attachInterrupt(uint8_t, void (*)(void), int mode);
+void detachInterrupt(uint8_t);
+
+void setup(void);
+void loop(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/wiring_analog.c b/test/ardmake/hardware/cores/arduino/wiring_analog.c
new file mode 100644
index 0000000..d248f4c
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring_analog.c
@@ -0,0 +1,259 @@
+/*
+ wiring_analog.c - analog input and output
+ Part of Arduino - http://www.arduino.cc/
+
+ Copyright (c) 2005-2006 David A. Mellis
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ Modified 28 September 2010 by Mark Sproul
+
+ $Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
+*/
+
+#include "wiring_private.h"
+#include "pins_arduino.h"
+
+uint8_t analog_reference = DEFAULT;
+
+void analogReference(uint8_t mode)
+{
+ // can't actually set the register here because the default setting
+ // will connect AVCC and the AREF pin, which would cause a short if
+ // there's something connected to AREF.
+ analog_reference = mode;
+}
+
+int analogRead(uint8_t pin)
+{
+ uint8_t low, high;
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+ if (pin >= 54) pin -= 54; // allow for channel or pin numbers
+#else
+ if (pin >= 14) pin -= 14; // allow for channel or pin numbers
+#endif
+
+#if defined(ADCSRB) && defined(MUX5)
+ // the MUX5 bit of ADCSRB selects whether we're reading from channels
+ // 0 to 7 (MUX5 low) or 8 to 15 (MUX5 high).
+ ADCSRB = (ADCSRB & ~(1 << MUX5)) | (((pin >> 3) & 0x01) << MUX5);
+#endif
+
+ // set the analog reference (high two bits of ADMUX) and select the
+ // channel (low 4 bits). this also sets ADLAR (left-adjust result)
+ // to 0 (the default).
+#if defined(ADMUX)
+ ADMUX = (analog_reference << 6) | (pin & 0x07);
+#endif
+
+ // without a delay, we seem to read from the wrong channel
+ //delay(1);
+
+#if defined(ADCSRA) && defined(ADCL)
+ // start the conversion
+ sbi(ADCSRA, ADSC);
+
+ // ADSC is cleared when the conversion finishes
+ while (bit_is_set(ADCSRA, ADSC));
+
+ // we have to read ADCL first; doing so locks both ADCL
+ // and ADCH until ADCH is read. reading ADCL second would
+ // cause the results of each conversion to be discarded,
+ // as ADCL and ADCH would be locked when it completed.
+ low = ADCL;
+ high = ADCH;
+#else
+ // we dont have an ADC, return 0
+ low = 0;
+ high = 0;
+#endif
+
+ // combine the two bytes
+ return (high << 8) | low;
+}
+
+// Right now, PWM output only works on the pins with
+// hardware support. These are defined in the appropriate
+// pins_*.c file. For the rest of the pins, we default
+// to digital output.
+void analogWrite(uint8_t pin, int val)
+{
+ // We need to make sure the PWM output is enabled for those pins
+ // that support it, as we turn it off when digitally reading or
+ // writing with them. Also, make sure the pin is in output mode
+ // for consistenty with Wiring, which doesn't require a pinMode
+ // call for the analog output pins.
+ pinMode(pin, OUTPUT);
+ if (val == 0)
+ {
+ digitalWrite(pin, LOW);
+ }
+ else if (val == 255)
+ {
+ digitalWrite(pin, HIGH);
+ }
+ else
+ {
+ switch(digitalPinToTimer(pin))
+ {
+ // XXX fix needed for atmega8
+ #if defined(TCCR0) && defined(COM00) && !defined(__AVR_ATmega8__)
+ case TIMER0A:
+ // connect pwm to pin on timer 0
+ sbi(TCCR0, COM00);
+ OCR0 = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR0A) && defined(COM0A1)
+ case TIMER0A:
+ // connect pwm to pin on timer 0, channel A
+ sbi(TCCR0A, COM0A1);
+ OCR0A = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR0A) && defined(COM0B1)
+ case TIMER0B:
+ // connect pwm to pin on timer 0, channel B
+ sbi(TCCR0A, COM0B1);
+ OCR0B = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR1A) && defined(COM1A1)
+ case TIMER1A:
+ // connect pwm to pin on timer 1, channel A
+ sbi(TCCR1A, COM1A1);
+ OCR1A = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR1A) && defined(COM1B1)
+ case TIMER1B:
+ // connect pwm to pin on timer 1, channel B
+ sbi(TCCR1A, COM1B1);
+ OCR1B = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR2) && defined(COM21)
+ case TIMER2:
+ // connect pwm to pin on timer 2
+ sbi(TCCR2, COM21);
+ OCR2 = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR2A) && defined(COM2A1)
+ case TIMER2A:
+ // connect pwm to pin on timer 2, channel A
+ sbi(TCCR2A, COM2A1);
+ OCR2A = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR2A) && defined(COM2B1)
+ case TIMER2B:
+ // connect pwm to pin on timer 2, channel B
+ sbi(TCCR2A, COM2B1);
+ OCR2B = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR3A) && defined(COM3A1)
+ case TIMER3A:
+ // connect pwm to pin on timer 3, channel A
+ sbi(TCCR3A, COM3A1);
+ OCR3A = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR3A) && defined(COM3B1)
+ case TIMER3B:
+ // connect pwm to pin on timer 3, channel B
+ sbi(TCCR3A, COM3B1);
+ OCR3B = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR3A) && defined(COM3C1)
+ case TIMER3C:
+ // connect pwm to pin on timer 3, channel C
+ sbi(TCCR3A, COM3C1);
+ OCR3C = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR4A) && defined(COM4A1)
+ case TIMER4A:
+ // connect pwm to pin on timer 4, channel A
+ sbi(TCCR4A, COM4A1);
+ OCR4A = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR4A) && defined(COM4B1)
+ case TIMER4B:
+ // connect pwm to pin on timer 4, channel B
+ sbi(TCCR4A, COM4B1);
+ OCR4B = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR4A) && defined(COM4C1)
+ case TIMER4C:
+ // connect pwm to pin on timer 4, channel C
+ sbi(TCCR4A, COM4C1);
+ OCR4C = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR5A) && defined(COM5A1)
+ case TIMER5A:
+ // connect pwm to pin on timer 5, channel A
+ sbi(TCCR5A, COM5A1);
+ OCR5A = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR5A) && defined(COM5B1)
+ case TIMER5B:
+ // connect pwm to pin on timer 5, channel B
+ sbi(TCCR5A, COM5B1);
+ OCR5B = val; // set pwm duty
+ break;
+ #endif
+
+ #if defined(TCCR5A) && defined(COM5C1)
+ case TIMER5C:
+ // connect pwm to pin on timer 5, channel C
+ sbi(TCCR5A, COM5C1);
+ OCR5C = val; // set pwm duty
+ break;
+ #endif
+
+ case NOT_ON_TIMER:
+ default:
+ if (val < 128) {
+ digitalWrite(pin, LOW);
+ } else {
+ digitalWrite(pin, HIGH);
+ }
+ }
+ }
+}
diff --git a/test/ardmake/hardware/cores/arduino/wiring_analog.d b/test/ardmake/hardware/cores/arduino/wiring_analog.d
new file mode 100644
index 0000000..43e0c9c
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring_analog.d
@@ -0,0 +1,24 @@
+ardmake/hardware/cores/arduino/wiring_analog.o ardmake/hardware/cores/arduino/wiring_analog.d: ardmake/hardware/cores/arduino/wiring_analog.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/pins_arduino.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h
diff --git a/test/ardmake/hardware/cores/arduino/wiring_digital.c b/test/ardmake/hardware/cores/arduino/wiring_digital.c
new file mode 100644
index 0000000..0949da4
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring_digital.c
@@ -0,0 +1,166 @@
+/*
+ wiring_digital.c - digital input and output functions
+ Part of Arduino - http://www.arduino.cc/
+
+ Copyright (c) 2005-2006 David A. Mellis
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ Modified 28 September 2010 by Mark Sproul
+
+ $Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
+*/
+
+#include "wiring_private.h"
+#include "pins_arduino.h"
+
+void pinMode(uint8_t pin, uint8_t mode)
+{
+ uint8_t bit = digitalPinToBitMask(pin);
+ uint8_t port = digitalPinToPort(pin);
+ volatile uint8_t *reg;
+
+ if (port == NOT_A_PIN) return;
+
+ // JWS: can I let the optimizer do this?
+ reg = portModeRegister(port);
+
+ if (mode == INPUT) {
+ uint8_t oldSREG = SREG;
+ cli();
+ *reg &= ~bit;
+ SREG = oldSREG;
+ } else {
+ uint8_t oldSREG = SREG;
+ cli();
+ *reg |= bit;
+ SREG = oldSREG;
+ }
+}
+
+// Forcing this inline keeps the callers from having to push their own stuff
+// on the stack. It is a good performance win and only takes 1 more byte per
+// user than calling. (It will take more bytes on the 168.)
+//
+// But shouldn't this be moved into pinMode? Seems silly to check and do on
+// each digitalread or write.
+//
+// Mark Sproul:
+// - Removed inline. Save 170 bytes on atmega1280
+// - changed to a switch statment; added 32 bytes but much easier to read and maintain.
+// - Added more #ifdefs, now compiles for atmega645
+//
+//static inline void turnOffPWM(uint8_t timer) __attribute__ ((always_inline));
+//static inline void turnOffPWM(uint8_t timer)
+static void turnOffPWM(uint8_t timer)
+{
+ switch (timer)
+ {
+ #if defined(TCCR1A) && defined(COM1A1)
+ case TIMER1A: cbi(TCCR1A, COM1A1); break;
+ #endif
+ #if defined(TCCR1A) && defined(COM1B1)
+ case TIMER1B: cbi(TCCR1A, COM1B1); break;
+ #endif
+
+ #if defined(TCCR2) && defined(COM21)
+ case TIMER2: cbi(TCCR2, COM21); break;
+ #endif
+
+ #if defined(TCCR0A) && defined(COM0A1)
+ case TIMER0A: cbi(TCCR0A, COM0A1); break;
+ #endif
+
+ #if defined(TIMER0B) && defined(COM0B1)
+ case TIMER0B: cbi(TCCR0A, COM0B1); break;
+ #endif
+ #if defined(TCCR2A) && defined(COM2A1)
+ case TIMER2A: cbi(TCCR2A, COM2A1); break;
+ #endif
+ #if defined(TCCR2A) && defined(COM2B1)
+ case TIMER2B: cbi(TCCR2A, COM2B1); break;
+ #endif
+
+ #if defined(TCCR3A) && defined(COM3A1)
+ case TIMER3A: cbi(TCCR3A, COM3A1); break;
+ #endif
+ #if defined(TCCR3A) && defined(COM3B1)
+ case TIMER3B: cbi(TCCR3A, COM3B1); break;
+ #endif
+ #if defined(TCCR3A) && defined(COM3C1)
+ case TIMER3C: cbi(TCCR3A, COM3C1); break;
+ #endif
+
+ #if defined(TCCR4A) && defined(COM4A1)
+ case TIMER4A: cbi(TCCR4A, COM4A1); break;
+ #endif
+ #if defined(TCCR4A) && defined(COM4B1)
+ case TIMER4B: cbi(TCCR4A, COM4B1); break;
+ #endif
+ #if defined(TCCR4A) && defined(COM4C1)
+ case TIMER4C: cbi(TCCR4A, COM4C1); break;
+ #endif
+ #if defined(TCCR5A)
+ case TIMER5A: cbi(TCCR5A, COM5A1); break;
+ case TIMER5B: cbi(TCCR5A, COM5B1); break;
+ case TIMER5C: cbi(TCCR5A, COM5C1); break;
+ #endif
+ }
+}
+
+void digitalWrite(uint8_t pin, uint8_t val)
+{
+ uint8_t timer = digitalPinToTimer(pin);
+ uint8_t bit = digitalPinToBitMask(pin);
+ uint8_t port = digitalPinToPort(pin);
+ volatile uint8_t *out;
+
+ if (port == NOT_A_PIN) return;
+
+ // If the pin that support PWM output, we need to turn it off
+ // before doing a digital write.
+ if (timer != NOT_ON_TIMER) turnOffPWM(timer);
+
+ out = portOutputRegister(port);
+
+ if (val == LOW) {
+ uint8_t oldSREG = SREG;
+ cli();
+ *out &= ~bit;
+ SREG = oldSREG;
+ } else {
+ uint8_t oldSREG = SREG;
+ cli();
+ *out |= bit;
+ SREG = oldSREG;
+ }
+}
+
+int digitalRead(uint8_t pin)
+{
+ uint8_t timer = digitalPinToTimer(pin);
+ uint8_t bit = digitalPinToBitMask(pin);
+ uint8_t port = digitalPinToPort(pin);
+
+ if (port == NOT_A_PIN) return LOW;
+
+ // If the pin that support PWM output, we need to turn it off
+ // before getting a digital reading.
+ if (timer != NOT_ON_TIMER) turnOffPWM(timer);
+
+ if (*portInputRegister(port) & bit) return HIGH;
+ return LOW;
+}
diff --git a/test/ardmake/hardware/cores/arduino/wiring_digital.d b/test/ardmake/hardware/cores/arduino/wiring_digital.d
new file mode 100644
index 0000000..269f2ff
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring_digital.d
@@ -0,0 +1,24 @@
+ardmake/hardware/cores/arduino/wiring_digital.o ardmake/hardware/cores/arduino/wiring_digital.d: ardmake/hardware/cores/arduino/wiring_digital.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/pins_arduino.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h
diff --git a/test/ardmake/hardware/cores/arduino/wiring_private.h b/test/ardmake/hardware/cores/arduino/wiring_private.h
new file mode 100644
index 0000000..11f6f00
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring_private.h
@@ -0,0 +1,68 @@
+/*
+ wiring_private.h - Internal header file.
+ Part of Arduino - http://www.arduino.cc/
+
+ Copyright (c) 2005-2006 David A. Mellis
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ $Id: wiring.h 239 2007-01-12 17:58:39Z mellis $
+*/
+
+#ifndef WiringPrivate_h
+#define WiringPrivate_h
+
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/delay.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "wiring.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#ifndef cbi
+#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+#endif
+#ifndef sbi
+#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+#endif
+
+#define EXTERNAL_INT_0 0
+#define EXTERNAL_INT_1 1
+#define EXTERNAL_INT_2 2
+#define EXTERNAL_INT_3 3
+#define EXTERNAL_INT_4 4
+#define EXTERNAL_INT_5 5
+#define EXTERNAL_INT_6 6
+#define EXTERNAL_INT_7 7
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#define EXTERNAL_NUM_INTERRUPTS 8
+#else
+#define EXTERNAL_NUM_INTERRUPTS 2
+#endif
+
+typedef void (*voidFuncPtr)(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif
diff --git a/test/ardmake/hardware/cores/arduino/wiring_pulse.c b/test/ardmake/hardware/cores/arduino/wiring_pulse.c
new file mode 100644
index 0000000..0d96886
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring_pulse.c
@@ -0,0 +1,69 @@
+/*
+ wiring_pulse.c - pulseIn() function
+ Part of Arduino - http://www.arduino.cc/
+
+ Copyright (c) 2005-2006 David A. Mellis
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ $Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
+*/
+
+#include "wiring_private.h"
+#include "pins_arduino.h"
+
+/* Measures the length (in microseconds) of a pulse on the pin; state is HIGH
+ * or LOW, the type of pulse to measure. Works on pulses from 2-3 microseconds
+ * to 3 minutes in length, but must be called at least a few dozen microseconds
+ * before the start of the pulse. */
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout)
+{
+ // cache the port and bit of the pin in order to speed up the
+ // pulse width measuring loop and achieve finer resolution. calling
+ // digitalRead() instead yields much coarser resolution.
+ uint8_t bit = digitalPinToBitMask(pin);
+ uint8_t port = digitalPinToPort(pin);
+ uint8_t stateMask = (state ? bit : 0);
+ unsigned long width = 0; // keep initialization out of time critical area
+
+ // convert the timeout from microseconds to a number of times through
+ // the initial loop; it takes 16 clock cycles per iteration.
+ unsigned long numloops = 0;
+ unsigned long maxloops = microsecondsToClockCycles(timeout) / 16;
+
+ // wait for any previous pulse to end
+ while ((*portInputRegister(port) & bit) == stateMask)
+ if (numloops++ == maxloops)
+ return 0;
+
+ // wait for the pulse to start
+ while ((*portInputRegister(port) & bit) != stateMask)
+ if (numloops++ == maxloops)
+ return 0;
+
+ // wait for the pulse to stop
+ while ((*portInputRegister(port) & bit) == stateMask) {
+ if (numloops++ == maxloops)
+ return 0;
+ width++;
+ }
+
+ // convert the reading to microseconds. The loop has been determined
+ // to be 20 clock cycles long and have about 16 clocks between the edge
+ // and the start of the loop. There will be some error introduced by
+ // the interrupt handlers.
+ return clockCyclesToMicroseconds(width * 21 + 16);
+}
diff --git a/test/ardmake/hardware/cores/arduino/wiring_pulse.d b/test/ardmake/hardware/cores/arduino/wiring_pulse.d
new file mode 100644
index 0000000..da7dd53
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring_pulse.d
@@ -0,0 +1,24 @@
+ardmake/hardware/cores/arduino/wiring_pulse.o ardmake/hardware/cores/arduino/wiring_pulse.d: ardmake/hardware/cores/arduino/wiring_pulse.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h \
+ ardmake/hardware/cores/arduino/pins_arduino.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/pgmspace.h
diff --git a/test/ardmake/hardware/cores/arduino/wiring_shift.c b/test/ardmake/hardware/cores/arduino/wiring_shift.c
new file mode 100644
index 0000000..cfe7867
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring_shift.c
@@ -0,0 +1,55 @@
+/*
+ wiring_shift.c - shiftOut() function
+ Part of Arduino - http://www.arduino.cc/
+
+ Copyright (c) 2005-2006 David A. Mellis
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+
+ $Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
+*/
+
+#include "wiring_private.h"
+
+uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder) {
+ uint8_t value = 0;
+ uint8_t i;
+
+ for (i = 0; i < 8; ++i) {
+ digitalWrite(clockPin, HIGH);
+ if (bitOrder == LSBFIRST)
+ value |= digitalRead(dataPin) << i;
+ else
+ value |= digitalRead(dataPin) << (7 - i);
+ digitalWrite(clockPin, LOW);
+ }
+ return value;
+}
+
+void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val)
+{
+ uint8_t i;
+
+ for (i = 0; i < 8; i++) {
+ if (bitOrder == LSBFIRST)
+ digitalWrite(dataPin, !!(val & (1 << i)));
+ else
+ digitalWrite(dataPin, !!(val & (1 << (7 - i))));
+
+ digitalWrite(clockPin, HIGH);
+ digitalWrite(clockPin, LOW);
+ }
+}
diff --git a/test/ardmake/hardware/cores/arduino/wiring_shift.d b/test/ardmake/hardware/cores/arduino/wiring_shift.d
new file mode 100644
index 0000000..1186d5b
--- /dev/null
+++ b/test/ardmake/hardware/cores/arduino/wiring_shift.d
@@ -0,0 +1,22 @@
+ardmake/hardware/cores/arduino/wiring_shift.o ardmake/hardware/cores/arduino/wiring_shift.d: ardmake/hardware/cores/arduino/wiring_shift.c \
+ ardmake/hardware/cores/arduino/wiring_private.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/io.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/sfr_defs.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/inttypes.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdint.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/iom328p.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/portpins.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/common.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/version.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/fuse.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/lock.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/interrupt.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/util/delay_basic.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdio.h \
+ /usr/lib/gcc/avr/4.3.5/include/stdarg.h \
+ /usr/lib/gcc/avr/4.3.5/include/stddef.h \
+ ardmake/hardware/cores/arduino/wiring.h \
+ /usr/lib/gcc/avr/4.3.5/../../../avr/include/stdlib.h \
+ ardmake/hardware/cores/arduino/binary.h
diff --git a/test/ardmake/hardware/firmwares/MEGA-dfu_and_usbserial_combined.hex b/test/ardmake/hardware/firmwares/MEGA-dfu_and_usbserial_combined.hex
new file mode 100644
index 0000000..e22196c
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/MEGA-dfu_and_usbserial_combined.hex
@@ -0,0 +1,234 @@
+:20000000A2C00000BBC00000B9C00000B7C00000B5C00000B3C00000B1C00000AFC000004B
+:20002000ADC00000ABC00000A9C000005AC400001EC40000A3C00000A1C000009FC000005C
+:200040009DC000009BC0000099C0000097C0000095C0000093C0000091C0000014C100006A
+:200060008DC000008BC0000089C0000087C0000085C0000083C0000081C000007FC0000050
+:200080007DC000007BC0000079C0000077C0000075C0000073C000001201100102000008E2
+:2000A0004123100001000102DC0109023E00020100C0320904000001020201000524000170
+:2000C00010042402060524060001070582030800FF09040100020A000000070504024000AC
+:2000E0000107058302400001040309043203410072006400750069006E006F0020002800CA
+:200100007700770077002E00610072006400750069006E006F002E0063006300290000003D
+:200120002403410072006400750069006E006F0020004D00650067006100200032003500A5
+:2001400036003000000011241FBECFEFD2E0DEBFCDBF11E0A0E0B1E0E0EDFFE002C0059089
+:200160000D92A631B107D9F712E0A6E1B1E001C01D92AF32B107E1F7F1D028C741CF9C0139
+:20018000DC01AE57BF4FED91FC91119741911196FC93EE9380589F4FE817F90711F42D93A9
+:2001A0003C939FB7F894F901EC57FF4F8081815080839FBF842F0895DF92EF92FF920F935B
+:2001C0001F93FC018489813019F0823021F405C040E3D42E04C0DD2402C030E2D32E838952
+:2001E000823011F488E0D82A8589873031F0883031F0863031F482E003C084E001C086E094
+:20020000D82A1092C9001092C8001092CA00E784F0880189128980E0E81681EEF80680E068
+:20022000080780E0180719F420E130E00FC0C801B701969587957795679560587B47814E2A
+:200240009F4FA8019701A0D6215030403093CD002093CC00D092CA0080E0E81681EEF80612
+:2002600080E0080780E0180711F082E001C080E08093C80088E98093C9001F910F91FF9005
+:20028000EF90DF9008951F920F920FB60F9211242F938F939F93EF93FF939091CE008EB38C
+:2002A0008430F1F4E0919901F0919A019083E0919901F0919A01CF01019690939A0180930C
+:2002C00099018959914021F489E191E0928381839FB7F89480919D018F5F80939D019FBF3A
+:2002E000FF91EF919F918F912F910F900FBE0F901F901895FC01858580FF02C05F9808959B
+:200300005F9A089580E091E0D5C580E091E088C584B7877F84BF28E10FB6F89420936000CD
+:20032000109260000FBE87E690E09093CD008093CC0086E08093CA001092C8002093C90019
+:20034000539A5A9A8AB180638AB98BB180638BB983D284E085BD5F9A579A08950F931F9322
+:20036000CF93DF93D5DF2FB7F8948EE991E090931F0280931E0290932102809320022FBFBB
+:200380002FB7F89489E191E090939A018093990190939C0180939B012FBF7894CEE9D1E0D4
+:2003A00003E08FB7F894909122028FBF903809F180E091E0ABD497FD1CC0E0911E02F09161
+:2003C0001F028083E0911E02F0911F02CF01019690931F0280931E028E51924011F4D283DD
+:2003E000C1839FB7F894809122028F5F809322029FBF8FB7F89410919D018FBFA89902C0BD
+:20040000113678F1A89A80919D01882361F05D980093160108C089E191E0B1DE682F80E077
+:2004200091E0DAD411501123B1F780911601882351F0809116018150809316018091160101
+:20044000882309F45D9A80911701882351F08091170181508093170180911701882309F4F2
+:200460005C9A8FB7F894909122028FBF992369F08EE991E084DE982F8091C80085FFFCCFD3
+:200480009093CE005C980093170180E091E095D42AD487CFDA01923049F0933061F0913093
+:2004A000F9F4E8E9F0E022E130E01EC0EAEAF0E02EE330E019C0813049F0813018F08230CA
+:2004C00079F408C0E8EEF0E0849107C0ECEEF0E0849103C0E0E2F1E08491282F30E004C010
+:2004E000E0E0F0E020E030E0ED93FC93C901089528E030E040E003C04F5F220F331F28177B
+:200500003907D0F3842F8295807F08958093E9008091EB0081608093EB001092ED00609319
+:20052000EC004093ED008091EE00881F8827881F08951092F40090E09093E9001092F000D2
+:200540001092E8001092ED008091EB008E7F8093EB009F5F953081F70895809127028823BE
+:200560008CF403C08EB38823B1F08091E80082FFF9CF8091E8008B778093E80008958EB395
+:20058000882349F08091E80080FFF9CF8091E8008E778093E800089594E68091EC0080FFAB
+:2005A00005C08091E80080FF05C023C08091E80082FD1FC08EB3882311F482E008958EB3CE
+:2005C000853011F483E008958091EB0085FF02C081E008958091E10082FFDFCF8091E1000E
+:2005E0008B7F8093E100992311F484E008959150D4CF80E008959C0140912D0250912E020C
+:200600004617570718F4F90120E038C06115710511F0AB01F8CF8091E8008E778093E800C8
+:2006200040E050E0F0CF8091E80083FF02C081E008958091E80082FD2DC08EB3882381F1AD
+:200640008EB3853079F18091E80080FF17C09091F20006C081918093F100415050409F5FDD
+:200660004115510511F09830A8F320E0983009F421E08091E8008E778093E80041155105FF
+:2006800091F6222381F606C08EB3882349F08EB3853041F08091E80082FFF6CF80E00895C9
+:2006A00082E0089583E008959C0140912D0250912E024617570710F490E03BC06115710577
+:2006C00011F0AB01F9CF8091E8008E778093E80040E050E0F1CF8091E80083FF02C081E0FE
+:2006E00008958091E80082FD30C08EB3882399F18EB3853091F18091E80080FF1AC08091A4
+:20070000F20009C0F9012F5F3F4FE491E093F100415050408F5F4115510511F0883090F338
+:2007200090E0883009F491E08091E8008E778093E8004115510579F6992369F606C08EB3ED
+:20074000882349F08EB3853041F08091E80082FFF6CF80E0089582E0089583E008959C01B6
+:200760006115710529F48091E8008B778093E800F90120C08091E80083FF02C081E0089565
+:200780008EB3882339F18EB3853031F18091E80082FFF0CF06C08091F100819361507040B5
+:2007A00021F08091F2008823B1F78091E8008B778093E80061157105E9F606C08EB388235F
+:2007C00049F08EB3853041F08091E80080FFF6CF80E0089582E0089583E0089542D044D05A
+:2007E0001EBA10922502109224021092230284E089BD89B5826089BD09B400FEFDCF809121
+:20080000D800982F9F779093D80080688093D800809163008E7F809363008091D8008F7D69
+:200820008093D8008091E0008E7F8093E0008091E1008E7F8093E1008091E2008160809302
+:20084000E2008091E100877F8093E1008091E20088608093E2000895C1DF81E08093260221
+:2008600008951092E20008951092E10008951F920F920FB60F9211241F932F933F934F9385
+:200880005F936F937F938F939F93AF93BF93EF93FF93E9EEF0E0108117701082E0EFF0E066
+:2008A0008081877F80837894C3D0F894A9EEB0E01C92E0EFF0E08081886080831C93FF9164
+:2008C000EF91BF91AF919F918F917F916F915F914F913F912F911F910F900FBE0F901F90DE
+:2008E00018951F920F920FB60F9211242F933F934F935F936F937F938F939F93AF93BF93FA
+:20090000EF93FF938091E10080FF1BC08091E20080FF17C08091E1008E7F8093E10080912A
+:20092000E2008E7F8093E2008091E20080618093E2008091D80080628093D80019BC1EBAA7
+:20094000D1D18091E10084FF29C08091E20084FF25C084E089BD89B5826089BD09B400FE71
+:20096000FDCF8091D8008F7D8093D8008091E1008F7E8093E1008091E2008F7E8093E200E3
+:200980008091E20081608093E20080912502882311F481E001C084E08EBBA4D18091E10070
+:2009A00083FF27C08091E20083FF23C08091E100877F8093E10082E08EBB10922502809105
+:2009C000E1008E7F8093E1008091E2008E7F8093E2008091E20080618093E200AADD80E090
+:2009E00060E042E093DD8091F00088608093F00079D18091E10082FF0AC08091E20082FF3E
+:200A000006C08091E1008B7F8093E1006BD1FF91EF91BF91AF919F918F917F916F915F91F4
+:200A20004F913F912F910F900FBE0F901F9018951F93DF93CF93CDB7DEB7AC970FB6F894AC
+:200A4000DEBF0FBECDBFE7E2F2E08091F100819322E0EF32F207C9F78091270230912802EE
+:200A6000353009F487C0363040F43130C9F1313070F0333009F01DC133C0383009F4EFC016
+:200A8000393009F4FEC0363009F013C192C0803821F0823809F00DC108C090912302809144
+:200AA0002402882399F0926011C080912B0287708093E9008091EB0090E025E09695879530
+:200AC0002A95E1F7982F91701092E9008091E800877F8093E8009093F1001092F100CAC001
+:200AE000882319F0823009F0E4C090E08F719070009721F0029709F0DDC00CC080912902A4
+:200B0000813009F0D7C010922402333069F5809324022AC080912902882331F520912B02FD
+:200B2000277009F4C7C02093E9008091EB0080FFC1C0333021F48091EB00806213C08091C8
+:200B4000EB0080618093EB0081E090E002C0880F991F2A95E2F78093EA001092EA008091B7
+:200B6000EB0088608093EB001092E9008091E800877F83C0882309F09CC0109129028091FA
+:200B8000E800877F8093E800E8DC04C08EB3882309F490C08091E80080FFF8CF812F8F77B6
+:200BA00011F492E001C093E09EBB80688093E30081C08058823008F07CC0809129029091F7
+:200BC0002A0223E08C3D920799F55FB7F894DE0115964EE020E030E061E2E42FF0E0609373
+:200BE0005700849120FF03C082958F704F5F982F9F70892F805D8A3308F0895F8C93119615
+:200C00001C9211972F5F3F4F12962431310529F75FBF8AE28B8383E08C838091E800877F06
+:200C20008093E800CE0103966AE270E0E4DC11C060912B02AE014F5F5F4F2CDCBC0100979F
+:200C4000C9F18091E800877F8093E80089819A812BDD8091E8008B778093E8002BC080381A
+:200C600041F58091E800877F8093E800809125028093F1008091E8008E778093E8006DDCC6
+:200C800019C08823B1F490912902923098F48091E800877F8093E800909325025EDC809102
+:200CA0002502882311F483E001C084E08EBB2DDB01C028DB8091E80083FF0AC08091EB007F
+:200CC00080628093EB008091E800877F8093E800AC960FB6F894DEBF0FBECDBFCF91DF91E1
+:200CE0001F91089508951F938EB3882361F01091E9001092E9008091E80083FF01C098DE54
+:200D000017701093E9001F9108950895FC018EB3843021F587859089A189B2890097A10507
+:200D2000B105E1F085818093E9008091E80082FF15C08091F200882319F42FEF3FEF04C010
+:200D40008091F100282F30E08091F200882341F48091E8008B778093E80002C02FEF3FEF43
+:200D6000C9010895FC018EB3843011F587859089A189B2890097A105B105D1F081818093C1
+:200D8000E9008091F2008823A9F09091E8008091E8008E778093E80095FD0CC0FDDB982F24
+:200DA000882349F48091E8008E778093E80003C092E001C090E0892F0895FC018EB38430A5
+:200DC00051F487859089A189B2890097A105B10511F0CF01C7CF08951F93FC01162F8EB318
+:200DE0008430D9F487859089A189B2890097A105B10599F081818093E9008091E80085FDF3
+:200E000008C08091E8008E778093E800C5DB882329F41093F10080E001C082E01F91089545
+:200E20000F931F93CF93DF93EC010D96FC0189E0DF011D928A95E9F72A813B8109818C8108
+:200E4000882311F410E001C014E0C90151DB182B1260802F61E8412F59DB882329F12E8182
+:200E60003F810D818885882311F410E001C014E0C9013EDB182B1260802F60E8412F46DBA2
+:200E8000882391F02A853B8509858C85882311F410E001C014E0C9012BDB182B1260802F8F
+:200EA00061EC412F33DB01C080E0DF91CF911F910F910895CF93DF93EC018091E80083FF4D
+:200EC00060C0888190E020912B0230912C022817390709F056C080912802813261F082322B
+:200EE00020F4803209F04DC019C0823269F1833209F047C038C080912702813A09F041C0A3
+:200F00008091E800877F8093E800CE010F9667E070E071DB8091E8008B7713C08091270278
+:200F2000813279F58091E800877F8093E800CE010F9667E070E013DCCE013ED98091E800BD
+:200F40008E778093E8001DC0809127028132C9F48091E800877F8093E800809129028D87C0
+:200F6000CE01C8D90DC080912702813251F48091E800877F8093E800CE0160912902C5DE7A
+:200F8000ECDADF91CF910895A1E21A2EAA1BBB1BFD010DC0AA1FBB1FEE1FFF1FA217B307AC
+:200FA000E407F50720F0A21BB30BE40BF50B661F771F881F991F1A9469F760957095809539
+:200FC00090959B01AC01BD01CF010895F894FFCF000340000004400000020800000000008D
+:200FE000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0B
+:201000004BC0000064C0000062C0000060C000005EC000005CC000005AC0000058C00000F3
+:2010200056C0000054C0000052C00000CBC400004EC000004CC000004AC0000048C00000B9
+:2010400046C0000044C0000042C0000040C000003EC000003CC000003AC0000038C0000098
+:2010600036C0000034C0000032C0000030C000002EC000002CC000002AC0000028C00000F8
+:2010800026C0000024C0000022C0000020C000001EC000001CC0000011241FBECFEFD2E088
+:2010A000DEBFCDBF11E0A0E0B1E0E4EBFCE102C005900D92A836B107D9F711E0A8E6B1E0ED
+:2010C00001C01D92A738B107E1F74FD3F1C598CF982F15C08091F200882371F48091E8004A
+:2010E0008B7F8093E80003C08EB3882351F08091E80082FFF9CF02C08091F1009150992358
+:2011000049F708952091760130917501809174019091730180936D0190936E01C901809388
+:201120006F0190937001089580917101843009F45AC0853030F4813059F0833009F0C3C0BE
+:201140001FC0853009F4A0C0863009F0BCC0AFC080917201823008F0B6C0D4DF8091720129
+:20116000882361F480916D0190916E0123E0FC0120935700E89507B600FCFDCF85E008C027
+:2011800080917201882311F0823029F4BBDF89E0809301010895813009F095C020E030E08C
+:2011A00040E050E0F90184918F3F81F0CA01AA27BB2780936C0130936E0120936D018AE0D6
+:2011C0008093010185E08093690108952F5F3F4F4F4F5F4F2030F0E13F07F0E04F07F0E0B6
+:2011E0005F0701F7089580917201833051F581E0809368018091770190917801892B71F062
+:2012000080917301813009F05EC0809176019091750190936B0180936A0108958091730133
+:20122000882361F42CE088E190E00FB6F894A895809360000FBE20936000089510920001A8
+:201240000895882309F03FC0809173018F3F09F03AC0E0E0F0E093E085E090935700E895A9
+:2012600007B600FCFDCF80935700E89507B600FCFDCFE058FF4F20E1E030F20771F781E123
+:2012800080935700E8950895E091730180917201882321F4F0E0EB5FFE4F05C0813099F437
+:2012A000F0E0EE52FF4F808180937C01089580917201833041F480917301882321F48091E0
+:2012C000740180936C0108952F923F924F925F926F927F929F92AF92BF92CF92DF92EF92F0
+:2012E000FF920F931F93CF93DF938091850190918601909378018093770180917901882399
+:2013000051F08091790181508093790180917901882309F45D9A80917A01882351F08091F0
+:201320007A01815080937A0180917A01882309F45C9A80918001833009F4B2C1843030F41C
+:20134000813071F0823009F0E3C111C1853009F4C5C1853008F4BAC1863009F0D9C1CDC11F
+:201360005C9883E080937A018091E800877F8093E80080916801882329F0D6DE5D9A5C9AAF
+:201380001092680120917701309178012115310529F42AC08EB3882309F4BAC18091E8000F
+:2013A00082FFF8CF8091F10080937101215030403093780120937701E2E7F1E00CC080919F
+:2013C000F10081932150304081E0E737F80719F43183208308C08091F200882381F7309394
+:2013E000780120937701A0DE80910101853009F0BAC08091770190917801892B21F482E042
+:2014000080930101B0C08AE163DE80916D018F715FDEC0916F01D091700120916D0130916C
+:201420006E0121968E01021B130B219780917201882309F093C0180136942794C901A091F0
+:201440006C01B0E09C01AD0162E0E62EF12C012D112DE20EF31E041F151F59016A0190E0D8
+:2014600099249394B5E0A3E048C08091F200882371F48091E8008B7F8093E80004C08EB352
+:20148000882309F445C18091E80082FFF8CF0894210831088091F100682F8091F100782F1D
+:2014A000F5010B0190925700E89511249F5F903419F021143104A1F4F901B0935700E89524
+:2014C00007B600FCFDCF2114310451F0F701A0935700E89507B600FCFDCFA801970190E0A7
+:2014E00042E0442E512C612C712CE40CF51C061D171DA40CB51CC61CD71C2114310409F0A0
+:20150000B4CFD0936E01C0936D0181E180935700E89527C08091F200882371F48091E80079
+:201520008B7F8093E80004C08EB3882309F4F0C08091E80082FFF8CF6091F10080916D01A7
+:2015400090916E01A7D380916D0190916E01019690936E0180936D010150104001151105FB
+:20156000C9F680E1B5DD8091E8008B7FC3C08091E800877F8093E8005D9883E08093790154
+:2015800004C08EB3882309F4C3C08091E80080FFF8CF80910101893091F08A3069F4809167
+:2015A0007201813049F480916D0190916E018093F1009093F1009BC080917C0196C0609173
+:2015C0006F017091700120916D0130916E016F5F7F4F7B01E21AF30A6150704080917201E4
+:2015E000882389F5870116950795C901A0916C01B0E09C01AD011FC08091F200803271F4B7
+:201600008091E8008E7F8093E80004C08EB3882309F47EC08091E80080FFF8CFF90185918F
+:2016200094918093F1009093F100015010402E5F3F4F4F4F5F4F01151105F1F670936E01E0
+:2016400060936D0129C0823039F523C08091F200803271F48091E8008E7F8093E80004C09E
+:201660008EB3882309F454C08091E80080FFF8CF00916D0110916E01C80104D38093F1007B
+:201680000F5F1F4F10936E0100936D010894E108F108E114F104D1F682E08093010127C0CE
+:2016A0008091E800877F8093E800809169018093F1001092F1001092F1001092F1008091E7
+:2016C00001018093F1001092F10011C08091E800877F8093E8001092690119C08091E800C8
+:2016E000877F8093E800809101018093F1008091E8008E7F8093E8000AC08091E800877F08
+:201700008093E8005D9A5C9A82E08093010187D0DF91CF911F910F91FF90EF90DF90CF9017
+:20172000BF90AF909F907F906F905F904F903F902F9008952BD181E085BF15BE089584B799
+:20174000877F84BF88E10FB6F89480936000109260000FBE81E085BF82E085BF8AB18063DB
+:201760008AB98BB180638BB90CC1E9DF789401C080D2809100018823D9F78091680188235D
+:20178000B9F7D8DFE0916A01F0916B010995FA01923071F0933089F0913029F488E091E06A
+:2017A00022E130E019C080E090E020E030E014C08AE191E02BE130E00FC0882339F48091D9
+:2017C0003501282F30E085E391E006C080913901282F30E089E391E091838083C9010895C0
+:2017E0008091EB0081608093EB001092ED006093EC004093ED008091EE00881F8827881FE4
+:2018000008951092F4001092F0001092E8001092ED00EBEEF0E080818E7F80830895809182
+:201820007F0188238CF403C08EB38823B1F08091E80082FFF9CF8091E8008B7F8093E8006D
+:2018400008958EB3882349F08091E80080FFF9CF8091E8008E7F8093E80008959C0140917A
+:201860008501509186014617570718F4F90120E038C06115710511F0AB01F8CF8091E80068
+:201880008E7F8093E80040E050E0F0CF8091E80083FF02C081E008958091E80082FD2DC091
+:2018A0008EB3882381F18EB3853079F18091E80080FF17C09091F20006C081918093F1002C
+:2018C000415050409F5F4115510511F09032A8F320E0903209F421E08091E8008E7F809306
+:2018E000E8004115510591F6222381F606C08EB3882349F08EB3853041F08091E80082FF85
+:20190000F6CF80E0089582E0089583E0089554D056D01EBA10927D0184E089BD89B58260FA
+:2019200089BD09B400FEFDCF8091D800982F9F779093D80080688093D800809163008E7FC5
+:20194000809363008091D8008F7D8093D8008091E0008E7F8093E0008091E1008E7F80932E
+:20196000E1008091E20081608093E2008091E100877F8093E1008091E20088608093E20001
+:201980000895C5DF81E080937E010895C0DFE0EEF0E0808181608083E8EDF0E080818F77A8
+:2019A00080830AD00CD019BCE3E6F0E080818160808310927E0108951092E200089510929A
+:2019C000E10008951F920F920FB60F9211242F933F934F935F936F937F938F939F93AF938A
+:2019E000BF93EF93FF938091E10080FF1BC08091E20080FF17C08091E1008E7F8093E100F9
+:201A00008091E2008E7F8093E2008091E20080618093E2008091D80080628093D80019BC7D
+:201A20001EBA26D18091E10084FF29C08091E20084FF25C084E089BD89B5826089BD09B451
+:201A400000FEFDCF8091D8008F7D8093D8008091E1008F7E8093E1008091E2008F7E8093D6
+:201A6000E2008091E20081608093E20080917D01882311F481E001C084E08EBBF9D08091D3
+:201A8000E10083FF22C08091E20083FF1EC08091E100877F8093E10082E08EBB10927D01F7
+:201AA0008091E1008E7F8093E1008091E2008E7F8093E2008091E20080618093E200A1DEF6
+:201AC00080E060E042E28CDED3D08091E10082FF0AC08091E20082FF06C08091E1008B7FC2
+:201AE0008093E100C5D0FF91EF91BF91AF919F918F917F916F915F914F913F912F910F905E
+:201B00000FBE0F901F9018951F93DF93CF9300D0CDB7DEB7EFE7F1E08091F100819381E070
+:201B2000E738F807C9F790917F0180918001853011F1863040F48130B9F0813070F08330D5
+:201B400009F081C011C0883009F453C0893009F462C0863009F077C02DC0903809F474C00E
+:201B6000923809F070C070C0992309F46DC0923009F069C069C0992309F065C01091810152
+:201B80008091E800877F8093E80049DE04C08EB3882309F459C08091E80080FFF8CF812F6F
+:201BA0008F7711F492E001C093E09EBB80688093E3004AC09058923008F045C080918101F9
+:201BC0009091820160918301AE014F5F5F4FDFDDBC010097C9F18091E800877F8093E8001D
+:201BE00089819A813BDE8091E8008B7F8093E8002BC0903841F58091E800877F8093E800C6
+:201C000080917D018093F1008091E8008E7F8093E80005DE19C09923B1F4909181019230AE
+:201C200098F48091E800877F8093E80090937D01F6DD80917D01882311F483E001C084E0E3
+:201C40008EBB16D001C040DB8091E80083FF0AC08091EB0080628093EB008091E800877F59
+:201C60008093E8000F900F90CF91DF911F91089508958EB3882329F08091E80083FF01C030
+:201C800043CF0895F999FECF92BD81BDF89A992780B50895262FF999FECF1FBA92BD81BD6B
+:201CA00020BD0FB6F894FA9AF99A0FBE01960895F894FFCF01021E938220DCFB1201100123
+:201CC00000000020EB03F72F00000001000109021B0001010080320904000000FE010200E6
+:201CE0000921030000000C0001040309042C03410072006400750069006E006F0020004D28
+:1C1D000000650067006100200032003500360030002000440046005500000000AE
+:00000001FF
diff --git a/test/ardmake/hardware/firmwares/README.txt b/test/ardmake/hardware/firmwares/README.txt
new file mode 100644
index 0000000..386dcf0
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/README.txt
@@ -0,0 +1,33 @@
+Arduino Uno and Mega 2560 Firmwares for the ATmega8U2
+
+This directory contains the firmwares used on the ATmega8U2 on the Arduino
+Uno and Arduino Mega 2560. The arduino-usbdfu directory contains the DFU
+bootloader on the 8U2; the arduino-usbserial directory contains the actual
+usb to serial firmware. Both should be compiled against LUFA 100807. The
+two .hex files in this directory combine the dfu and serial firmwares into
+a single file to burn onto the 8U2.
+
+To burn (Uno):
+avrdude -p at90usb82 -F -P usb -c avrispmkii -U flash:w:UNO-dfu_and_usbserial_combined.hex -U lfuse:w:0xFF:m -U hfuse:w:0xD9:m -U efuse:w:0xF4:m -U lock:w:0x0F:m
+
+To burn (Mega 2560):
+avrdude -p at90usb82 -F -P usb -c avrispmkii -U flash:w:MEGA-dfu_and_usbserial_combined.hex -U lfuse:w:0xFF:m -U hfuse:w:0xD9:m -U efuse:w:0xF4:m -U lock:w:0x0F:m
+
+
+Note on USB Vendor IDs (VID) and Product IDs (PID): The arduino-usbdfu
+project uses Atmel's VID and MCU-specific PIDs to maintain compatibility
+with their FLIP software. The source code to the arduino-usbserial
+project includes Atmel's VID and a PID donated by them to LUFA. This
+PID is used in LUFA's USBtoSerial project, which forms the basis for
+arduino-usbserial. According to the LUFA documentation, this VID/PID
+combination is:
+
+ "For use in testing of LUFA powered devices during development only,
+ by non-commercial entities. All devices must accept collisions on this
+ VID/PID range (from other in-development LUFA devices) to be resolved
+ by using a unique release number in the Device Descriptor. No devices
+ using this VID/PID combination may be released to the general public."
+
+The production version of the arduino-usbserial firmware uses the
+Arduino VID. This is only for use with official Arduino hardware and
+should not be used on other products. \ No newline at end of file
diff --git a/test/ardmake/hardware/firmwares/UNO-dfu_and_usbserial_combined.hex b/test/ardmake/hardware/firmwares/UNO-dfu_and_usbserial_combined.hex
new file mode 100644
index 0000000..60acf44
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/UNO-dfu_and_usbserial_combined.hex
@@ -0,0 +1,234 @@
+:200000009CC00000B5C00000B3C00000B1C00000AFC00000ADC00000ABC00000A9C000007B
+:20002000A7C00000A5C00000A3C0000054C4000018C400009DC000009BC0000099C000008C
+:2000400097C0000095C0000093C0000091C000008FC000008DC000008BC000000EC100009A
+:2000600087C0000085C0000083C0000081C000007FC000007DC000007BC0000079C0000080
+:2000800077C0000075C0000073C0000071C000006FC000006DC00000120110010200000806
+:2000A0004123010001000102DC0109023E00020100C032090400000102020100052400017F
+:2000C00010042402060524060001070582030800FF09040100020A000000070504024000AC
+:2000E0000107058302400001040309043203410072006400750069006E006F0020002800CA
+:200100007700770077002E00610072006400750069006E006F002E0063006300290000003D
+:200120001803410072006400750069006E006F00200055006E006F00000011241FBECFEFB0
+:20014000D2E0DEBFCDBF11E0A0E0B1E0E4ECFFE002C005900D92A631B107D9F712E0A6E145
+:20016000B1E001C01D92AF32B107E1F7F1D028C747CF9C01DC01AE57BF4FED91FC91119707
+:2001800041911196FC93EE9380589F4FE817F90711F42D933C939FB7F894F901EC57FF4F10
+:2001A0008081815080839FBF842F0895DF92EF92FF920F931F93FC018489813019F082306F
+:2001C00021F405C040E3D42E04C0DD2402C030E2D32E8389823011F488E0D82A8589873094
+:2001E00031F0883031F0863031F482E003C084E001C086E0D82A1092C9001092C800109201
+:20020000CA00E784F0880189128980E0E81681EEF80680E0080780E0180719F420E130E035
+:200220000FC0C801B701969587957795679560587B47814E9F4FA8019701A0D62150304050
+:200240003093CD002093CC00D092CA0080E0E81681EEF80680E0080780E0180711F082E047
+:2002600001C080E08093C80088E98093C9001F910F91FF90EF90DF9008951F920F920FB6B4
+:200280000F9211242F938F939F93EF93FF939091CE008EB38430F1F4E0919901F0919A016E
+:2002A0009083E0919901F0919A01CF01019690939A01809399018959914021F489E191E08F
+:2002C000928381839FB7F89480919D018F5F80939D019FBFFF91EF919F918F912F910F90B8
+:2002E0000FBE0F901F901895FC01858580FF02C05F9808955F9A089580E091E0D5C580E0F9
+:2003000091E088C584B7877F84BF28E10FB6F89420936000109260000FBE87E690E090935F
+:20032000CD008093CC0086E08093CA001092C8002093C900539A5A9A8AB180638AB98BB16A
+:2003400080638BB983D284E085BD5F9A579A08950F931F93CF93DF93D5DF2FB7F8948EE92F
+:2003600091E090931F0280931E0290932102809320022FBF2FB7F89489E191E090939A0121
+:200380008093990190939C0180939B012FBF7894CEE9D1E003E08FB7F894909122028FBF97
+:2003A000903809F180E091E0ABD497FD1CC0E0911E02F0911F028083E0911E02F0911F0252
+:2003C000CF01019690931F0280931E028E51924011F4D283C1839FB7F894809122028F5FEB
+:2003E000809322029FBF8FB7F89410919D018FBFA89902C0113678F1A89A80919D018823BA
+:2004000061F05D980093160108C089E191E0B1DE682F80E091E0DAD411501123B1F7809156
+:200420001601882351F08091160181508093160180911601882309F45D9A809117018823FB
+:2004400051F08091170181508093170180911701882309F45C9A8FB7F894909122028FBF0A
+:20046000992369F08EE991E084DE982F8091C80085FFFCCF9093CE005C980093170180E03E
+:2004800091E095D42AD487CFDA01923049F0933061F09130F9F4E8E9F0E022E130E01EC004
+:2004A000EAEAF0E02EE330E019C0813049F0813018F0823079F408C0E8EEF0E0849107C092
+:2004C000ECEEF0E0849103C0E0E2F1E08491282F30E004C0E0E0F0E020E030E0ED93FC9318
+:2004E000C901089528E030E040E003C04F5F220F331F28173907D0F3842F8295807F0895C1
+:200500008093E9008091EB0081608093EB001092ED006093EC004093ED008091EE00881F30
+:200520008827881F08951092F40090E09093E9001092F0001092E8001092ED008091EB000F
+:200540008E7F8093EB009F5F953081F708958091270288238CF403C08EB38823B1F08091F2
+:20056000E80082FFF9CF8091E8008B778093E80008958EB3882349F08091E80080FFF9CF52
+:200580008091E8008E778093E800089594E68091EC0080FF05C08091E80080FF05C023C0EA
+:2005A0008091E80082FD1FC08EB3882311F482E008958EB3853011F483E008958091EB00FD
+:2005C00085FF02C081E008958091E10082FFDFCF8091E1008B7F8093E100992311F484E0A1
+:2005E00008959150D4CF80E008959C0140912D0250912E024617570718F4F90120E038C076
+:200600006115710511F0AB01F8CF8091E8008E778093E80040E050E0F0CF8091E80083FFF7
+:2006200002C081E008958091E80082FD2DC08EB3882381F18EB3853079F18091E80080FF5F
+:2006400017C09091F20006C081918093F100415050409F5F4115510511F09830A8F320E0A5
+:20066000983009F421E08091E8008E778093E8004115510591F6222381F606C08EB388231A
+:2006800049F08EB3853041F08091E80082FFF6CF80E0089582E0089583E008959C01409151
+:2006A0002D0250912E024617570710F490E03BC06115710511F0AB01F9CF8091E8008E7771
+:2006C0008093E80040E050E0F1CF8091E80083FF02C081E008958091E80082FD30C08EB32B
+:2006E000882399F18EB3853091F18091E80080FF1AC08091F20009C0F9012F5F3F4FE491A4
+:20070000E093F100415050408F5F4115510511F0883090F390E0883009F491E08091E800EF
+:200720008E778093E8004115510579F6992369F606C08EB3882349F08EB3853041F0809160
+:20074000E80082FFF6CF80E0089582E0089583E008959C016115710529F48091E8008B77CE
+:200760008093E800F90120C08091E80083FF02C081E008958EB3882339F18EB3853031F13B
+:200780008091E80082FFF0CF06C08091F10081936150704021F08091F2008823B1F780916B
+:2007A000E8008B778093E80061157105E9F606C08EB3882349F08EB3853041F08091E8007E
+:2007C00080FFF6CF80E0089582E0089583E0089542D044D01EBA10922502109224021092A8
+:2007E000230284E089BD89B5826089BD09B400FEFDCF8091D800982F9F779093D800806894
+:200800008093D800809163008E7F809363008091D8008F7D8093D8008091E0008E7F809305
+:20082000E0008091E1008E7F8093E1008091E20081608093E2008091E100877F8093E10030
+:200840008091E20088608093E2000895C1DF81E08093260208951092E20008951092E100AE
+:2008600008951F920F920FB60F9211241F932F933F934F935F936F937F938F939F93AF932A
+:20088000BF93EF93FF93E9EEF0E0108117701082E0EFF0E08081877F80837894C3D0F894CD
+:2008A000A9EEB0E01C92E0EFF0E08081886080831C93FF91EF91BF91AF919F918F917F9129
+:2008C0006F915F914F913F912F911F910F900FBE0F901F9018951F920F920FB60F921124B4
+:2008E0002F933F934F935F936F937F938F939F93AF93BF93EF93FF938091E10080FF1BC034
+:200900008091E20080FF17C08091E1008E7F8093E1008091E2008E7F8093E2008091E200B3
+:2009200080618093E2008091D80080628093D80019BC1EBAD1D18091E10084FF29C080916D
+:20094000E20084FF25C084E089BD89B5826089BD09B400FEFDCF8091D8008F7D8093D800D6
+:200960008091E1008F7E8093E1008091E2008F7E8093E2008091E20081608093E2008091B5
+:200980002502882311F481E001C084E08EBBA4D18091E10083FF27C08091E20083FF23C089
+:2009A0008091E100877F8093E10082E08EBB109225028091E1008E7F8093E1008091E200F1
+:2009C0008E7F8093E2008091E20080618093E200AADD80E060E042E093DD8091F0008860AA
+:2009E0008093F00079D18091E10082FF0AC08091E20082FF06C08091E1008B7F8093E10043
+:200A00006BD1FF91EF91BF91AF919F918F917F916F915F914F913F912F910F900FBE0F902F
+:200A20001F9018951F93DF93CF93CDB7DEB7AC970FB6F894DEBF0FBECDBFE7E2F2E0809185
+:200A4000F100819322E0EF32F207C9F78091270230912802353009F487C0363040F43130EC
+:200A6000C9F1313070F0333009F01DC133C0383009F4EFC0393009F4FEC0363009F013C163
+:200A800092C0803821F0823809F00DC108C09091230280912402882399F0926011C080916D
+:200AA0002B0287708093E9008091EB0090E025E0969587952A95E1F7982F91701092E90074
+:200AC0008091E800877F8093E8009093F1001092F100CAC0882319F0823009F0E4C090E078
+:200AE0008F719070009721F0029709F0DDC00CC080912902813009F0D7C0109224023330AB
+:200B000069F5809324022AC080912902882331F520912B02277009F4C7C02093E9008091A1
+:200B2000EB0080FFC1C0333021F48091EB00806213C08091EB0080618093EB0081E090E0F5
+:200B400002C0880F991F2A95E2F78093EA001092EA008091EB0088608093EB001092E900F6
+:200B60008091E800877F83C0882309F09CC0109129028091E800877F8093E800E8DC04C0E5
+:200B80008EB3882309F490C08091E80080FFF8CF812F8F7711F492E001C093E09EBB80683B
+:200BA0008093E30081C08058823008F07CC08091290290912A0223E08C3D920799F55FB7AE
+:200BC000F894DE0115964EE020E030E061E2E42FF0E060935700849120FF03C082958F7044
+:200BE0004F5F982F9F70892F805D8A3308F0895F8C9311961C9211972F5F3F4F129624310A
+:200C0000310529F75FBF8AE28B8383E08C838091E800877F8093E800CE0103966AE270E076
+:200C2000E4DC11C060912B02AE014F5F5F4F2CDCBC010097C9F18091E800877F8093E800EA
+:200C400089819A812BDD8091E8008B778093E8002BC0803841F58091E800877F8093E8009E
+:200C6000809125028093F1008091E8008E778093E8006DDC19C08823B1F4909129029230BF
+:200C800098F48091E800877F8093E800909325025EDC80912502882311F483E001C084E0DA
+:200CA0008EBB2DDB01C028DB8091E80083FF0AC08091EB0080628093EB008091E800877FFF
+:200CC0008093E800AC960FB6F894DEBF0FBECDBFCF91DF911F91089508951F938EB3882338
+:200CE00061F01091E9001092E9008091E80083FF01C098DE17701093E9001F9108950895DF
+:200D0000FC018EB3843021F587859089A189B2890097A105B105E1F085818093E90080916A
+:200D2000E80082FF15C08091F200882319F42FEF3FEF04C08091F100282F30E08091F2003E
+:200D4000882341F48091E8008B778093E80002C02FEF3FEFC9010895FC018EB3843011F550
+:200D600087859089A189B2890097A105B105D1F081818093E9008091F2008823A9F09091CF
+:200D8000E8008091E8008E778093E80095FD0CC0FDDB982F882349F48091E8008E7780937C
+:200DA000E80003C092E001C090E0892F0895FC018EB3843051F487859089A189B289009738
+:200DC000A105B10511F0CF01C7CF08951F93FC01162F8EB38430D9F487859089A189B28973
+:200DE0000097A105B10599F081818093E9008091E80085FD08C08091E8008E778093E8003D
+:200E0000C5DB882329F41093F10080E001C082E01F9108950F931F93CF93DF93EC010D964E
+:200E2000FC0189E0DF011D928A95E9F72A813B8109818C81882311F410E001C014E0C901A1
+:200E400051DB182B1260802F61E8412F59DB882329F12E813F810D818885882311F410E0A6
+:200E600001C014E0C9013EDB182B1260802F60E8412F46DB882391F02A853B8509858C8563
+:200E8000882311F410E001C014E0C9012BDB182B1260802F61EC412F33DB01C080E0DF916D
+:200EA000CF911F910F910895CF93DF93EC018091E80083FF60C0888190E020912B02309171
+:200EC0002C022817390709F056C080912802813261F0823220F4803209F04DC019C082320A
+:200EE00069F1833209F047C038C080912702813A09F041C08091E800877F8093E800CE0133
+:200F00000F9667E070E071DB8091E8008B7713C080912702813279F58091E800877F80930E
+:200F2000E800CE010F9667E070E013DCCE013ED98091E8008E778093E8001DC080912702D9
+:200F40008132C9F48091E800877F8093E800809129028D87CE01C8D90DC0809127028132AD
+:200F600051F48091E800877F8093E800CE0160912902C5DEECDADF91CF910895A1E21A2EA6
+:200F8000AA1BBB1BFD010DC0AA1FBB1FEE1FFF1FA217B307E407F50720F0A21BB30BE40B49
+:200FA000F50B661F771F881F991F1A9469F760957095809590959B01AC01BD01CF01089501
+:200FC000F894FFCF00034000000440000002080000000000000000000000FFFFFFFFFFFF2C
+:200FE000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF11
+:201000004BC0000064C0000062C0000060C000005EC000005CC000005AC0000058C00000F3
+:2010200056C0000054C0000052C00000CBC400004EC000004CC000004AC0000048C00000B9
+:2010400046C0000044C0000042C0000040C000003EC000003CC000003AC0000038C0000098
+:2010600036C0000034C0000032C0000030C000002EC000002CC000002AC0000028C00000F8
+:2010800026C0000024C0000022C0000020C000001EC000001CC0000011241FBECFEFD2E088
+:2010A000DEBFCDBF11E0A0E0B1E0E4EBFCE102C005900D92AC35B107D9F711E0ACE5B1E0E7
+:2010C00001C01D92AB37B107E1F74FD3F1C598CF982F15C08091F200882371F48091E80047
+:2010E0008B7F8093E80003C08EB3882351F08091E80082FFF9CF02C08091F1009150992358
+:2011000049F7089520916A013091690180916801909167018093610190936201C9018093D0
+:20112000630190936401089580916501843009F45AC0853030F4813059F0833009F0C3C0E2
+:201140001FC0853009F4A0C0863009F0BCC0AFC080916601823008F0B6C0D4DF8091660141
+:20116000882361F4809161019091620123E0FC0120935700E89507B600FCFDCF85E008C03F
+:2011800080916601882311F0823029F4BBDF89E0809301010895813009F095C020E030E098
+:2011A00040E050E0F90184918F3F81F0CA01AA27BB278093600130936201209361018AE0FA
+:2011C0008093010185E080935D0108952F5F3F4F4F4F5F4F2030F0E13F07F0E04F07F0E0C2
+:2011E0005F0701F7089580916601833051F581E080935C0180916B0190916C01892B71F092
+:2012000080916701813009F05EC080916A019091690190935F0180935E010895809167017B
+:20122000882361F42CE088E190E00FB6F894A895809360000FBE20936000089510920001A8
+:201240000895882309F03FC0809167018F3F09F03AC0E0E0F0E093E085E090935700E895B5
+:2012600007B600FCFDCF80935700E89507B600FCFDCFE058FF4F20E1E030F20771F781E123
+:2012800080935700E8950895E091670180916601882321F4F0E0EB5FFE4F05C0813099F44F
+:2012A000F0E0EE52FF4F808180937001089580916601833041F480916701882321F4809104
+:2012C00068018093600108952F923F924F925F926F927F929F92AF92BF92CF92DF92EF9208
+:2012E000FF920F931F93CF93DF938091790190917A0190936C0180936B0180916D018823D5
+:2013000051F080916D01815080936D0180916D01882309F45D9A80916E01882351F0809120
+:201320006E01815080936E0180916E01882309F45C9A80917401833009F4B2C1843030F44C
+:20134000813071F0823009F0E3C111C1853009F4C5C1853008F4BAC1863009F0D9C1CDC11F
+:201360005C9883E080936E018091E800877F8093E80080915C01882329F0D6DE5D9A5C9AC7
+:2013800010925C0120916B0130916C012115310529F42AC08EB3882309F4BAC18091E80033
+:2013A00082FFF8CF8091F100809365012150304030936C0120936B01E6E6F1E00CC08091C0
+:2013C000F10081932150304081E0EB36F80719F43183208308C08091F200882381F7309391
+:2013E0006C0120936B01A0DE80910101853009F0BAC080916B0190916C01892B21F482E072
+:2014000080930101B0C08AE163DE809161018F715FDEC0916301D09164012091610130919C
+:20142000620121968E01021B130B219780916601882309F093C0180136942794C901A09108
+:201440006001B0E09C01AD0162E0E62EF12C012D112DE20EF31E041F151F59016A0190E0E4
+:2014600099249394B5E0A3E048C08091F200882371F48091E8008B7F8093E80004C08EB352
+:20148000882309F445C18091E80082FFF8CF0894210831088091F100682F8091F100782F1D
+:2014A000F5010B0190925700E89511249F5F903419F021143104A1F4F901B0935700E89524
+:2014C00007B600FCFDCF2114310451F0F701A0935700E89507B600FCFDCFA801970190E0A7
+:2014E00042E0442E512C612C712CE40CF51C061D171DA40CB51CC61CD71C2114310409F0A0
+:20150000B4CFD0936201C093610181E180935700E89527C08091F200882371F48091E80091
+:201520008B7F8093E80004C08EB3882309F4F0C08091E80082FFF8CF6091F10080916101B3
+:2015400090916201A7D3809161019091620101969093620180936101015010400115110537
+:20156000C9F680E1B5DD8091E8008B7FC3C08091E800877F8093E8005D9883E080936D0160
+:2015800004C08EB3882309F4C3C08091E80080FFF8CF80910101893091F08A3069F4809167
+:2015A0006601813049F480916101909162018093F1009093F1009BC08091700196C06091A3
+:2015C00063017091640120916101309162016F5F7F4F7B01E21AF30A615070408091660120
+:2015E000882389F5870116950795C901A0916001B0E09C01AD011FC08091F200803271F4C3
+:201600008091E8008E7F8093E80004C08EB3882309F47EC08091E80080FFF8CFF90185918F
+:2016200094918093F1009093F100015010402E5F3F4F4F4F5F4F01151105F1F670936201EC
+:201640006093610129C0823039F523C08091F200803271F48091E8008E7F8093E80004C0AA
+:201660008EB3882309F454C08091E80080FFF8CF0091610110916201C80104D38093F10093
+:201680000F5F1F4F10936201009361010894E108F108E114F104D1F682E08093010127C0E6
+:2016A0008091E800877F8093E80080915D018093F1001092F1001092F1001092F1008091F3
+:2016C00001018093F1001092F10011C08091E800877F8093E80010925D0119C08091E800D4
+:2016E000877F8093E800809101018093F1008091E8008E7F8093E8000AC08091E800877F08
+:201700008093E8005D9A5C9A82E08093010187D0DF91CF911F910F91FF90EF90DF90CF9017
+:20172000BF90AF909F907F906F905F904F903F902F9008952BD181E085BF15BE089584B799
+:20174000877F84BF88E10FB6F89480936000109260000FBE81E085BF82E085BF8AB18063DB
+:201760008AB98BB180638BB90CC1E9DF789401C080D2809100018823D9F780915C01882369
+:20178000B9F7D8DFE0915E01F0915F010995FA01923071F0933089F0913029F488E091E082
+:2017A00022E130E019C080E090E020E030E014C08AE191E02BE130E00FC0882339F48091D9
+:2017C0003501282F30E085E391E006C080913901282F30E089E391E091838083C9010895C0
+:2017E0008091EB0081608093EB001092ED006093EC004093ED008091EE00881F8827881FE4
+:2018000008951092F4001092F0001092E8001092ED00EBEEF0E080818E7F80830895809182
+:20182000730188238CF403C08EB38823B1F08091E80082FFF9CF8091E8008B7F8093E80079
+:2018400008958EB3882349F08091E80080FFF9CF8091E8008E7F8093E80008959C0140917A
+:20186000790150917A014617570718F4F90120E038C06115710511F0AB01F8CF8091E80080
+:201880008E7F8093E80040E050E0F0CF8091E80083FF02C081E008958091E80082FD2DC091
+:2018A0008EB3882381F18EB3853079F18091E80080FF17C09091F20006C081918093F1002C
+:2018C000415050409F5F4115510511F09032A8F320E0903209F421E08091E8008E7F809306
+:2018E000E8004115510591F6222381F606C08EB3882349F08EB3853041F08091E80082FF85
+:20190000F6CF80E0089582E0089583E0089554D056D01EBA1092710184E089BD89B5826006
+:2019200089BD09B400FEFDCF8091D800982F9F779093D80080688093D800809163008E7FC5
+:20194000809363008091D8008F7D8093D8008091E0008E7F8093E0008091E1008E7F80932E
+:20196000E1008091E20081608093E2008091E100877F8093E1008091E20088608093E20001
+:201980000895C5DF81E0809372010895C0DFE0EEF0E0808181608083E8EDF0E080818F77B4
+:2019A00080830AD00CD019BCE3E6F0E08081816080831092720108951092E20008951092A6
+:2019C000E10008951F920F920FB60F9211242F933F934F935F936F937F938F939F93AF938A
+:2019E000BF93EF93FF938091E10080FF1BC08091E20080FF17C08091E1008E7F8093E100F9
+:201A00008091E2008E7F8093E2008091E20080618093E2008091D80080628093D80019BC7D
+:201A20001EBA26D18091E10084FF29C08091E20084FF25C084E089BD89B5826089BD09B451
+:201A400000FEFDCF8091D8008F7D8093D8008091E1008F7E8093E1008091E2008F7E8093D6
+:201A6000E2008091E20081608093E20080917101882311F481E001C084E08EBBF9D08091DF
+:201A8000E10083FF22C08091E20083FF1EC08091E100877F8093E10082E08EBB1092710103
+:201AA0008091E1008E7F8093E1008091E2008E7F8093E2008091E20080618093E200A1DEF6
+:201AC00080E060E042E28CDED3D08091E10082FF0AC08091E20082FF06C08091E1008B7FC2
+:201AE0008093E100C5D0FF91EF91BF91AF919F918F917F916F915F914F913F912F910F905E
+:201B00000FBE0F901F9018951F93DF93CF9300D0CDB7DEB7E3E7F1E08091F100819381E07C
+:201B2000EB37F807C9F79091730180917401853011F1863040F48130B9F0813070F08330EA
+:201B400009F081C011C0883009F453C0893009F462C0863009F077C02DC0903809F474C00E
+:201B6000923809F070C070C0992309F46DC0923009F069C069C0992309F065C0109175015E
+:201B80008091E800877F8093E80049DE04C08EB3882309F459C08091E80080FFF8CF812F6F
+:201BA0008F7711F492E001C093E09EBB80688093E3004AC09058923008F045C08091750105
+:201BC0009091760160917701AE014F5F5F4FDFDDBC010097C9F18091E800877F8093E80035
+:201BE00089819A813BDE8091E8008B7F8093E8002BC0903841F58091E800877F8093E800C6
+:201C0000809171018093F1008091E8008E7F8093E80005DE19C09923B1F4909175019230C6
+:201C200098F48091E800877F8093E80090937101F6DD80917101882311F483E001C084E0FB
+:201C40008EBB16D001C040DB8091E80083FF0AC08091EB0080628093EB008091E800877F59
+:201C60008093E8000F900F90CF91DF911F91089508958EB3882329F08091E80083FF01C030
+:201C800043CF0895F999FECF92BD81BDF89A992780B50895262FF999FECF1FBA92BD81BD6B
+:201CA00020BD0FB6F894FA9AF99A0FBE01960895F894FFCF01021E938220DCFB1201100123
+:201CC00000000020EB03F72F00000001000109021B0001010080320904000000FE010200E6
+:201CE0000921030000000C0001040309042003410072006400750069006E006F002000552C
+:101D0000006E006F002000440046005500000000F7
+:00000001FF
diff --git a/test/ardmake/hardware/firmwares/arduino-usbdfu/Arduino-usbdfu.c b/test/ardmake/hardware/firmwares/arduino-usbdfu/Arduino-usbdfu.c
new file mode 100644
index 0000000..7bed831
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbdfu/Arduino-usbdfu.c
@@ -0,0 +1,728 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * Main source file for the DFU class bootloader. This file contains the complete bootloader logic.
+ */
+
+#define INCLUDE_FROM_BOOTLOADER_C
+#include "Arduino-usbdfu.h"
+
+/** Flag to indicate if the bootloader should be running, or should exit and allow the application code to run
+ * via a soft reset. When cleared, the bootloader will abort, the USB interface will shut down and the application
+ * jumped to via an indirect jump to location 0x0000 (or other location specified by the host).
+ */
+bool RunBootloader = true;
+
+/** Flag to indicate if the bootloader is waiting to exit. When the host requests the bootloader to exit and
+ * jump to the application address it specifies, it sends two sequential commands which must be properly
+ * acknowledged. Upon reception of the first the RunBootloader flag is cleared and the WaitForExit flag is set,
+ * causing the bootloader to wait for the final exit command before shutting down.
+ */
+bool WaitForExit = false;
+
+/** Current DFU state machine state, one of the values in the DFU_State_t enum. */
+uint8_t DFU_State = dfuIDLE;
+
+/** Status code of the last executed DFU command. This is set to one of the values in the DFU_Status_t enum after
+ * each operation, and returned to the host when a Get Status DFU request is issued.
+ */
+uint8_t DFU_Status = OK;
+
+/** Data containing the DFU command sent from the host. */
+DFU_Command_t SentCommand;
+
+/** Response to the last issued Read Data DFU command. Unlike other DFU commands, the read command
+ * requires a single byte response from the bootloader containing the read data when the next DFU_UPLOAD command
+ * is issued by the host.
+ */
+uint8_t ResponseByte;
+
+/** Pointer to the start of the user application. By default this is 0x0000 (the reset vector), however the host
+ * may specify an alternate address when issuing the application soft-start command.
+ */
+AppPtr_t AppStartPtr = (AppPtr_t)0x0000;
+
+/** 64-bit flash page number. This is concatenated with the current 16-bit address on USB AVRs containing more than
+ * 64KB of flash memory.
+ */
+uint8_t Flash64KBPage = 0;
+
+/** Memory start address, indicating the current address in the memory being addressed (either FLASH or EEPROM
+ * depending on the issued command from the host).
+ */
+uint16_t StartAddr = 0x0000;
+
+/** Memory end address, indicating the end address to read to/write from in the memory being addressed (either FLASH
+ * of EEPROM depending on the issued command from the host).
+ */
+uint16_t EndAddr = 0x0000;
+
+
+/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
+volatile struct
+{
+ uint8_t TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
+ uint8_t RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
+ uint8_t PingPongLEDPulse; /**< Milliseconds remaining for enumeration Tx/Rx ping-pong LED pulse */
+} PulseMSRemaining;
+
+/** Main program entry point. This routine configures the hardware required by the bootloader, then continuously
+ * runs the bootloader processing routine until instructed to soft-exit, or hard-reset via the watchdog to start
+ * the loaded application code.
+ */
+int main(void)
+{
+ /* Configure hardware required by the bootloader */
+ SetupHardware();
+
+ /* Enable global interrupts so that the USB stack can function */
+ sei();
+
+ /* Run the USB management task while the bootloader is supposed to be running */
+ while (RunBootloader || WaitForExit)
+ USB_USBTask();
+
+ /* Reset configured hardware back to their original states for the user application */
+ ResetHardware();
+
+ /* Start the user application */
+ AppStartPtr();
+}
+
+/** Configures all hardware required for the bootloader. */
+void SetupHardware(void)
+{
+ /* Disable watchdog if enabled by bootloader/fuses */
+ MCUSR &= ~(1 << WDRF);
+ wdt_disable();
+
+ /* Disable clock division */
+// clock_prescale_set(clock_div_1);
+
+ /* Relocate the interrupt vector table to the bootloader section */
+ MCUCR = (1 << IVCE);
+ MCUCR = (1 << IVSEL);
+
+ LEDs_Init();
+
+ /* Initialize the USB subsystem */
+ USB_Init();
+}
+
+/** Resets all configured hardware required for the bootloader back to their original states. */
+void ResetHardware(void)
+{
+ /* Shut down the USB subsystem */
+ USB_ShutDown();
+
+ /* Relocate the interrupt vector table back to the application section */
+ MCUCR = (1 << IVCE);
+ MCUCR = 0;
+}
+
+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific
+ * control requests that are not handled internally by the USB library (including the DFU commands, which are
+ * all issued via the control endpoint), so that they can be handled appropriately for the application.
+ */
+void EVENT_USB_Device_UnhandledControlRequest(void)
+{
+ /* Get the size of the command and data from the wLength value */
+ SentCommand.DataSize = USB_ControlRequest.wLength;
+
+ /* Turn off TX LED(s) once the TX pulse period has elapsed */
+ if (PulseMSRemaining.TxLEDPulse && !(--PulseMSRemaining.TxLEDPulse))
+ LEDs_TurnOffLEDs(LEDMASK_TX);
+
+ /* Turn off RX LED(s) once the RX pulse period has elapsed */
+ if (PulseMSRemaining.RxLEDPulse && !(--PulseMSRemaining.RxLEDPulse))
+ LEDs_TurnOffLEDs(LEDMASK_RX);
+
+ switch (USB_ControlRequest.bRequest)
+ {
+ case DFU_DNLOAD:
+ LEDs_TurnOnLEDs(LEDMASK_RX);
+ PulseMSRemaining.RxLEDPulse = TX_RX_LED_PULSE_MS;
+
+ Endpoint_ClearSETUP();
+
+ /* Check if bootloader is waiting to terminate */
+ if (WaitForExit)
+ {
+ /* Bootloader is terminating - process last received command */
+ ProcessBootloaderCommand();
+
+ /* Turn off TX/RX status LEDs so that they're not left on when application starts */
+ LEDs_TurnOffLEDs(LEDMASK_TX);
+ LEDs_TurnOffLEDs(LEDMASK_RX);
+
+ /* Indicate that the last command has now been processed - free to exit bootloader */
+ WaitForExit = false;
+ }
+
+ /* If the request has a data stage, load it into the command struct */
+ if (SentCommand.DataSize)
+ {
+ while (!(Endpoint_IsOUTReceived()))
+ {
+ if (USB_DeviceState == DEVICE_STATE_Unattached)
+ return;
+ }
+
+ /* First byte of the data stage is the DNLOAD request's command */
+ SentCommand.Command = Endpoint_Read_Byte();
+
+ /* One byte of the data stage is the command, so subtract it from the total data bytes */
+ SentCommand.DataSize--;
+
+ /* Load in the rest of the data stage as command parameters */
+ for (uint8_t DataByte = 0; (DataByte < sizeof(SentCommand.Data)) &&
+ Endpoint_BytesInEndpoint(); DataByte++)
+ {
+ SentCommand.Data[DataByte] = Endpoint_Read_Byte();
+ SentCommand.DataSize--;
+ }
+
+ /* Process the command */
+ ProcessBootloaderCommand();
+ }
+
+ /* Check if currently downloading firmware */
+ if (DFU_State == dfuDNLOAD_IDLE)
+ {
+ if (!(SentCommand.DataSize))
+ {
+ DFU_State = dfuIDLE;
+ }
+ else
+ {
+ /* Throw away the filler bytes before the start of the firmware */
+ DiscardFillerBytes(DFU_FILLER_BYTES_SIZE);
+
+ /* Throw away the packet alignment filler bytes before the start of the firmware */
+ DiscardFillerBytes(StartAddr % FIXED_CONTROL_ENDPOINT_SIZE);
+
+ /* Calculate the number of bytes remaining to be written */
+ uint16_t BytesRemaining = ((EndAddr - StartAddr) + 1);
+
+ if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00)) // Write flash
+ {
+ /* Calculate the number of words to be written from the number of bytes to be written */
+ uint16_t WordsRemaining = (BytesRemaining >> 1);
+
+ union
+ {
+ uint16_t Words[2];
+ uint32_t Long;
+ } CurrFlashAddress = {.Words = {StartAddr, Flash64KBPage}};
+
+ uint32_t CurrFlashPageStartAddress = CurrFlashAddress.Long;
+ uint8_t WordsInFlashPage = 0;
+
+ while (WordsRemaining--)
+ {
+ /* Check if endpoint is empty - if so clear it and wait until ready for next packet */
+ if (!(Endpoint_BytesInEndpoint()))
+ {
+ Endpoint_ClearOUT();
+
+ while (!(Endpoint_IsOUTReceived()))
+ {
+ if (USB_DeviceState == DEVICE_STATE_Unattached)
+ return;
+ }
+ }
+
+ /* Write the next word into the current flash page */
+ boot_page_fill(CurrFlashAddress.Long, Endpoint_Read_Word_LE());
+
+ /* Adjust counters */
+ WordsInFlashPage += 1;
+ CurrFlashAddress.Long += 2;
+
+ /* See if an entire page has been written to the flash page buffer */
+ if ((WordsInFlashPage == (SPM_PAGESIZE >> 1)) || !(WordsRemaining))
+ {
+ /* Commit the flash page to memory */
+ boot_page_write(CurrFlashPageStartAddress);
+ boot_spm_busy_wait();
+
+ /* Check if programming incomplete */
+ if (WordsRemaining)
+ {
+ CurrFlashPageStartAddress = CurrFlashAddress.Long;
+ WordsInFlashPage = 0;
+
+ /* Erase next page's temp buffer */
+ boot_page_erase(CurrFlashAddress.Long);
+ boot_spm_busy_wait();
+ }
+ }
+ }
+
+ /* Once programming complete, start address equals the end address */
+ StartAddr = EndAddr;
+
+ /* Re-enable the RWW section of flash */
+ boot_rww_enable();
+ }
+ else // Write EEPROM
+ {
+ while (BytesRemaining--)
+ {
+ /* Check if endpoint is empty - if so clear it and wait until ready for next packet */
+ if (!(Endpoint_BytesInEndpoint()))
+ {
+ Endpoint_ClearOUT();
+
+ while (!(Endpoint_IsOUTReceived()))
+ {
+ if (USB_DeviceState == DEVICE_STATE_Unattached)
+ return;
+ }
+ }
+
+ /* Read the byte from the USB interface and write to to the EEPROM */
+ eeprom_write_byte((uint8_t*)StartAddr, Endpoint_Read_Byte());
+
+ /* Adjust counters */
+ StartAddr++;
+ }
+ }
+
+ /* Throw away the currently unused DFU file suffix */
+ DiscardFillerBytes(DFU_FILE_SUFFIX_SIZE);
+ }
+ }
+
+ Endpoint_ClearOUT();
+
+ Endpoint_ClearStatusStage();
+
+ break;
+ case DFU_UPLOAD:
+ Endpoint_ClearSETUP();
+
+ LEDs_TurnOnLEDs(LEDMASK_TX);
+ PulseMSRemaining.TxLEDPulse = TX_RX_LED_PULSE_MS;
+
+ while (!(Endpoint_IsINReady()))
+ {
+ if (USB_DeviceState == DEVICE_STATE_Unattached)
+ return;
+ }
+
+ if (DFU_State != dfuUPLOAD_IDLE)
+ {
+ if ((DFU_State == dfuERROR) && IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Blank Check
+ {
+ /* Blank checking is performed in the DFU_DNLOAD request - if we get here we've told the host
+ that the memory isn't blank, and the host is requesting the first non-blank address */
+ Endpoint_Write_Word_LE(StartAddr);
+ }
+ else
+ {
+ /* Idle state upload - send response to last issued command */
+ Endpoint_Write_Byte(ResponseByte);
+ }
+ }
+ else
+ {
+ /* Determine the number of bytes remaining in the current block */
+ uint16_t BytesRemaining = ((EndAddr - StartAddr) + 1);
+
+ if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00)) // Read FLASH
+ {
+ /* Calculate the number of words to be written from the number of bytes to be written */
+ uint16_t WordsRemaining = (BytesRemaining >> 1);
+
+ union
+ {
+ uint16_t Words[2];
+ uint32_t Long;
+ } CurrFlashAddress = {.Words = {StartAddr, Flash64KBPage}};
+
+ while (WordsRemaining--)
+ {
+ /* Check if endpoint is full - if so clear it and wait until ready for next packet */
+ if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)
+ {
+ Endpoint_ClearIN();
+
+ while (!(Endpoint_IsINReady()))
+ {
+ if (USB_DeviceState == DEVICE_STATE_Unattached)
+ return;
+ }
+ }
+
+ /* Read the flash word and send it via USB to the host */
+ #if (FLASHEND > 0xFFFF)
+ Endpoint_Write_Word_LE(pgm_read_word_far(CurrFlashAddress.Long));
+ #else
+ Endpoint_Write_Word_LE(pgm_read_word(CurrFlashAddress.Long));
+ #endif
+
+ /* Adjust counters */
+ CurrFlashAddress.Long += 2;
+ }
+
+ /* Once reading is complete, start address equals the end address */
+ StartAddr = EndAddr;
+ }
+ else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x02)) // Read EEPROM
+ {
+ while (BytesRemaining--)
+ {
+ /* Check if endpoint is full - if so clear it and wait until ready for next packet */
+ if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)
+ {
+ Endpoint_ClearIN();
+
+ while (!(Endpoint_IsINReady()))
+ {
+ if (USB_DeviceState == DEVICE_STATE_Unattached)
+ return;
+ }
+ }
+
+ /* Read the EEPROM byte and send it via USB to the host */
+ Endpoint_Write_Byte(eeprom_read_byte((uint8_t*)StartAddr));
+
+ /* Adjust counters */
+ StartAddr++;
+ }
+ }
+
+ /* Return to idle state */
+ DFU_State = dfuIDLE;
+ }
+
+ Endpoint_ClearIN();
+
+ Endpoint_ClearStatusStage();
+ break;
+ case DFU_GETSTATUS:
+ Endpoint_ClearSETUP();
+
+ /* Write 8-bit status value */
+ Endpoint_Write_Byte(DFU_Status);
+
+ /* Write 24-bit poll timeout value */
+ Endpoint_Write_Byte(0);
+ Endpoint_Write_Word_LE(0);
+
+ /* Write 8-bit state value */
+ Endpoint_Write_Byte(DFU_State);
+
+ /* Write 8-bit state string ID number */
+ Endpoint_Write_Byte(0);
+
+ Endpoint_ClearIN();
+
+ Endpoint_ClearStatusStage();
+ break;
+ case DFU_CLRSTATUS:
+ Endpoint_ClearSETUP();
+
+ /* Reset the status value variable to the default OK status */
+ DFU_Status = OK;
+
+ Endpoint_ClearStatusStage();
+ break;
+ case DFU_GETSTATE:
+ Endpoint_ClearSETUP();
+
+ /* Write the current device state to the endpoint */
+ Endpoint_Write_Byte(DFU_State);
+
+ Endpoint_ClearIN();
+
+ Endpoint_ClearStatusStage();
+ break;
+ case DFU_ABORT:
+ Endpoint_ClearSETUP();
+
+ /* Turn off TX/RX status LEDs so that they're not left on when application starts */
+ LEDs_TurnOffLEDs(LEDMASK_TX);
+ LEDs_TurnOffLEDs(LEDMASK_RX);
+
+ /* Reset the current state variable to the default idle state */
+ DFU_State = dfuIDLE;
+
+ Endpoint_ClearStatusStage();
+ break;
+ }
+}
+
+/** Routine to discard the specified number of bytes from the control endpoint stream. This is used to
+ * discard unused bytes in the stream from the host, including the memory program block suffix.
+ *
+ * \param[in] NumberOfBytes Number of bytes to discard from the host from the control endpoint
+ */
+static void DiscardFillerBytes(uint8_t NumberOfBytes)
+{
+ while (NumberOfBytes--)
+ {
+ if (!(Endpoint_BytesInEndpoint()))
+ {
+ Endpoint_ClearOUT();
+
+ /* Wait until next data packet received */
+ while (!(Endpoint_IsOUTReceived()))
+ {
+ if (USB_DeviceState == DEVICE_STATE_Unattached)
+ return;
+ }
+ }
+ else
+ {
+ Endpoint_Discard_Byte();
+ }
+ }
+}
+
+/** Routine to process an issued command from the host, via a DFU_DNLOAD request wrapper. This routine ensures
+ * that the command is allowed based on the current secure mode flag value, and passes the command off to the
+ * appropriate handler function.
+ */
+static void ProcessBootloaderCommand(void)
+{
+ /* Check if device is in secure mode */
+// if (IsSecure)
+// {
+// /* Don't process command unless it is a READ or chip erase command */
+// if (!(((SentCommand.Command == COMMAND_WRITE) &&
+// IS_TWOBYTE_COMMAND(SentCommand.Data, 0x00, 0xFF)) ||
+// (SentCommand.Command == COMMAND_READ)))
+// {
+// /* Set the state and status variables to indicate the error */
+// DFU_State = dfuERROR;
+// DFU_Status = errWRITE;
+//
+// /* Stall command */
+// Endpoint_StallTransaction();
+//
+// /* Don't process the command */
+// return;
+// }
+// }
+
+ /* Dispatch the required command processing routine based on the command type */
+ switch (SentCommand.Command)
+ {
+ case COMMAND_PROG_START:
+ ProcessMemProgCommand();
+ break;
+ case COMMAND_DISP_DATA:
+ ProcessMemReadCommand();
+ break;
+ case COMMAND_WRITE:
+ ProcessWriteCommand();
+ break;
+ case COMMAND_READ:
+ ProcessReadCommand();
+ break;
+ case COMMAND_CHANGE_BASE_ADDR:
+ if (IS_TWOBYTE_COMMAND(SentCommand.Data, 0x03, 0x00)) // Set 64KB flash page command
+ Flash64KBPage = SentCommand.Data[2];
+ break;
+ }
+}
+
+/** Routine to concatenate the given pair of 16-bit memory start and end addresses from the host, and store them
+ * in the StartAddr and EndAddr global variables.
+ */
+static void LoadStartEndAddresses(void)
+{
+ union
+ {
+ uint8_t Bytes[2];
+ uint16_t Word;
+ } Address[2] = {{.Bytes = {SentCommand.Data[2], SentCommand.Data[1]}},
+ {.Bytes = {SentCommand.Data[4], SentCommand.Data[3]}}};
+
+ /* Load in the start and ending read addresses from the sent data packet */
+ StartAddr = Address[0].Word;
+ EndAddr = Address[1].Word;
+}
+
+/** Handler for a Memory Program command issued by the host. This routine handles the preparations needed
+ * to write subsequent data from the host into the specified memory.
+ */
+static void ProcessMemProgCommand(void)
+{
+ if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00) || // Write FLASH command
+ IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Write EEPROM command
+ {
+ /* Load in the start and ending read addresses */
+ LoadStartEndAddresses();
+
+ /* If FLASH is being written to, we need to pre-erase the first page to write to */
+ if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00))
+ {
+ union
+ {
+ uint16_t Words[2];
+ uint32_t Long;
+ } CurrFlashAddress = {.Words = {StartAddr, Flash64KBPage}};
+
+ /* Erase the current page's temp buffer */
+ boot_page_erase(CurrFlashAddress.Long);
+ boot_spm_busy_wait();
+ }
+
+ /* Set the state so that the next DNLOAD requests reads in the firmware */
+ DFU_State = dfuDNLOAD_IDLE;
+ }
+}
+
+/** Handler for a Memory Read command issued by the host. This routine handles the preparations needed
+ * to read subsequent data from the specified memory out to the host, as well as implementing the memory
+ * blank check command.
+ */
+static void ProcessMemReadCommand(void)
+{
+ if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00) || // Read FLASH command
+ IS_ONEBYTE_COMMAND(SentCommand.Data, 0x02)) // Read EEPROM command
+ {
+ /* Load in the start and ending read addresses */
+ LoadStartEndAddresses();
+
+ /* Set the state so that the next UPLOAD requests read out the firmware */
+ DFU_State = dfuUPLOAD_IDLE;
+ }
+ else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Blank check FLASH command
+ {
+ uint32_t CurrFlashAddress = 0;
+
+ while (CurrFlashAddress < BOOT_START_ADDR)
+ {
+ /* Check if the current byte is not blank */
+ #if (FLASHEND > 0xFFFF)
+ if (pgm_read_byte_far(CurrFlashAddress) != 0xFF)
+ #else
+ if (pgm_read_byte(CurrFlashAddress) != 0xFF)
+ #endif
+ {
+ /* Save the location of the first non-blank byte for response back to the host */
+ Flash64KBPage = (CurrFlashAddress >> 16);
+ StartAddr = CurrFlashAddress;
+
+ /* Set state and status variables to the appropriate error values */
+ DFU_State = dfuERROR;
+ DFU_Status = errCHECK_ERASED;
+
+ break;
+ }
+
+ CurrFlashAddress++;
+ }
+ }
+}
+
+/** Handler for a Data Write command issued by the host. This routine handles non-programming commands such as
+ * bootloader exit (both via software jumps and hardware watchdog resets) and flash memory erasure.
+ */
+static void ProcessWriteCommand(void)
+{
+ if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x03)) // Start application
+ {
+ /* Indicate that the bootloader is terminating */
+ WaitForExit = true;
+
+ /* Check if data supplied for the Start Program command - no data executes the program */
+ if (SentCommand.DataSize)
+ {
+ if (SentCommand.Data[1] == 0x01) // Start via jump
+ {
+ union
+ {
+ uint8_t Bytes[2];
+ AppPtr_t FuncPtr;
+ } Address = {.Bytes = {SentCommand.Data[4], SentCommand.Data[3]}};
+
+ /* Load in the jump address into the application start address pointer */
+ AppStartPtr = Address.FuncPtr;
+ }
+ }
+ else
+ {
+ if (SentCommand.Data[1] == 0x00) // Start via watchdog
+ {
+ /* Start the watchdog to reset the AVR once the communications are finalized */
+ wdt_enable(WDTO_250MS);
+ }
+ else // Start via jump
+ {
+ /* Set the flag to terminate the bootloader at next opportunity */
+ RunBootloader = false;
+ }
+ }
+ }
+ else if (IS_TWOBYTE_COMMAND(SentCommand.Data, 0x00, 0xFF)) // Erase flash
+ {
+ uint32_t CurrFlashAddress = 0;
+
+ /* Clear the application section of flash */
+ while (CurrFlashAddress < BOOT_START_ADDR)
+ {
+ boot_page_erase(CurrFlashAddress);
+ boot_spm_busy_wait();
+ boot_page_write(CurrFlashAddress);
+ boot_spm_busy_wait();
+
+ CurrFlashAddress += SPM_PAGESIZE;
+ }
+
+ /* Re-enable the RWW section of flash as writing to the flash locks it out */
+ boot_rww_enable();
+
+ /* Memory has been erased, reset the security bit so that programming/reading is allowed */
+// IsSecure = false;
+ }
+}
+
+/** Handler for a Data Read command issued by the host. This routine handles bootloader information retrieval
+ * commands such as device signature and bootloader version retrieval.
+ */
+static void ProcessReadCommand(void)
+{
+ const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2};
+ const uint8_t SignatureInfo[3] = {AVR_SIGNATURE_1, AVR_SIGNATURE_2, AVR_SIGNATURE_3};
+
+ uint8_t DataIndexToRead = SentCommand.Data[1];
+
+ if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00)) // Read bootloader info
+ ResponseByte = BootloaderInfo[DataIndexToRead];
+ else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Read signature byte
+ ResponseByte = SignatureInfo[DataIndexToRead - 0x30];
+}
diff --git a/test/ardmake/hardware/firmwares/arduino-usbdfu/Arduino-usbdfu.h b/test/ardmake/hardware/firmwares/arduino-usbdfu/Arduino-usbdfu.h
new file mode 100644
index 0000000..4fb236e
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbdfu/Arduino-usbdfu.h
@@ -0,0 +1,220 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * Header file for Arduino-usbdfu.c.
+ */
+
+#ifndef _ARDUINO_USB_DFU_BOOTLOADER_H_
+#define _ARDUINO_USB_DFU_BOOTLOADER_H_
+
+ /* Includes: */
+ #include <avr/io.h>
+ #include <avr/wdt.h>
+ #include <avr/boot.h>
+ #include <avr/pgmspace.h>
+ #include <avr/eeprom.h>
+ #include <avr/power.h>
+ #include <avr/interrupt.h>
+ #include <stdbool.h>
+
+ #include "Descriptors.h"
+
+ #include <LUFA/Drivers/Board/LEDs.h>
+ #include <LUFA/Drivers/USB/USB.h>
+
+ /* Macros: */
+ /** LED mask for the library LED driver, to indicate TX activity. */
+ #define LEDMASK_TX LEDS_LED1
+
+ /** LED mask for the library LED driver, to indicate RX activity. */
+ #define LEDMASK_RX LEDS_LED2
+
+ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
+ #define LEDMASK_ERROR (LEDS_LED1 | LEDS_LED2)
+
+ /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
+ #define LEDMASK_BUSY (LEDS_LED1 | LEDS_LED2)
+
+ /** Configuration define. Define this token to true to case the bootloader to reject all memory commands
+ * until a memory erase has been performed. When used in conjunction with the lockbits of the AVR, this
+ * can protect the AVR's firmware from being dumped from a secured AVR. When false, memory operations are
+ * allowed at any time.
+ */
+// #define SECURE_MODE false
+
+ /** Major bootloader version number. */
+ #define BOOTLOADER_VERSION_MINOR 2
+
+ /** Minor bootloader version number. */
+ #define BOOTLOADER_VERSION_REV 0
+
+ /** Complete bootloader version number expressed as a packed byte, constructed from the
+ * two individual bootloader version macros.
+ */
+ #define BOOTLOADER_VERSION ((BOOTLOADER_VERSION_MINOR << 4) | BOOTLOADER_VERSION_REV)
+
+ /** First byte of the bootloader identification bytes, used to identify a device's bootloader. */
+ #define BOOTLOADER_ID_BYTE1 0xDC
+
+ /** Second byte of the bootloader identification bytes, used to identify a device's bootloader. */
+ #define BOOTLOADER_ID_BYTE2 0xFB
+
+ /** Convenience macro, used to determine if the issued command is the given one-byte long command.
+ *
+ * \param[in] dataarr Command byte array to check against
+ * \param[in] cb1 First command byte to check
+ */
+ #define IS_ONEBYTE_COMMAND(dataarr, cb1) (dataarr[0] == (cb1))
+
+ /** Convenience macro, used to determine if the issued command is the given two-byte long command.
+ *
+ * \param[in] dataarr Command byte array to check against
+ * \param[in] cb1 First command byte to check
+ * \param[in] cb2 Second command byte to check
+ */
+ #define IS_TWOBYTE_COMMAND(dataarr, cb1, cb2) ((dataarr[0] == (cb1)) && (dataarr[1] == (cb2)))
+
+ /** Length of the DFU file suffix block, appended to the end of each complete memory write command.
+ * The DFU file suffix is currently unused (but is designed to give extra file information, such as
+ * a CRC of the complete firmware for error checking) and so is discarded.
+ */
+ #define DFU_FILE_SUFFIX_SIZE 16
+
+ /** Length of the DFU file filler block, appended to the start of each complete memory write command.
+ * Filler bytes are added to the start of each complete memory write command, and must be discarded.
+ */
+ #define DFU_FILLER_BYTES_SIZE 26
+
+ /** DFU class command request to detach from the host. */
+ #define DFU_DETATCH 0x00
+
+ /** DFU class command request to send data from the host to the bootloader. */
+ #define DFU_DNLOAD 0x01
+
+ /** DFU class command request to send data from the bootloader to the host. */
+ #define DFU_UPLOAD 0x02
+
+ /** DFU class command request to get the current DFU status and state from the bootloader. */
+ #define DFU_GETSTATUS 0x03
+
+ /** DFU class command request to reset the current DFU status and state variables to their defaults. */
+ #define DFU_CLRSTATUS 0x04
+
+ /** DFU class command request to get the current DFU state of the bootloader. */
+ #define DFU_GETSTATE 0x05
+
+ /** DFU class command request to abort the current multi-request transfer and return to the dfuIDLE state. */
+ #define DFU_ABORT 0x06
+
+ /** DFU command to begin programming the device's memory. */
+ #define COMMAND_PROG_START 0x01
+
+ /** DFU command to begin reading the device's memory. */
+ #define COMMAND_DISP_DATA 0x03
+
+ /** DFU command to issue a write command. */
+ #define COMMAND_WRITE 0x04
+
+ /** DFU command to issue a read command. */
+ #define COMMAND_READ 0x05
+
+ /** DFU command to issue a memory base address change command, to set the current 64KB flash page
+ * that subsequent flash operations should use. */
+ #define COMMAND_CHANGE_BASE_ADDR 0x06
+
+ /* Type Defines: */
+ /** Type define for a non-returning function pointer to the loaded application. */
+ typedef void (*AppPtr_t)(void) ATTR_NO_RETURN;
+
+ /** Type define for a structure containing a complete DFU command issued by the host. */
+ typedef struct
+ {
+ uint8_t Command; /**< Single byte command to perform, one of the COMMAND_* macro values */
+ uint8_t Data[5]; /**< Command parameters */
+ uint16_t DataSize; /**< Size of the command parameters */
+ } DFU_Command_t;
+
+ /* Enums: */
+ /** DFU bootloader states. Refer to the DFU class specification for information on each state. */
+ enum DFU_State_t
+ {
+ appIDLE = 0,
+ appDETACH = 1,
+ dfuIDLE = 2,
+ dfuDNLOAD_SYNC = 3,
+ dfuDNBUSY = 4,
+ dfuDNLOAD_IDLE = 5,
+ dfuMANIFEST_SYNC = 6,
+ dfuMANIFEST = 7,
+ dfuMANIFEST_WAIT_RESET = 8,
+ dfuUPLOAD_IDLE = 9,
+ dfuERROR = 10
+ };
+
+ /** DFU command status error codes. Refer to the DFU class specification for information on each error code. */
+ enum DFU_Status_t
+ {
+ OK = 0,
+ errTARGET = 1,
+ errFILE = 2,
+ errWRITE = 3,
+ errERASE = 4,
+ errCHECK_ERASED = 5,
+ errPROG = 6,
+ errVERIFY = 7,
+ errADDRESS = 8,
+ errNOTDONE = 9,
+ errFIRMWARE = 10,
+ errVENDOR = 11,
+ errUSBR = 12,
+ errPOR = 13,
+ errUNKNOWN = 14,
+ errSTALLEDPKT = 15
+ };
+
+ /* Function Prototypes: */
+ void SetupHardware(void);
+ void ResetHardware(void);
+
+ void EVENT_USB_Device_UnhandledControlRequest(void);
+
+ #if defined(INCLUDE_FROM_BOOTLOADER_C)
+ static void DiscardFillerBytes(uint8_t NumberOfBytes);
+ static void ProcessBootloaderCommand(void);
+ static void LoadStartEndAddresses(void);
+ static void ProcessMemProgCommand(void);
+ static void ProcessMemReadCommand(void);
+ static void ProcessWriteCommand(void);
+ static void ProcessReadCommand(void);
+ #endif
+
+#endif /* _ARDUINO_USB_DFU_BOOTLOADER_H_ */
diff --git a/test/ardmake/hardware/firmwares/arduino-usbdfu/Board/LEDs.h b/test/ardmake/hardware/firmwares/arduino-usbdfu/Board/LEDs.h
new file mode 100644
index 0000000..152e8f5
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbdfu/Board/LEDs.h
@@ -0,0 +1,110 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/*
+ Board LEDs driver for the Benito board, from www.dorkbotpdx.org.
+*/
+
+#ifndef __LEDS_ARDUINOUNO_H__
+#define __LEDS_ARDUINOUNO_H__
+
+ /* Includes: */
+ #include <avr/io.h>
+
+/* Enable C linkage for C++ Compilers: */
+ #if defined(__cplusplus)
+ extern "C" {
+ #endif
+
+ /* Preprocessor Checks: */
+ #if !defined(INCLUDE_FROM_LEDS_H)
+ #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
+ #endif
+
+ /* Public Interface - May be used in end-application: */
+ /* Macros: */
+ /** LED mask for the first LED on the board. */
+ #define LEDS_LED1 (1 << 5)
+
+ /** LED mask for the second LED on the board. */
+ #define LEDS_LED2 (1 << 4)
+
+ /** LED mask for all the LEDs on the board. */
+ #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2)
+
+ /** LED mask for the none of the board LEDs */
+ #define LEDS_NO_LEDS 0
+
+ /* Inline Functions: */
+ #if !defined(__DOXYGEN__)
+ static inline void LEDs_Init(void)
+ {
+ DDRD |= LEDS_ALL_LEDS;
+ PORTD |= LEDS_ALL_LEDS;
+ }
+
+ static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
+ {
+ PORTD &= ~LEDMask;
+ }
+
+ static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
+ {
+ PORTD |= LEDMask;
+ }
+
+ static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
+ {
+ PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
+ }
+
+ static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)
+ {
+ PORTD = ((PORTD | ActiveMask) & ~LEDMask);
+ }
+
+ static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
+ {
+ PORTD ^= LEDMask;
+ }
+
+ static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+ static inline uint8_t LEDs_GetLEDs(void)
+ {
+ return (PORTD & LEDS_ALL_LEDS);
+ }
+ #endif
+
+ /* Disable C linkage for C++ Compilers: */
+ #if defined(__cplusplus)
+ }
+ #endif
+
+#endif
diff --git a/test/ardmake/hardware/firmwares/arduino-usbdfu/Descriptors.c b/test/ardmake/hardware/firmwares/arduino-usbdfu/Descriptors.c
new file mode 100644
index 0000000..4deaa06
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbdfu/Descriptors.c
@@ -0,0 +1,189 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * USB Device Descriptors, for library use when in USB device mode. Descriptors are special
+ * computer-readable structures which the host requests upon device enumeration, to determine
+ * the device's capabilities and functions.
+ */
+
+#include "Descriptors.h"
+
+/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
+ * device characteristics, including the supported USB version, control endpoint size and the
+ * number of device configurations. The descriptor is read out by the USB host when the enumeration
+ * process begins.
+ */
+USB_Descriptor_Device_t DeviceDescriptor =
+{
+ .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
+
+ .USBSpecification = VERSION_BCD(01.10),
+ .Class = 0x00,
+ .SubClass = 0x00,
+ .Protocol = 0x00,
+
+ .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
+
+ .VendorID = 0x03EB, // Atmel
+ .ProductID = PRODUCT_ID_CODE, // MCU-dependent
+ .ReleaseNumber = 0x0000,
+
+ .ManufacturerStrIndex = NO_DESCRIPTOR,
+ .ProductStrIndex = 0x01,
+ .SerialNumStrIndex = NO_DESCRIPTOR,
+
+ .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
+};
+
+/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
+ * of the device in one of its supported configurations, including information about any device interfaces
+ * and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
+ * a configuration so that the host may correctly communicate with the USB device.
+ */
+USB_Descriptor_Configuration_t ConfigurationDescriptor =
+{
+ .Config =
+ {
+ .Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
+
+ .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
+ .TotalInterfaces = 1,
+
+ .ConfigurationNumber = 1,
+ .ConfigurationStrIndex = NO_DESCRIPTOR,
+
+ .ConfigAttributes = USB_CONFIG_ATTR_BUSPOWERED,
+
+ .MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
+ },
+
+ .DFU_Interface =
+ {
+ .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+ .InterfaceNumber = 0,
+ .AlternateSetting = 0,
+
+ .TotalEndpoints = 0,
+
+ .Class = 0xFE,
+ .SubClass = 0x01,
+ .Protocol = 0x02,
+
+ .InterfaceStrIndex = NO_DESCRIPTOR
+ },
+
+ .DFU_Functional =
+ {
+ .Header = {.Size = sizeof(USB_DFU_Functional_Descriptor_t), .Type = DTYPE_DFUFunctional},
+
+ .Attributes = (ATTR_CAN_UPLOAD | ATTR_CAN_DOWNLOAD),
+
+ .DetachTimeout = 0x0000,
+ .TransferSize = 0x0c00,
+
+ .DFUSpecification = VERSION_BCD(01.01)
+ }
+};
+
+/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
+ * the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
+ * via the language ID table available at USB.org what languages the device supports for its string descriptors.
+ */
+USB_Descriptor_String_t LanguageString =
+{
+ .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
+
+ .UnicodeString = {LANGUAGE_ID_ENG}
+};
+
+/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
+ * and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
+ * Descriptor.
+ */
+USB_Descriptor_String_t ProductString =
+{
+ #if (ARDUINO_MODEL_PID == ARDUINO_UNO_PID)
+ .Header = {.Size = USB_STRING_LEN(15), .Type = DTYPE_String},
+
+ .UnicodeString = L"Arduino Uno DFU"
+ #elif (ARDUINO_MODEL_PID == ARDUINO_MEGA2560_PID)
+ .Header = {.Size = USB_STRING_LEN(21), .Type = DTYPE_String},
+
+ .UnicodeString = L"Arduino Mega 2560 DFU"
+ #endif
+};
+
+/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
+ * documentation) by the application code so that the address and size of a requested descriptor can be given
+ * to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
+ * is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
+ * USB host.
+ */
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+ const uint8_t wIndex,
+ void** const DescriptorAddress)
+{
+ const uint8_t DescriptorType = (wValue >> 8);
+ const uint8_t DescriptorNumber = (wValue & 0xFF);
+
+ void* Address = NULL;
+ uint16_t Size = NO_DESCRIPTOR;
+
+ switch (DescriptorType)
+ {
+ case DTYPE_Device:
+ Address = &DeviceDescriptor;
+ Size = sizeof(USB_Descriptor_Device_t);
+ break;
+ case DTYPE_Configuration:
+ Address = &ConfigurationDescriptor;
+ Size = sizeof(USB_Descriptor_Configuration_t);
+ break;
+ case DTYPE_String:
+ if (!(DescriptorNumber))
+ {
+ Address = &LanguageString;
+ Size = LanguageString.Header.Size;
+ }
+ else
+ {
+ Address = &ProductString;
+ Size = ProductString.Header.Size;
+ }
+
+ break;
+ }
+
+ *DescriptorAddress = Address;
+ return Size;
+}
diff --git a/test/ardmake/hardware/firmwares/arduino-usbdfu/Descriptors.h b/test/ardmake/hardware/firmwares/arduino-usbdfu/Descriptors.h
new file mode 100644
index 0000000..6c93f20
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbdfu/Descriptors.h
@@ -0,0 +1,177 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * Header file for Descriptors.c.
+ */
+
+#ifndef _DESCRIPTORS_H_
+#define _DESCRIPTORS_H_
+
+ /* Includes: */
+ #include <LUFA/Drivers/USB/USB.h>
+
+ /* Product-specific definitions: */
+ #define ARDUINO_UNO_PID 0x0001
+ #define ARDUINO_MEGA2560_PID 0x0010
+
+ /* Macros: */
+ /** Descriptor type value for a DFU class functional descriptor. */
+ #define DTYPE_DFUFunctional 0x21
+
+ /** DFU attribute mask, indicating that the DFU device will detach and re-attach when a DFU_DETACH
+ * command is issued, rather than the host issuing a USB Reset.
+ */
+ #define ATTR_WILL_DETATCH (1 << 3)
+
+ /** DFU attribute mask, indicating that the DFU device can communicate during the manifestation phase
+ * (memory programming phase).
+ */
+ #define ATTR_MANEFESTATION_TOLLERANT (1 << 2)
+
+ /** DFU attribute mask, indicating that the DFU device can accept DFU_UPLOAD requests to send data from
+ * the device to the host.
+ */
+ #define ATTR_CAN_UPLOAD (1 << 1)
+
+ /** DFU attribute mask, indicating that the DFU device can accept DFU_DNLOAD requests to send data from
+ * the host to the device.
+ */
+ #define ATTR_CAN_DOWNLOAD (1 << 0)
+
+ #if defined(__AVR_AT90USB1287__)
+ #define PRODUCT_ID_CODE 0x2FFB
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x97
+ #define AVR_SIGNATURE_3 0x82
+ #elif defined(__AVR_AT90USB1286__)
+ #define PRODUCT_ID_CODE 0x2FFB
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x97
+ #define AVR_SIGNATURE_3 0x82
+ #elif defined(__AVR_AT90USB647__)
+ #define PRODUCT_ID_CODE 0x2FF9
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x96
+ #define AVR_SIGNATURE_3 0x82
+ #elif defined(__AVR_AT90USB646__)
+ #define PRODUCT_ID_CODE 0x2FF9
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x96
+ #define AVR_SIGNATURE_3 0x82
+ #elif defined(__AVR_ATmega32U6__)
+ #define PRODUCT_ID_CODE 0x2FFB
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x95
+ #define AVR_SIGNATURE_3 0x88
+ #elif defined(__AVR_ATmega32U4__)
+ #define PRODUCT_ID_CODE 0x2FF4
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x95
+ #define AVR_SIGNATURE_3 0x87
+ #elif defined(__AVR_ATmega32U2__)
+ #define PRODUCT_ID_CODE 0x2FF0
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x95
+ #define AVR_SIGNATURE_3 0x8A
+ #elif defined(__AVR_ATmega16U4__)
+ #define PRODUCT_ID_CODE 0x2FF3
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x94
+ #define AVR_SIGNATURE_3 0x88
+ #elif defined(__AVR_ATmega16U2__)
+ #define PRODUCT_ID_CODE 0x2FEF
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x94
+ #define AVR_SIGNATURE_3 0x89
+ #elif defined(__AVR_AT90USB162__)
+ #define PRODUCT_ID_CODE 0x2FFA
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x94
+ #define AVR_SIGNATURE_3 0x82
+ #elif defined(__AVR_AT90USB82__)
+ #define PRODUCT_ID_CODE 0x2FEE
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x93
+ #define AVR_SIGNATURE_3 0x89
+ #elif defined(__AVR_ATmega8U2__)
+ #define PRODUCT_ID_CODE 0x2FF7
+ #define AVR_SIGNATURE_1 0x1E
+ #define AVR_SIGNATURE_2 0x93
+ #define AVR_SIGNATURE_3 0x82
+ #else
+ #error The selected AVR part is not currently supported by this bootloader.
+ #endif
+
+ #if !defined(PRODUCT_ID_CODE)
+ #error Current AVR model is not supported by this bootloader.
+ #endif
+
+ /* Type Defines: */
+ /** Type define for a DFU class function descriptor. This descriptor gives DFU class information
+ * to the host when read, indicating the DFU device's capabilities.
+ */
+ typedef struct
+ {
+ USB_Descriptor_Header_t Header; /**< Standard descriptor header structure */
+
+ uint8_t Attributes; /**< DFU device attributes, a mask comprising of the
+ * ATTR_* macros listed in this source file
+ */
+ uint16_t DetachTimeout; /**< Timeout in milliseconds between a USB_DETACH
+ * command being issued and the device detaching
+ * from the USB bus
+ */
+ uint16_t TransferSize; /**< Maximum number of bytes the DFU device can accept
+ * from the host in a transaction
+ */
+ uint16_t DFUSpecification; /**< BCD packed DFU specification number this DFU
+ * device complies with
+ */
+ } USB_DFU_Functional_Descriptor_t;
+
+ /** Type define for the device configuration descriptor structure. This must be defined in the
+ * application code, as the configuration descriptor contains several sub-descriptors which
+ * vary between devices, and which describe the device's usage to the host.
+ */
+ typedef struct
+ {
+ USB_Descriptor_Configuration_Header_t Config;
+ USB_Descriptor_Interface_t DFU_Interface;
+ USB_DFU_Functional_Descriptor_t DFU_Functional;
+ } USB_Descriptor_Configuration_t;
+
+ /* Function Prototypes: */
+ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+ const uint8_t wIndex,
+ void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif
diff --git a/test/ardmake/hardware/firmwares/arduino-usbdfu/makefile b/test/ardmake/hardware/firmwares/arduino-usbdfu/makefile
new file mode 100644
index 0000000..1fb4ed3
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbdfu/makefile
@@ -0,0 +1,710 @@
+# Hey Emacs, this is a -*- makefile -*-
+#----------------------------------------------------------------------------
+# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.
+# >> Modified for use with the LUFA project. <<
+#
+# 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
+# Dean Camera
+# Opendous Inc.
+# Denver Gingerich
+#
+#----------------------------------------------------------------------------
+# 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 doxygen = Generate DoxyGen documentation for the project (must have
+# DoxyGen installed)
+#
+# 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 = atmega8u2
+MCU_AVRDUDE = at90usb82
+
+# Specify the Arduino model using the assigned PID. This is used by Descriptors.c
+# to set the product descriptor string (for DFU we must use the PID for each
+# chip that dfu-bootloader or Flip expect)
+# Uno PID:
+ARDUINO_MODEL_PID = 0x0001
+# Mega 2560 PID:
+#ARDUINO_MODEL_PID = 0x0010
+
+# Target board (see library "Board Types" documentation, NONE for projects not requiring
+# LUFA board drivers). If USER is selected, put custom board drivers in a directory called
+# "Board" inside the application directory.
+BOARD = USER
+
+
+# Processor frequency.
+# This will define a symbol, F_CPU, in all source code files equal to the
+# processor frequency in Hz. 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.
+#
+# This will be an integer division of F_CLOCK below, as it is sourced by
+# F_CLOCK after it has run through any CPU prescalers. Note that this value
+# does not *change* the processor frequency - it should merely be updated to
+# reflect the processor speed set externally so that the code can use accurate
+# software delays.
+F_CPU = 16000000
+
+
+# Input clock frequency.
+# This will define a symbol, F_CLOCK, in all source code files equal to the
+# input clock frequency (before any prescaling is performed) in Hz. This value may
+# differ from F_CPU if prescaling is used on the latter, and is required as the
+# raw input clock is fed directly to the PLL sections of the AVR for high speed
+# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+# at the end, this will be done automatically to create a 32-bit value in your
+# source code.
+#
+# If no clock division is performed on the input clock inside the AVR (via the
+# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_CLOCK = $(F_CPU)
+
+
+# Starting byte address of the bootloader, as a byte address - computed via the formula
+# BOOT_START = ((TOTAL_FLASH_BYTES - BOOTLOADER_SECTION_SIZE_BYTES) * 1024)
+#
+# Note that the bootloader size and start address given in AVRStudio is in words and not
+# bytes, and so will need to be doubled to obtain the byte address needed by AVR-GCC.
+BOOT_START = 0x1000
+
+
+# Output format. (can be srec, ihex, binary)
+FORMAT = ihex
+
+
+# Target file name (without extension).
+TARGET = Arduino-usbdfu
+
+
+# Object files directory
+# To put object files in current directory, use a dot (.), do NOT make
+# this an empty or blank macro!
+OBJDIR = .
+
+
+# Path to the LUFA library
+LUFA_PATH = ../..
+
+
+# LUFA library compile-time options and predefined tokens
+LUFA_OPTS = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D CONTROL_ONLY_DEVICE
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_RAM_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D NO_INTERNAL_SERIAL
+LUFA_OPTS += -D NO_DEVICE_SELF_POWER
+LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP
+LUFA_OPTS += -D NO_STREAM_CALLBACKS
+
+
+# Create the LUFA source path variables by including the LUFA root makefile
+include $(LUFA_PATH)/LUFA/makefile
+
+
+# List C source files here. (C dependencies are automatically generated.)
+SRC = $(TARGET).c \
+ Descriptors.c \
+ $(LUFA_SRC_USB) \
+
+
+# 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 = $(LUFA_PATH)/
+
+
+# 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 for C sources
+CDEFS = -DF_CPU=$(F_CPU)UL
+CDEFS += -DARDUINO_MODEL_PID=$(ARDUINO_MODEL_PID)
+CDEFS += -DF_CLOCK=$(F_CLOCK)UL
+CDEFS += -DBOARD=BOARD_$(BOARD)
+CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
+CDEFS += -DTX_RX_LED_PULSE_MS=3
+CDEFS += $(LUFA_OPTS)
+
+
+# Place -D or -U options here for ASM sources
+ADEFS = -DF_CPU=$(F_CPU)
+ADEFS += -DF_CLOCK=$(F_CLOCK)UL
+ADEFS += -DBOARD=BOARD_$(BOARD)
+CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
+ADEFS += $(LUFA_OPTS)
+
+# Place -D or -U options here for C++ sources
+CPPDEFS = -DF_CPU=$(F_CPU)UL
+CPPDEFS += -DF_CLOCK=$(F_CLOCK)UL
+CPPDEFS += -DBOARD=BOARD_$(BOARD)
+CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
+CPPDEFS += $(LUFA_OPTS)
+#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 += -funsigned-char
+CFLAGS += -funsigned-bitfields
+CFLAGS += -ffunction-sections
+CFLAGS += -fno-inline-small-functions
+CFLAGS += -fpack-struct
+CFLAGS += -fshort-enums
+CFLAGS += -fno-strict-aliasing
+CFLAGS += -Wall
+CFLAGS += -Wstrict-prototypes
+#CFLAGS += -mshort-calls
+#CFLAGS += -fno-unit-at-a-time
+#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 += -funsigned-char
+CPPFLAGS += -funsigned-bitfields
+CPPFLAGS += -fpack-struct
+CPPFLAGS += -fshort-enums
+CPPFLAGS += -fno-exceptions
+CPPFLAGS += -Wall
+CPPFLAGS += -Wundef
+#CPPFLAGS += -mshort-calls
+#CPPFLAGS += -fno-unit-at-a-time
+#CPPFLAGS += -Wstrict-prototypes
+#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.
+# -adhlns: 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]
+# -listing-cont-lines: Sets the maximum number of continuation lines of hex
+# dump that will be displayed for a given single line of source input.
+ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+
+
+#---------------- 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
+
+
+# List any extra directories to look for libraries 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.
+EXTRALIBDIRS =
+
+
+
+#---------------- 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,--section-start,.data=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 += -Wl,--section-start=.text=$(BOOT_START)
+LDFLAGS += -Wl,--relax
+LDFLAGS += -Wl,--gc-sections
+LDFLAGS += $(EXTMEMOPTS)
+LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
+LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
+#LDFLAGS += -T linker_script.x
+
+
+
+#---------------- Programming Options (avrdude) ----------------
+
+# Fuse settings for Arduino Uno DFU bootloader project
+AVRDUDE_FUSES = -U efuse:w:0xF4:m -U hfuse:w:0xD9:m -U lfuse:w:0xFF:m
+
+# Lock settings for Arduino Uno DFU bootloader project
+AVRDUDE_LOCK = -U lock:w:0x0F:m
+
+# Programming hardware
+# Type: avrdude -c ?
+# to get a full listing.
+#
+AVRDUDE_PROGRAMMER = avrispmkii
+
+# com1 = serial port. Use lpt1 to connect to parallel port.
+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 <http://savannah.nongnu.org/projects/avrdude>
+# to submit bug reports.
+#AVRDUDE_VERBOSE = -v -v
+
+AVRDUDE_FLAGS = -p $(MCU_AVRDUDE) -F -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
+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
+AR = avr-ar rcs
+NM = avr-nm
+AVRDUDE = avrdude
+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 = -MMD -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) $(MCU_FLAG) $(FORMAT_FLAG) $(TARGET).elf
+MCU_FLAG = $(shell $(SIZE) --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) )
+FORMAT_FLAG = $(shell $(SIZE) --help | grep -- --format=.*avr > /dev/null && echo --format=avr )
+
+
+sizebefore:
+ @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \
+ 2>/dev/null; echo; fi
+
+sizeafter:
+ @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
+ 2>/dev/null; echo; fi
+
+
+
+# Display compiler version information.
+gccversion :
+ @$(CC) --version
+
+
+# Program the device.
+program: $(TARGET).hex $(TARGET).eep
+ $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) $(AVRDUDE_FUSES) $(AVRDUDE_LOCK)
+
+
+# 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 -R .fuse -R .lock $< $@
+
+%.eep: %.elf
+ @echo
+ @echo $(MSG_EEPROM) $@
+ -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+ --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0
+
+# Create extended listing file from ELF output file.
+%.lss: %.elf
+ @echo
+ @echo $(MSG_EXTENDED_LISTING) $@
+ $(OBJDUMP) -h -S -z $< > $@
+
+# 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
+ $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)
+ $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)
+ $(REMOVE) $(SRC:.c=.s)
+ $(REMOVE) $(SRC:.c=.d)
+ $(REMOVE) $(SRC:.c=.i)
+ $(REMOVEDIR) .dep
+
+doxygen:
+ @echo Generating Project Documentation...
+ @doxygen Doxygen.conf
+ @echo Documentation Generation Complete.
+
+clean_doxygen:
+ rm -rf Documentation
+
+# 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 doxygen clean \
+clean_list clean_doxygen program debug gdb-config
diff --git a/test/ardmake/hardware/firmwares/arduino-usbdfu/readme.txt b/test/ardmake/hardware/firmwares/arduino-usbdfu/readme.txt
new file mode 100644
index 0000000..e376679
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbdfu/readme.txt
@@ -0,0 +1,7 @@
+To setup the project and program an ATMEG8U2 with the Arduino USB DFU bootloader:
+1. unpack the source into LUFA's Bootloader directory
+2. set ARDUINO_MODEL_PID in the makefile as appropriate
+3. do "make clean; make; make program"
+
+Check that the board enumerates as either "Arduino Uno DFU" or "Arduino Mega 2560 DFU". Test by uploading the Arduino-usbserial application firmware (see instructions in Arduino-usbserial directory)
+
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex b/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
new file mode 100644
index 0000000..fbbeb07
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
@@ -0,0 +1,256 @@
+:10000000A2C00000BBC00000B9C00000B7C0000023
+:10001000B5C00000B3C00000B1C00000AFC0000018
+:10002000ADC00000ABC00000A9C000005AC4000071
+:100030001EC40000A3C00000A1C000009FC00000BB
+:100040009DC000009BC0000099C0000097C0000048
+:1000500095C0000093C0000091C0000014C10000D2
+:100060008DC000008BC0000089C0000087C0000068
+:1000700085C0000083C0000081C000007FC0000078
+:100080007DC000007BC0000079C0000077C0000088
+:1000900075C0000073C000001201100102000008CA
+:1000A0004123100001000102DC0109023E000201AF
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:100120002403410072006400750069006E006F00D6
+:1001300020004D006500670061002000320035009E
+:1001400036003000000011241FBECFEFD2E0DEBF2A
+:10015000CDBF11E0A0E0B1E0E0EDFFE002C005900E
+:100160000D92A631B107D9F712E0A6E1B1E001C0C6
+:100170001D92AF32B107E1F7F1D028C741CF9C0102
+:10018000DC01AE57BF4FED91FC9111974191119653
+:10019000FC93EE9380589F4FE817F90711F42D93C5
+:1001A0003C939FB7F894F901EC57FF4F8081815041
+:1001B00080839FBF842F0895DF92EF92FF920F9369
+:1001C0001F93FC018489813019F0823021F405C02D
+:1001D00040E3D42E04C0DD2402C030E2D32E838954
+:1001E000823011F488E0D82A8589873031F0883050
+:1001F00031F0863031F482E003C084E001C086E053
+:10020000D82A1092C9001092C8001092CA00E78440
+:10021000F0880189128980E0E81681EEF80680E016
+:10022000080780E0180719F420E130E00FC0C8018A
+:10023000B701969587957795679560587B47814E6E
+:100240009F4FA8019701A0D6215030403093CD0098
+:100250002093CC00D092CA0080E0E81681EEF80628
+:1002600080E0080780E0180711F082E001C080E01C
+:100270008093C80088E98093C9001F910F91FF9077
+:10028000EF90DF9008951F920F920FB60F921124F6
+:100290002F938F939F93EF93FF939091CE008EB304
+:1002A0008430F1F4E0919901F0919A019083E0910A
+:1002B0009901F0919A01CF01019690939A01809350
+:1002C00099018959914021F489E191E092838183D8
+:1002D0009FB7F89480919D018F5F80939D019FBF90
+:1002E000FF91EF919F918F912F910F900FBE0F90E3
+:1002F0001F901895FC01858580FF02C05F980895C6
+:100300005F9A089580E091E0D5C580E091E088C5CE
+:1003100084B7877F84BF28E10FB6F89420936000EC
+:10032000109260000FBE87E690E09093CD0080931E
+:10033000CC0086E08093CA001092C8002093C900C8
+:10034000539A5A9A8AB180638AB98BB180638BB908
+:1003500083D284E085BD5F9A579A08950F931F93C7
+:10036000CF93DF93D5DF2FB7F8948EE991E0909388
+:100370001F0280931E0290932102809320022FBFC0
+:100380002FB7F89489E191E090939A0180939901B5
+:1003900090939C0180939B012FBF7894CEE9D1E08C
+:1003A00003E08FB7F894909122028FBF903809F143
+:1003B00080E091E0ABD497FD1CC0E0911E02F0916B
+:1003C0001F028083E0911E02F0911F02CF0101966F
+:1003D00090931F0280931E028E51924011F4D2839B
+:1003E000C1839FB7F894809122028F5F809322028D
+:1003F0009FBF8FB7F89410919D018FBFA89902C03D
+:10040000113678F1A89A80919D01882361F05D985A
+:100410000093160108C089E191E0B1DE682F80E009
+:1004200091E0DAD411501123B1F78091160188239D
+:1004300051F0809116018150809316018091160130
+:10044000882309F45D9A80911701882351F08091E7
+:10045000170181508093170180911701882309F4B7
+:100460005C9A8FB7F894909122028FBF992369F01C
+:100470008EE991E084DE982F8091C80085FFFCCF43
+:100480009093CE005C980093170180E091E095D4A2
+:100490002AD487CFDA01923049F0933061F091305D
+:1004A000F9F4E8E9F0E022E130E01EC0EAEAF0E029
+:1004B0002EE330E019C0813049F0813018F08230ED
+:1004C00079F408C0E8EEF0E0849107C0ECEEF0E0CB
+:1004D000849103C0E0E2F1E08491282F30E004C071
+:1004E000E0E0F0E020E030E0ED93FC93C9010895F6
+:1004F00028E030E040E003C04F5F220F331F281791
+:100500003907D0F3842F8295807F08958093E90086
+:100510008091EB0081608093EB001092ED0060937E
+:10052000EC004093ED008091EE00881F8827881F23
+:1005300008951092F40090E09093E9001092F0007A
+:100540001092E8001092ED008091EB008E7F809376
+:10055000EB009F5F953081F70895809127028823F3
+:100560008CF403C08EB38823B1F08091E80082FF41
+:10057000F9CF8091E8008B778093E80008958EB3DF
+:10058000882349F08091E80080FFF9CF8091E8004E
+:100590008E778093E800089594E68091EC0080FFC8
+:1005A00005C08091E80080FF05C023C08091E8006D
+:1005B00082FD1FC08EB3882311F482E008958EB3AC
+:1005C000853011F483E008958091EB0085FF02C02F
+:1005D00081E008958091E10082FFDFCF8091E1000A
+:1005E0008B7F8093E100992311F484E0089591506A
+:1005F000D4CF80E008959C0140912D0250912E02AD
+:100600004617570718F4F90120E038C06115710545
+:1006100011F0AB01F8CF8091E8008E778093E8006D
+:1006200040E050E0F0CF8091E80083FF02C081E01D
+:1006300008958091E80082FD2DC08EB3882381F15A
+:100640008EB3853079F18091E80080FF17C09091DA
+:10065000F20006C081918093F100415050409F5FAD
+:100660004115510511F09830A8F320E0983009F4B5
+:1006700021E08091E8008E778093E80041155105D4
+:1006800091F6222381F606C08EB3882349F08EB3FB
+:10069000853041F08091E80082FFF6CF80E0089538
+:1006A00082E0089583E008959C0140912D025091CD
+:1006B0002E024617570710F490E03BC061157105F4
+:1006C00011F0AB01F9CF8091E8008E778093E800BC
+:1006D00040E050E0F1CF8091E80083FF02C081E06C
+:1006E00008958091E80082FD30C08EB3882399F18F
+:1006F0008EB3853091F18091E80080FF1AC080911F
+:10070000F20009C0F9012F5F3F4FE491E093F1003F
+:10071000415050408F5F4115510511F0883090F3E2
+:1007200090E0883009F491E08091E8008E77809322
+:10073000E8004115510579F6992369F606C08EB394
+:10074000882349F08EB3853041F08091E80082FF24
+:10075000F6CF80E0089582E0089583E008959C013B
+:100760006115710529F48091E8008B778093E8008A
+:10077000F90120C08091E80083FF02C081E0089564
+:100780008EB3882339F18EB3853031F18091E80042
+:1007900082FFF0CF06C08091F100819361507040DC
+:1007A00021F08091F2008823B1F78091E8008B77E7
+:1007B0008093E80061157105E9F606C08EB38823C1
+:1007C00049F08EB3853041F08091E80080FFF6CF8C
+:1007D00080E0089582E0089583E0089542D044D0F7
+:1007E0001EBA10922502109224021092230284E075
+:1007F00089BD89B5826089BD09B400FEFDCF8091B5
+:10080000D800982F9F779093D80080688093D80065
+:10081000809163008E7F809363008091D8008F7DEC
+:100820008093D8008091E0008E7F8093E0008091DB
+:10083000E1008E7F8093E1008091E20081608093EF
+:10084000E2008091E100877F8093E1008091E200E7
+:1008500088608093E2000895C1DF81E080932602E2
+:1008600008951092E20008951092E10008951F92F9
+:100870000F920FB60F9211241F932F933F934F9314
+:100880005F936F937F938F939F93AF93BF93EF93F8
+:10089000FF93E9EEF0E0108117701082E0EFF0E0D6
+:1008A0008081877F80837894C3D0F894A9EEB0E0EC
+:1008B0001C92E0EFF0E08081886080831C93FF91C0
+:1008C000EF91BF91AF919F918F917F916F915F91C8
+:1008D0004F913F912F911F910F900FBE0F901F903E
+:1008E00018951F920F920FB60F9211242F933F93DA
+:1008F0004F935F936F937F938F939F93AF93BF9328
+:10090000EF93FF938091E10080FF1BC08091E20094
+:1009100080FF17C08091E1008E7F8093E10080917D
+:10092000E2008E7F8093E2008091E20080618093FC
+:10093000E2008091D80080628093D80019BC1EBA72
+:10094000D1D18091E10084FF29C08091E20084FF31
+:1009500025C084E089BD89B5826089BD09B400FEE7
+:10096000FDCF8091D8008F7D8093D8008091E100E9
+:100970008F7E8093E1008091E2008F7E8093E20081
+:100980008091E20081608093E200809125028823BB
+:1009900011F481E001C084E08EBBA4D18091E1001C
+:1009A00083FF27C08091E20083FF23C08091E10094
+:1009B000877F8093E10082E08EBB109225028091B8
+:1009C000E1008E7F8093E1008091E2008E7F809332
+:1009D000E2008091E20080618093E200AADD80E085
+:1009E00060E042E093DD8091F00088608093F00049
+:1009F00079D18091E10082FF0AC08091E20082FFFC
+:100A000006C08091E1008B7F8093E1006BD1FF9164
+:100A1000EF91BF91AF919F918F917F916F915F9176
+:100A20004F913F912F910F900FBE0F901F901895EF
+:100A30001F93DF93CF93CDB7DEB7AC970FB6F89483
+:100A4000DEBF0FBECDBFE7E2F2E08091F1008193FF
+:100A500022E0EF32F207C9F7809127023091280295
+:100A6000353009F487C0363040F43130C9F13130C7
+:100A700070F0333009F01DC133C0383009F4EFC0D5
+:100A8000393009F4FEC0363009F013C192C0803805
+:100A900021F0823809F00DC108C0909123028091A5
+:100AA0002402882399F0926011C080912B028770F4
+:100AB0008093E9008091EB0090E025E09695879582
+:100AC0002A95E1F7982F91701092E9008091E80043
+:100AD000877F8093E8009093F1001092F100CAC0E4
+:100AE000882319F0823009F0E4C090E08F71907093
+:100AF000009721F0029709F0DDC00CC08091290217
+:100B0000813009F0D7C010922402333069F5809308
+:100B100024022AC080912902882331F520912B02DA
+:100B2000277009F4C7C02093E9008091EB0080FF93
+:100B3000C1C0333021F48091EB00806213C08091FA
+:100B4000EB0080618093EB0081E090E002C0880FB1
+:100B5000991F2A95E2F78093EA001092EA008091AB
+:100B6000EB0088608093EB001092E9008091E80030
+:100B7000877F83C0882309F09CC01091290280914F
+:100B8000E800877F8093E800E8DC04C08EB3882308
+:100B900009F490C08091E80080FFF8CF812F8F7713
+:100BA00011F492E001C093E09EBB80688093E30063
+:100BB00081C08058823008F07CC0809129029091D9
+:100BC0002A0223E08C3D920799F55FB7F894DE0185
+:100BD00015964EE020E030E061E2E42FF0E0609313
+:100BE0005700849120FF03C082958F704F5F982F2C
+:100BF0009F70892F805D8A3308F0895F8C931196EE
+:100C00001C9211972F5F3F4F12962431310529F71F
+:100C10005FBF8AE28B8383E08C838091E800877FCB
+:100C20008093E800CE0103966AE270E0E4DC11C034
+:100C300060912B02AE014F5F5F4F2CDCBC0100972F
+:100C4000C9F18091E800877F8093E80089819A81CB
+:100C50002BDD8091E8008B778093E8002BC08038F3
+:100C600041F58091E800877F8093E800809125021C
+:100C70008093F1008091E8008E778093E8006DDC2E
+:100C800019C08823B1F490912902923098F4809190
+:100C9000E800877F8093E800909325025EDC8091D6
+:100CA0002502882311F483E001C084E08EBB2DDB94
+:100CB00001C028DB8091E80083FF0AC08091EB002F
+:100CC00080628093EB008091E800877F8093E8004A
+:100CD000AC960FB6F894DEBF0FBECDBFCF91DF91BB
+:100CE0001F91089508951F938EB3882361F010918A
+:100CF000E9001092E9008091E80083FF01C098DECE
+:100D000017701093E9001F9108950895FC018EB3A8
+:100D1000843021F587859089A189B2890097A10542
+:100D2000B105E1F085818093E9008091E80082FFC0
+:100D300015C08091F200882319F42FEF3FEF04C013
+:100D40008091F100282F30E08091F200882341F457
+:100D50008091E8008B778093E80002C02FEF3FEF8F
+:100D6000C9010895FC018EB3843011F587859089FF
+:100D7000A189B2890097A105B105D1F08181809345
+:100D8000E9008091F2008823A9F09091E800809119
+:100D9000E8008E778093E80095FD0CC0FDDB982F6E
+:100DA000882349F48091E8008E778093E80003C09F
+:100DB00092E001C090E0892F0895FC018EB3843049
+:100DC00051F487859089A189B2890097A105B10561
+:100DD00011F0CF01C7CF08951F93FC01162F8EB3DA
+:100DE0008430D9F487859089A189B2890097A105BB
+:100DF000B10599F081818093E9008091E80085FD3B
+:100E000008C08091E8008E778093E800C5DB8823D6
+:100E100029F41093F10080E001C082E01F91089551
+:100E20000F931F93CF93DF93EC010D96FC0189E0A4
+:100E3000DF011D928A95E9F72A813B8109818C8126
+:100E4000882311F410E001C014E0C90151DB182B14
+:100E50001260802F61E8412F59DB882329F12E8110
+:100E60003F810D818885882311F410E001C014E0D2
+:100E7000C9013EDB182B1260802F60E8412F46DB52
+:100E8000882391F02A853B8509858C85882311F478
+:100E900010E001C014E0C9012BDB182B1260802F79
+:100EA00061EC412F33DB01C080E0DF91CF911F91D6
+:100EB0000F910895CF93DF93EC018091E80083FFB9
+:100EC00060C0888190E020912B0230912C0228177D
+:100ED000390709F056C080912802813261F08232D0
+:100EE00020F4803209F04DC019C0823269F183329A
+:100EF00009F047C038C080912702813A09F041C00B
+:100F00008091E800877F8093E800CE010F9667E02C
+:100F100070E071DB8091E8008B7713C0809127022D
+:100F2000813279F58091E800877F8093E800CE01D7
+:100F30000F9667E070E013DCCE013ED98091E800A7
+:100F40008E778093E8001DC0809127028132C9F41A
+:100F50008091E800877F8093E800809129028D8747
+:100F6000CE01C8D90DC080912702813251F4809101
+:100F7000E800877F8093E800CE0160912902C5DEFA
+:100F8000ECDADF91CF910895A1E21A2EAA1BBB1BC8
+:100F9000FD010DC0AA1FBB1FEE1FFF1FA217B30745
+:100FA000E407F50720F0A21BB30BE40BF50B661F5B
+:100FB000771F881F991F1A9469F76095709580951F
+:100FC00090959B01AC01BD01CF010895F894FFCF2E
+:100FD0000003400000044000000208000000000080
+:060FE0000000000000000B
+:00000001FF
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex b/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
new file mode 100644
index 0000000..ca51dfa
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
@@ -0,0 +1,256 @@
+:100000009CC00000B5C00000B3C00000B1C000003B
+:10001000AFC00000ADC00000ABC00000A9C0000030
+:10002000A7C00000A5C00000A3C0000054C4000089
+:1000300018C400009DC000009BC0000099C00000D3
+:1000400097C0000095C0000093C0000091C0000060
+:100050008FC000008DC000008BC000000EC10000EA
+:1000600087C0000085C0000083C0000081C0000080
+:100070007FC000007DC000007BC0000079C0000090
+:1000800077C0000075C0000073C0000071C00000A0
+:100090006FC000006DC000001201100102000008D6
+:1000A0004123010001000102DC0109023E000201BE
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:100120001803410072006400750069006E006F00E2
+:10013000200055006E006F00000011241FBECFEF9D
+:10014000D2E0DEBFCDBF11E0A0E0B1E0E4ECFFE023
+:1001500002C005900D92A631B107D9F712E0A6E1D1
+:10016000B1E001C01D92AF32B107E1F7F1D028C76D
+:1001700047CF9C01DC01AE57BF4FED91FC91119729
+:1001800041911196FC93EE9380589F4FE817F90721
+:1001900011F42D933C939FB7F894F901EC57FF4F5E
+:1001A0008081815080839FBF842F0895DF92EF92DA
+:1001B000FF920F931F93FC018489813019F08230E4
+:1001C00021F405C040E3D42E04C0DD2402C030E297
+:1001D000D32E8389823011F488E0D82A858987302C
+:1001E00031F0883031F0863031F482E003C084E0B1
+:1001F00001C086E0D82A1092C9001092C80010925F
+:10020000CA00E784F0880189128980E0E81681EE4F
+:10021000F80680E0080780E0180719F420E130E0D4
+:100220000FC0C801B7019695879577956795605877
+:100230007B47814E9F4FA8019701A0D621503040A7
+:100240003093CD002093CC00D092CA0080E0E81615
+:1002500081EEF80680E0080780E0180711F082E0E0
+:1002600001C080E08093C80088E98093C9001F9195
+:100270000F91FF90EF90DF9008951F920F920FB6AD
+:100280000F9211242F938F939F93EF93FF9390914D
+:10029000CE008EB38430F1F4E0919901F0919A018F
+:1002A0009083E0919901F0919A01CF01019690938A
+:1002B0009A01809399018959914021F489E191E053
+:1002C000928381839FB7F89480919D018F5F809383
+:1002D0009D019FBFFF91EF919F918F912F910F9063
+:1002E0000FBE0F901F901895FC01858580FF02C0FE
+:1002F0005F9808955F9A089580E091E0D5C580E009
+:1003000091E088C584B7877F84BF28E10FB6F89451
+:1003100020936000109260000FBE87E690E09093FB
+:10032000CD008093CC0086E08093CA001092C80074
+:100330002093C900539A5A9A8AB180638AB98BB1C3
+:1003400080638BB983D284E085BD5F9A579A089504
+:100350000F931F93CF93DF93D5DF2FB7F8948EE9D8
+:1003600091E090931F0280931E029093210280934C
+:1003700020022FBF2FB7F89489E191E090939A0162
+:100380008093990190939C0180939B012FBF789457
+:10039000CEE9D1E003E08FB7F894909122028FBFAD
+:1003A000903809F180E091E0ABD497FD1CC0E0915A
+:1003B0001E02F0911F028083E0911E02F0911F0245
+:1003C000CF01019690931F0280931E028E5192409E
+:1003D00011F4D283C1839FB7F894809122028F5F7A
+:1003E000809322029FBF8FB7F89410919D018FBF19
+:1003F000A89902C0113678F1A89A80919D018823AE
+:1004000061F05D980093160108C089E191E0B1DECA
+:10041000682F80E091E0DAD411501123B1F7809178
+:100420001601882351F080911601815080931601A6
+:1004300080911601882309F45D9A80911701882321
+:1004400051F080911701815080931701809117011D
+:10045000882309F45C9A8FB7F894909122028FBF99
+:10046000992369F08EE991E084DE982F8091C8008D
+:1004700085FFFCCF9093CE005C980093170180E03D
+:1004800091E095D42AD487CFDA01923049F09330A5
+:1004900061F09130F9F4E8E9F0E022E130E01EC0CB
+:1004A000EAEAF0E02EE330E019C0813049F0813013
+:1004B00018F0823079F408C0E8EEF0E0849107C0CB
+:1004C000ECEEF0E0849103C0E0E2F1E08491282FAB
+:1004D00030E004C0E0E0F0E020E030E0ED93FC9399
+:1004E000C901089528E030E040E003C04F5F220FCB
+:1004F000331F28173907D0F3842F8295807F089502
+:100500008093E9008091EB0081608093EB00109272
+:10051000ED006093EC004093ED008091EE00881FA9
+:100520008827881F08951092F40090E09093E900C6
+:100530001092F0001092E8001092ED008091EB0014
+:100540008E7F8093EB009F5F953081F708958091B7
+:10055000270288238CF403C08EB38823B1F08091E6
+:10056000E80082FFF9CF8091E8008B778093E80064
+:1005700008958EB3882349F08091E80080FFF9CF79
+:100580008091E8008E778093E800089594E680914A
+:10059000EC0080FF05C08091E80080FF05C023C00B
+:1005A0008091E80082FD1FC08EB3882311F482E0A1
+:1005B00008958EB3853011F483E008958091EB00A7
+:1005C00085FF02C081E008958091E10082FFDFCFC6
+:1005D0008091E1008B7F8093E100992311F484E006
+:1005E00008959150D4CF80E008959C0140912D0250
+:1005F00050912E024617570718F4F90120E038C031
+:100600006115710511F0AB01F8CF8091E8008E778C
+:100610008093E80040E050E0F0CF8091E80083FF55
+:1006200002C081E008958091E80082FD2DC08EB364
+:10063000882381F18EB3853079F18091E80080FFC5
+:1006400017C09091F20006C081918093F100415053
+:1006500050409F5F4115510511F09830A8F320E0FC
+:10066000983009F421E08091E8008E778093E800CB
+:100670004115510591F6222381F606C08EB38823D9
+:1006800049F08EB3853041F08091E80082FFF6CFCB
+:1006900080E0089582E0089583E008959C014091F0
+:1006A0002D0250912E024617570710F490E03BC0E0
+:1006B0006115710511F0AB01F9CF8091E8008E77DB
+:1006C0008093E80040E050E0F1CF8091E80083FFA4
+:1006D00002C081E008958091E80082FD30C08EB3B1
+:1006E000882399F18EB3853091F18091E80080FFE5
+:1006F0001AC08091F20009C0F9012F5F3F4FE491C9
+:10070000E093F100415050408F5F4115510511F0C9
+:10071000883090F390E0883009F491E08091E8000F
+:100720008E778093E8004115510579F6992369F693
+:1007300006C08EB3882349F08EB3853041F0809196
+:10074000E80082FFF6CF80E0089582E0089583E01C
+:1007500008959C016115710529F48091E8008B775B
+:100760008093E800F90120C08091E80083FF02C077
+:1007700081E008958EB3882339F18EB3853031F14D
+:100780008091E80082FFF0CF06C08091F100819354
+:100790006150704021F08091F2008823B1F7809180
+:1007A000E8008B778093E80061157105E9F606C0D3
+:1007B0008EB3882349F08EB3853041F08091E800F4
+:1007C00080FFF6CF80E0089582E0089583E00895E9
+:1007D00042D044D01EBA10922502109224021092E8
+:1007E000230284E089BD89B5826089BD09B400FE19
+:1007F000FDCF8091D800982F9F779093D800806884
+:100800008093D800809163008E7F809363008091F5
+:10081000D8008F7D8093D8008091E0008E7F8093F8
+:10082000E0008091E1008E7F8093E1008091E20002
+:1008300081608093E2008091E100877F8093E100F6
+:100840008091E20088608093E2000895C1DF81E03A
+:100850008093260208951092E20008951092E1001C
+:1008600008951F920F920FB60F9211241F932F938A
+:100870003F934F935F936F937F938F939F93AF9328
+:10088000BF93EF93FF93E9EEF0E0108117701082B1
+:10089000E0EFF0E08081877F80837894C3D0F89484
+:1008A000A9EEB0E01C92E0EFF0E0808188608083E8
+:1008B0001C93FF91EF91BF91AF919F918F917F9189
+:1008C0006F915F914F913F912F911F910F900FBEAC
+:1008D0000F901F9018951F920F920FB60F92112430
+:1008E0002F933F934F935F936F937F938F939F9338
+:1008F000AF93BF93EF93FF938091E10080FF1BC004
+:100900008091E20080FF17C08091E1008E7F80938C
+:10091000E1008091E2008E7F8093E2008091E2000E
+:1009200080618093E2008091D80080628093D8003B
+:1009300019BC1EBAD1D18091E10084FF29C08091F9
+:10094000E20084FF25C084E089BD89B5826089BD4D
+:1009500009B400FEFDCF8091D8008F7D8093D80030
+:100960008091E1008F7E8093E1008091E2008F7E94
+:100970008093E2008091E20081608093E2008091A8
+:100980002502882311F481E001C084E08EBBA4D14C
+:100990008091E10083FF27C08091E20083FF23C0A4
+:1009A0008091E100877F8093E10082E08EBB10920E
+:1009B00025028091E1008E7F8093E1008091E2002A
+:1009C0008E7F8093E2008091E20080618093E2005C
+:1009D000AADD80E060E042E093DD8091F000886075
+:1009E0008093F00079D18091E10082FF0AC080916C
+:1009F000E20082FF06C08091E1008B7F8093E100DE
+:100A00006BD1FF91EF91BF91AF919F918F917F91AA
+:100A10006F915F914F913F912F910F900FBE0F906B
+:100A20001F9018951F93DF93CF93CDB7DEB7AC9788
+:100A30000FB6F894DEBF0FBECDBFE7E2F2E08091C3
+:100A4000F100819322E0EF32F207C9F7809127028B
+:100A500030912802353009F487C0363040F4313007
+:100A6000C9F1313070F0333009F01DC133C0383076
+:100A700009F4EFC0393009F4FEC0363009F013C173
+:100A800092C0803821F0823809F00DC108C09091E1
+:100A9000230280912402882399F0926011C08091F2
+:100AA0002B0287708093E9008091EB0090E025E0B5
+:100AB000969587952A95E1F7982F91701092E90005
+:100AC0008091E800877F8093E8009093F100109276
+:100AD000F100CAC0882319F0823009F0E4C090E028
+:100AE0008F719070009721F0029709F0DDC00CC063
+:100AF00080912902813009F0D7C01092240233304E
+:100B000069F5809324022AC080912902882331F557
+:100B100020912B02277009F4C7C02093E90080912F
+:100B2000EB0080FFC1C0333021F48091EB00806284
+:100B300013C08091EB0080618093EB0081E090E036
+:100B400002C0880F991F2A95E2F78093EA0010925D
+:100B5000EA008091EB0088608093EB001092E9003E
+:100B60008091E800877F83C0882309F09CC01091A2
+:100B700029028091E800877F8093E800E8DC04C0C8
+:100B80008EB3882309F490C08091E80080FFF8CFED
+:100B9000812F8F7711F492E001C093E09EBB8068B3
+:100BA0008093E30081C08058823008F07CC080913F
+:100BB000290290912A0223E08C3D920799F55FB7B4
+:100BC000F894DE0115964EE020E030E061E2E42F7B
+:100BD000F0E060935700849120FF03C082958F70EE
+:100BE0004F5F982F9F70892F805D8A3308F0895F4F
+:100BF0008C9311961C9211972F5F3F4F12962431C0
+:100C0000310529F75FBF8AE28B8383E08C83809173
+:100C1000E800877F8093E800CE0103966AE270E0E7
+:100C2000E4DC11C060912B02AE014F5F5F4F2CDC02
+:100C3000BC010097C9F18091E800877F8093E800AC
+:100C400089819A812BDD8091E8008B778093E80081
+:100C50002BC0803841F58091E800877F8093E800C1
+:100C6000809125028093F1008091E8008E77809337
+:100C7000E8006DDC19C08823B1F49091290292300C
+:100C800098F48091E800877F8093E8009093250294
+:100C90005EDC80912502882311F483E001C084E0AA
+:100CA0008EBB2DDB01C028DB8091E80083FF0AC0EA
+:100CB0008091EB0080628093EB008091E800877F59
+:100CC0008093E800AC960FB6F894DEBF0FBECDBFA0
+:100CD000CF91DF911F91089508951F938EB38823BC
+:100CE00061F01091E9001092E9008091E80083FF23
+:100CF00001C098DE17701093E9001F9108950895C0
+:100D0000FC018EB3843021F587859089A189B28951
+:100D10000097A105B105E1F085818093E9008091FC
+:100D2000E80082FF15C08091F200882319F42FEFAC
+:100D30003FEF04C08091F100282F30E08091F20055
+:100D4000882341F48091E8008B778093E80002C00B
+:100D50002FEF3FEFC9010895FC018EB3843011F5E8
+:100D600087859089A189B2890097A105B105D1F045
+:100D700081818093E9008091F2008823A9F090910D
+:100D8000E8008091E8008E778093E80095FD0CC024
+:100D9000FDDB982F882349F48091E8008E778093BB
+:100DA000E80003C092E001C090E0892F0895FC01A3
+:100DB0008EB3843051F487859089A189B2890097D8
+:100DC000A105B10511F0CF01C7CF08951F93FC0114
+:100DD000162F8EB38430D9F487859089A189B28982
+:100DE0000097A105B10599F081818093E900809178
+:100DF000E80085FD08C08091E8008E778093E800C8
+:100E0000C5DB882329F41093F10080E001C082E063
+:100E10001F9108950F931F93CF93DF93EC010D96CD
+:100E2000FC0189E0DF011D928A95E9F72A813B8167
+:100E300009818C81882311F410E001C014E0C901FC
+:100E400051DB182B1260802F61E8412F59DB88237A
+:100E500029F12E813F810D818885882311F410E0CE
+:100E600001C014E0C9013EDB182B1260802F60E83E
+:100E7000412F46DB882391F02A853B8509858C85A7
+:100E8000882311F410E001C014E0C9012BDB182BFA
+:100E90001260802F61EC412F33DB01C080E0DF91D5
+:100EA000CF911F910F910895CF93DF93EC01809123
+:100EB000E80083FF60C0888190E020912B02309190
+:100EC0002C022817390709F056C080912802813278
+:100ED00061F0823220F4803209F04DC019C08232B4
+:100EE00069F1833209F047C038C080912702813A06
+:100EF00009F041C08091E800877F8093E800CE012F
+:100F00000F9667E070E071DB8091E8008B7713C08B
+:100F100080912702813279F58091E800877F809364
+:100F2000E800CE010F9667E070E013DCCE013ED9F9
+:100F30008091E8008E778093E8001DC080912702A1
+:100F40008132C9F48091E800877F8093E800809126
+:100F500029028D87CE01C8D90DC080912702813228
+:100F600051F48091E800877F8093E800CE01609182
+:100F70002902C5DEECDADF91CF910895A1E21A2EA5
+:100F8000AA1BBB1BFD010DC0AA1FBB1FEE1FFF1F2D
+:100F9000A217B307E407F50720F0A21BB30BE40B7D
+:100FA000F50B661F771F881F991F1A9469F76095C4
+:100FB0007095809590959B01AC01BD01CF0108957E
+:040FC000F894FFCFD3
+:100FC400000340000004400000020800000000008C
+:060FD40000000000000017
+:00000001FF
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial.c b/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial.c
new file mode 100644
index 0000000..4de73c8
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial.c
@@ -0,0 +1,242 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * Main source file for the Arduino-usbserial project. This file contains the main tasks of
+ * the project and is responsible for the initial application hardware configuration.
+ */
+
+#include "Arduino-usbserial.h"
+
+/** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
+RingBuff_t USBtoUSART_Buffer;
+
+/** Circular buffer to hold data from the serial port before it is sent to the host. */
+RingBuff_t USARTtoUSB_Buffer;
+
+/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
+volatile struct
+{
+ uint8_t TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
+ uint8_t RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
+ uint8_t PingPongLEDPulse; /**< Milliseconds remaining for enumeration Tx/Rx ping-pong LED pulse */
+} PulseMSRemaining;
+
+/** LUFA CDC Class driver interface configuration and state information. This structure is
+ * passed to all CDC Class driver functions, so that multiple instances of the same class
+ * within a device can be differentiated from one another.
+ */
+USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
+ {
+ .Config =
+ {
+ .ControlInterfaceNumber = 0,
+
+ .DataINEndpointNumber = CDC_TX_EPNUM,
+ .DataINEndpointSize = CDC_TXRX_EPSIZE,
+ .DataINEndpointDoubleBank = false,
+
+ .DataOUTEndpointNumber = CDC_RX_EPNUM,
+ .DataOUTEndpointSize = CDC_TXRX_EPSIZE,
+ .DataOUTEndpointDoubleBank = false,
+
+ .NotificationEndpointNumber = CDC_NOTIFICATION_EPNUM,
+ .NotificationEndpointSize = CDC_NOTIFICATION_EPSIZE,
+ .NotificationEndpointDoubleBank = false,
+ },
+ };
+
+/** Main program entry point. This routine contains the overall program flow, including initial
+ * setup of all components and the main program loop.
+ */
+int main(void)
+{
+ SetupHardware();
+
+ RingBuffer_InitBuffer(&USBtoUSART_Buffer);
+ RingBuffer_InitBuffer(&USARTtoUSB_Buffer);
+
+ sei();
+
+ for (;;)
+ {
+ /* Only try to read in bytes from the CDC interface if the transmit buffer is not full */
+ if (!(RingBuffer_IsFull(&USBtoUSART_Buffer)))
+ {
+ int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
+
+ /* Read bytes from the USB OUT endpoint into the USART transmit buffer */
+ if (!(ReceivedByte < 0))
+ RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);
+ }
+
+ /* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */
+ RingBuff_Count_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
+ if ((TIFR0 & (1 << TOV0)) || (BufferCount > BUFFER_NEARLY_FULL))
+ {
+ TIFR0 |= (1 << TOV0);
+
+ if (USARTtoUSB_Buffer.Count) {
+ LEDs_TurnOnLEDs(LEDMASK_TX);
+ PulseMSRemaining.TxLEDPulse = TX_RX_LED_PULSE_MS;
+ }
+
+ /* Read bytes from the USART receive buffer into the USB IN endpoint */
+ while (BufferCount--)
+ CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&USARTtoUSB_Buffer));
+
+ /* Turn off TX LED(s) once the TX pulse period has elapsed */
+ if (PulseMSRemaining.TxLEDPulse && !(--PulseMSRemaining.TxLEDPulse))
+ LEDs_TurnOffLEDs(LEDMASK_TX);
+
+ /* Turn off RX LED(s) once the RX pulse period has elapsed */
+ if (PulseMSRemaining.RxLEDPulse && !(--PulseMSRemaining.RxLEDPulse))
+ LEDs_TurnOffLEDs(LEDMASK_RX);
+ }
+
+ /* Load the next byte from the USART transmit buffer into the USART */
+ if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer))) {
+ Serial_TxByte(RingBuffer_Remove(&USBtoUSART_Buffer));
+
+ LEDs_TurnOnLEDs(LEDMASK_RX);
+ PulseMSRemaining.RxLEDPulse = TX_RX_LED_PULSE_MS;
+ }
+
+ CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
+ USB_USBTask();
+ }
+}
+
+/** Configures the board hardware and chip peripherals for the demo's functionality. */
+void SetupHardware(void)
+{
+ /* Disable watchdog if enabled by bootloader/fuses */
+ MCUSR &= ~(1 << WDRF);
+ wdt_disable();
+
+ /* Hardware Initialization */
+ Serial_Init(9600, false);
+ LEDs_Init();
+ USB_Init();
+
+ /* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */
+ TCCR0B = (1 << CS02);
+
+ /* Pull target /RESET line high */
+ AVR_RESET_LINE_PORT |= AVR_RESET_LINE_MASK;
+ AVR_RESET_LINE_DDR |= AVR_RESET_LINE_MASK;
+}
+
+/** Event handler for the library USB Configuration Changed event. */
+void EVENT_USB_Device_ConfigurationChanged(void)
+{
+ CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
+}
+
+/** Event handler for the library USB Unhandled Control Request event. */
+void EVENT_USB_Device_UnhandledControlRequest(void)
+{
+ CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
+}
+
+/** Event handler for the CDC Class driver Line Encoding Changed event.
+ *
+ * \param[in] CDCInterfaceInfo Pointer to the CDC class interface configuration structure being referenced
+ */
+void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
+{
+ uint8_t ConfigMask = 0;
+
+ switch (CDCInterfaceInfo->State.LineEncoding.ParityType)
+ {
+ case CDC_PARITY_Odd:
+ ConfigMask = ((1 << UPM11) | (1 << UPM10));
+ break;
+ case CDC_PARITY_Even:
+ ConfigMask = (1 << UPM11);
+ break;
+ }
+
+ if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)
+ ConfigMask |= (1 << USBS1);
+
+ switch (CDCInterfaceInfo->State.LineEncoding.DataBits)
+ {
+ case 6:
+ ConfigMask |= (1 << UCSZ10);
+ break;
+ case 7:
+ ConfigMask |= (1 << UCSZ11);
+ break;
+ case 8:
+ ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
+ break;
+ }
+
+ /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */
+ UCSR1B = 0;
+ UCSR1A = 0;
+ UCSR1C = 0;
+
+ /* Special case 57600 baud for compatibility with the ATmega328 bootloader. */
+ UBRR1 = (CDCInterfaceInfo->State.LineEncoding.BaudRateBPS == 57600)
+ ? SERIAL_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS)
+ : SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
+
+ UCSR1C = ConfigMask;
+ UCSR1A = (CDCInterfaceInfo->State.LineEncoding.BaudRateBPS == 57600) ? 0 : (1 << U2X1);
+ UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
+}
+
+/** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer
+ * for later transmission to the host.
+ */
+ISR(USART1_RX_vect, ISR_BLOCK)
+{
+ uint8_t ReceivedByte = UDR1;
+
+ if (USB_DeviceState == DEVICE_STATE_Configured)
+ RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);
+}
+
+/** Event handler for the CDC Class driver Host-to-Device Line Encoding Changed event.
+ *
+ * \param[in] CDCInterfaceInfo Pointer to the CDC class interface configuration structure being referenced
+ */
+void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
+{
+ bool CurrentDTRState = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR);
+
+ if (CurrentDTRState)
+ AVR_RESET_LINE_PORT &= ~AVR_RESET_LINE_MASK;
+ else
+ AVR_RESET_LINE_PORT |= AVR_RESET_LINE_MASK;
+}
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial.h b/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial.h
new file mode 100644
index 0000000..99fde39
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/Arduino-usbserial.h
@@ -0,0 +1,79 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * Header file for Arduino-usbserial.c.
+ */
+
+#ifndef _ARDUINO_USBSERIAL_H_
+#define _ARDUINO_USBSERIAL_H_
+
+ /* Includes: */
+ #include <avr/io.h>
+ #include <avr/wdt.h>
+ #include <avr/interrupt.h>
+ #include <avr/power.h>
+
+ #include "Descriptors.h"
+
+ #include "Lib/LightweightRingBuff.h"
+
+ #include <LUFA/Version.h>
+ #include <LUFA/Drivers/Board/LEDs.h>
+ #include <LUFA/Drivers/Peripheral/Serial.h>
+ #include <LUFA/Drivers/USB/USB.h>
+ #include <LUFA/Drivers/USB/Class/CDC.h>
+
+ /* Macros: */
+ /** LED mask for the library LED driver, to indicate TX activity. */
+ #define LEDMASK_TX LEDS_LED1
+
+ /** LED mask for the library LED driver, to indicate RX activity. */
+ #define LEDMASK_RX LEDS_LED2
+
+ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
+ #define LEDMASK_ERROR (LEDS_LED1 | LEDS_LED2)
+
+ /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
+ #define LEDMASK_BUSY (LEDS_LED1 | LEDS_LED2)
+
+ /* Function Prototypes: */
+ void SetupHardware(void);
+
+ void EVENT_USB_Device_Connect(void);
+ void EVENT_USB_Device_Disconnect(void);
+ void EVENT_USB_Device_ConfigurationChanged(void);
+ void EVENT_USB_Device_UnhandledControlRequest(void);
+
+ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
+ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
+
+#endif /* _ARDUINO_USBSERIAL_H_ */
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/Board/LEDs.h b/test/ardmake/hardware/firmwares/arduino-usbserial/Board/LEDs.h
new file mode 100644
index 0000000..152e8f5
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/Board/LEDs.h
@@ -0,0 +1,110 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/*
+ Board LEDs driver for the Benito board, from www.dorkbotpdx.org.
+*/
+
+#ifndef __LEDS_ARDUINOUNO_H__
+#define __LEDS_ARDUINOUNO_H__
+
+ /* Includes: */
+ #include <avr/io.h>
+
+/* Enable C linkage for C++ Compilers: */
+ #if defined(__cplusplus)
+ extern "C" {
+ #endif
+
+ /* Preprocessor Checks: */
+ #if !defined(INCLUDE_FROM_LEDS_H)
+ #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
+ #endif
+
+ /* Public Interface - May be used in end-application: */
+ /* Macros: */
+ /** LED mask for the first LED on the board. */
+ #define LEDS_LED1 (1 << 5)
+
+ /** LED mask for the second LED on the board. */
+ #define LEDS_LED2 (1 << 4)
+
+ /** LED mask for all the LEDs on the board. */
+ #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2)
+
+ /** LED mask for the none of the board LEDs */
+ #define LEDS_NO_LEDS 0
+
+ /* Inline Functions: */
+ #if !defined(__DOXYGEN__)
+ static inline void LEDs_Init(void)
+ {
+ DDRD |= LEDS_ALL_LEDS;
+ PORTD |= LEDS_ALL_LEDS;
+ }
+
+ static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
+ {
+ PORTD &= ~LEDMask;
+ }
+
+ static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
+ {
+ PORTD |= LEDMask;
+ }
+
+ static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
+ {
+ PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
+ }
+
+ static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)
+ {
+ PORTD = ((PORTD | ActiveMask) & ~LEDMask);
+ }
+
+ static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
+ {
+ PORTD ^= LEDMask;
+ }
+
+ static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+ static inline uint8_t LEDs_GetLEDs(void)
+ {
+ return (PORTD & LEDS_ALL_LEDS);
+ }
+ #endif
+
+ /* Disable C linkage for C++ Compilers: */
+ #if defined(__cplusplus)
+ }
+ #endif
+
+#endif
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/Descriptors.c b/test/ardmake/hardware/firmwares/arduino-usbserial/Descriptors.c
new file mode 100644
index 0000000..705dddf
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/Descriptors.c
@@ -0,0 +1,277 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * USB Device Descriptors, for library use when in USB device mode. Descriptors are special
+ * computer-readable structures which the host requests upon device enumeration, to determine
+ * the device's capabilities and functions.
+ */
+
+#include "Descriptors.h"
+
+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as
+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.
+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated
+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices
+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value
+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and
+ * port location).
+ */
+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)
+ #warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.
+#endif
+
+/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
+ * device characteristics, including the supported USB version, control endpoint size and the
+ * number of device configurations. The descriptor is read out by the USB host when the enumeration
+ * process begins.
+ */
+USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
+{
+ .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
+
+ .USBSpecification = VERSION_BCD(01.10),
+ .Class = 0x02,
+ .SubClass = 0x00,
+ .Protocol = 0x00,
+
+ .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
+
+ .VendorID = 0x03EB, // Atmel
+
+ .ProductID = 0x204B, // LUFA USB to Serial Demo Application
+ .ReleaseNumber = 0x0001,
+
+ .ManufacturerStrIndex = 0x01,
+ .ProductStrIndex = 0x02,
+ .SerialNumStrIndex = USE_INTERNAL_SERIAL,
+
+ .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
+};
+
+/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
+ * of the device in one of its supported configurations, including information about any device interfaces
+ * and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
+ * a configuration so that the host may correctly communicate with the USB device.
+ */
+USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
+{
+ .Config =
+ {
+ .Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
+
+ .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
+ .TotalInterfaces = 2,
+
+ .ConfigurationNumber = 1,
+ .ConfigurationStrIndex = NO_DESCRIPTOR,
+
+ .ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),
+
+ .MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
+ },
+
+ .CDC_CCI_Interface =
+ {
+ .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+ .InterfaceNumber = 0,
+ .AlternateSetting = 0,
+
+ .TotalEndpoints = 1,
+
+ .Class = 0x02,
+ .SubClass = 0x02,
+ .Protocol = 0x01,
+
+ .InterfaceStrIndex = NO_DESCRIPTOR
+ },
+
+ .CDC_Functional_IntHeader =
+ {
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+ .SubType = 0x00,
+
+ .Data = {0x01, 0x10}
+ },
+
+ .CDC_Functional_AbstractControlManagement =
+ {
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},
+ .SubType = 0x02,
+
+ .Data = {0x06}
+ },
+
+ .CDC_Functional_Union =
+ {
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+ .SubType = 0x06,
+
+ .Data = {0x00, 0x01}
+ },
+
+ .CDC_NotificationEndpoint =
+ {
+ .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+ .EndpointSize = CDC_NOTIFICATION_EPSIZE,
+ .PollingIntervalMS = 0xFF
+ },
+
+ .CDC_DCI_Interface =
+ {
+ .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+ .InterfaceNumber = 1,
+ .AlternateSetting = 0,
+
+ .TotalEndpoints = 2,
+
+ .Class = 0x0A,
+ .SubClass = 0x00,
+ .Protocol = 0x00,
+
+ .InterfaceStrIndex = NO_DESCRIPTOR
+ },
+
+ .CDC_DataOutEndpoint =
+ {
+ .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+ .EndpointSize = CDC_TXRX_EPSIZE,
+ .PollingIntervalMS = 0x01
+ },
+
+ .CDC_DataInEndpoint =
+ {
+ .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+ .EndpointSize = CDC_TXRX_EPSIZE,
+ .PollingIntervalMS = 0x01
+ }
+};
+
+/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
+ * the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
+ * via the language ID table available at USB.org what languages the device supports for its string descriptors.
+ */
+USB_Descriptor_String_t PROGMEM LanguageString =
+{
+ .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
+
+ .UnicodeString = {LANGUAGE_ID_ENG}
+};
+
+/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
+ * form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
+ * Descriptor.
+ */
+USB_Descriptor_String_t PROGMEM ManufacturerString =
+{
+ .Header = {.Size = USB_STRING_LEN(24), .Type = DTYPE_String},
+
+ .UnicodeString = L"Arduino (www.arduino.cc)"
+};
+
+/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
+ * and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
+ * Descriptor.
+ */
+USB_Descriptor_String_t PROGMEM ProductString =
+{
+ #if (ARDUINO_MODEL_PID == ARDUINO_UNO_PID)
+ .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
+
+ .UnicodeString = L"Arduino Uno"
+ #elif (ARDUINO_MODEL_PID == ARDUINO_MEGA2560_PID)
+ .Header = {.Size = USB_STRING_LEN(17), .Type = DTYPE_String},
+
+ .UnicodeString = L"Arduino Mega 2560"
+ #endif
+
+};
+
+/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
+ * documentation) by the application code so that the address and size of a requested descriptor can be given
+ * to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
+ * is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
+ * USB host.
+ */
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+ const uint8_t wIndex,
+ void** const DescriptorAddress)
+{
+ const uint8_t DescriptorType = (wValue >> 8);
+ const uint8_t DescriptorNumber = (wValue & 0xFF);
+
+ void* Address = NULL;
+ uint16_t Size = NO_DESCRIPTOR;
+
+ switch (DescriptorType)
+ {
+ case DTYPE_Device:
+ Address = (void*)&DeviceDescriptor;
+ Size = sizeof(USB_Descriptor_Device_t);
+ break;
+ case DTYPE_Configuration:
+ Address = (void*)&ConfigurationDescriptor;
+ Size = sizeof(USB_Descriptor_Configuration_t);
+ break;
+ case DTYPE_String:
+ switch (DescriptorNumber)
+ {
+ case 0x00:
+ Address = (void*)&LanguageString;
+ Size = pgm_read_byte(&LanguageString.Header.Size);
+ break;
+ case 0x01:
+ Address = (void*)&ManufacturerString;
+ Size = pgm_read_byte(&ManufacturerString.Header.Size);
+ break;
+ case 0x02:
+ Address = (void*)&ProductString;
+ Size = pgm_read_byte(&ProductString.Header.Size);
+ break;
+ }
+
+ break;
+ }
+
+ *DescriptorAddress = Address;
+ return Size;
+}
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/Descriptors.h b/test/ardmake/hardware/firmwares/arduino-usbserial/Descriptors.h
new file mode 100644
index 0000000..3ac4e52
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/Descriptors.h
@@ -0,0 +1,88 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * Header file for Descriptors.c.
+ */
+
+#ifndef _DESCRIPTORS_H_
+#define _DESCRIPTORS_H_
+
+ /* Includes: */
+ #include <avr/pgmspace.h>
+
+ #include <LUFA/Drivers/USB/USB.h>
+ #include <LUFA/Drivers/USB/Class/CDC.h>
+
+ /* Product-specific definitions: */
+ #define ARDUINO_UNO_PID 0x0001
+ #define ARDUINO_MEGA2560_PID 0x0010
+
+ /* Macros: */
+ /** Endpoint number of the CDC device-to-host notification IN endpoint. */
+ #define CDC_NOTIFICATION_EPNUM 2
+
+ /** Endpoint number of the CDC device-to-host data IN endpoint. */
+ #define CDC_TX_EPNUM 3
+
+ /** Endpoint number of the CDC host-to-device data OUT endpoint. */
+ #define CDC_RX_EPNUM 4
+
+ /** Size in bytes of the CDC device-to-host notification IN endpoint. */
+ #define CDC_NOTIFICATION_EPSIZE 8
+
+ /** Size in bytes of the CDC data IN and OUT endpoints. */
+ #define CDC_TXRX_EPSIZE 64
+
+ /* Type Defines: */
+ /** Type define for the device configuration descriptor structure. This must be defined in the
+ * application code, as the configuration descriptor contains several sub-descriptors which
+ * vary between devices, and which describe the device's usage to the host.
+ */
+ typedef struct
+ {
+ USB_Descriptor_Configuration_Header_t Config;
+ USB_Descriptor_Interface_t CDC_CCI_Interface;
+ CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;
+ CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;
+ CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;
+ USB_Descriptor_Endpoint_t CDC_NotificationEndpoint;
+ USB_Descriptor_Interface_t CDC_DCI_Interface;
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;
+ } USB_Descriptor_Configuration_t;
+
+ /* Function Prototypes: */
+ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+ const uint8_t wIndex,
+ void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h b/test/ardmake/hardware/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
new file mode 100644
index 0000000..fb48c1f
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
@@ -0,0 +1,197 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * Ultra lightweight ring buffer, for fast insertion/deletion.
+ */
+
+#ifndef _ULW_RING_BUFF_H_
+#define _ULW_RING_BUFF_H_
+
+ /* Includes: */
+ #include <util/atomic.h>
+
+ #include <stdint.h>
+ #include <stdbool.h>
+
+ /* Defines: */
+ /** Size of each ring buffer, in data elements - must be between 1 and 255. */
+ #define BUFFER_SIZE 128
+
+ /** Maximum number of data elements to buffer before forcing a flush.
+ * Must be less than BUFFER_SIZE
+ */
+ #define BUFFER_NEARLY_FULL 96
+
+ /** Type of data to store into the buffer. */
+ #define RingBuff_Data_t uint8_t
+
+ /** Datatype which may be used to store the count of data stored in a buffer, retrieved
+ * via a call to \ref RingBuffer_GetCount().
+ */
+ #if (BUFFER_SIZE <= 0xFF)
+ #define RingBuff_Count_t uint8_t
+ #else
+ #define RingBuff_Count_t uint16_t
+ #endif
+
+ /* Type Defines: */
+ /** Type define for a new ring buffer object. Buffers should be initialized via a call to
+ * \ref RingBuffer_InitBuffer() before use.
+ */
+ typedef struct
+ {
+ RingBuff_Data_t Buffer[BUFFER_SIZE]; /**< Internal ring buffer data, referenced by the buffer pointers. */
+ RingBuff_Data_t* In; /**< Current storage location in the circular buffer */
+ RingBuff_Data_t* Out; /**< Current retrieval location in the circular buffer */
+ RingBuff_Count_t Count;
+ } RingBuff_t;
+
+ /* Inline Functions: */
+ /** Initializes a ring buffer ready for use. Buffers must be initialized via this function
+ * before any operations are called upon them. Already initialized buffers may be reset
+ * by re-initializing them using this function.
+ *
+ * \param[out] Buffer Pointer to a ring buffer structure to initialize
+ */
+ static inline void RingBuffer_InitBuffer(RingBuff_t* const Buffer)
+ {
+ ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+ {
+ Buffer->In = Buffer->Buffer;
+ Buffer->Out = Buffer->Buffer;
+ }
+ }
+
+ /** Retrieves the minimum number of bytes stored in a particular buffer. This value is computed
+ * by entering an atomic lock on the buffer while the IN and OUT locations are fetched, so that
+ * the buffer cannot be modified while the computation takes place. This value should be cached
+ * when reading out the contents of the buffer, so that as small a time as possible is spent
+ * in an atomic lock.
+ *
+ * \note The value returned by this function is guaranteed to only be the minimum number of bytes
+ * stored in the given buffer; this value may change as other threads write new data and so
+ * the returned number should be used only to determine how many successive reads may safely
+ * be performed on the buffer.
+ *
+ * \param[in] Buffer Pointer to a ring buffer structure whose count is to be computed
+ */
+ static inline RingBuff_Count_t RingBuffer_GetCount(RingBuff_t* const Buffer)
+ {
+ RingBuff_Count_t Count;
+
+ ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+ {
+ Count = Buffer->Count;
+ }
+
+ return Count;
+ }
+
+ /** Atomically determines if the specified ring buffer contains any free space. This should
+ * be tested before storing data to the buffer, to ensure that no data is lost due to a
+ * buffer overrun.
+ *
+ * \param[in,out] Buffer Pointer to a ring buffer structure to insert into
+ *
+ * \return Boolean true if the buffer contains no free space, false otherwise
+ */
+ static inline bool RingBuffer_IsFull(RingBuff_t* const Buffer)
+ {
+ return (RingBuffer_GetCount(Buffer) == BUFFER_SIZE);
+ }
+
+ /** Atomically determines if the specified ring buffer contains any data. This should
+ * be tested before removing data from the buffer, to ensure that the buffer does not
+ * underflow.
+ *
+ * If the data is to be removed in a loop, store the total number of bytes stored in the
+ * buffer (via a call to the \ref RingBuffer_GetCount() function) in a temporary variable
+ * to reduce the time spent in atomicity locks.
+ *
+ * \param[in,out] Buffer Pointer to a ring buffer structure to insert into
+ *
+ * \return Boolean true if the buffer contains no free space, false otherwise
+ */
+ static inline bool RingBuffer_IsEmpty(RingBuff_t* const Buffer)
+ {
+ return (RingBuffer_GetCount(Buffer) == 0);
+ }
+
+ /** Inserts an element into the ring buffer.
+ *
+ * \note Only one execution thread (main program thread or an ISR) may insert into a single buffer
+ * otherwise data corruption may occur. Insertion and removal may occur from different execution
+ * threads.
+ *
+ * \param[in,out] Buffer Pointer to a ring buffer structure to insert into
+ * \param[in] Data Data element to insert into the buffer
+ */
+ static inline void RingBuffer_Insert(RingBuff_t* const Buffer,
+ const RingBuff_Data_t Data)
+ {
+ *Buffer->In = Data;
+
+ if (++Buffer->In == &Buffer->Buffer[BUFFER_SIZE])
+ Buffer->In = Buffer->Buffer;
+
+ ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+ {
+ Buffer->Count++;
+ }
+ }
+
+ /** Removes an element from the ring buffer.
+ *
+ * \note Only one execution thread (main program thread or an ISR) may remove from a single buffer
+ * otherwise data corruption may occur. Insertion and removal may occur from different execution
+ * threads.
+ *
+ * \param[in,out] Buffer Pointer to a ring buffer structure to retrieve from
+ *
+ * \return Next data element stored in the buffer
+ */
+ static inline RingBuff_Data_t RingBuffer_Remove(RingBuff_t* const Buffer)
+ {
+ RingBuff_Data_t Data = *Buffer->Out;
+
+ if (++Buffer->Out == &Buffer->Buffer[BUFFER_SIZE])
+ Buffer->Out = Buffer->Buffer;
+
+ ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+ {
+ Buffer->Count--;
+ }
+
+ return Data;
+ }
+
+#endif
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/makefile b/test/ardmake/hardware/firmwares/arduino-usbserial/makefile
new file mode 100644
index 0000000..79d6be2
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/makefile
@@ -0,0 +1,776 @@
+# Hey Emacs, this is a -*- makefile -*-
+#----------------------------------------------------------------------------
+# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.
+# >> Modified for use with the LUFA project. <<
+#
+# 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
+# Dean Camera
+# Opendous Inc.
+# Denver Gingerich
+#
+#----------------------------------------------------------------------------
+# 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 dfu = Download the hex file to the device, using dfu-programmer (must
+# have dfu-programmer installed).
+#
+# make flip = Download the hex file to the device, using Atmel FLIP (must
+# have Atmel FLIP installed).
+#
+# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
+# (must have dfu-programmer installed).
+#
+# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
+# (must have Atmel FLIP installed).
+#
+# make doxygen = Generate DoxyGen documentation for the project (must have
+# DoxyGen installed)
+#
+# 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(s)
+# Since the ATMEGA8U2 part is not directly supported by the current
+# versions of either avrdude or dfu-programmer, we specify a dummy
+# part; AT90USB82 which is close enough in memory size and organization
+MCU = atmega8u2
+MCU_AVRDUDE = at90usb82
+MCU_DFU = at90usb82
+
+# Specify the Arduino model using the assigned PID. This is used by Descriptors.c
+# to set PID and product descriptor string
+# Uno PID:
+ARDUINO_MODEL_PID = 0x0001
+# Mega 2560 PID:
+#ARDUINO_MODEL_PID = 0x0010
+
+
+# Target board (see library "Board Types" documentation, NONE for projects not requiring
+# LUFA board drivers). If USER is selected, put custom board drivers in a directory called
+# "Board" inside the application directory.
+BOARD = USER
+
+
+# Processor frequency.
+# This will define a symbol, F_CPU, in all source code files equal to the
+# processor frequency in Hz. 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.
+#
+# This will be an integer division of F_CLOCK below, as it is sourced by
+# F_CLOCK after it has run through any CPU prescalers. Note that this value
+# does not *change* the processor frequency - it should merely be updated to
+# reflect the processor speed set externally so that the code can use accurate
+# software delays.
+F_CPU = 16000000
+
+
+# Input clock frequency.
+# This will define a symbol, F_CLOCK, in all source code files equal to the
+# input clock frequency (before any prescaling is performed) in Hz. This value may
+# differ from F_CPU if prescaling is used on the latter, and is required as the
+# raw input clock is fed directly to the PLL sections of the AVR for high speed
+# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+# at the end, this will be done automatically to create a 32-bit value in your
+# source code.
+#
+# If no clock division is performed on the input clock inside the AVR (via the
+# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_CLOCK = $(F_CPU)
+
+
+# Output format. (can be srec, ihex, binary)
+FORMAT = ihex
+
+
+# Target file name (without extension).
+TARGET = Arduino-usbserial
+
+
+# Object files directory
+# To put object files in current directory, use a dot (.), do NOT make
+# this an empty or blank macro!
+OBJDIR = .
+
+
+# Path to the LUFA library
+LUFA_PATH = ../..
+
+
+# LUFA library compile-time options
+LUFA_OPTS = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
+# Create the LUFA source path variables by including the LUFA root makefile
+include $(LUFA_PATH)/LUFA/makefile
+
+
+# List C source files here. (C dependencies are automatically generated.)
+SRC = $(TARGET).c \
+ Descriptors.c \
+ $(LUFA_SRC_USB) \
+ $(LUFA_SRC_USBCLASS) \
+ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Device.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/HostStandardReq.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/USBController.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/USBInterrupt.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/CDC.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/CDC.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 = $(LUFA_PATH)/
+
+
+# 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
+CDEFS += -DF_CLOCK=$(F_CLOCK)UL
+CDEFS += -DARDUINO_MODEL_PID=$(ARDUINO_MODEL_PID)
+CDEFS += -DBOARD=BOARD_$(BOARD)
+CDEFS += $(LUFA_OPTS)
+CDEFS += -DAVR_RESET_LINE_PORT="PORTD"
+CDEFS += -DAVR_RESET_LINE_DDR="DDRD"
+CDEFS += -DAVR_RESET_LINE_MASK="(1 << 7)"
+CDEFS += -DTX_RX_LED_PULSE_MS=3
+CDEFS += -DPING_PONG_LED_PULSE_MS=100
+
+# Place -D or -U options here for ASM sources
+ADEFS = -DF_CPU=$(F_CPU)
+ADEFS += -DF_CLOCK=$(F_CLOCK)UL
+ADEFS += -DBOARD=BOARD_$(BOARD)
+ADEFS += $(LUFA_OPTS)
+
+# Place -D or -U options here for C++ sources
+CPPDEFS = -DF_CPU=$(F_CPU)UL
+CPPDEFS += -DF_CLOCK=$(F_CLOCK)UL
+CPPDEFS += -DBOARD=BOARD_$(BOARD)
+CPPDEFS += $(LUFA_OPTS)
+#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 += -funsigned-char
+CFLAGS += -funsigned-bitfields
+CFLAGS += -ffunction-sections
+CFLAGS += -fno-inline-small-functions
+CFLAGS += -fpack-struct
+CFLAGS += -fshort-enums
+CFLAGS += -fno-strict-aliasing
+CFLAGS += -Wall
+CFLAGS += -Wstrict-prototypes
+#CFLAGS += -mshort-calls
+#CFLAGS += -fno-unit-at-a-time
+#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 += -funsigned-char
+CPPFLAGS += -funsigned-bitfields
+CPPFLAGS += -fpack-struct
+CPPFLAGS += -fshort-enums
+CPPFLAGS += -fno-exceptions
+CPPFLAGS += -Wall
+CPPFLAGS += -Wundef
+CFLAGS += -Wundef
+#CPPFLAGS += -mshort-calls
+#CPPFLAGS += -fno-unit-at-a-time
+#CPPFLAGS += -Wstrict-prototypes
+#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.
+# -adhlns: 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]
+# -listing-cont-lines: Sets the maximum number of continuation lines of hex
+# dump that will be displayed for a given single line of source input.
+ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+
+
+#---------------- 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
+
+
+# List any extra directories to look for libraries 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.
+EXTRALIBDIRS =
+
+
+
+#---------------- 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,--section-start,.data=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 += -Wl,--relax
+LDFLAGS += -Wl,--gc-sections
+LDFLAGS += $(EXTMEMOPTS)
+LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
+LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
+#LDFLAGS += -T linker_script.x
+
+
+
+#---------------- Programming Options (avrdude) ----------------
+
+# Programming hardware
+# Type: avrdude -c ?
+# to get a full listing.
+#
+AVRDUDE_PROGRAMMER = avrispmkii
+
+# com1 = serial port. Use lpt1 to connect to parallel port.
+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 <http://savannah.nongnu.org/projects/avrdude>
+# to submit bug reports.
+#AVRDUDE_VERBOSE = -v -v
+
+AVRDUDE_FORCE = -F
+
+AVRDUDE_FLAGS = -p $(MCU_AVRDUDE) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
+AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
+AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
+AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
+AVRDUDE_FLAGS += $(AVRDUDE_FORCE)
+
+
+
+#---------------- 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
+AR = avr-ar rcs
+NM = avr-nm
+AVRDUDE = avrdude
+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 = -MMD -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 checkinvalidevents showliboptions showtarget sizeafter end
+all: begin gccversion sizebefore build showliboptions showtarget sizeafter end
+
+# Change the build target to build a HEX file or a library.
+build: elf hex eep lss sym asm
+#build: lib
+
+
+elf: $(TARGET).elf
+hex: $(TARGET).hex
+eep: $(TARGET).eep
+lss: $(TARGET).lss
+sym: $(TARGET).sym
+asm: $(TARGET).s
+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) $(MCU_FLAG) $(FORMAT_FLAG) $(TARGET).elf
+MCU_FLAG = $(shell $(SIZE) --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) )
+FORMAT_FLAG = $(shell $(SIZE) --help | grep -- --format=.*avr > /dev/null && echo --format=avr )
+
+sizebefore:
+ @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \
+ 2>/dev/null; echo; fi
+
+sizeafter:
+ @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
+ 2>/dev/null; echo; fi
+
+#$(LUFA_PATH)/LUFA/LUFA_Events.lst:
+# @make -C $(LUFA_PATH)/LUFA/ LUFA_Events.lst
+
+#checkinvalidevents: $(LUFA_PATH)/LUFA/LUFA_Events.lst
+# @echo
+# @echo Checking for invalid events...
+# @$(shell) avr-nm $(OBJ) | sed -n -e 's/^.*EVENT_/EVENT_/p' | \
+# grep -F -v --file=$(LUFA_PATH)/LUFA/LUFA_Events.lst > InvalidEvents.tmp || true
+# @sed -n -e 's/^/ WARNING - INVALID EVENT NAME: /p' InvalidEvents.tmp
+# @if test -s InvalidEvents.tmp; then exit 1; fi
+
+showliboptions:
+ @echo
+ @echo ---- Compile Time Library Options ----
+ @for i in $(LUFA_OPTS:-D%=%); do \
+ echo $$i; \
+ done
+ @echo --------------------------------------
+
+showtarget:
+ @echo
+ @echo --------- Target Information ---------
+ @echo AVR Model: $(MCU)
+ @echo Board: $(BOARD)
+ @echo Clock: $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master
+ @echo --------------------------------------
+
+
+# Display compiler version information.
+gccversion :
+ @$(CC) --version
+
+
+# Program the device.
+program: $(TARGET).hex $(TARGET).eep
+ $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
+
+flip: $(TARGET).hex
+ batchisp -hardware usb -device $(MCU_DFU) -operation erase f
+ batchisp -hardware usb -device $(MCU_DFU) -operation loadbuffer $(TARGET).hex program
+ batchisp -hardware usb -device $(MCU_DFU) -operation start reset 0
+
+dfu: $(TARGET).hex
+ dfu-programmer $(MCU_DFU) erase
+ dfu-programmer $(MCU_DFU) flash --debug 1 $(TARGET).hex
+ dfu-programmer $(MCU_DFU) reset
+
+
+flip-ee: $(TARGET).hex $(TARGET).eep
+ $(COPY) $(TARGET).eep $(TARGET)eep.hex
+ batchisp -hardware usb -device $(MCU_DFU) -operation memory EEPROM erase
+ batchisp -hardware usb -device $(MCU_DFU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program
+ batchisp -hardware usb -device $(MCU_DFU) -operation start reset 0
+ $(REMOVE) $(TARGET)eep.hex
+
+dfu-ee: $(TARGET).hex $(TARGET).eep
+ dfu-programmer $(MCU_DFU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep
+ dfu-programmer $(MCU_DFU) reset
+
+
+# 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 -R .fuse -R .lock $< $@
+
+%.eep: %.elf
+ @echo
+ @echo $(MSG_EEPROM) $@
+ -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+ --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0
+
+# Create extended listing file from ELF output file.
+%.lss: %.elf
+ @echo
+ @echo $(MSG_EXTENDED_LISTING) $@
+ $(OBJDUMP) -h -S -z $< > $@
+
+# 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 clean_binary end
+
+clean_binary:
+ $(REMOVE) $(TARGET).hex
+
+clean_list:
+ @echo $(MSG_CLEANING)
+ $(REMOVE) $(TARGET).hex
+ $(REMOVE) $(TARGET).eep
+ $(REMOVE) $(TARGET).cof
+ $(REMOVE) $(TARGET).elf
+ $(REMOVE) $(TARGET).map
+ $(REMOVE) $(TARGET).sym
+ $(REMOVE) $(TARGET).lss
+ $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)
+ $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)
+ $(REMOVE) $(SRC:.c=.s)
+ $(REMOVE) $(SRC:.c=.d)
+ $(REMOVE) $(SRC:.c=.i)
+ $(REMOVEDIR) .dep
+
+doxygen:
+ @echo Generating Project Documentation...
+ @doxygen Doxygen.conf
+ @echo Documentation Generation Complete.
+
+clean_doxygen:
+ rm -rf Documentation
+
+# 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 doxygen clean \
+clean_list clean_doxygen program dfu flip flip-ee dfu-ee \
+debug gdb-config
diff --git a/test/ardmake/hardware/firmwares/arduino-usbserial/readme.txt b/test/ardmake/hardware/firmwares/arduino-usbserial/readme.txt
new file mode 100644
index 0000000..289326b
--- /dev/null
+++ b/test/ardmake/hardware/firmwares/arduino-usbserial/readme.txt
@@ -0,0 +1,13 @@
+To setup the project and upload the Arduino usbserial application firmware to an ATMEGA8U2 using the Arduino USB DFU bootloader:
+1. unpack the source into LUFA's Projects directory
+2. set ARDUINO_MODEL_PID in the makefile as appropriate
+3. do "make clean; make"
+4. put the 8U2 into USB DFU mode:
+4.a. assert and hold the 8U2's RESET line
+4.b. assert and hold the 8U2's HWB line
+4.c. release the 8U2's RESET line
+4.d. release the 8U2's HWB line
+5. confirm that the board enumerates as either "Arduino Uno DFU" or "Arduino Mega 2560 DFU"
+6. do "make dfu" (OS X or Linux - dfu-programmer must be installed first) or "make flip" (Windows - Flip must be installed first)
+
+Check that the board enumerates as either "Arduino Uno" or "Arduino Mega 2560". Test by uploading a new Arduino sketch from the Arduino IDE.
diff --git a/test/ardmake/hardware/programmers.txt b/test/ardmake/hardware/programmers.txt
new file mode 100644
index 0000000..466f602
--- /dev/null
+++ b/test/ardmake/hardware/programmers.txt
@@ -0,0 +1,20 @@
+avrisp.name=AVR ISP
+avrisp.communication=serial
+avrisp.protocol=stk500v1
+
+avrispmkii.name=AVRISP mkII
+avrispmkii.communication=usb
+avrispmkii.protocol=stk500v2
+
+usbtinyisp.name=USBtinyISP
+usbtinyisp.protocol=usbtiny
+
+parallel.name=Parallel Programmer
+parallel.protocol=dapa
+parallel.force=true
+# parallel.delay=200
+
+arduinoisp.name=Arduino as ISP
+arduinoisp.communication=serial
+arduinoisp.protocol=stk500v1
+arduinoisp.speed=19200
diff --git a/test/arduino_make.sh b/test/arduino_make.sh
new file mode 100755
index 0000000..a4aaee9
--- /dev/null
+++ b/test/arduino_make.sh
@@ -0,0 +1,1359 @@
+#!/bin/sh
+# ardmake: A command-line Arduino make/build environment. 2009-12-08
+# For instructions, run with the argument "help"!
+#
+# This script is Copyright (c) 2009 Kimmo Kulovesi <http://arkku.com/>.
+# Use at your own risk only. Released under GPL, see below for details.
+# Please mark any modified copies as such, and retain the original
+# copyright notice in all relevant files, usage, and documentation.
+#
+#
+# INTRODUCTION
+#
+# This script runs the Makefile included with Arduino to compile and
+# upload projects on the command-line. This script sets all
+# board-specific variables automatically according to the board type,
+# as well as detects and adds libraries automatically based on the
+# #include-directives in the program (i.e. with the same convenience
+# as the graphical Arduino environment). This script also supports
+# burning bootloaders, setting fuses, uploading pre-compiled binaries,
+# and using certain external programming devices (e.g. for stand-alone
+# microcontrollers).
+#
+# In short, this script can completely replace the Arduino IDE for
+# typical Arduino/ATMega development, and in some cases it can even
+# do more than the IDE. The intended user is a relatively experienced
+# command-line user, who wants to combine the power of their chosen
+# editor and tools with the development speed and convenience of
+# the Arduino platform. Beginners will probably be more comfortable
+# starting with the simple graphical Arduino IDE.
+#
+# This script is not an official part of Arduino, but since it is
+# in active use by its author, it will probably be rapidly updated
+# to support any new Arduino releases (and some care has been
+# taken to minimise the changes necessary to support each release).
+#
+#
+# INSTALLATION
+#
+# Install Arduino somewhere, e.g. /opt/arduino or ~/arduino. If you
+# are using additional core types (e.g. Sanguino) or custom board
+# types (e.g. ADABoot), also install them. Custom libraries can be
+# installed in e.g. ~/sketchbook/libraries, or anywhere you like.
+#
+# Install the AVR version of GCC (e.g. package name avr-gcc) and
+# AVRDUDE (you can probably use the one bundled with Arduino if you
+# prefer). Preferably install versions packaged for your specific
+# Linux distribution (e.g. with apt-get install avr-gcc avrdude).
+#
+# Put this script somewhere along your PATH (e.g. /usr/local/bin,
+# ~/bin, or wherever you like to install programs). This script is
+# distributed by the author as "arduino_make.sh" due to historical
+# reasons, but "ardmake" is the suggested name (shorter to type and
+# all). Run this script with the parameter "help" and read about
+# configuring and usage (usually only the board type needs to be set
+# and you are good to go).
+#
+#
+# SYSTEM REQUIREMENTS
+#
+# Last been tested with Arduino version 0017 on Ubuntu 9.04, with
+# avr-gcc and avrdude installed from Ubuntu packages. While this script
+# should run in non-Linux environments, there are some dependencies to
+# GNU tools (e.g. GNU Make), so GNU/Linux should be considered the
+# preferred/intended environment for running this.
+#
+#
+# CHANGES
+#
+# December 2009 - Added a "serial monitor" (target "serial") with
+# limited support for serial speed autodetection
+# from the Arduino program.
+# - Added support for using the "arduino" protocol
+# in avrdude when available; this eliminates the
+# need to reset the device with "stty". The old
+# behaviour can be restored by using the target
+# "upload_autoreset" instead of "upload".
+# - Added support for downloading with external
+# programmers.
+# - Added basic support for reading configurations
+# for external programming devices from the
+# file hardware/programmers.txt, in addition to
+# the built-in isp and dragon targets. This should
+# enable the use of parallel programmers.
+# - Added target "programmers" for listing supported
+# external programming devices.
+# - Don't do autoreset when uploading with external
+# programmers.
+# - Removed unnecessary debug outputs.
+# - Additional documentation in the script file.
+# November 2009 - Major bugfix for boards with CPU frequency other
+# than 16MHz.
+# - Possibly fixed the __cxa_pure_virtual issue.
+# - Forcing user to define ARDUINO_BOARD explicitly
+# since using an incorrect board type can cause
+# nasty hidden errors.
+# - Added reset commands to upload and download
+# when not using the Makefile.
+# - Added dependency on the board type, i.e. if the
+# board type is changed, everything gets rebuilt.
+# - Added target "boards" to list available boards.
+# - Changed default library path to include the
+# "~/sketchbook/libraries" directory, similarly to
+# the current Arduino IDE.
+# - Made building locally the default and fixed
+# the problem of dependency files being built in
+# the core directory.
+# - Implemented reading configuration from
+# ~/.ardmake.conf and ardmake.conf in the
+# sketch directory.
+# - Fixed build dependencies with Sanguino.
+# - Rewrote most of the help texts.
+# - Fixed compatibility with mawk. Thanks to Tom
+# Parkin for reporting this!
+# October 2009 - Support AVRISP and burning bootloaders.
+# - Support building object files into the
+# applet directory instead of the core and
+# library directories.
+# - Generate automatic dependecies for libraries
+# - Support uploading specified .hex or .bin
+# directly without compiling anything
+# - Support downloading flash memory from
+# microcontroller to .hex or .bin file
+# - Replace the slightly broken build target:
+# - Proper dependencies
+# - Show correct file name and line numbers for errors
+# - Display program size compared to controller capacity
+# September 2009 - Support Arduino 017
+# March 2009 - Support Arduino 014
+# February 2009 - Initial version
+#
+#
+# FANCY ARDUINO DEVICE NODES ON LINUX
+#
+# The default port for the Arduino is set to "/dev/arduino", which
+# requires udev rules (but avoids the problem of changing ttyUSB names).
+# Alternatively, it can be changed in this file. The udev rule that
+# works for the Arduino clone that I have is this:
+#
+# KERNEL=="ttyUSB*", ATTRS{product}=="FT232R USB UART", \
+# ATTRS{idProduct}=="6001", ATTRS{idVendor}=="0403", \
+# SYMLINK+="arduino arduino_$attr{serial}", GROUP="avrprog", MODE="0660"
+#
+# You will probably want to change the group to "dialout", or create
+# the "avrprog" group on your system (like I did). On Ubuntu Linux, place
+# the rule in a file inside "/etc/udev/rules.d", e.g. "80-arduino.rules".
+#
+# If you have many devices with the same product and vendor ids,
+# as may be the case with a popular chip like FT232R, you can
+# add the condition "ATTRS{serial}" to your udev rules. You can
+# see the serial if you first use the above rules and then look at
+# the symlink "arduino_SERIAL" where SERIAL is the serial number
+# of that particular device. Then create one rule for each of your
+# devices' serial numbers (add ATTRS{serial}=="MySerial", right
+# before SYMLINK in the above rules).
+#
+#
+# COMPILER ERROR ABOUT __cxa_pure_virtual
+#
+# Some versions of Arduino and avr-gcc cause an error about a missing
+# function "__cxa_pure_virtual" in programs where C++ classes are used.
+# To fix this problem, add the following line anywhere in your program:
+#
+# extern "C" void __cxa_pure_virtual() {}
+#
+###################################################################################
+# This script 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 2 of the License,
+# or (at your option) any later version.
+#
+# This script 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 script. If not, see <http://www.gnu.org/licenses/>.
+###################################################################################
+# Read the configuration file (if any):
+
+CONFNAME="ardmake.conf"
+for conf in "./$CONFNAME" "$HOME/.$CONFNAME"; do
+ if [ -r "$conf" ]; then
+ eval "$(awk -v FS== '{ sub(/^[ \t]*/, ""); sub(/^(set|export)[ ]*/, "");
+ if (/^A(RDUINO_|AVR)[A-Za-z0-9_]*=[^;<>`]*$/) {
+ print "[ -z \"$" $1 "\" ] && " $0
+ }
+ next }' "$conf")"
+ #echo "Loaded configuration file \"$conf\"."
+ fi
+done
+
+###################################################################################
+# Defaults configuration:
+
+# Path to avr tools (/usr/bin if installed from Linux distribution packages)
+[ -z "$AVR_TOOLS_PATH" ] && AVR_TOOLS_PATH=/usr/bin
+
+# Path to avrdude (/usr/bin if installed from Linux distribution packages)
+[ -z "$AVRDUDE_PATH" ] && AVRDUDE_PATH=/usr/bin
+
+# Path to search for additional Arduino libraries (separated by : colons).
+# The "official" script directory at hardware/libraries is always searched!
+
+if [ -z "$ARDUINO_LIBRARY_PATH" ]; then
+ ARDUINO_LIBRARY_PATH="../libraries:$HOME/sketchbook/libraries"
+fi
+
+# Try to figure out Arduino install directory (first from environment
+# variable ARDUINO_DIR, then ~/arduino, then opt/arduino)
+if [ -n "$ARDUINO_DIR" ]; then
+ INSTALL_DIR="$ARDUINO_DIR"
+else
+ INSTALL_DIR="$HOME/arduino"
+ if [ ! -x "$INSTALL_DIR/arduino" -a -x '/opt/arduino/arduino' ]; then
+ INSTALL_DIR='/opt/arduino'
+ fi
+fi
+
+# Build locally unless a shared build is specifically requested:
+if [ ! "$ARDUINO_BUILD" = "shared" ]; then
+ BUILD_LOCALLY=1
+else
+ BUILD_LOCALLY=''
+fi
+
+# The extension for Arduino program files (.pde at the time of writing, but
+# this is the same as for Processing - .ade would be more fitting)
+EXT='pde'
+
+# Command to reset serial port:
+RESET_COMMAND="stty hupcl; sleep 0.1; true"
+
+###################################################################################
+
+basename="$(basename "$0")"
+
+# Check the configuration:
+
+PROGRAMMERFILE="$INSTALL_DIR/hardware/programmers.txt"
+BOARDFILE="$INSTALL_DIR/hardware/boards.txt"
+if [ ! -r "$BOARDFILE" ]; then
+ cat >&2 <<EOF
+ERROR: Could not read "$BOARDFILE".
+
+Please set ARDUINO_DIR correctly so that \$ARDUINO_DIR/hardware/boards.txt
+is the location of the boards.txt in your Arduino installation.
+
+You can configure ARDUINO_DIR either in the environment, or in the
+configuration file ~/.$CONFNAME, e.g.:
+ echo ARDUINO_DIR=$HOME/arduino-0017 >>~/.$CONFNAME
+
+Run "$basename help" for instructions.
+EOF
+ exit 1
+fi
+
+[ ! -x "$AVRDUDE_PATH/avrdude" ] && AVRDUDE_PATH="$INSTALL_DIR/hardware/tools"
+[ ! -x "$AVRDUDE_PATH/avrdude" ] && AVRDUDE_PATH="$(dirname $(which avrdude))"
+if [ ! -x "$AVRDUDE_PATH/avrdude" ]; then
+ cat >&2 <<EOF
+ERROR: Could not find an executable avrdude!
+
+Please set AVRDUDE_PATH correctly so that \$AVRDUDE_PATH/avrdude is
+the correct avrdude executable. If you do not have avrdude installed,
+see if it's available in your system packages, e.g. on Ubuntu Linux
+you should be able to use:
+
+ sudo apt-get install avrdude
+EOF
+ exit 1
+fi
+
+AVRDUDE_CONFIG="$AVRDUDE_PATH/avrdude.conf"
+[ ! -e "$AVRDUDE_CONFIG" ] && AVRDUDE_CONFIG="/etc/avrdude.conf"
+[ ! -e "$AVRDUDE_CONFIG" ] && AVRDUDE_CONFIG="$INSTALL_DIR/hardware/tools/avrdude.conf"
+
+[ ! -x "$AVR_TOOLS_PATH/avr-gcc" ] && AVR_TOOLS_PATH="$INSTALL_DIR/hardware/tools"
+[ ! -x "$AVR_TOOLS_PATH/AVR_TOOLS" ] && AVR_TOOLS_PATH="$(dirname $(which avr-gcc))"
+if [ ! -x "$AVR_TOOLS_PATH/avr-gcc" ]; then
+ cat >&2 <<EOF
+ERROR: Could not find an executable avr-gcc!
+
+Please set AVR_TOOLS_PATH correctly so that \$AVR_TOOLS_PATH/avr-gcc is
+the correct avr-gcc executable. Other avr build tools (binutils, etc)
+should be installed at the same location. If you do not have avr-gcc
+installed, see if it's available in your system packages, e.g. on
+Ubuntu Linux you should be able to use:
+
+ sudo apt-get install gcc-avr
+EOF
+ exit 1
+fi
+
+# Usage:
+
+if [ "$1" = 'help' -o "$1" = '--help' -o "$1" = '-h' ]; then
+ cat | less <<EOF
+Command-line Arduino programming helper (make and library handler),
+copyright (c) 2009 Kimmo Kulovesi <http://arkku.com/>. This script
+is provided as free software under GPL with ABSOLUTELY NO WARRANTY.
+
+Usage: $basename [target] [options for Make]
+
+This script provides a command-line build environment for Arduino,
+by wrapping the call to Make and setting parameters for it over those
+defined in the Arduino Makefile. Supported features include library
+autodetection from #include-directives (just like the graphical IDE),
+custom library paths, all board types (including custom ones), external
+programming devices, downloading programs from the microcontroller, etc.
+
+
+Setup and installation:
+ 1) Install Arduino, e.g.:
+ wget http://arduino.googlecode.com/files/arduino-0017.tgz
+ tar xvzf arduino-0017.tgz; ln -s arduino-0017 arduino
+ 2) Install avrdude and GCC for AVR, e.g. on Ubuntu & Debian:
+ apt-get install avrdude gcc-avr
+ 3) Configure your Arduino installation directory, e.g.
+ export ARDUINO_DIR=/path/to/arduino
+ 3) Configure your Arduino board, e.g.:
+ export ARDUINO_BOARD=diecimila
+ 4) Configure your Arduino serial port device, e.g.:
+ export ARDUINO_PORT=/dev/ttyUSB0
+
+ The variable ARDUINO_BOARD must be set to the short name of the
+ board you are using. To list available board types, use the
+ command "$basename boards".
+
+ By default, this script attempts to find an Arduino installation
+ in ~/arduino and /opt/arduino. If it's neither of these, specify
+ the variable ARDUINO_DIR accordingly.
+
+ The serial device defaults to /dev/<corename> (e.g. /dev/arduino),
+ and to /dev/ttyUSB0 if that is not available. A specific port may
+ be configured by setting the variable ARDUINO_PORT. Linux admins
+ may wish to specify udev rules so that the port device is constant
+ (e.g. /dev/arduino); for details on that, see the comments at the top
+ of this script file, i.e. "$0".
+
+Configuring variables:
+ The configuration variables for this script (as detailed above)
+ can be set in the file ~/.$CONFNAME, e.g.:
+ echo ARDUINO_BOARD=atmega328 >~/.$CONFNAME
+
+ To override all or part of this global configuration, a
+ program-specific configuration file called $CONFNAME can be
+ created inside each sketch directory, if desired. Any settings
+ found in the sketch directory $CONFNAME take precedence over
+ the settings in the user's ~/.$CONFNAME.
+
+ You may also configure any or all of these variables in the
+ environment. Variables configured in the environment take
+ precedence over those in any configuration file! This allows
+ you to specify variables directly on the command-line, e.g.:
+ ARDUINO_DIR=~/arduino-0014 $basename
+
+To create and upload an Arduino sketch:
+ 1) Create a directory for your program ("sketch"), e.g.
+ mkdir -p ~/sketchbook/Blink
+ 2) Create your program .$EXT inside the directory, e.g.:
+ cd ~/sketchbook/Blink; vim Blink.$EXT
+ 3) Compile your program by running this script:
+ $basename
+ 4) After a succesful compilation, upload to your board:
+ $basename upload
+
+ Libraries are automatically detected from the #include-directives
+ used. The libraries installed together with your Arduino are
+ always available. Custom libraries are searched for in the
+ directory ~/sketchbook/libraries and in ../libraries (i.e. in
+ the directory libraries in the same directory as your sketch
+ directory is in).
+
+ The custom library locations can be overridden by specifying
+ the variable ARDUINO_LIBRARY_PATH as a colon-separated list of
+ directories, e.g.:
+ ARDUINO_LIBRARY_PATH=$HOME/arduino_libs:/opt/arduino_libs
+
+
+There are also other make targets that you may use instead of
+compile (the default) and upload. The target is specified as the first
+command-line argument, and it can be any target in the Makefile. Special
+targets handled by $basename are:
+
+compile (default): Compile the applet (.hex file) ready for uploading.
+ Do this first after making changes to your program!
+
+upload: Upload the applet to the microcontroller. See above
+ about the configuration variable ARDUINO_PORT. Usage:
+ $basename upload
+
+ To upload a pre-compiled file to the microcontroller,
+ you can specify a filename after upload on the
+ command line. The file must have the extension
+ .hex for Intel hex format, or the extension .bin
+ for raw binary format. For example:
+ $basename upload myprog.hex
+
+isp:
+dragon: Just like "upload", but an AVRISP (or clone) or
+ an AVRDragon device is used to upload instead. These
+ can be used to upload to a stand-alone microcontroller
+ in ISP mode.
+
+ The AVRDragon is an USB device and the port is
+ autodetected. For AVRISP and clones, the default
+ ports are /dev/avrisp and /dev/ttyUSB0, but the
+ port can be overridden by setting AVRISP_PORT.
+
+programmer: Like "isp" and "dragon", except the target must
+ be followed by the short name of a programmer
+ defined in hardware/programmers.txt. This allows
+ you to use any external programmer define there, e.g.:
+ $basename programmer parallel
+
+download: Download the microcontroller's flash memory to
+ the file specified as the next command line
+ parameter. The file name MUST have either the
+ extension .hex for Intel hex format, or the
+ extension .bin for raw binary format. For example:
+ $basename download backup.bin
+
+ External programmers can be used by specifying
+ "download" after the programmer, e.g.:
+ $basename isp download backup.hex
+
+serial: Start a serial monitor on the serial port. The port
+ device defaults to the programming port (ARDUINO_PORT),
+ but it can be specified on the command line. The
+ speed can often be autodetected from the program in
+ the current directory if it uses Serial.begin(speed),
+ but the speed defaults to 9600 and can be specified
+ on the command line. Examples:
+ $basename serial
+ $basename serial 19200
+ $basename serial /dev/ttyS0
+ $basename serial /dev/ttyUSB1 2400
+
+boards: List available board types.
+programmers: List available external programmer types.
+coff: Build an applet .cof file for debugging/etc.
+lss: Build an applet .lss file to show annotated assembler.
+
+
+ Targets for burning a bootloader (requires a programming device!):
+
+bootloader: Program the fuses and burn a bootloader. The
+ filenames and settings are obtained from the
+ file ARDUINO_DIR/harware/boards.txt according
+ to the board type (ARDUINO_BOARD).
+
+ The bootloader can only be burned with an external
+ programmer. If the settings in boards.txt are not
+ applicable to your programmer device (as is
+ probably the case), you can specify the external
+ programmer at the end of the command line.
+
+ For example, to burn the ADABoot bootloader for
+ ATMega168 using an AVRISP device, you would set
+ ARDUINO_BOARD="ADABoot168" and then run:
+ $basename bootloader isp
+
+ You can also follow the bootloader target with
+ a .bin or .hex filename to burn a custom
+ bootloader without entering it into boards.txt, e.g.:
+ $basename bootloader boot.hex programmer parallel
+
+fuses: Just program the fuses and set the lock bits
+ to unlock. For example:
+ $basename fuses isp
+
+EOF
+ exit 0
+fi
+
+# Display list of available board types if requested:
+
+if [ "$1" = "boards" -o "$1" = "programmers" ]; then
+ if [ "$1" = "boards" ]; then
+ file="$BOARDFILE"
+ else
+ file="$PROGRAMMERFILE"
+ fi
+ echo "Available $1 in $file:"
+ awk -v FS== '$1 ~ /\.name/ {
+ sub(/\.name$/, "", $1)
+ printf("\t%-15s\t\"%s\"\n", $1, $2);
+ }' "$file"
+ if [ "$1" = "boards" ]; then
+ cat <<EOF
+
+To configure your board type, set the variable ARDUINO_BOARD
+either in the environment or in ~/.$CONFNAME, or in the
+file $CONFNAME inside your program's directory.
+EOF
+ else
+ cat <<EOF
+
+To use an external programming device for uploading, you can use
+the target "programmer" followed by the device name (as listed above)
+instead of "upload", e.g.
+ $basename programmer parallel
+
+Also note that $basename has two built-in programming device types:
+1) AVRDragon in ISP mode, which can be invoked as:
+ $basename dragon
+
+2) AVRISP and clones (the most common third-party device sold online):
+ $basename isp
+
+The AVRDragon device requires no port configuration, nor do many of
+the programmers typically defined in hardware/programmers.txt. The
+serial port for the built-in AVRISP can be defined as AVRISP_PORT,
+while others use ARDUINO_PORT (and default to the /dev/<programmer_name>
+or /dev/ttyUSB0 if that is not available).
+EOF
+ fi
+ exit 0
+fi
+
+# Die if no board type is set:
+
+if [ -z "$ARDUINO_BOARD" ]; then
+ cat <<EOF >&2
+ERROR: The variable ARDUINO_BOARD must be set to the type of Arduino
+board you are using. Accepted values are those appearing in Arduino's
+hardware/boards.txt, e.g. "diecimila", "mega", "lilypad", etc.
+The names are case-sensitive.
+
+To save a certain board type as your default, put the setting
+in ~/.$CONFNAME, e.g.:
+ echo ARDUINO_BOARD=diecimila >>~/.$CONFNAME
+
+To configure a project-specific board type, put the setting
+in the file $CONFNAME in the sketch directory, e.g.:
+ cd ~/sketchbook/MyProg
+ echo ARDUINO_BOARD=mega >>$CONFNAME
+
+Run "$basename help" for instructions.
+EOF
+ exit 1
+fi
+
+# Try to read the hardware configuration for this board:
+
+eval $(awk -v FS== -v board="$ARDUINO_BOARD" '$1 ~ /\.name$/ {
+ if (boardname) { exit 0 }
+ sub(/\.name$/, "", $1)
+ if (board == $1 || board == $2) {
+ boardname = $2
+ speed=0; core=""; mcu=""; protocol="";
+ f_cpu=0; lfuse=""; hfuse=""; efuse="";
+ unlock_bits=""; lock_bits="";
+ bootloader_dir=""; bootlader_file="";
+ }
+ next
+ }
+ !boardname { next }
+ $1 ~ /\.upload\.protocol$/ { protocol = $2; next }
+ $1 ~ /\.upload\.speed$/ { speed = $2; next }
+ $1 ~ /\.upload\.maximum_size$/ {
+ max_size = $2; next
+ }
+ $1 ~ /\.build\.core$/ { core = $2; next }
+ $1 ~ /\.build\.f_cpu$/ { f_cpu = $2; next }
+ $1 ~ /\.build\.mcu$/ { mcu = $2; next }
+ $1 ~ /\.bootloader\.low_fuses$/ {
+ lfuse = $2; next
+ }
+ $1 ~ /\.bootloader\.high_fuses$/ {
+ hfuse = $2; next
+ }
+ $1 ~ /\.bootloader\.extended_fuses$/ {
+ efuse = $2; next
+ }
+ $1 ~ /\.bootloader\.unlock_bits$/ {
+ unlock_bits = $2; next
+ }
+ $1 ~ /\.bootloader\.lock_bits$/ {
+ lock_bits = $2; next
+ }
+ $1 ~ /\.bootloader\.path$/ {
+ bootloader_dir = $2; next
+ }
+ $1 ~ /\.bootloader\.file$/ {
+ bootloader_file = $2; next
+ }
+ END {
+ if (boardname) {
+ print "BOARDNAME=\"" boardname "\""
+ if (speed) {
+ gsub(/[^0-9]/, "", speed)
+ print "UPLOAD_RATE=\"" speed "\""
+ }
+ if (f_cpu) {
+ gsub(/[^0-9]/, "", f_cpu)
+ print "F_CPU=\"" f_cpu "\""
+ }
+ if (core) {
+ gsub(/[^a-zA-Z0-9_.:-]/, "", core)
+ print "CORE=\"" core "\""
+ }
+ if (mcu) {
+ gsub(/[^a-zA-Z0-9_.:-]/, "", mcu)
+ print "MCU=\"" mcu "\""
+ }
+ if (protocol) {
+ gsub(/[^a-zA-Z0-9_.:-]/, "", protocol)
+ print "AVRDUDE_PROGRAMMER=\"" \
+ protocol "\""
+ }
+ if (max_size) {
+ gsub(/[^0-9]/, "", max_size)
+ print "MAX_SIZE=\"" max_size "\""
+ }
+ if (hfuse != "") {
+ gsub(/[^0-9xA-Fa-f]/, "", hfuse)
+ print "BL_HFUSE=\"" hfuse "\""
+ }
+ if (lfuse != "") {
+ gsub(/[^0-9xA-Fa-f]/, "", lfuse)
+ print "BL_LFUSE=\"" lfuse "\""
+ }
+ if (efuse != "") {
+ gsub(/[^0-9xA-Fa-f]/, "", efuse)
+ print "BL_EFUSE=\"" efuse "\""
+ }
+ if (lock_bits != "") {
+ gsub(/[^0-9xA-Fa-f]/, "", lock_bits)
+ print "BL_LOCK=\"" lock_bits "\""
+ }
+ if (unlock_bits != "") {
+ gsub(/[^0-9xA-Fa-f]/, "", unlock_bits)
+ print "BL_UNLOCK=\"" unlock_bits "\""
+ }
+ if (bootloader_dir && bootloader_file) {
+ gsub(/["]/, "\\\"", bootloader_dir)
+ gsub(/["]/, "\\\"", bootloader_file)
+ print "BL_PATH=\"" bootloader_dir "/" \
+ bootloader_file "\""
+ }
+ }
+ }' "$BOARDFILE")
+
+# Die if the board configuration was not found:
+
+if [ -z "$F_CPU" ]; then
+ cat <<EOF >&2
+ERROR: The board "$ARDUINO_BOARD" was not found in the configuration
+file "$BOARDFILE". The variable ARDUINO_BOARD
+must be set to the (case-sensitive) short name of the board,
+e.g. "diecimila" or "atmega328".
+
+Run "$basename boards" to list known board types, or
+"$basename help" for general instructions.
+EOF
+ exit 1
+fi
+
+# Some defaults for board types, e.g. if the user has placed a custom
+# board in boards.txt and didn't define everything:
+
+[ -z "$CORE" ] && CORE=arduino
+[ -z "$MAX_SIZE" ] && MAX_SIZE=14336
+[ -z "$MCU" ] && MCU="$ARDUINO_BOARD"
+[ -z "$AVRDUDE_PROGRAMMER" ] && AVRDUDE_PROGRAMMER=stk500v1
+[ -z "$UPLOAD_RATE" ] && UPLOAD_RATE=19200
+UPLOAD_DELAY=""
+
+# Set some helper variables based on the Arduino location:
+
+MAKEFILE="$INSTALL_DIR/hardware/cores/$CORE/Makefile"
+[ ! -e "$MAKEFILE" ] && MAKEFILE="$INSTALL_DIR/hardware/cores/arduino/Makefile"
+ARDUINO="$INSTALL_DIR/hardware/cores/$CORE"
+LIBRARY_DIR="$INSTALL_DIR/hardware/libraries"
+
+# Check for the wiring_serial.c bug in some versions of Arduino:
+
+if grep -q -s -F 'wiring_serial.c' "$MAKEFILE"; then
+ if [ ! -e "$ARDUINO/wiring_serial.c" ]; then
+ echo '/* Empty file created due to bug in Arduino Makefile */' \
+ >"$ARDUINO/wiring_serial.c"
+ if [ ! -e "$ARDUINO/wiring_serial.c" ]; then
+ cat <<EOF >&2
+
+WARNING: The file "$ARDUINO/wiring_serial.c" is referred to in
+the Makefile, but it does not exist. This is a bug in some Arduino
+versions, and will probably lead to failed builds. To remedy, please
+create the file (it can be empty) or remove the reference from the
+Makefile ("$MAKEFILE").
+
+EOF
+ fi
+ fi
+fi
+
+# Correct the programmer "stk500" specified for pretty much every
+# Arduino board to "stk500v1" (which is the correct, more specific
+# option for avrdude):
+[ "$AVRDUDE_PROGRAMMER" = "stk500" ] && AVRDUDE_PROGRAMMER='stk500v1'
+
+# Configure the programmer port location:
+
+if [ -n "$ARDUINO_PORT" ]; then
+ PORT="$ARDUINO_PORT"
+else
+ PORT="/dev/$CORE"
+ if [ ! -e "$PORT" ]; then
+ PORT="/dev/$ARDUINO_BOARD"
+ if [ ! -e "$PORT" ]; then
+ PORT='/dev/avr'
+ [ ! -e "$PORT" ] && PORT='/dev/ttyUSB0'
+ fi
+ fi
+fi
+
+# Serial monitor:
+
+if [ "$1" = "serial" ]; then
+ shift
+ if [ -c "$1" ]; then
+ PORT="$1"
+ shift
+ fi
+ if [ ! -e "$PORT" ]; then
+ cat >&2 <<EOF
+ERROR: Serial port device "$PORT" not found.
+
+You can either specify the port as the variable ARDUINO_PORT, or give an
+alternative port on the command line, e.g.:
+ $basename serial /dev/ttyUSB1
+
+The speed of the serial port is normally autodetected from typical
+programs using the Arduino Serial library, but it can be specified
+on the command line, e.g. for 9600 bps:
+ $basename serial /dev/ttyUSB0 9600
+EOF
+ exit 1
+ fi
+ TARGET="$(basename "$(pwd)").$EXT"
+ if [ -n "$1" ]; then
+ SPEED="$1"
+ elif [ -r "$TARGET" ]; then
+ SPEED=$(awk -v baud="${ARDUINO_BAUD:-9600}" '/Serial[0-9]*\.begin/ {
+ sub(/^.*Serial[^0-9]*/, "");
+ sub(/[^0-9].*$/, "");
+ if ($0 != "" && $0 > 0) { baud = $0; exit }
+ }
+ END { print baud }' "$TARGET")
+ else
+ SPEED="${ARDUINO_BAUD:-9600}"
+ fi
+ if tty >/dev/null 2>&1; then
+ cat >&2 <<EOF
+Starting serial monitor on port $PORT at $SPEED bps.
+Your input will be sent to the serial port. Press Ctrl-C to stop.
+
+EOF
+ fi
+ stty -F "$PORT" ospeed "$SPEED" ispeed "$SPEED" \
+ cs8 ignbrk -ignpar -cstopb -hupcl -echo \
+ -ixon -crtscts -imaxbel
+ cat <"$PORT" &
+ catpid=$!
+ trap '[ -n "$catpid" ] && kill $catpid; catpid=""' EXIT INT QUIT TERM
+ if [ -e "$PORT" ]; then
+ cat >"$PORT"
+ exit $?
+ else
+ echo "Error: Serial device \"$PORT\" does not exist!" >&2
+ exit 1
+ fi
+fi
+
+# Display verification that the correct board was selected:
+
+cat <<EOF
+Read settings for ARDUINO_BOARD="$ARDUINO_BOARD":
+ $BOARDNAME
+
+EOF
+
+# Configure AVRDUDE here, since the Makefile included with Arduino
+# has non-working paths hard-coded:
+
+AVRDUDE_MCU=$(echo "$MCU" | awk '
+ $1 ~ /^atmega/ { sub(/^atmega/, "m", $1); print $1; exit }
+ $1 ~ /^attiny/ { sub(/^attiny/, "t", $1); print $1; exit }
+ $1 ~ /^at90s/ { sub(/^at90s/, "t", $1); print $1; exit }
+ $1 ~ /^at90pwm/ { sub(/^at90/, "t", $1); print $1; exit }')
+
+AVRDUDE_FLAGS="-F -D -p $AVRDUDE_MCU -v -v"
+
+# Allow targets "bootloader" and "fuses" for burning the bootloader
+# or setting the fuses, respectively, e.g. for preparing a DIY
+# Arduino clone with a blank ATMega device.
+
+burn_bootloader=''
+program_fuses=''
+if [ "$1" = "bootloader" -o "$1" = "fuses" ]; then
+ program_fuses='yes'
+ [ "$1" = "bootloader" ] && burn_bootloader='yes'
+ shift
+ [ ! -x "$AVRDUDE_PATH/avrdude" ] && AVRDUDE_PATH=''
+
+ if [ -z "$BL_HFUSE" -o -z "$BL_LFUSE" -o -z "$BL_EFUSE" -o \
+ -z "$BL_UNLOCK" -o -z "$BL_PATH" ]
+ then
+ cat >&2 <<EOF
+ERROR: boards.txt did not define the information necessary for burning
+a bootloader and/or setting the fuses. You must ensure that the file
+$INSTALL_DIR/hardware/boards.txt is available and contains the following
+settings for your board type (currently "$ARDUINO_BOARD"):
+
+$ARDUINO_BOARD.bootloader.low_fuses=0x??
+$ARDUINO_BOARD.bootloader.high_fuses=0x??
+$ARDUINO_BOARD.bootloader.extended_fuses=0x??
+$ARDUINO_BOARD.bootloader.unlock_bits=0x??
+$ARDUINO_BOARD.bootloader.lock_bits=0x??
+$ARDUINO_BOARD.bootloader.file=filename.hex
+$ARDUINO_BOARD.bootloader.path=dirname
+
+Aborting...
+EOF
+ exit 1
+ fi
+ BOOTLOADER_FILE="$INSTALL_DIR/hardware/bootloaders/$BL_PATH"
+ if [ -n "$1" -a -r "$1" ] && echo "$1" | grep -E -q -s '\.(hex|bin)$' ; then
+ BOOTLOADER_FILE="$1"
+ shift
+ elif [ ! -r "$BOOTLOADER_FILE" ]; then
+ echo "ERROR: Bootloader file "$BOOTLOADER_FILE" is not readable!" >&2
+ exit 1
+ fi
+ cat <<EOF
+This command will set the following:
+
+EOF
+ [ -n "$burn_bootloader" ] && echo "Bootloader: $BOOTLOADER_FILE"
+ cat <<EOF
+Fuses: high=$BL_HFUSE low=$BL_LFUSE extended=$BL_EFUSE
+
+ WARNING!
+
+Burning a bootloader and/or setting the fuse bits is potentially
+dangerous and incorrect settings can make your device stop working!
+Note that an external programmer is required for this operation,
+i.e. you can't burn the bootloader via Arduino's own USB.
+
+Press Return to continue (at your own risk), or Ctrl-C to cancel!
+
+EOF
+ read press_enter >/dev/null 2>&1
+fi
+
+# Change the target "dragon" to "upload", but perform the upload using
+# the AVRDragon in ISP mode instead of the instead of the typical Arduino
+# programming method (e.g. for DIY projects using the same microprocessor
+# as an Arduino but not having the programming capability themselves).
+#
+# Similarly change the target "isp" to "upload", but perform the upload
+# using an AVRISP (or clone thereof).
+
+if [ -n "$1" ]; then
+ if [ "$1" = "dragon" ]; then
+ # Uploading with the AVR Dragon:
+
+ AVRDUDE_PROGRAMMER='dragon_isp'
+ PORT='usb'
+ UPLOAD_RATE=''
+ target='upload'
+ if [ "$2" = "download" ]; then target="$2"; shift; fi
+ elif [ "$1" = "isp" ]; then
+ # Uploading via AVRISP with the stk500v2 protocol:
+ if [ -n "$AVRISP_PORT" ]; then
+ PORT="$AVRISP_PORT"
+ elif [ -e '/dev/avrisp' ]; then
+ PORT='/dev/avrisp'
+ else
+ PORT='/dev/ttyUSB0'
+ fi
+ AVRDUDE_PROGRAMMER='stk500v2'
+ UPLOAD_RATE="$AVRISP_BAUD"
+ target='upload'
+ if [ "$2" = "download" ]; then target="$2"; shift; fi
+ elif [ "$1" = "programmer" ]; then
+ shift
+ AVRDUDE_PROGRAMMER="$1"
+
+ if [ -z "$AVRDUDE_PROGRAMMER" ]; then
+ echo "ERROR: No programming device specified on the command-line!" >&2
+ exit 1
+ fi
+ if [ ! -r "$PROGRAMMERFILE" ]; then
+ echo "ERROR: Could not read \"$PROGRAMMERFILE\"!" >&2
+ exit 1
+ fi
+
+ # Read custom configuration for an external programming device:
+
+ eval $(awk -v FS== -v prog="$AVRDUDE_PROGRAMMER" '$1 ~ /\.name$/ {
+ if (progname) { exit 0 }
+ sub(/\.name$/, "", $1)
+ if (prog == $1 || prog == $2) {
+ progname = $2; communication="";
+ protocol=""; delay=""; port="";
+ }
+ next
+ }
+ !progname { next }
+ $1 ~ /\.communication$/ { communication = $2; next }
+ $1 ~ /\.protocol$/ { protocol = $2; next }
+ $1 ~ /\.delay$/ { delay = $2; next }
+ END {
+ if (progname) {
+ print "AVRDUDE_PROGRAMMER_NAME=\"" progname "\""
+ gsub(/[^a-zA-Z0-9_.:-]/, "", communication)
+ print "AVR_COMMUNICATION=\"" communication "\""
+ gsub(/[^0-9]/, "", delay)
+ print "UPLOAD_DELAY=\"" delay "\""
+ if (protocol) {
+ gsub(/[^a-zA-Z0-9_.:-]/, "", protocol)
+ print "AVRDUDE_PROGRAMMER=\"" protocol "\""
+ }
+ }
+ }' "$PROGRAMMERFILE")
+
+ # Die if the specified programmer was not found in programmers.txt:
+ if [ -z "$AVRDUDE_PROGRAMMER_NAME" ]; then
+ cat >&2 <<EOF
+ERROR: "$AVRDUDE_PROGRAMMER" not found in "$PROGRAMMERFILE". You can
+view a list of the available programmer types with the command:
+ $basename programmers
+EOF
+ exit 1
+ fi
+
+ # Set up the ports according to means of communication:
+ if [ "$AVR_COMMUNICATION" = 'usb' ]; then
+ PORT='usb'
+ UPLOAD_RATE=''
+ else
+ if [ "$AVR_COMMUNICATION" = 'serial' ]; then
+ if [ ! "$PORT" = "$ARDUINO_PORT" -o ! -e "$PORT" ]; then
+ if [ -e "/dev/$AVRDUDE_PROGRAMMER" ]; then
+ PORT="/dev/$AVRDUDE_PROGRAMMER"
+ elif [ ! -e "$PORT" ]; then
+ PORT='/dev/ttyUSB0'
+ fi
+ fi
+ UPLOAD_RATE="$AVRISP_BAUD"
+ else
+ # DEBUG: Specifying port for parallel programmers?
+ PORT=''
+ UPLOAD_RATE=''
+ fi
+ fi
+
+ target='upload'
+ if [ "$2" = "download" ]; then target="$2"; shift; fi
+ echo " Programming device..... $AVRDUDE_PROGRAMMER_NAME"
+ elif [ '(' "$1" = "upload" -o "$1" = "download" ')' \
+ -a "$AVRDUDE_PROGRAMMER" = "stk500v1" ]
+ then
+ if "$AVRDUDE_PATH/avrdude" ${AVRDUDE_CONFIG:+-C "$AVRDUDE_CONFIG"} \
+ -c list_all 2>&1 | grep -q -s '^ *arduino *= .*conf'; then
+ # Use the "arduino" programmer with autoreset built in,
+ # if it's available in the avrdude version we are using.
+ AVRDUDE_PROGRAMMER='arduino'
+ target="$1"
+ else
+ target="$1_autoreset"
+ fi
+ else
+ target="$1"
+ fi
+ shift
+else
+ target='compile'
+fi
+AVRDUDE_FLAGS="$AVRDUDE_FLAGS${PORT:+ -P $PORT} -c $AVRDUDE_PROGRAMMER${UPLOAD_RATE:+ -b $UPLOAD_RATE}${UPLOAD_DELAY:+ -i $UPLOAD_DELAY}"
+
+# Show the configuration:
+
+cat <<EOF
+ Core................... $CORE
+ Core directory......... $ARDUINO
+ Microcontroller........ $MCU ($AVRDUDE_MCU)
+ Clock frequency........ $(echo "$F_CPU" | sed 's/UL$//') Hz
+ Programming protocol... $AVRDUDE_PROGRAMMER
+ Port................... ${PORT:-(unspecified)}
+ Maximum upload size.... ${MAX_SIZE:-?} bytes
+
+EOF
+
+# Program the fuses (usually as the first step for burning a bootloader):
+
+if [ -n "$program_fuses" ]; then
+ "$AVRDUDE_PATH/avrdude" ${AVRDUDE_CONFIG:+-C "$AVRDUDE_CONFIG"} \
+ $AVRDUDE_FLAGS -e -U "lock:w:$BL_UNLOCK:m" \
+ -U "efuse:w:$BL_EFUSE:m" -U "hfuse:w:$BL_HFUSE:m" \
+ -U "lfuse:w:$BL_LFUSE:m" || exit 1
+ cat <<EOF
+
+Programmed fuses: high=$BL_HFUSE low=$BL_LFUSE extended=$BL_EFUSE
+Setting lock bits to unlock: $BL_UNLOCK
+EOF
+fi
+
+# Burn the bootloader:
+
+if [ -n "$burn_bootloader" ]; then
+cat <<EOF
+
+Burning bootloader: $BOOTLOADER_FILE
+
+EOF
+ sleep 5
+ exec "$AVRDUDE_PATH/avrdude" ${AVRDUDE_CONFIG:+-C "$AVRDUDE_CONFIG"} \
+ $AVRDUDE_FLAGS -e -U "flash:w:$BOOTLOADER_FILE:a" -U "lock:w:$BL_LOCK:m"
+elif [ -n "$program_fuses" ]; then
+ exit 0
+fi
+
+# Upload custom file (.hex or .bin) with compiling:
+
+if [ '(' "$target" = "upload" -o "$target" = "upload_autoreset" ')' \
+ -a -r "$1" ] && echo "$1" | grep -E -q -s '\.(hex|bin)$' ; then
+ echo "Uploading file '$1' to microcontroller..."
+ if [ "$target" = "upload_autoreset" ]; then
+ ( eval "$RESET_COMMAND" ) <"$PORT" 2>/dev/null
+ fi
+ exec "$AVRDUDE_PATH/avrdude" ${AVRDUDE_CONFIG:+-C "$AVRDUDE_CONFIG"} \
+ $AVRDUDE_FLAGS -U "flash:w:$1:a"
+fi
+
+# Download flash to file (.hex or .bin, Intel Hex or raw binary format):
+
+if [ '(' "$target" = "download" -o "$target" = "download_autoreset" ')' \
+ -a -n "$1" ] && \
+ echo "$1" | grep -E -q -s '\.(hex|bin)$' ; then
+ echo "Downloading flash memory to file '$1'..."
+ if [ "$target" = "download_autoreset" ]; then
+ ( eval "$RESET_COMMAND" ) <"$PORT" 2>/dev/null
+ fi
+ exec "$AVRDUDE_PATH/avrdude" ${AVRDUDE_CONFIG:+-C "$AVRDUDE_CONFIG"} \
+ $AVRDUDE_FLAGS \
+ -U "flash:r:$1:$(echo "$1" | sed 's/^.*hex$/i/; s/^.*bin$/r/')"
+fi
+
+# Escape AVRDUDE_CONFIG path for the Makefile:
+
+[ -n "$AVRDUDE_CONFIG" ] && AVRDUDE_FLAGS="-C \"$AVRDUDE_CONFIG\" $AVRDUDE_FLAGS"
+
+# Try to discover the program name:
+
+TARGET=$(basename "$(pwd)")
+for f in *.$EXT; do
+ TARGET=$(echo "$f" | sed "s/\.$EXT$//")
+ break
+done
+if [ ! -e "./$TARGET.$EXT" ]; then
+ cat >&2 <<EOF
+ERROR: No sketch found! To create a program, make a directory with the
+program name, e.g. MyProg, and write the program code inside that
+directory in a file with the same name but with the extension ".$EXT".
+For example:
+ mkdir MyProg; cd MyProg; vim MyProg.$EXT
+ $basename
+
+Run "$basename help" for instructions!
+EOF
+ exit 1
+fi
+
+# Figure out what libraries are being used:
+
+LIBRARIES_DIR="\$(INSTALL_DIR)/hardware/libraries"
+LIBSRC=''
+LIBASRC=''
+LIBCXXSRC=''
+CINCS=''
+CXXINCS='$(CINCS)'
+LIBCHECK_FILES=' '
+
+ARDUINO_LIBRARY_PATH=$(echo "$ARDUINO_LIBRARY_PATH" | \
+ sed 's/ /\\ /g; s/[^+-9:=@A-Z_a-z!]//g; s/:/ /g')
+
+echo 'Looking for libraries in these directories:'
+for libpath in $ARDUINO_LIBRARY_PATH "$LIBRARY_DIR"; do
+ echo " $libpath/"
+done
+echo
+
+# Check an included header for matching .c, .cpp and/or .S files
+# (simply by filename) and add any of those to the sources.
+
+check_header () {
+ local libname="$1"
+ local base="$2"
+ local inlib="$3"
+ local pfx="$base/$libname"
+ [ ! -e "$pfx.h" ] && return 1
+
+ check_for_libraries "$pfx.h"
+
+ local makepfx="$pfx"
+ if [ "$base" = "$ARDUINO" ]; then
+ # Beautify the Arduino directory path
+ makepfx="\$(ARDUINO)/$libname"
+ elif [ -n "$inlib" ]; then
+ # Beautify the Arduino library directory path
+ if echo "$base" | grep -q -s -F "$LIBRARY_DIR/$inlib/utility"
+ then
+ makepfx="\$(LIBRARIES_DIR)/$inlib/utility/$libname"
+ elif echo "$base" | grep -q -s -F "$LIBRARY_DIR/$inlib"
+ then
+ makepfx="\$(LIBRARIES_DIR)/$inlib/$libname"
+ fi
+ fi
+
+ if [ -e "$pfx.c" ]; then
+ check_for_libraries "$pfx.c" "$inlib" && \
+ LIBSRC="$LIBSRC $makepfx.c"
+ fi
+ if [ -e "$pfx.cpp" ]; then
+ check_for_libraries "$pfx.cpp" "$inlib" && \
+ LIBCXXSRC="$LIBCXXSRC $makepfx.cpp"
+ fi
+ [ -e "$pfx.S" ] && LIBASRC="$LIBASRC $makepfx.S"
+
+ return 0
+}
+
+# Check a file for new libraries we need to include. This is done simply
+# by locating the #include-lines in the C/C++ sources. Obviously no
+# pre-processor conditionals or such are supported, but for simple purposes
+# this seems to work reasonably well. (All examples included with Arduino
+# version 013 compile correctly.)
+
+check_for_libraries () {
+ [ ! -r "$1" ] && return 1
+ if echo "$LIBCHECK_FILES" | grep -q -s -F " |$1| "; then
+ return 1
+ fi
+ LIBCHECK_FILES="${LIBCHECK_FILES}|$1| "
+ local basedir=$(dirname "$1")
+ local inlib="$2"
+
+ # Note: Print.cpp is a standard dependency for Arduino programs, but
+ # the dependency was not included in the official Makefile up to and
+ # including version 0014. If this script is used with old versions of
+ # Arduino, compilation may fail due to missing Print.cpp. The suggested
+ # solution is to update Arduino, but if that is not possible you can
+ # add "Print" after the closing ")" on the line before "do":
+
+ for lib in $(awk -F '[<>"]' '/^[ ]*#include [<"]/ { sub(/\.h[p]*$/, "", $2);
+ gsub(/[^a-zA-Z0-9_.:/-]/, "", $2);
+ print $2; next }' "$1" 2>/dev/null)
+ do
+ local found=''
+ local libpath=''
+ local libname="$lib"
+ local header="$ARDUINO/$libname.h"
+ local base=''
+
+ for libpath in $ARDUINO_LIBRARY_PATH "$LIBRARY_DIR"; do
+ local libdir="$libpath/$libname"
+
+ if [ -e "$libdir" ]; then
+ if check_for_libraries "$libdir/$libname.h" "$libname"; then
+ if [ "$libpath" = "$LIBRARY_DIR" ]; then
+ echo "Including Arduino library: $libname"
+ CINCS="$CINCS -I\$(LIBRARIES_DIR)/$libname"
+ [ -e "$libdir/utility" ] && \
+ CINCS="$CINCS -I\$(LIBRARIES_DIR)/$libname/utility"
+ else
+ echo "Including local library: $libname"
+ CINCS="$CINCS -I$libdir"
+ [ -e "$libdir/utility" ] && \
+ CINCS="$CINCS -I$libdir/utility"
+ fi
+ fi
+ check_header "$libname" "$libdir" "$libname"
+ found=1
+ break
+ fi
+ done
+
+ if [ -z "$found" ]; then
+ for base in "$ARDUINO" "$basedir" "$basedir/utility"; do
+ check_header "$libname" "$base" "$inlib" && break
+ done
+ fi
+ done
+ return 0
+}
+
+check_for_libraries "$TARGET.$EXT"
+
+# Ensure the applet directory exists:
+
+ [ ! -d applet ] && mkdir applet
+
+if [ -e 'applet/board' -a ! "$BOARDFILE" -nt "applet/board" ]; then
+ configured_board="$(head -n 1 'applet/board')"
+else
+ configured_board=''
+fi
+[ ! "$configured_board" = "$ARDUINO_BOARD" ] && echo "$ARDUINO_BOARD" >'applet/board'
+
+# Display library settings to the user:
+
+old_CINCS="$CINCS"
+CINCS="-I. -I./utility -I\$(ARDUINO)$CINCS"
+if [ -n "$old_CINCS" ]; then
+ echo
+ echo "Includes = $CINCS"
+ #[ -n "$LIBSRC" ] && echo "LIBSRC =$LIBSRC"
+ #[ -n "$LIBASRC" ] && echo "LIBASRC =$LIBASRC"
+ #[ -n "$LIBCXXSRC" ] && echo "LIBCXXSRC =$LIBCXXSRC"
+ echo
+fi
+unset old_CINCS
+
+# Set the compiler options to better match the IDE:
+
+CTUNING='-ffunction-sections -fdata-sections -fshort-enums'
+CFLAGS='$(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CTUNING) $(CEXTRA) $(CDEBUG)'
+CXXFLAGS='$(CDEFS) $(CINCS) -O$(OPT) -fno-exceptions $(CTUNING)'
+
+# Create the Makefile:
+
+if [ ! -e 'applet/Makefile' -o 'applet/board' -nt 'applet/Makefile' \
+ -o "$0" -nt 'applet/Makefile' ]; then
+ # Change the Make default target to our own:
+ echo 'compile: do_compile' >applet/Makefile
+
+ # Take the original Makefile, but remove the built-in dependency
+ # includes (so we can override them) and the original .elf target
+ # which we are replacing below:
+ sed '/^include $[(][^)]*\.d[)]/ d;
+ /^applet\/$[(]TARGET[)]\.elf: / d;
+ /^[ \t]*#/ d;
+ s/\.pde/\.$(EXT)/g' "$MAKEFILE" >>applet/Makefile
+
+ # Now the dirty parts, featuring some rather explicit Make:
+ echo -e 'do_compile: do_build show_size
+do_build: applet/$(TARGET).hex
+applet/$(TARGET).hex: applet/$(TARGET).elf
+
+ARDMAKE_BOARD=applet/board
+
+applet/$(TARGET).elf: applet/$(TARGET).cpp applet/core.a
+\t$(CXX) $(ALL_CXXFLAGS) -Wl,--gc-sections $(LDFLAGS) -L. -Lapplet/ -o $@ $< applet/core.a
+\t@chmod a-x $@ >/dev/null 2>&1 || true
+
+applet/$(TARGET).cpp: $(TARGET).$(EXT) $(ARDUINO)/main.cxx $(ARDUINO)/WProgram.h $(ARDMAKE_BOARD)
+\techo '\''#include "WProgram.h"'\'' >$@
+\t@echo '\''#line 1 "$<"'\'' >>$@
+\tcat $(TARGET).$(EXT) >>$@
+\t@echo '\''#line 1 "$(ARDUINO)/main.cxx"'\'' >>$@
+\tcat $(ARDUINO)/main.cxx >>$@
+
+show_size:
+\t@echo
+\t@echo Program size:
+\t@$(HEXSIZE) | awk -v m="$(MAX_SIZE)" '\''{print;if(NR^1){s=$$4}} \\
+ END {printf("\\n%d/%d bytes (%.1f%% of capacity, %d bytes left)\\n\\n",\\
+ s,m,s*100.0/m,m-s);}'\''
+
+upload_autoreset: do_autoreset upload unreset
+
+do_autoreset:
+\t@echo Sending reset to prepare for upload...
+\t( '"$RESET_COMMAND"' ) <$(PORT) 2>/dev/null
+\t@echo
+
+unreset:
+\t@stty -hupcl <$(PORT) 2>/dev/null || true
+
+$(OBJ): $(ARDMAKE_BOARD)
+$(DEPS): $(ARDMAKE_BOARD)
+
+$(APPC): applet/%.o: %.c
+\t$(CC) -c $(ALL_CFLAGS) -o $@ $<
+
+$(APPCXX): applet/%.o: %.cpp
+\t$(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
+
+$(APPA): applet/%.o: %.S
+\t$(CC) -c $(ALL_ASFLAGS) -o $@ $<
+
+$(APPC:.o=.d): applet/%.d: %.c
+\t$(CC) -M $(ALL_CFLAGS) $< | sed '\''s;^[^:]*:;applet/$*.o applet/$*.d:;'\'' >$@
+
+$(APPCXX:.o=.d): applet/%.d: %.cpp
+\t$(CXX) -M $(ALL_CXXFLAGS) $< | sed '\''s;^[^:]*:;applet/$*.o applet/$*.d:;'\'' >$@
+
+$(APPA:.o=.d): applet/%.d: %.S
+\t$(CC) -M $(ALL_ASFLAGS) $< | sed '\''s;^[^:]*:;applet/$*.o applet/$*.d:;'\'' >$@
+
+applet/$(TARGET).d: applet/$(TARGET).cpp
+
+vpath %.c applet/ $(sort $(dir $(OBJC)))
+vpath %.cpp applet/ $(sort $(dir $(OBJCXX)))
+vpath %.S applet/ $(sort $(dir $(OBJA)))
+
+include $(DEPS)' >>applet/Makefile
+
+ # Ensure applet/core.a gets re-built every time, because otherwise
+ # we won't get the correct dependencies:
+ if [ -z "$target" -o "$target" = "compile" -o "$target" = "all" ]; then
+ if [ -w "applet/core.a" ]; then
+ echo "rm -f applet/core.a"
+ rm -f "applet/core.a"
+ fi
+ fi
+fi
+
+# Don't do autoreset if we don't have a serial port:
+
+[ "$target" = "upload_autoreset" -a ! -c "$PORT" ] && target=upload
+
+# Substitute the Makefile "clean" target:
+
+if [ "$target" = "clean" ]; then
+ echo "Cleaning up..."
+ for ext in d o cpp h elf hex a s S lss cof; do
+ rm -f applet/*.$ext 2>/dev/null
+ done
+ rm -f applet/Makefile applet/board 2>/dev/null
+ # If we are building locally, do not try to clean inside Arduino dir:
+ [ -n "$BUILD_LOCALLY" ] && exit 0
+fi
+
+# Finally, execute Make:
+
+exec make -f applet/Makefile \
+ MAKEFILE='applet/Makefile' LIBRARIES_DIR="$LIBRARIES_DIR" \
+ AVRDUDE_FLAGS="$AVRDUDE_FLAGS" AVRDUDE_PROGRAMMER="$AVRDUDE_PROGRAMMER" \
+ TARGET="$TARGET" PORT="$PORT" MCU="$MCU" F_CPU="$F_CPU" MAX_SIZE="$MAX_SIZE" \
+ AVR_TOOLS_PATH="$AVR_TOOLS_PATH" INSTALL_DIR="$INSTALL_DIR" EXT="$EXT" \
+ AVRDUDE_PATH="$AVRDUDE_PATH" UPLOAD_RATE="$UPLOAD_RATE" ARDUINO="$ARDUINO" \
+ LIBSRC="$LIBSRC" LIBASRC="$LIBASRC" LIBCXXSRC="$LIBCXXSRC" \
+ CINCS="$CINCS" CXXINCS="$CXXINCS" AVRDUDE='$(AVRDUDE_PATH)/avrdude' \
+ CTUNING="$CTUNING" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
+ OBJC='$(sort $(SRC:.c=.o) $(abspath $(LIBSRC:.c=.o)))' \
+ OBJCXX='$(sort $(CXXSRC:.cpp=.o) $(abspath $(LIBCXXSRC:.cpp=.o)))' \
+ OBJA='$(sort $(ASRC:.S=.o) $(abspath $(LIBASRC:.S=.o)))' \
+ OBJARDUINODIR='$(OBJC) $(OBJCXX) $(OBJA)' \
+ APPC='$(addprefix applet/,$(notdir $(OBJC)))' \
+ APPCXX='$(addprefix applet/,$(notdir $(OBJCXX)))' \
+ APPA='$(addprefix applet/,$(notdir $(OBJA)))' \
+ OBJAPPDIR='$(APPC) $(APPCXX) $(APPA)' \
+ OBJ='$(if $(BUILD_LOCALLY),$(OBJAPPDIR),$(OBJARDUINODIR))' \
+ DEPS='$(OBJ:.o=.d) applet/$(TARGET).d' LST='$(OBJ:.o=.lst)' \
+ $target ${BUILD_LOCALLY:+BUILD_LOCALLY=1} "$@"
diff --git a/test/arduinocube/arduinocube.pde b/test/arduinocube/arduinocube.pde
new file mode 100644
index 0000000..40e926f
--- /dev/null
+++ b/test/arduinocube/arduinocube.pde
@@ -0,0 +1,812 @@
+#include <avr/interrupt.h>
+#include <string.h>
+#define AXIS_X 1
+#define AXIS_Y 2
+#define AXIS_Z 3
+
+#define delay_ms(x) delayMicroseconds((x)/1000)
+
+volatile unsigned char cube[8][8];
+volatile int current_layer = 0;
+
+void setup()
+{
+ int i;
+
+ for(i=0; i<14; i++)
+ pinMode(i, OUTPUT);
+
+ // Reset any PWM configuration that the arduino may have set up automagically!
+ TCCR2A = 0x00;
+ TCCR2B = 0x00;
+
+ TCCR2A |= (0x01 << WGM21); // CTC mode. clear counter on TCNT2 == OCR2A
+ OCR2A = 10; // Interrupt every 25600th cpu cycle (256*100)
+ TCNT2 = 0x00; // start counting at 0
+ TCCR2B |= (0x01 << CS22) | (0x01 << CS21); // Start the clock with a 256 prescaler
+
+ TIMSK2 |= (0x01 << OCIE2A);
+
+
+ digitalWrite(13, HIGH);
+}
+
+ISR (TIMER2_COMPA_vect)
+{
+ char i;
+
+ // all layer selects off
+ //PORTC = 0x00;
+ //PORTB &= 0x0f;
+
+ //PORTB |= 0x08; // output enable off.
+
+ //digitalWrite(13, LOW);
+ digitalWrite(8, LOW);
+
+ for (i=0; i<8; i++)
+ {
+ char line = cube[current_layer][i];
+ //PORTD = cube[current_layer][i];
+ //PORTB = (PORTB & 0xF8) | (0x07 & (i+1));
+ for (char j = 0; j < 8; ++j, line >>= 1) {
+ digitalWrite(9, LOW);
+ digitalWrite(7, line & 1);
+ //digitalWrite(7, HIGH);
+ digitalWrite(9, HIGH);
+ }
+ }
+
+ //PORTB &= 0b00110111; // Output enable on.
+ digitalWrite(8, HIGH);
+ //digitalWrite(13, HIGH);
+
+ /*
+ if (current_layer < 6)
+ {
+ PORTC = (0x01 << current_layer);
+ } else if (current_layer == 6)
+ {
+ digitalWrite(12, HIGH);
+ } else
+ {
+ digitalWrite(13, HIGH);
+ }
+ */
+ digitalWrite(12, current_layer & 0x1 ? HIGH : LOW);
+ digitalWrite(11, current_layer & 0x2 ? HIGH : LOW);
+ digitalWrite(10, current_layer & 0x4 ? HIGH : LOW);
+
+
+ current_layer++;
+
+ if (current_layer == 8)
+ current_layer = 0;
+}
+
+void loop()
+{
+ int i,x,y,z;
+
+ while (true)
+ {
+
+ effect_planboing(AXIS_Z, 400);
+ effect_planboing(AXIS_Y, 400);
+ effect_planboing(AXIS_X, 400);
+
+ effect_blinky2();
+
+ effect_random_filler(75,1);
+ effect_random_filler(75,0);
+
+ effect_rain(100);
+
+ effect_boxside_randsend_parallel (AXIS_X, 0, 150, 1);
+ effect_boxside_randsend_parallel (AXIS_X, 1, 150, 1);
+ effect_boxside_randsend_parallel (AXIS_Y, 0, 150, 1);
+ effect_boxside_randsend_parallel (AXIS_Y, 1, 150, 1);
+ effect_boxside_randsend_parallel (AXIS_Z, 0, 150, 1);
+ effect_boxside_randsend_parallel (AXIS_Z, 1, 150, 1);
+
+ }
+}
+
+
+// ==========================================================================================
+// Effect functions
+// ==========================================================================================
+
+void draw_positions_axis (char axis, unsigned char positions[64], int invert)
+{
+ int x, y, p;
+
+ fill(0x00);
+
+ for (x=0; x<8; x++)
+ {
+ for (y=0; y<8; y++)
+ {
+ if (invert)
+ {
+ p = (7-positions[(x*8)+y]);
+ } else
+ {
+ p = positions[(x*8)+y];
+ }
+
+ if (axis == AXIS_Z)
+ setvoxel(x,y,p);
+
+ if (axis == AXIS_Y)
+ setvoxel(x,p,y);
+
+ if (axis == AXIS_X)
+ setvoxel(p,y,x);
+ }
+ }
+
+}
+
+
+void effect_boxside_randsend_parallel (char axis, int origin, int delay, int mode)
+{
+ int i;
+ int done;
+ unsigned char cubepos[64];
+ unsigned char pos[64];
+ int notdone = 1;
+ int notdone2 = 1;
+ int sent = 0;
+
+ for (i=0;i<64;i++)
+ {
+ pos[i] = 0;
+ }
+
+ while (notdone)
+ {
+ if (mode == 1)
+ {
+ notdone2 = 1;
+ while (notdone2 && sent<64)
+ {
+ i = rand()%64;
+ if (pos[i] == 0)
+ {
+ sent++;
+ pos[i] += 1;
+ notdone2 = 0;
+ }
+ }
+ } else if (mode == 2)
+ {
+ if (sent<64)
+ {
+ pos[sent] += 1;
+ sent++;
+ }
+ }
+
+ done = 0;
+ for (i=0;i<64;i++)
+ {
+ if (pos[i] > 0 && pos[i] <7)
+ {
+ pos[i] += 1;
+ }
+
+ if (pos[i] == 7)
+ done++;
+ }
+
+ if (done == 64)
+ notdone = 0;
+
+ for (i=0;i<64;i++)
+ {
+ if (origin == 0)
+ {
+ cubepos[i] = pos[i];
+ } else
+ {
+ cubepos[i] = (7-pos[i]);
+ }
+ }
+
+
+ delay_ms(delay);
+ draw_positions_axis(axis,cubepos,0);
+
+ }
+
+}
+
+
+void effect_rain (int iterations)
+{
+ int i, ii;
+ int rnd_x;
+ int rnd_y;
+ int rnd_num;
+
+ for (ii=0;ii<iterations;ii++)
+ {
+ rnd_num = rand()%4;
+
+ for (i=0; i < rnd_num;i++)
+ {
+ rnd_x = rand()%8;
+ rnd_y = rand()%8;
+ setvoxel(rnd_x,rnd_y,7);
+ }
+
+ delay_ms(1000);
+ shift(AXIS_Z,-1);
+ }
+}
+
+// Set or clear exactly 512 voxels in a random order.
+void effect_random_filler (int delay, int state)
+{
+ int x,y,z;
+ int loop = 0;
+
+
+ if (state == 1)
+ {
+ fill(0x00);
+ } else
+ {
+ fill(0xff);
+ }
+
+ while (loop<511)
+ {
+ x = rand()%8;
+ y = rand()%8;
+ z = rand()%8;
+
+ if ((state == 0 && getvoxel(x,y,z) == 0x01) || (state == 1 && getvoxel(x,y,z) == 0x00))
+ {
+ altervoxel(x,y,z,state);
+ delay_ms(delay);
+ loop++;
+ }
+ }
+}
+
+
+void effect_blinky2()
+{
+ int i,r;
+ fill(0x00);
+
+ for (r=0;r<2;r++)
+ {
+ i = 750;
+ while (i>0)
+ {
+ fill(0x00);
+ delay_ms(i);
+
+ fill(0xff);
+ delay_ms(100);
+
+ i = i - (15+(1000/(i/10)));
+ }
+
+ delay_ms(1000);
+
+ i = 750;
+ while (i>0)
+ {
+ fill(0x00);
+ delay_ms(751-i);
+
+ fill(0xff);
+ delay_ms(100);
+
+ i = i - (15+(1000/(i/10)));
+ }
+ }
+
+}
+
+// Draw a plane on one axis and send it back and forth once.
+void effect_planboing (int plane, int speed)
+{
+ int i;
+ for (i=0;i<8;i++)
+ {
+ fill(0x00);
+ setplane(plane, i);
+ delay_ms(speed);
+ }
+
+ for (i=7;i>=0;i--)
+ {
+ fill(0x00);
+ setplane(plane,i);
+ delay_ms(speed);
+ }
+}
+
+// ==========================================================================================
+// Draw functions
+// ==========================================================================================
+
+
+// Set a single voxel to ON
+void setvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ cube[z][y] |= (1 << x);
+}
+
+
+// Set a single voxel to ON
+void clrvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ cube[z][y] &= ~(1 << x);
+}
+
+
+
+// This function validates that we are drawing inside the cube.
+unsigned char inrange(int x, int y, int z)
+{
+ if (x >= 0 && x < 8 && y >= 0 && y < 8 && z >= 0 && z < 8)
+ {
+ return 0x01;
+ } else
+ {
+ // One of the coordinates was outside the cube.
+ return 0x00;
+ }
+}
+
+// Get the current status of a voxel
+unsigned char getvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ {
+ if (cube[z][y] & (1 << x))
+ {
+ return 0x01;
+ } else
+ {
+ return 0x00;
+ }
+ } else
+ {
+ return 0x00;
+ }
+}
+
+// In some effect we want to just take bool and write it to a voxel
+// this function calls the apropriate voxel manipulation function.
+void altervoxel(int x, int y, int z, int state)
+{
+ if (state == 1)
+ {
+ setvoxel(x,y,z);
+ } else
+ {
+ clrvoxel(x,y,z);
+ }
+}
+
+// Flip the state of a voxel.
+// If the voxel is 1, its turned into a 0, and vice versa.
+void flpvoxel(int x, int y, int z)
+{
+ if (inrange(x, y, z))
+ cube[z][y] ^= (1 << x);
+}
+
+// Makes sure x1 is alwas smaller than x2
+// This is usefull for functions that uses for loops,
+// to avoid infinite loops
+void argorder(int ix1, int ix2, int *ox1, int *ox2)
+{
+ if (ix1>ix2)
+ {
+ int tmp;
+ tmp = ix1;
+ ix1= ix2;
+ ix2 = tmp;
+ }
+ *ox1 = ix1;
+ *ox2 = ix2;
+}
+
+// Sets all voxels along a X/Y plane at a given point
+// on axis Z
+void setplane_z (int z)
+{
+ int i;
+ if (z>=0 && z<8)
+ {
+ for (i=0;i<8;i++)
+ cube[z][i] = 0xff;
+ }
+}
+
+// Clears voxels in the same manner as above
+void clrplane_z (int z)
+{
+ int i;
+ if (z>=0 && z<8)
+ {
+ for (i=0;i<8;i++)
+ cube[z][i] = 0x00;
+ }
+}
+
+void setplane_x (int x)
+{
+ int z;
+ int y;
+ if (x>=0 && x<8)
+ {
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] |= (1 << x);
+ }
+ }
+ }
+}
+
+void clrplane_x (int x)
+{
+ int z;
+ int y;
+ if (x>=0 && x<8)
+ {
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] &= ~(1 << x);
+ }
+ }
+ }
+}
+
+void setplane_y (int y)
+{
+ int z;
+ if (y>=0 && y<8)
+ {
+ for (z=0;z<8;z++)
+ cube[z][y] = 0xff;
+ }
+}
+
+void clrplane_y (int y)
+{
+ int z;
+ if (y>=0 && y<8)
+ {
+ for (z=0;z<8;z++)
+ cube[z][y] = 0x00;
+ }
+}
+
+void setplane (char axis, unsigned char i)
+{
+ switch (axis)
+ {
+ case AXIS_X:
+ setplane_x(i);
+ break;
+
+ case AXIS_Y:
+ setplane_y(i);
+ break;
+
+ case AXIS_Z:
+ setplane_z(i);
+ break;
+ }
+}
+
+void clrplane (char axis, unsigned char i)
+{
+ switch (axis)
+ {
+ case AXIS_X:
+ clrplane_x(i);
+ break;
+
+ case AXIS_Y:
+ clrplane_y(i);
+ break;
+
+ case AXIS_Z:
+ clrplane_z(i);
+ break;
+ }
+}
+
+// Fill a value into all 64 byts of the cube buffer
+// Mostly used for clearing. fill(0x00)
+// or setting all on. fill(0xff)
+void fill (unsigned char pattern)
+{
+ int z;
+ int y;
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] = pattern;
+ }
+ }
+}
+
+
+
+// Draw a box with all walls drawn and all voxels inside set
+void box_filled(int x1, int y1, int z1, int x2, int y2, int z2)
+{
+ int iy;
+ int iz;
+
+ argorder(x1, x2, &x1, &x2);
+ argorder(y1, y2, &y1, &y2);
+ argorder(z1, z2, &z1, &z2);
+
+ for (iz=z1;iz<=z2;iz++)
+ {
+ for (iy=y1;iy<=y2;iy++)
+ {
+ cube[iz][iy] |= byteline(x1,x2);
+ }
+ }
+
+}
+
+// Darw a hollow box with side walls.
+void box_walls(int x1, int y1, int z1, int x2, int y2, int z2)
+{
+ int iy;
+ int iz;
+
+ argorder(x1, x2, &x1, &x2);
+ argorder(y1, y2, &y1, &y2);
+ argorder(z1, z2, &z1, &z2);
+
+ for (iz=z1;iz<=z2;iz++)
+ {
+ for (iy=y1;iy<=y2;iy++)
+ {
+ if (iy == y1 || iy == y2 || iz == z1 || iz == z2)
+ {
+ cube[iz][iy] = byteline(x1,x2);
+ } else
+ {
+ cube[iz][iy] |= ((0x01 << x1) | (0x01 << x2));
+ }
+ }
+ }
+
+}
+
+// Draw a wireframe box. This only draws the corners and edges,
+// no walls.
+void box_wireframe(int x1, int y1, int z1, int x2, int y2, int z2)
+{
+ int iy;
+ int iz;
+
+ argorder(x1, x2, &x1, &x2);
+ argorder(y1, y2, &y1, &y2);
+ argorder(z1, z2, &z1, &z2);
+
+ // Lines along X axis
+ cube[z1][y1] = byteline(x1,x2);
+ cube[z1][y2] = byteline(x1,x2);
+ cube[z2][y1] = byteline(x1,x2);
+ cube[z2][y2] = byteline(x1,x2);
+
+ // Lines along Y axis
+ for (iy=y1;iy<=y2;iy++)
+ {
+ setvoxel(x1,iy,z1);
+ setvoxel(x1,iy,z2);
+ setvoxel(x2,iy,z1);
+ setvoxel(x2,iy,z2);
+ }
+
+ // Lines along Z axis
+ for (iz=z1;iz<=z2;iz++)
+ {
+ setvoxel(x1,y1,iz);
+ setvoxel(x1,y2,iz);
+ setvoxel(x2,y1,iz);
+ setvoxel(x2,y2,iz);
+ }
+
+}
+
+// Returns a byte with a row of 1's drawn in it.
+// byteline(2,5) gives 0b00111100
+char byteline (int start, int end)
+{
+ return ((0xff<<start) & ~(0xff<<(end+1)));
+}
+
+// Flips a byte 180 degrees.
+// MSB becomes LSB, LSB becomes MSB.
+char flipbyte (char byte)
+{
+ char flop = 0x00;
+
+ flop = (flop & 0b11111110) | (0b00000001 & (byte >> 7));
+ flop = (flop & 0b11111101) | (0b00000010 & (byte >> 5));
+ flop = (flop & 0b11111011) | (0b00000100 & (byte >> 3));
+ flop = (flop & 0b11110111) | (0b00001000 & (byte >> 1));
+ flop = (flop & 0b11101111) | (0b00010000 & (byte << 1));
+ flop = (flop & 0b11011111) | (0b00100000 & (byte << 3));
+ flop = (flop & 0b10111111) | (0b01000000 & (byte << 5));
+ flop = (flop & 0b01111111) | (0b10000000 & (byte << 7));
+ return flop;
+}
+
+// Draw a line between any coordinates in 3d space.
+// Uses integer values for input, so dont expect smooth animations.
+void line(int x1, int y1, int z1, int x2, int y2, int z2)
+{
+ float xy; // how many voxels do we move on the y axis for each step on the x axis
+ float xz; // how many voxels do we move on the y axis for each step on the x axis
+ unsigned char x,y,z;
+ unsigned char lasty,lastz;
+
+ // We always want to draw the line from x=0 to x=7.
+ // If x1 is bigget than x2, we need to flip all the values.
+ if (x1>x2)
+ {
+ int tmp;
+ tmp = x2; x2 = x1; x1 = tmp;
+ tmp = y2; y2 = y1; y1 = tmp;
+ tmp = z2; z2 = z1; z1 = tmp;
+ }
+
+
+ if (y1>y2)
+ {
+ xy = (float)(y1-y2)/(float)(x2-x1);
+ lasty = y2;
+ } else
+ {
+ xy = (float)(y2-y1)/(float)(x2-x1);
+ lasty = y1;
+ }
+
+ if (z1>z2)
+ {
+ xz = (float)(z1-z2)/(float)(x2-x1);
+ lastz = z2;
+ } else
+ {
+ xz = (float)(z2-z1)/(float)(x2-x1);
+ lastz = z1;
+ }
+
+
+
+ // For each step of x, y increments by:
+ for (x = x1; x<=x2;x++)
+ {
+ y = (xy*(x-x1))+y1;
+ z = (xz*(x-x1))+z1;
+ setvoxel(x,y,z);
+ }
+
+}
+
+// Delay loop.
+// This is not calibrated to milliseconds,
+// but we had allready made to many effects using this
+// calibration when we figured it might be a good idea
+// to calibrate it.
+
+/*
+void delay_ms(uint16_t x)
+{
+ uint8_t y, z;
+ for ( ; x > 0 ; x--){
+ for ( y = 0 ; y < 90 ; y++){
+ for ( z = 0 ; z < 6 ; z++){
+ asm volatile ("nop");
+ }
+ }
+ }
+}
+*/
+
+
+
+// Shift the entire contents of the cube along an axis
+// This is great for effects where you want to draw something
+// on one side of the cube and have it flow towards the other
+// side. Like rain flowing down the Z axiz.
+void shift (char axis, int direction)
+{
+ int i, x ,y;
+ int ii, iii;
+ int state;
+
+ for (i = 0; i < 8; i++)
+ {
+ if (direction == -1)
+ {
+ ii = i;
+ } else
+ {
+ ii = (7-i);
+ }
+
+
+ for (x = 0; x < 8; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if (direction == -1)
+ {
+ iii = ii+1;
+ } else
+ {
+ iii = ii-1;
+ }
+
+ if (axis == AXIS_Z)
+ {
+ state = getvoxel(x,y,iii);
+ altervoxel(x,y,ii,state);
+ }
+
+ if (axis == AXIS_Y)
+ {
+ state = getvoxel(x,iii,y);
+ altervoxel(x,ii,y,state);
+ }
+
+ if (axis == AXIS_X)
+ {
+ state = getvoxel(iii,y,x);
+ altervoxel(ii,y,x,state);
+ }
+ }
+ }
+ }
+
+ if (direction == -1)
+ {
+ i = 7;
+ } else
+ {
+ i = 0;
+ }
+
+ for (x = 0; x < 8; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if (axis == AXIS_Z)
+ clrvoxel(x,y,i);
+
+ if (axis == AXIS_Y)
+ clrvoxel(x,i,y);
+
+ if (axis == AXIS_X)
+ clrvoxel(i,y,x);
+ }
+ }
+}
+
diff --git a/test/build b/test/build
new file mode 120000
index 0000000..945c9b4
--- /dev/null
+++ b/test/build
@@ -0,0 +1 @@
+. \ No newline at end of file
diff --git a/test/test.pde b/test/test.pde
new file mode 100644
index 0000000..231e163
--- /dev/null
+++ b/test/test.pde
@@ -0,0 +1,812 @@
+// On the Arduino board, digital pins are also used
+// for the analog output (software PWM). Analog input
+// pins are a separate set.
+
+// ATMEL ATMEGA8 & 168 / ARDUINO
+//
+// +-\/-+
+// PC6 1| |28 PC5 (AI 5)
+// (D 0) PD0 2| |27 PC4 (AI 4)
+// (D 1) PD1 3| |26 PC3 (AI 3)
+// (D 2) PD2 4| |25 PC2 (AI 2)
+// PWM+ (D 3) PD3 5| |24 PC1 (AI 1)
+// (D 4) PD4 6| |23 PC0 (AI 0)
+// VCC 7| |22 GND
+// GND 8| |21 AREF
+// PB6 9| |20 AVCC
+// PB7 10| |19 PB5 (D 13)
+// PWM+ (D 5) PD5 11| |18 PB4 (D 12)
+// PWM+ (D 6) PD6 12| |17 PB3 (D 11) PWM
+// (D 7) PD7 13| |16 PB2 (D 10) PWM
+// (D 8) PB0 14| |15 PB1 (D 9) PWM
+// +----+
+//
+// (PWM+ indicates the additional PWM pins on the ATmega168.)
+
+#define CUBE_SIZE 8
+
+#define AXIS_X 1
+#define AXIS_Y 2
+#define AXIS_Z 3
+
+void setup()
+{
+ Serial.begin(9600);
+ delay(1000);
+ Serial.println("begin");
+
+ DDRB = 0xFF;
+ DDRD = 0xFC;
+
+ PORTB = 0;
+ PORTD &= 0x03;
+
+
+ // Reset any PWM configuration that the arduino may have set up automagically!
+ TCCR2A = 0x00;
+ TCCR2B = 0x00;
+
+ TCCR2A |= (0x01 << WGM21); // CTC mode. clear counter on TCNT2 == OCR2A
+ OCR2A = 50; // Interrupt every 25600th cpu cycle (256*100)
+ TCNT2 = 0x00; // start counting at 0
+ TCCR2B |= (0x01 << CS22) | (0x01 << CS21); // Start the clock with a 256 prescaler
+
+ TIMSK2 |= (0x01 << OCIE2A);
+
+}
+
+volatile unsigned char cube[8][8];
+volatile unsigned char current_layer = 0;
+
+ISR (TIMER2_COMPA_vect)
+{
+ PORTB &= ~0x21; // layer and latch low
+ char current_layer_ = current_layer;
+
+ //for (char j = 0; j < 8; ++j) {
+ for (char j = 0; j < 4; ++j) {
+ unsigned char val = cube[7-j][current_layer_];
+ unsigned char val2 = cube[3-j][current_layer_];
+ for (char i = 0; i < 8; ++i/*, val >>= 1*/) {
+ PORTB &= ~0x02;
+ PORTD = (PORTD & ~0x80) | ((val2 << (7-i)) & 0x80);
+ //PORTD |= 0x80;
+ PORTD = (PORTD & ~0x40) | (((val << (7-i)) & 0x80) >> 1);
+ PORTB |= 0x02;
+ }
+ }
+
+ PORTB = (PORTB & ~0x1C) | (current_layer_ << 2);
+ ++current_layer_;
+ current_layer = current_layer_ & 0x07;
+
+ PORTB |= 0x21; // layer and latch high
+}
+
+/*****************************************************************************
+ * ACCESSORS
+ *****************************************************************************/
+
+unsigned char inrange(int x, int y, int z)
+{
+ if (x >= 0 && x < CUBE_SIZE && y >= 0 && y < CUBE_SIZE && z >= 0 && z < CUBE_SIZE)
+ {
+ return 1;
+ } else
+ {
+ // One of the coordinates was outside the cube.
+ return 0;
+ }
+}
+
+bool get_led(unsigned char x, unsigned char y, unsigned char z)
+{
+ /*
+ assert(x >= 0 && x <= 7);
+ assert(y >= 0 && y <= 7);
+ assert(z >= 0 && z <= 7);
+ */
+
+ if (inrange(x, y, z)) {
+ return cube[y][z] & (1 << x);
+ }
+
+ return false;
+}
+
+void set_led(unsigned char x, unsigned char y, unsigned char z, bool on)
+{
+
+ if (!inrange(x, y, z)) {
+ return;
+ }
+
+ /*
+ assert(x >= 0 && x <= 7);
+ assert(y >= 0 && y <= 7);
+ assert(z >= 0 && z <= 7);
+ */
+
+ if (on) {
+ cube[y][z] |= ((unsigned char)1) << x;
+ }
+ else {
+ cube[y][z] &= ~(((unsigned char)1) << x);
+ }
+}
+
+void clear_led()
+{
+ for (char z = 0; z < 8; ++z) {
+ for (char y = 0; y < 8; ++y) {
+ cube[y][z] = 0;
+ }
+ }
+}
+// Set a single voxel to ON
+void setvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ cube[y][z] |= (1 << x);
+}
+
+unsigned char getvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ {
+ if (cube[y][z] & (1 << x))
+ {
+ return 0x01;
+ } else
+ {
+ return 0x00;
+ }
+ } else
+ {
+ return 0x00;
+ }
+}
+
+
+// Set a single voxel to ON
+void clrvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ cube[y][z] &= ~(1 << x);
+}
+// In some effect we want to just take bool and write it to a voxel
+// this function calls the apropriate voxel manipulation function.
+void altervoxel(int x, int y, int z, int state)
+{
+ if (state == 1)
+ {
+ setvoxel(x,y,z);
+ } else
+ {
+ clrvoxel(x,y,z);
+ }
+}
+
+// Shift the entire contents of the cube along an axis
+// This is great for effects where you want to draw something
+// on one side of the cube and have it flow towards the other
+// side. Like rain flowing down the Z axiz.
+void shift (char axis, int direction)
+{
+ int i, x ,y;
+ int ii, iii;
+ int state;
+
+ for (i = 0; i < 8; i++)
+ {
+ if (direction == -1)
+ {
+ ii = i;
+ } else
+ {
+ ii = (7-i);
+ }
+
+
+ for (x = 0; x < 8; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if (direction == -1)
+ {
+ iii = ii+1;
+ } else
+ {
+ iii = ii-1;
+ }
+
+ if (axis == AXIS_Z)
+ {
+ state = getvoxel(x,y,iii);
+ altervoxel(x,y,ii,state);
+ }
+
+ if (axis == AXIS_Y)
+ {
+ state = getvoxel(x,iii,y);
+ altervoxel(x,ii,y,state);
+ }
+
+ if (axis == AXIS_X)
+ {
+ state = getvoxel(iii,y,x);
+ altervoxel(ii,y,x,state);
+ }
+ }
+ }
+ }
+
+ if (direction == -1)
+ {
+ i = 7;
+ } else
+ {
+ i = 0;
+ }
+
+ for (x = 0; x < 8; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if (axis == AXIS_Z)
+ clrvoxel(x,y,i);
+
+ if (axis == AXIS_Y)
+ clrvoxel(x,i,y);
+
+ if (axis == AXIS_X)
+ clrvoxel(i,y,x);
+ }
+ }
+}
+
+
+// Delay loop.
+// This is not calibrated to milliseconds,
+// but we had allready made to many effects using this
+// calibration when we figured it might be a good idea
+// to calibrate it.
+void delay_ms(uint16_t x)
+{
+ uint8_t y, z;
+ for ( ; x > 0 ; x--){
+ for ( y = 0 ; y < 90 ; y++){
+ for ( z = 0 ; z < 6 ; z++){
+ asm volatile ("nop");
+ }
+ }
+ }
+}
+
+void effect_rain (int iterations)
+{
+ int i, ii;
+ int rnd_x;
+ int rnd_y;
+ int rnd_num;
+
+ for (ii=0;ii<iterations;ii++)
+ {
+ rnd_num = rand()%4;
+
+ for (i=0; i < rnd_num;i++)
+ {
+ rnd_x = rand()%8;
+ rnd_y = rand()%8;
+ setvoxel(rnd_x,rnd_y,7);
+ }
+
+ delay_ms(1000);
+ shift(AXIS_Z,-1);
+ }
+}
+
+volatile const unsigned char font[455] /*EEMEM*/ = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0x5f,0x00,0x00, // !
+ 0x00,0x03,0x00,0x03,0x00,0x14,0x7f,0x14,0x7f,0x14, // "#
+ 0x24,0x2a,0x7f,0x2a,0x12,0x23,0x13,0x08,0x64,0x62, // $%
+ 0x36,0x49,0x55,0x22,0x50,0x00,0x05,0x03,0x00,0x00, // &'
+ 0x00,0x1c,0x22,0x41,0x00,0x00,0x41,0x22,0x1c,0x00, // ()
+ 0x14,0x08,0x3e,0x08,0x14,0x08,0x08,0x3e,0x08,0x08, // *+
+ 0x00,0x50,0x30,0x00,0x00,0x08,0x08,0x08,0x08,0x08, // ,-
+ 0x00,0x60,0x60,0x00,0x00,0x20,0x10,0x08,0x04,0x02, // ./
+ 0x3e,0x51,0x49,0x45,0x3e,0x00,0x42,0x7f,0x40,0x00, // 01
+ 0x42,0x61,0x51,0x49,0x46,0x21,0x41,0x45,0x4b,0x31, // 23
+ 0x18,0x14,0x12,0x7f,0x10,0x27,0x45,0x45,0x45,0x39, // 45
+ 0x3c,0x4a,0x49,0x49,0x30,0x01,0x71,0x09,0x05,0x03, // 67
+ 0x36,0x49,0x49,0x49,0x36,0x06,0x49,0x49,0x29,0x1e, // 89
+ 0x00,0x36,0x36,0x00,0x00,0x00,0x56,0x36,0x00,0x00, // :;
+ 0x08,0x14,0x22,0x41,0x00,0x14,0x14,0x14,0x14,0x14, // <=
+ 0x00,0x41,0x22,0x14,0x08,0x02,0x01,0x51,0x09,0x06, // >?
+ 0x32,0x49,0x79,0x41,0x3e,0x7e,0x11,0x11,0x11,0x7e, // @A
+ 0x7f,0x49,0x49,0x49,0x36,0x3e,0x41,0x41,0x41,0x22, // BC
+ 0x7f,0x41,0x41,0x22,0x1c,0x7f,0x49,0x49,0x49,0x41, // DE
+ 0x7f,0x09,0x09,0x09,0x01,0x3e,0x41,0x49,0x49,0x7a, // FG
+ 0x7f,0x08,0x08,0x08,0x7f,0x00,0x41,0x7f,0x41,0x00, // HI
+ 0x20,0x40,0x41,0x3f,0x01,0x7f,0x08,0x14,0x22,0x41, // JK
+ 0x7f,0x40,0x40,0x40,0x40,0x7f,0x02,0x0c,0x02,0x7f, // LM
+ 0x7f,0x04,0x08,0x10,0x7f,0x3e,0x41,0x41,0x41,0x3e, // NO
+ 0x7f,0x09,0x09,0x09,0x06,0x3e,0x41,0x51,0x21,0x5e, // PQ
+ 0x7f,0x09,0x19,0x29,0x46,0x46,0x49,0x49,0x49,0x31, // RS
+ 0x01,0x01,0x7f,0x01,0x01,0x3f,0x40,0x40,0x40,0x3f, // TU
+ 0x1f,0x20,0x40,0x20,0x1f,0x3f,0x40,0x38,0x40,0x3f, // VW
+ 0x63,0x14,0x08,0x14,0x63,0x07,0x08,0x70,0x08,0x07, // XY
+ 0x61,0x51,0x49,0x45,0x43,0x00,0x7f,0x41,0x41,0x00, // Z[
+ 0x02,0x04,0x08,0x10,0x20,0x00,0x41,0x41,0x7f,0x00, // \]
+ 0x04,0x02,0x01,0x02,0x04,0x40,0x40,0x40,0x40,0x40, // ^_
+ 0x00,0x01,0x02,0x04,0x00,0x20,0x54,0x54,0x54,0x78, // `a
+ 0x7f,0x48,0x44,0x44,0x38,0x38,0x44,0x44,0x44,0x20, // bc
+ 0x38,0x44,0x44,0x48,0x7f,0x38,0x54,0x54,0x54,0x18, // de
+ 0x08,0x7e,0x09,0x01,0x02,0x0c,0x52,0x52,0x52,0x3e, // fg
+ 0x7f,0x08,0x04,0x04,0x78,0x00,0x44,0x7d,0x40,0x00, // hi
+ 0x20,0x40,0x44,0x3d,0x00,0x7f,0x10,0x28,0x44,0x00, // jk
+ 0x00,0x41,0x7f,0x40,0x00,0x7c,0x04,0x18,0x04,0x78, // lm
+ 0x7c,0x08,0x04,0x04,0x78,0x38,0x44,0x44,0x44,0x38, // no
+ 0x7c,0x14,0x14,0x14,0x08,0x08,0x14,0x14,0x18,0x7c, // pq
+ 0x7c,0x08,0x04,0x04,0x08,0x48,0x54,0x54,0x54,0x20, // rs
+ 0x04,0x3f,0x44,0x40,0x20,0x3c,0x40,0x40,0x20,0x7c, // tu
+ 0x1c,0x20,0x40,0x20,0x1c,0x3c,0x40,0x30,0x40,0x3c, // vw
+ 0x44,0x28,0x10,0x28,0x44,0x0c,0x50,0x50,0x50,0x3c, // xy
+ 0x44,0x64,0x54,0x4c,0x44 // z
+};
+
+
+volatile const unsigned char bitmaps[6][8] /*EEMEM*/ = {
+ {0xc3,0xc3,0x00,0x18,0x18,0x81,0xff,0x7e}, // smiley 3 small
+ {0x3c,0x42,0x81,0x81,0xc3,0x24,0xa5,0xe7}, // Omega
+ {0x00,0x04,0x06,0xff,0xff,0x06,0x04,0x00}, // Arrow
+ {0x81,0x42,0x24,0x18,0x18,0x24,0x42,0x81}, // X
+ {0xBD,0xA1,0xA1,0xB9,0xA1,0xA1,0xA1,0x00}, // ifi
+ {0xEF,0x48,0x4B,0x49,0x4F,0x00,0x00,0x00} // TG
+};
+
+const unsigned char paths[44] /*PROGMEM */= {0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00,0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x67,0x57,0x47,0x37,0x27,0x17,
+0x04,0x03,0x12,0x21,0x30,0x40,0x51,0x62,0x73,0x74,0x65,0x56,0x47,0x37,0x26,0x15}; // circle, len 16, offset 28
+
+/*
+void font_getpath (unsigned char path, unsigned char *destination, int length)
+{
+ int i;
+ int offset = 0;
+
+ if (path == 1)
+ offset=28;
+
+ for (i = 0; i < length; i++)
+ destination[i] = pgm_read_byte(&paths[i+offset]);
+}
+*/
+// Fill a value into all 64 byts of the cube buffer
+// Mostly used for clearing. fill(0x00)
+// or setting all on. fill(0xff)
+void fill (unsigned char pattern)
+{
+ int z;
+ int y;
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] = pattern;
+ }
+ }
+}
+
+
+
+void font_getchar (char chr, unsigned char dst[5])
+{
+ //uint8_t i;
+ unsigned char i;
+ chr -= 32; // our bitmap font starts at ascii char 32.
+
+ for (i = 0; i < 5; i++)
+ //dst[i] = (unsigned char)eeprom_read_byte((uint8_t*)&font[(chr*5)+i]);
+ dst[i] = font[(chr*5)+i];
+}
+void effect_stringfly2(const char* str)
+{
+ //int x,y,i;
+ unsigned char x,y,i;
+ unsigned char chr[5];
+ const int DELAY = 80;
+
+ clear_led();
+
+ while (*str)
+ {
+ font_getchar(*str++, chr);
+
+ // Put a character on the back of the cube
+ for (x = 0; x < 5; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if ((chr[x] & (0x80>>y)))
+ {
+ //setvoxel(7,x+2,y);
+ //set_led(7,x+2,y);
+ set_led(x+2, 0, y, true);
+ }
+ }
+ }
+
+ //led_change = true;
+ //SDL_Delay(1000);
+ //clear_led();
+ //continue;
+
+ // Shift the entire contents of the cube forward by 6 steps
+ // before placing the next character
+ for (i = 0; i<6; i++)
+ {
+ //delay_ms(1000);
+ //SDL_Delay(1000);
+ delay(DELAY);
+ shift(AXIS_Y,1);
+ //shift(1,-1);
+ //set_plane(1, 7, false);
+ }
+ }
+
+ //return;
+ // Shift the last character out of the cube.
+ for (i = 0; i<8; i++)
+ {
+ delay(DELAY);
+ //delay_ms(1000);
+ shift(AXIS_Y,1);
+ //shift(1,-1);
+ }
+}
+
+// Sets all voxels along a X/Y plane at a given point
+// on axis Z
+void setplane_z (int z)
+{
+ int i;
+ if (z>=0 && z<8)
+ {
+ for (i=0;i<8;i++)
+ cube[z][i] = 0xff;
+ }
+}
+
+// Clears voxels in the same manner as above
+void clrplane_z (int z)
+{
+ int i;
+ if (z>=0 && z<8)
+ {
+ for (i=0;i<8;i++)
+ cube[z][i] = 0x00;
+ }
+}
+
+void setplane_x (int x)
+{
+ int z;
+ int y;
+ if (x>=0 && x<8)
+ {
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] |= (1 << x);
+ }
+ }
+ }
+}
+
+void clrplane_x (int x)
+{
+ int z;
+ int y;
+ if (x>=0 && x<8)
+ {
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] &= ~(1 << x);
+ }
+ }
+ }
+}
+
+void setplane_y (int y)
+{
+ int z;
+ if (y>=0 && y<8)
+ {
+ for (z=0;z<8;z++)
+ cube[z][y] = 0xff;
+ }
+}
+
+void clrplane_y (int y)
+{
+ int z;
+ if (y>=0 && y<8)
+ {
+ for (z=0;z<8;z++)
+ cube[z][y] = 0x00;
+ }
+}
+
+
+void setplane (char axis, unsigned char i)
+{
+ switch (axis)
+ {
+ case AXIS_X:
+ setplane_x(i);
+ break;
+
+ case AXIS_Y:
+ setplane_y(i);
+ break;
+
+ case AXIS_Z:
+ setplane_z(i);
+ break;
+ }
+}
+
+
+// Draw a plane on one axis and send it back and forth once.
+void effect_planboing (int plane, int speed)
+{
+ int i;
+ for (i=0;i<8;i++)
+ {
+ fill(0x00);
+ setplane(plane, i);
+ delay_ms(speed);
+ }
+
+ for (i=7;i>=0;i--)
+ {
+ fill(0x00);
+ setplane(plane,i);
+ delay_ms(speed);
+ }
+}
+
+void effect_blinky2()
+{
+ int i,r;
+ fill(0x00);
+
+ for (r=0;r<2;r++)
+ {
+ i = 750;
+ while (i>0)
+ {
+ fill(0x00);
+ delay(i/5);
+
+ fill(0xff);
+ delay(20);
+
+ i = i - (15+(1000/(i/10)));
+ }
+
+ delay(500);
+
+ i = 750;
+ while (i>0)
+ {
+ fill(0x00);
+ delay((751-i)/5);
+
+ fill(0xff);
+ delay(20);
+
+ i = i - (15+(1000/(i/10)));
+ }
+ }
+
+}
+// Set or clear exactly 512 voxels in a random order.
+void effect_random_filler (int delay, int state)
+{
+ int x,y,z;
+ int loop = 0;
+
+
+ if (state == 1)
+ {
+ fill(0x00);
+ } else
+ {
+ fill(0xff);
+ }
+
+ while (loop<511)
+ {
+ x = rand()%8;
+ y = rand()%8;
+ z = rand()%8;
+
+ if ((state == 0 && getvoxel(x,y,z) == 0x01) || (state == 1 && getvoxel(x,y,z) == 0x00))
+ {
+ altervoxel(x,y,z,state);
+ delay_ms(delay);
+ loop++;
+ }
+ }
+}
+
+void draw_positions_axis (char axis, unsigned char positions[64], int invert)
+{
+ int x, y, p;
+
+ fill(0x00);
+
+ for (x=0; x<8; x++)
+ {
+ for (y=0; y<8; y++)
+ {
+ if (invert)
+ {
+ p = (7-positions[(x*8)+y]);
+ } else
+ {
+ p = positions[(x*8)+y];
+ }
+
+ if (axis == AXIS_Z)
+ setvoxel(x,y,p);
+
+ if (axis == AXIS_Y)
+ setvoxel(x,p,y);
+
+ if (axis == AXIS_X)
+ setvoxel(p,y,x);
+ }
+ }
+
+}
+
+
+
+void effect_boxside_randsend_parallel (char axis, int origin, int delay, int mode)
+{
+ int i;
+ int done;
+ unsigned char cubepos[64];
+ unsigned char pos[64];
+ int notdone = 1;
+ int notdone2 = 1;
+ int sent = 0;
+
+ for (i=0;i<64;i++)
+ {
+ pos[i] = 0;
+ }
+
+ while (notdone)
+ {
+ if (mode == 1)
+ {
+ notdone2 = 1;
+ while (notdone2 && sent<64)
+ {
+ i = rand()%64;
+ if (pos[i] == 0)
+ {
+ sent++;
+ pos[i] += 1;
+ notdone2 = 0;
+ }
+ }
+ } else if (mode == 2)
+ {
+ if (sent<64)
+ {
+ pos[sent] += 1;
+ sent++;
+ }
+ }
+
+ done = 0;
+ for (i=0;i<64;i++)
+ {
+ if (pos[i] > 0 && pos[i] <7)
+ {
+ pos[i] += 1;
+ }
+
+ if (pos[i] == 7)
+ done++;
+ }
+
+ if (done == 64)
+ notdone = 0;
+
+ for (i=0;i<64;i++)
+ {
+ if (origin == 0)
+ {
+ cubepos[i] = pos[i];
+ } else
+ {
+ cubepos[i] = (7-pos[i]);
+ }
+ }
+
+
+ delay_ms(delay);
+ draw_positions_axis(axis,cubepos,0);
+
+ }
+
+}
+
+
+
+
+/*****************************************************************************
+ * LOOP TEST
+ *****************************************************************************/
+
+void loop()
+{
+ //for (char i = 0; i < 8; ++i) {
+ //PORTB = (PORTB & ~0x1C) | ((i & 0x07) << 2);
+ //display(i);
+ //delay(2);
+
+ //Serial.println(layer, DEC);
+ //delay(1000);
+ //}
+ clear_led();
+ //delay_ms(1000);
+ delay(1000);
+ //return;
+ for (char z = 0; z < 8; ++z) {
+ for (char y = 0; y < 8; ++y) {
+ for (char x = 0; x < 8; ++x) {
+ set_led(x, y, z, true);
+ delay(5);
+ delay(100);
+ //delay(500);
+ //delay(1000);
+ //delay_ms(1000);
+ }
+ }
+ }
+ delay(1000);
+ //delay_ms(1000);
+ clear_led();
+ /* effect_stringfly2("test de texte - c'est trop super genial et tout "
+ "yeahhh!!!!!");
+ */
+ effect_planboing(AXIS_Z, 700);
+ effect_planboing(AXIS_Y, 700);
+ effect_planboing(AXIS_X, 700);
+
+ effect_blinky2();
+
+ effect_random_filler(75,1);
+ effect_random_filler(75,0);
+
+ for (char i = 0; i < 10; ++i) {
+ effect_boxside_randsend_parallel (AXIS_X, 0, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_X, 1, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Y, 0, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Y, 1, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Z, 0, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Z, 1, 950, 2);
+ }
+
+
+ //effect_rain(1000)
+}
diff --git a/test/test.pde.backup b/test/test.pde.backup
new file mode 100644
index 0000000..2ebec6d
--- /dev/null
+++ b/test/test.pde.backup
@@ -0,0 +1,843 @@
+// On the Arduino board, digital pins are also used
+// for the analog output (software PWM). Analog input
+// pins are a separate set.
+
+// ATMEL ATMEGA8 & 168 / ARDUINO
+//
+// +-\/-+
+// PC6 1| |28 PC5 (AI 5)
+// (D 0) PD0 2| |27 PC4 (AI 4)
+// (D 1) PD1 3| |26 PC3 (AI 3)
+// (D 2) PD2 4| |25 PC2 (AI 2)
+// PWM+ (D 3) PD3 5| |24 PC1 (AI 1)
+// (D 4) PD4 6| |23 PC0 (AI 0)
+// VCC 7| |22 GND
+// GND 8| |21 AREF
+// PB6 9| |20 AVCC
+// PB7 10| |19 PB5 (D 13)
+// PWM+ (D 5) PD5 11| |18 PB4 (D 12)
+// PWM+ (D 6) PD6 12| |17 PB3 (D 11) PWM
+// (D 7) PD7 13| |16 PB2 (D 10) PWM
+// (D 8) PB0 14| |15 PB1 (D 9) PWM
+// +----+
+//
+// (PWM+ indicates the additional PWM pins on the ATmega168.)
+
+#define CUBE_SIZE 8
+
+#define AXIS_X 1
+#define AXIS_Y 2
+#define AXIS_Z 3
+
+void setup()
+{
+ Serial.begin(9600);
+ delay(1000);
+ Serial.println("begin");
+
+ pinMode(13, OUTPUT);
+ pinMode(12, OUTPUT);
+ pinMode(11, OUTPUT);
+ pinMode(10, OUTPUT);
+ pinMode(9, OUTPUT);
+ pinMode(8, OUTPUT);
+ pinMode(7, OUTPUT);
+
+ digitalWrite(10, LOW);
+ digitalWrite(11, LOW);
+ digitalWrite(12, LOW);
+
+ digitalWrite(13, HIGH);
+
+
+
+ // Reset any PWM configuration that the arduino may have set up automagically!
+ TCCR2A = 0x00;
+ TCCR2B = 0x00;
+
+ TCCR2A |= (0x01 << WGM21); // CTC mode. clear counter on TCNT2 == OCR2A
+ OCR2A = 50; // Interrupt every 25600th cpu cycle (256*100)
+ TCNT2 = 0x00; // start counting at 0
+ TCCR2B |= (0x01 << CS22) | (0x01 << CS21); // Start the clock with a 256 prescaler
+
+ TIMSK2 |= (0x01 << OCIE2A);
+
+}
+
+volatile unsigned char cube[8][8];
+volatile unsigned char current_layer = 0;
+
+void display(char current_layer)
+{
+ //digitalWrite(8, LOW);
+ PORTB &= ~0x21;
+ for (char j = 0; j < 8; ++j) {
+ unsigned char val = cube[j][current_layer];
+ for (char i = 0; i < 8; ++i, val >>= 1) {
+ //digitalWrite(9, LOW);
+ PORTB &= ~0x02;
+ //digitalWrite(7, ! (i & 1) ? HIGH : LOW);
+ //digitalWrite(7, HIGH);
+ //PORTD |= 0x80;
+ PORTD = (PORTD & ~0x80) | ((val & 1) << 7);
+ //digitalWrite(9, HIGH);
+ PORTB |= 0x02;
+ //delay(500);
+ }
+ }
+ PORTB |= 0x21;
+ //digitalWrite(8, HIGH);
+}
+
+ISR (TIMER2_COMPA_vect)
+{
+ PORTB &= ~0x21; // layer and latch low
+ char current_layer_ = current_layer;
+
+ //for (char j = 0; j < 8; ++j) {
+ for (char j = 0; j < 4; ++j) {
+ unsigned char val = cube[7-j][current_layer_];
+ unsigned char val2 = cube[3-j][current_layer_];
+ for (char i = 0; i < 8; ++i/*, val >>= 1*/) {
+ PORTB &= ~0x02;
+ PORTD = (PORTD & ~0x80) | ((val << (7-i)) & 0x80);
+ //PORTD |= 0x80;
+ PORTD = (PORTD & ~0x40) | (((val << (7-i)) & 0x80) >> 1);
+ PORTB |= 0x02;
+ }
+ }
+
+ PORTB = (PORTB & ~0x1C) | (current_layer_ << 2);
+ ++current_layer_;
+ current_layer = current_layer_ & 0x07;
+
+ PORTB |= 0x21; // layer and latch high
+}
+
+/*****************************************************************************
+ * ACCESSORS
+ *****************************************************************************/
+
+unsigned char inrange(int x, int y, int z)
+{
+ if (x >= 0 && x < CUBE_SIZE && y >= 0 && y < CUBE_SIZE && z >= 0 && z < CUBE_SIZE)
+ {
+ return 1;
+ } else
+ {
+ // One of the coordinates was outside the cube.
+ return 0;
+ }
+}
+
+bool get_led(unsigned char x, unsigned char y, unsigned char z)
+{
+ /*
+ assert(x >= 0 && x <= 7);
+ assert(y >= 0 && y <= 7);
+ assert(z >= 0 && z <= 7);
+ */
+
+ if (inrange(x, y, z)) {
+ return cube[y][z] & (1 << x);
+ }
+
+ return false;
+}
+
+void set_led(unsigned char x, unsigned char y, unsigned char z, bool on)
+{
+
+ if (!inrange(x, y, z)) {
+ return;
+ }
+
+ /*
+ assert(x >= 0 && x <= 7);
+ assert(y >= 0 && y <= 7);
+ assert(z >= 0 && z <= 7);
+ */
+
+ if (on) {
+ cube[y][z] |= ((unsigned char)1) << x;
+ }
+ else {
+ cube[y][z] &= ~(((unsigned char)1) << x);
+ }
+}
+
+void clear_led()
+{
+ for (char z = 0; z < 8; ++z) {
+ for (char y = 0; y < 8; ++y) {
+ cube[y][z] = 0;
+ }
+ }
+}
+// Set a single voxel to ON
+void setvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ cube[y][z] |= (1 << x);
+}
+
+unsigned char getvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ {
+ if (cube[y][z] & (1 << x))
+ {
+ return 0x01;
+ } else
+ {
+ return 0x00;
+ }
+ } else
+ {
+ return 0x00;
+ }
+}
+
+
+// Set a single voxel to ON
+void clrvoxel(int x, int y, int z)
+{
+ if (inrange(x,y,z))
+ cube[y][z] &= ~(1 << x);
+}
+// In some effect we want to just take bool and write it to a voxel
+// this function calls the apropriate voxel manipulation function.
+void altervoxel(int x, int y, int z, int state)
+{
+ if (state == 1)
+ {
+ setvoxel(x,y,z);
+ } else
+ {
+ clrvoxel(x,y,z);
+ }
+}
+
+// Shift the entire contents of the cube along an axis
+// This is great for effects where you want to draw something
+// on one side of the cube and have it flow towards the other
+// side. Like rain flowing down the Z axiz.
+void shift (char axis, int direction)
+{
+ int i, x ,y;
+ int ii, iii;
+ int state;
+
+ for (i = 0; i < 8; i++)
+ {
+ if (direction == -1)
+ {
+ ii = i;
+ } else
+ {
+ ii = (7-i);
+ }
+
+
+ for (x = 0; x < 8; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if (direction == -1)
+ {
+ iii = ii+1;
+ } else
+ {
+ iii = ii-1;
+ }
+
+ if (axis == AXIS_Z)
+ {
+ state = getvoxel(x,y,iii);
+ altervoxel(x,y,ii,state);
+ }
+
+ if (axis == AXIS_Y)
+ {
+ state = getvoxel(x,iii,y);
+ altervoxel(x,ii,y,state);
+ }
+
+ if (axis == AXIS_X)
+ {
+ state = getvoxel(iii,y,x);
+ altervoxel(ii,y,x,state);
+ }
+ }
+ }
+ }
+
+ if (direction == -1)
+ {
+ i = 7;
+ } else
+ {
+ i = 0;
+ }
+
+ for (x = 0; x < 8; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if (axis == AXIS_Z)
+ clrvoxel(x,y,i);
+
+ if (axis == AXIS_Y)
+ clrvoxel(x,i,y);
+
+ if (axis == AXIS_X)
+ clrvoxel(i,y,x);
+ }
+ }
+}
+
+
+// Delay loop.
+// This is not calibrated to milliseconds,
+// but we had allready made to many effects using this
+// calibration when we figured it might be a good idea
+// to calibrate it.
+void delay_ms(uint16_t x)
+{
+ uint8_t y, z;
+ for ( ; x > 0 ; x--){
+ for ( y = 0 ; y < 90 ; y++){
+ for ( z = 0 ; z < 6 ; z++){
+ asm volatile ("nop");
+ }
+ }
+ }
+}
+
+void effect_rain (int iterations)
+{
+ int i, ii;
+ int rnd_x;
+ int rnd_y;
+ int rnd_num;
+
+ for (ii=0;ii<iterations;ii++)
+ {
+ rnd_num = rand()%4;
+
+ for (i=0; i < rnd_num;i++)
+ {
+ rnd_x = rand()%8;
+ rnd_y = rand()%8;
+ setvoxel(rnd_x,rnd_y,7);
+ }
+
+ delay_ms(1000);
+ shift(AXIS_Z,-1);
+ }
+}
+
+volatile const unsigned char font[455] /*EEMEM*/ = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0x5f,0x00,0x00, // !
+ 0x00,0x03,0x00,0x03,0x00,0x14,0x7f,0x14,0x7f,0x14, // "#
+ 0x24,0x2a,0x7f,0x2a,0x12,0x23,0x13,0x08,0x64,0x62, // $%
+ 0x36,0x49,0x55,0x22,0x50,0x00,0x05,0x03,0x00,0x00, // &'
+ 0x00,0x1c,0x22,0x41,0x00,0x00,0x41,0x22,0x1c,0x00, // ()
+ 0x14,0x08,0x3e,0x08,0x14,0x08,0x08,0x3e,0x08,0x08, // *+
+ 0x00,0x50,0x30,0x00,0x00,0x08,0x08,0x08,0x08,0x08, // ,-
+ 0x00,0x60,0x60,0x00,0x00,0x20,0x10,0x08,0x04,0x02, // ./
+ 0x3e,0x51,0x49,0x45,0x3e,0x00,0x42,0x7f,0x40,0x00, // 01
+ 0x42,0x61,0x51,0x49,0x46,0x21,0x41,0x45,0x4b,0x31, // 23
+ 0x18,0x14,0x12,0x7f,0x10,0x27,0x45,0x45,0x45,0x39, // 45
+ 0x3c,0x4a,0x49,0x49,0x30,0x01,0x71,0x09,0x05,0x03, // 67
+ 0x36,0x49,0x49,0x49,0x36,0x06,0x49,0x49,0x29,0x1e, // 89
+ 0x00,0x36,0x36,0x00,0x00,0x00,0x56,0x36,0x00,0x00, // :;
+ 0x08,0x14,0x22,0x41,0x00,0x14,0x14,0x14,0x14,0x14, // <=
+ 0x00,0x41,0x22,0x14,0x08,0x02,0x01,0x51,0x09,0x06, // >?
+ 0x32,0x49,0x79,0x41,0x3e,0x7e,0x11,0x11,0x11,0x7e, // @A
+ 0x7f,0x49,0x49,0x49,0x36,0x3e,0x41,0x41,0x41,0x22, // BC
+ 0x7f,0x41,0x41,0x22,0x1c,0x7f,0x49,0x49,0x49,0x41, // DE
+ 0x7f,0x09,0x09,0x09,0x01,0x3e,0x41,0x49,0x49,0x7a, // FG
+ 0x7f,0x08,0x08,0x08,0x7f,0x00,0x41,0x7f,0x41,0x00, // HI
+ 0x20,0x40,0x41,0x3f,0x01,0x7f,0x08,0x14,0x22,0x41, // JK
+ 0x7f,0x40,0x40,0x40,0x40,0x7f,0x02,0x0c,0x02,0x7f, // LM
+ 0x7f,0x04,0x08,0x10,0x7f,0x3e,0x41,0x41,0x41,0x3e, // NO
+ 0x7f,0x09,0x09,0x09,0x06,0x3e,0x41,0x51,0x21,0x5e, // PQ
+ 0x7f,0x09,0x19,0x29,0x46,0x46,0x49,0x49,0x49,0x31, // RS
+ 0x01,0x01,0x7f,0x01,0x01,0x3f,0x40,0x40,0x40,0x3f, // TU
+ 0x1f,0x20,0x40,0x20,0x1f,0x3f,0x40,0x38,0x40,0x3f, // VW
+ 0x63,0x14,0x08,0x14,0x63,0x07,0x08,0x70,0x08,0x07, // XY
+ 0x61,0x51,0x49,0x45,0x43,0x00,0x7f,0x41,0x41,0x00, // Z[
+ 0x02,0x04,0x08,0x10,0x20,0x00,0x41,0x41,0x7f,0x00, // \]
+ 0x04,0x02,0x01,0x02,0x04,0x40,0x40,0x40,0x40,0x40, // ^_
+ 0x00,0x01,0x02,0x04,0x00,0x20,0x54,0x54,0x54,0x78, // `a
+ 0x7f,0x48,0x44,0x44,0x38,0x38,0x44,0x44,0x44,0x20, // bc
+ 0x38,0x44,0x44,0x48,0x7f,0x38,0x54,0x54,0x54,0x18, // de
+ 0x08,0x7e,0x09,0x01,0x02,0x0c,0x52,0x52,0x52,0x3e, // fg
+ 0x7f,0x08,0x04,0x04,0x78,0x00,0x44,0x7d,0x40,0x00, // hi
+ 0x20,0x40,0x44,0x3d,0x00,0x7f,0x10,0x28,0x44,0x00, // jk
+ 0x00,0x41,0x7f,0x40,0x00,0x7c,0x04,0x18,0x04,0x78, // lm
+ 0x7c,0x08,0x04,0x04,0x78,0x38,0x44,0x44,0x44,0x38, // no
+ 0x7c,0x14,0x14,0x14,0x08,0x08,0x14,0x14,0x18,0x7c, // pq
+ 0x7c,0x08,0x04,0x04,0x08,0x48,0x54,0x54,0x54,0x20, // rs
+ 0x04,0x3f,0x44,0x40,0x20,0x3c,0x40,0x40,0x20,0x7c, // tu
+ 0x1c,0x20,0x40,0x20,0x1c,0x3c,0x40,0x30,0x40,0x3c, // vw
+ 0x44,0x28,0x10,0x28,0x44,0x0c,0x50,0x50,0x50,0x3c, // xy
+ 0x44,0x64,0x54,0x4c,0x44 // z
+};
+
+
+volatile const unsigned char bitmaps[6][8] /*EEMEM*/ = {
+ {0xc3,0xc3,0x00,0x18,0x18,0x81,0xff,0x7e}, // smiley 3 small
+ {0x3c,0x42,0x81,0x81,0xc3,0x24,0xa5,0xe7}, // Omega
+ {0x00,0x04,0x06,0xff,0xff,0x06,0x04,0x00}, // Arrow
+ {0x81,0x42,0x24,0x18,0x18,0x24,0x42,0x81}, // X
+ {0xBD,0xA1,0xA1,0xB9,0xA1,0xA1,0xA1,0x00}, // ifi
+ {0xEF,0x48,0x4B,0x49,0x4F,0x00,0x00,0x00} // TG
+};
+
+const unsigned char paths[44] /*PROGMEM */= {0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00,0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x67,0x57,0x47,0x37,0x27,0x17,
+0x04,0x03,0x12,0x21,0x30,0x40,0x51,0x62,0x73,0x74,0x65,0x56,0x47,0x37,0x26,0x15}; // circle, len 16, offset 28
+
+/*
+void font_getpath (unsigned char path, unsigned char *destination, int length)
+{
+ int i;
+ int offset = 0;
+
+ if (path == 1)
+ offset=28;
+
+ for (i = 0; i < length; i++)
+ destination[i] = pgm_read_byte(&paths[i+offset]);
+}
+*/
+// Fill a value into all 64 byts of the cube buffer
+// Mostly used for clearing. fill(0x00)
+// or setting all on. fill(0xff)
+void fill (unsigned char pattern)
+{
+ int z;
+ int y;
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] = pattern;
+ }
+ }
+}
+
+
+
+void font_getchar (char chr, unsigned char dst[5])
+{
+ //uint8_t i;
+ unsigned char i;
+ chr -= 32; // our bitmap font starts at ascii char 32.
+
+ for (i = 0; i < 5; i++)
+ //dst[i] = (unsigned char)eeprom_read_byte((uint8_t*)&font[(chr*5)+i]);
+ dst[i] = font[(chr*5)+i];
+}
+void effect_stringfly2(const char* str)
+{
+ //int x,y,i;
+ unsigned char x,y,i;
+ unsigned char chr[5];
+ const int DELAY = 80;
+
+ clear_led();
+
+ while (*str)
+ {
+ font_getchar(*str++, chr);
+
+ // Put a character on the back of the cube
+ for (x = 0; x < 5; x++)
+ {
+ for (y = 0; y < 8; y++)
+ {
+ if ((chr[x] & (0x80>>y)))
+ {
+ //setvoxel(7,x+2,y);
+ //set_led(7,x+2,y);
+ set_led(x+2, 0, y, true);
+ }
+ }
+ }
+
+ //led_change = true;
+ //SDL_Delay(1000);
+ //clear_led();
+ //continue;
+
+ // Shift the entire contents of the cube forward by 6 steps
+ // before placing the next character
+ for (i = 0; i<6; i++)
+ {
+ //delay_ms(1000);
+ //SDL_Delay(1000);
+ delay(DELAY);
+ shift(AXIS_Y,1);
+ //shift(1,-1);
+ //set_plane(1, 7, false);
+ }
+ }
+
+ //return;
+ // Shift the last character out of the cube.
+ for (i = 0; i<8; i++)
+ {
+ delay(DELAY);
+ //delay_ms(1000);
+ shift(AXIS_Y,1);
+ //shift(1,-1);
+ }
+}
+
+// Sets all voxels along a X/Y plane at a given point
+// on axis Z
+void setplane_z (int z)
+{
+ int i;
+ if (z>=0 && z<8)
+ {
+ for (i=0;i<8;i++)
+ cube[z][i] = 0xff;
+ }
+}
+
+// Clears voxels in the same manner as above
+void clrplane_z (int z)
+{
+ int i;
+ if (z>=0 && z<8)
+ {
+ for (i=0;i<8;i++)
+ cube[z][i] = 0x00;
+ }
+}
+
+void setplane_x (int x)
+{
+ int z;
+ int y;
+ if (x>=0 && x<8)
+ {
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] |= (1 << x);
+ }
+ }
+ }
+}
+
+void clrplane_x (int x)
+{
+ int z;
+ int y;
+ if (x>=0 && x<8)
+ {
+ for (z=0;z<8;z++)
+ {
+ for (y=0;y<8;y++)
+ {
+ cube[z][y] &= ~(1 << x);
+ }
+ }
+ }
+}
+
+void setplane_y (int y)
+{
+ int z;
+ if (y>=0 && y<8)
+ {
+ for (z=0;z<8;z++)
+ cube[z][y] = 0xff;
+ }
+}
+
+void clrplane_y (int y)
+{
+ int z;
+ if (y>=0 && y<8)
+ {
+ for (z=0;z<8;z++)
+ cube[z][y] = 0x00;
+ }
+}
+
+
+void setplane (char axis, unsigned char i)
+{
+ switch (axis)
+ {
+ case AXIS_X:
+ setplane_x(i);
+ break;
+
+ case AXIS_Y:
+ setplane_y(i);
+ break;
+
+ case AXIS_Z:
+ setplane_z(i);
+ break;
+ }
+}
+
+
+// Draw a plane on one axis and send it back and forth once.
+void effect_planboing (int plane, int speed)
+{
+ int i;
+ for (i=0;i<8;i++)
+ {
+ fill(0x00);
+ setplane(plane, i);
+ delay_ms(speed);
+ }
+
+ for (i=7;i>=0;i--)
+ {
+ fill(0x00);
+ setplane(plane,i);
+ delay_ms(speed);
+ }
+}
+
+void effect_blinky2()
+{
+ int i,r;
+ fill(0x00);
+
+ for (r=0;r<2;r++)
+ {
+ i = 750;
+ while (i>0)
+ {
+ fill(0x00);
+ delay(i/5);
+
+ fill(0xff);
+ delay(20);
+
+ i = i - (15+(1000/(i/10)));
+ }
+
+ delay(500);
+
+ i = 750;
+ while (i>0)
+ {
+ fill(0x00);
+ delay((751-i)/5);
+
+ fill(0xff);
+ delay(20);
+
+ i = i - (15+(1000/(i/10)));
+ }
+ }
+
+}
+// Set or clear exactly 512 voxels in a random order.
+void effect_random_filler (int delay, int state)
+{
+ int x,y,z;
+ int loop = 0;
+
+
+ if (state == 1)
+ {
+ fill(0x00);
+ } else
+ {
+ fill(0xff);
+ }
+
+ while (loop<511)
+ {
+ x = rand()%8;
+ y = rand()%8;
+ z = rand()%8;
+
+ if ((state == 0 && getvoxel(x,y,z) == 0x01) || (state == 1 && getvoxel(x,y,z) == 0x00))
+ {
+ altervoxel(x,y,z,state);
+ delay_ms(delay);
+ loop++;
+ }
+ }
+}
+
+void draw_positions_axis (char axis, unsigned char positions[64], int invert)
+{
+ int x, y, p;
+
+ fill(0x00);
+
+ for (x=0; x<8; x++)
+ {
+ for (y=0; y<8; y++)
+ {
+ if (invert)
+ {
+ p = (7-positions[(x*8)+y]);
+ } else
+ {
+ p = positions[(x*8)+y];
+ }
+
+ if (axis == AXIS_Z)
+ setvoxel(x,y,p);
+
+ if (axis == AXIS_Y)
+ setvoxel(x,p,y);
+
+ if (axis == AXIS_X)
+ setvoxel(p,y,x);
+ }
+ }
+
+}
+
+
+
+void effect_boxside_randsend_parallel (char axis, int origin, int delay, int mode)
+{
+ int i;
+ int done;
+ unsigned char cubepos[64];
+ unsigned char pos[64];
+ int notdone = 1;
+ int notdone2 = 1;
+ int sent = 0;
+
+ for (i=0;i<64;i++)
+ {
+ pos[i] = 0;
+ }
+
+ while (notdone)
+ {
+ if (mode == 1)
+ {
+ notdone2 = 1;
+ while (notdone2 && sent<64)
+ {
+ i = rand()%64;
+ if (pos[i] == 0)
+ {
+ sent++;
+ pos[i] += 1;
+ notdone2 = 0;
+ }
+ }
+ } else if (mode == 2)
+ {
+ if (sent<64)
+ {
+ pos[sent] += 1;
+ sent++;
+ }
+ }
+
+ done = 0;
+ for (i=0;i<64;i++)
+ {
+ if (pos[i] > 0 && pos[i] <7)
+ {
+ pos[i] += 1;
+ }
+
+ if (pos[i] == 7)
+ done++;
+ }
+
+ if (done == 64)
+ notdone = 0;
+
+ for (i=0;i<64;i++)
+ {
+ if (origin == 0)
+ {
+ cubepos[i] = pos[i];
+ } else
+ {
+ cubepos[i] = (7-pos[i]);
+ }
+ }
+
+
+ delay_ms(delay);
+ draw_positions_axis(axis,cubepos,0);
+
+ }
+
+}
+
+
+
+
+/*****************************************************************************
+ * LOOP TEST
+ *****************************************************************************/
+
+void loop()
+{
+ //for (char i = 0; i < 8; ++i) {
+ //PORTB = (PORTB & ~0x1C) | ((i & 0x07) << 2);
+ //display(i);
+ //delay(2);
+
+ //Serial.println(layer, DEC);
+ //delay(1000);
+ //}
+ clear_led();
+ //delay_ms(1000);
+ delay(1000);
+ //return;
+ for (char z = 0; z < 8; ++z) {
+ for (char y = 0; y < 8; ++y) {
+ for (char x = 0; x < 8; ++x) {
+ set_led(x, y, z, true);
+ delay(5);
+ //delay(100);
+ //delay(500);
+ //delay(1000);
+ //delay_ms(1000);
+ }
+ }
+ }
+ delay(1000);
+ //delay_ms(1000);
+ clear_led();
+ /* effect_stringfly2("test de texte - c'est trop super genial et tout "
+ "yeahhh!!!!!");
+ */
+ effect_planboing(AXIS_Z, 700);
+ effect_planboing(AXIS_Y, 700);
+ effect_planboing(AXIS_X, 700);
+
+ effect_blinky2();
+
+ effect_random_filler(75,1);
+ effect_random_filler(75,0);
+
+ for (char i = 0; i < 10; ++i) {
+ effect_boxside_randsend_parallel (AXIS_X, 0, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_X, 1, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Y, 0, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Y, 1, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Z, 0, 950, 2);
+ effect_boxside_randsend_parallel (AXIS_Z, 1, 950, 2);
+ }
+
+
+ //effect_rain(1000)
+}