[gnoduino] Update hardware from upstream - take II
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnoduino] Update hardware from upstream - take II
- Date: Sun, 1 Apr 2012 15:36:21 +0000 (UTC)
commit a5fb4d77dcb18c9ea7921b3eb3d6c4b0536eb11a
Author: Lucian Langa <lucilanga gnome org>
Date: Sun Apr 1 17:28:44 2012 +0200
Update hardware from upstream - take II
hardware/arduino/boards.txt | 182 ++++-
.../bootloaders/diskloader/DiskLoader-Leonardo.hex | 115 +++
hardware/arduino/bootloaders/diskloader/Makefile | 105 +++
.../bootloaders/diskloader/src/DiskLoader.cpp | 239 ++++++
.../arduino/bootloaders/diskloader/src/Platform.h | 51 ++
.../arduino/bootloaders/diskloader/src/USBCore.cpp | 510 ++++++++++++
.../arduino/bootloaders/diskloader/src/USBCore.h | 246 ++++++
.../arduino/bootloaders/diskloader/src/USBDesc.cpp | 87 ++
.../arduino/bootloaders/diskloader/src/USBDesc.h | 65 ++
hardware/arduino/bootloaders/optiboot/Makefile | 306 ++++++--
hardware/arduino/bootloaders/optiboot/README.TXT | 81 ++
hardware/arduino/bootloaders/optiboot/boot.h | 848 ++++++++++++++++++++
hardware/arduino/bootloaders/optiboot/makeall | 15 +-
hardware/arduino/bootloaders/optiboot/omake | 2 +
hardware/arduino/bootloaders/optiboot/omake.bat | 1 +
hardware/arduino/bootloaders/optiboot/optiboot.c | 398 ++++++---
.../bootloaders/optiboot/optiboot_atmega168.hex | 35 +
.../bootloaders/optiboot/optiboot_atmega168.lst | 598 ++++++++++++++
...28_pro_8MHz.hex => optiboot_atmega328-Mini.hex} | 66 +-
.../bootloaders/optiboot/optiboot_atmega328.hex | 62 +-
.../bootloaders/optiboot/optiboot_atmega328.lst | 656 +++++++++-------
.../optiboot/optiboot_atmega328_pro_8MHz.lst | 520 ------------
.../bootloaders/optiboot/optiboot_atmega8.hex | 33 +
.../bootloaders/optiboot/optiboot_atmega8.lst | 604 ++++++++++++++
.../bootloaders/optiboot/optiboot_diecimila.hex | 33 -
.../bootloaders/optiboot/optiboot_diecimila.lst | 520 ------------
.../bootloaders/optiboot/optiboot_lilypad.hex | 34 -
.../bootloaders/optiboot/optiboot_lilypad.lst | 533 ------------
.../optiboot/optiboot_lilypad_resonator.hex | 34 -
.../optiboot/optiboot_lilypad_resonator.lst | 533 ------------
.../bootloaders/optiboot/optiboot_luminet.hex | 42 -
.../bootloaders/optiboot/optiboot_luminet.lst | 604 --------------
.../bootloaders/optiboot/optiboot_pro_16MHz.hex | 33 -
.../bootloaders/optiboot/optiboot_pro_16MHz.lst | 520 ------------
.../bootloaders/optiboot/optiboot_pro_20mhz.hex | 33 -
.../bootloaders/optiboot/optiboot_pro_20mhz.lst | 520 ------------
.../bootloaders/optiboot/optiboot_pro_8MHz.hex | 34 -
.../bootloaders/optiboot/optiboot_pro_8MHz.lst | 533 ------------
hardware/arduino/bootloaders/optiboot/pin_defs.h | 80 ++
hardware/arduino/bootloaders/optiboot/stk500.h | 39 +
hardware/arduino/bootloaders/stk500v2/stk500boot.c | 3 +-
.../stk500v2/stk500boot_v2_mega2560.hex | 648 ++++++++++++----
hardware/arduino/cores/arduino/Arduino.h | 215 +++++
hardware/arduino/cores/arduino/CDC.cpp | 175 ++++
hardware/arduino/cores/arduino/Client.h | 26 +
hardware/arduino/cores/arduino/HID.cpp | 446 ++++++++++
hardware/arduino/cores/arduino/HardwareSerial.cpp | 275 +++++--
hardware/arduino/cores/arduino/HardwareSerial.h | 14 +-
hardware/arduino/cores/arduino/IPAddress.cpp | 56 ++
hardware/arduino/cores/arduino/IPAddress.h | 76 ++
hardware/arduino/cores/arduino/Platform.h | 23 +
hardware/arduino/cores/arduino/Print.cpp | 207 +++--
hardware/arduino/cores/arduino/Print.h | 62 +-
hardware/arduino/cores/arduino/Printable.h | 40 +
hardware/arduino/cores/arduino/Server.h | 9 +
hardware/arduino/cores/arduino/Stream.cpp | 246 ++++++
hardware/arduino/cores/arduino/Stream.h | 59 ++
hardware/arduino/cores/arduino/Tone.cpp | 2 +-
hardware/arduino/cores/arduino/USBAPI.h | 166 ++++
hardware/arduino/cores/arduino/USBCore.cpp | 660 +++++++++++++++
hardware/arduino/cores/arduino/USBCore.h | 303 +++++++
hardware/arduino/cores/arduino/USBDesc.h | 67 ++
hardware/arduino/cores/arduino/Udp.h | 88 ++
hardware/arduino/cores/arduino/WConstants.h | 1 -
hardware/arduino/cores/arduino/WInterrupts.c | 23 +-
hardware/arduino/cores/arduino/WProgram.h | 63 --
hardware/arduino/cores/arduino/WString.cpp | 736 +++++++++++------
hardware/arduino/cores/arduino/WString.h | 255 ++++--
hardware/arduino/cores/arduino/main.cpp | 10 +-
hardware/arduino/cores/arduino/new.cpp | 18 +
hardware/arduino/cores/arduino/new.h | 22 +
hardware/arduino/cores/arduino/pins_arduino.h | 88 --
hardware/arduino/cores/arduino/wiring.c | 30 +-
hardware/arduino/cores/arduino/wiring.h | 135 ----
hardware/arduino/cores/arduino/wiring_analog.c | 19 +-
hardware/arduino/cores/arduino/wiring_digital.c | 22 +-
hardware/arduino/cores/arduino/wiring_private.h | 5 +-
...INED-dfu-usbserial-atmega16u2-Mega2560-Rev3.hex | 467 +++++++++++
...BINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex | 467 +++++++++++
...-COMBINED-dfu-usbserial-atmega16u2-Uno-Rev3.hex | 467 +++++++++++
.../Arduino-usbserial-atmega16u2-Mega2560-Rev3.hex | 254 ++++++
.../Arduino-usbserial-atmega16u2-MegaADK-Rev3.hex | 254 ++++++
.../Arduino-usbserial-atmega16u2-Uno-Rev3.hex | 254 ++++++
hardware/arduino/programmers.txt | 6 +
.../variants/eightanaloginputs/pins_arduino.h | 27 +
hardware/arduino/variants/leonardo/pins_arduino.h | 253 ++++++
.../mega/pins_arduino.h} | 228 ++----
hardware/arduino/variants/micro/pins_arduino.h | 27 +
hardware/arduino/variants/standard/pins_arduino.h | 218 +++++
89 files changed, 11930 insertions(+), 6235 deletions(-)
---
diff --git a/hardware/arduino/boards.txt b/hardware/arduino/boards.txt
index 0ae40d3..8ce7cc9 100644
--- a/hardware/arduino/boards.txt
+++ b/hardware/arduino/boards.txt
@@ -1,7 +1,9 @@
+# See: http://code.google.com/p/arduino/wiki/Platforms
+
##############################################################
uno.name=Arduino Uno
-uno.upload.protocol=stk500
+uno.upload.protocol=arduino
uno.upload.maximum_size=32256
uno.upload.speed=115200
uno.bootloader.low_fuses=0xff
@@ -14,12 +16,13 @@ uno.bootloader.lock_bits=0x0F
uno.build.mcu=atmega328p
uno.build.f_cpu=16000000L
uno.build.core=arduino
+uno.build.variant=standard
##############################################################
-atmega328.name=Arduino Duemilanove or Nano w/ ATmega328
+atmega328.name=Arduino Duemilanove w/ ATmega328
-atmega328.upload.protocol=stk500
+atmega328.upload.protocol=arduino
atmega328.upload.maximum_size=30720
atmega328.upload.speed=57600
@@ -34,12 +37,13 @@ atmega328.bootloader.lock_bits=0x0F
atmega328.build.mcu=atmega328p
atmega328.build.f_cpu=16000000L
atmega328.build.core=arduino
+atmega328.build.variant=standard
##############################################################
-diecimila.name=Arduino Diecimila, Duemilanove, or Nano w/ ATmega168
+diecimila.name=Arduino Diecimila or Duemilanove w/ ATmega168
-diecimila.upload.protocol=stk500
+diecimila.upload.protocol=arduino
diecimila.upload.maximum_size=14336
diecimila.upload.speed=19200
@@ -54,10 +58,53 @@ diecimila.bootloader.lock_bits=0x0F
diecimila.build.mcu=atmega168
diecimila.build.f_cpu=16000000L
diecimila.build.core=arduino
+diecimila.build.variant=standard
+
+##############################################################
+
+nano328.name=Arduino Nano w/ ATmega328
+
+nano328.upload.protocol=arduino
+nano328.upload.maximum_size=30720
+nano328.upload.speed=57600
+
+nano328.bootloader.low_fuses=0xFF
+nano328.bootloader.high_fuses=0xDA
+nano328.bootloader.extended_fuses=0x05
+nano328.bootloader.path=atmega
+nano328.bootloader.file=ATmegaBOOT_168_atmega328.hex
+nano328.bootloader.unlock_bits=0x3F
+nano328.bootloader.lock_bits=0x0F
+
+nano328.build.mcu=atmega328p
+nano328.build.f_cpu=16000000L
+nano328.build.core=arduino
+nano328.build.variant=eightanaloginputs
+
+##############################################################
+
+nano.name=Arduino Nano w/ ATmega168
+
+nano.upload.protocol=arduino
+nano.upload.maximum_size=14336
+nano.upload.speed=19200
+
+nano.bootloader.low_fuses=0xff
+nano.bootloader.high_fuses=0xdd
+nano.bootloader.extended_fuses=0x00
+nano.bootloader.path=atmega
+nano.bootloader.file=ATmegaBOOT_168_diecimila.hex
+nano.bootloader.unlock_bits=0x3F
+nano.bootloader.lock_bits=0x0F
+
+nano.build.mcu=atmega168
+nano.build.f_cpu=16000000L
+nano.build.core=arduino
+nano.build.variant=eightanaloginputs
##############################################################
-mega2560.name=Arduino Mega 2560
+mega2560.name=Arduino Mega 2560 or Mega ADK
mega2560.upload.protocol=stk500v2
mega2560.upload.maximum_size=258048
@@ -74,12 +121,13 @@ mega2560.bootloader.lock_bits=0x0F
mega2560.build.mcu=atmega2560
mega2560.build.f_cpu=16000000L
mega2560.build.core=arduino
+mega2560.build.variant=mega
##############################################################
mega.name=Arduino Mega (ATmega1280)
-mega.upload.protocol=stk500
+mega.upload.protocol=arduino
mega.upload.maximum_size=126976
mega.upload.speed=57600
@@ -94,12 +142,70 @@ mega.bootloader.lock_bits=0x0F
mega.build.mcu=atmega1280
mega.build.f_cpu=16000000L
mega.build.core=arduino
+mega.build.variant=mega
+
+##############################################################
+
+#leonardo.name=Arduino Leonardo
+#leonardo.upload.protocol=arduino
+#leonardo.upload.maximum_size=28672
+#leonardo.upload.speed=1200
+#leonardo.bootloader.low_fuses=0xde
+#leonardo.bootloader.high_fuses=0xd8
+#leonardo.bootloader.extended_fuses=0xcb
+#leonardo.bootloader.path=diskloader
+#leonardo.bootloader.file=DiskLoader-Leonardo.hex
+#leonardo.bootloader.unlock_bits=0x3F
+#leonardo.bootloader.lock_bits=0x2F
+#leonardo.build.mcu=atmega32u4
+#leonardo.build.f_cpu=16000000L
+#leonardo.build.core=arduino
+#leonardo.build.variant=leonardo
##############################################################
-mini.name=Arduino Mini
+#micro.name=Arduino Micro
+#micro.upload.protocol=arduino
+#micro.upload.maximum_size=30720
+#micro.upload.speed=1200
+#micro.bootloader.low_fuses=0xde
+#micro.bootloader.high_fuses=0xda
+#micro.bootloader.extended_fuses=0xcb
+#micro.bootloader.path=diskloader
+#micro.bootloader.file=DiskLoader-Micro.hex
+#micro.bootloader.unlock_bits=0x3F
+#micro.bootloader.lock_bits=0x2F
+#micro.build.mcu=atmega32u4
+#micro.build.f_cpu=16000000L
+#micro.build.core=arduino
+#micro.build.variant=micro
-mini.upload.protocol=stk500
+##############################################################
+
+mini328.name=Arduino Mini w/ ATmega328
+
+mini328.upload.protocol=arduino
+mini328.upload.maximum_size=28672
+mini328.upload.speed=115200
+
+mini328.bootloader.low_fuses=0xff
+mini328.bootloader.high_fuses=0xd8
+mini328.bootloader.extended_fuses=0x05
+mini328.bootloader.path=optiboot
+mini328.bootloader.file=optiboot_atmega328-Mini.hex
+mini328.bootloader.unlock_bits=0x3F
+mini328.bootloader.lock_bits=0x0F
+
+mini328.build.mcu=atmega328p
+mini328.build.f_cpu=16000000L
+mini328.build.core=arduino
+mini328.build.variant=eightanaloginputs
+
+##############################################################
+
+mini.name=Arduino Mini w/ ATmega168
+
+mini.upload.protocol=arduino
mini.upload.maximum_size=14336
mini.upload.speed=19200
@@ -114,12 +220,34 @@ mini.bootloader.lock_bits=0x0F
mini.build.mcu=atmega168
mini.build.f_cpu=16000000L
mini.build.core=arduino
+mini.build.variant=eightanaloginputs
+
+##############################################################
+
+ethernet.name=Arduino Ethernet
+
+ethernet.upload.protocol=arduino
+ethernet.upload.maximum_size=32256
+ethernet.upload.speed=115200
+
+ethernet.bootloader.low_fuses=0xff
+ethernet.bootloader.high_fuses=0xde
+ethernet.bootloader.extended_fuses=0x05
+ethernet.bootloader.path=optiboot
+ethernet.bootloader.file=optiboot_atmega328.hex
+ethernet.bootloader.unlock_bits=0x3F
+ethernet.bootloader.lock_bits=0x0F
+
+ethernet.build.variant=standard
+ethernet.build.mcu=atmega328p
+ethernet.build.f_cpu=16000000L
+ethernet.build.core=arduino
##############################################################
fio.name=Arduino Fio
-fio.upload.protocol=stk500
+fio.upload.protocol=arduino
fio.upload.maximum_size=30720
fio.upload.speed=57600
@@ -133,13 +261,14 @@ fio.bootloader.lock_bits=0x0F
fio.build.mcu=atmega328p
fio.build.f_cpu=8000000L
-fio.build.core=arduino:arduino
+fio.build.core=arduino
+fio.build.variant=eightanaloginputs
##############################################################
bt328.name=Arduino BT w/ ATmega328
-bt328.upload.protocol=stk500
+bt328.upload.protocol=arduino
bt328.upload.maximum_size=28672
bt328.upload.speed=19200
bt328.upload.disable_flushing=true
@@ -155,12 +284,13 @@ bt328.bootloader.lock_bits=0x0F
bt328.build.mcu=atmega328p
bt328.build.f_cpu=16000000L
bt328.build.core=arduino
+bt328.build.variant=eightanaloginputs
##############################################################
bt.name=Arduino BT w/ ATmega168
-bt.upload.protocol=stk500
+bt.upload.protocol=arduino
bt.upload.maximum_size=14336
bt.upload.speed=19200
bt.upload.disable_flushing=true
@@ -176,12 +306,13 @@ bt.bootloader.lock_bits=0x0F
bt.build.mcu=atmega168
bt.build.f_cpu=16000000L
bt.build.core=arduino
+bt.build.variant=eightanaloginputs
##############################################################
lilypad328.name=LilyPad Arduino w/ ATmega328
-lilypad328.upload.protocol=stk500
+lilypad328.upload.protocol=arduino
lilypad328.upload.maximum_size=30720
lilypad328.upload.speed=57600
@@ -196,12 +327,13 @@ lilypad328.bootloader.lock_bits=0x0F
lilypad328.build.mcu=atmega328p
lilypad328.build.f_cpu=8000000L
lilypad328.build.core=arduino
+lilypad328.build.variant=standard
##############################################################
lilypad.name=LilyPad Arduino w/ ATmega168
-lilypad.upload.protocol=stk500
+lilypad.upload.protocol=arduino
lilypad.upload.maximum_size=14336
lilypad.upload.speed=19200
@@ -216,12 +348,13 @@ lilypad.bootloader.lock_bits=0x0F
lilypad.build.mcu=atmega168
lilypad.build.f_cpu=8000000L
lilypad.build.core=arduino
+lilypad.build.variant=standard
##############################################################
pro5v328.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega328
-pro5v328.upload.protocol=stk500
+pro5v328.upload.protocol=arduino
pro5v328.upload.maximum_size=30720
pro5v328.upload.speed=57600
@@ -236,12 +369,13 @@ pro5v328.bootloader.lock_bits=0x0F
pro5v328.build.mcu=atmega328p
pro5v328.build.f_cpu=16000000L
pro5v328.build.core=arduino
+pro5v328.build.variant=standard
##############################################################
pro5v.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega168
-pro5v.upload.protocol=stk500
+pro5v.upload.protocol=arduino
pro5v.upload.maximum_size=14336
pro5v.upload.speed=19200
@@ -256,12 +390,13 @@ pro5v.bootloader.lock_bits=0x0F
pro5v.build.mcu=atmega168
pro5v.build.f_cpu=16000000L
pro5v.build.core=arduino
+pro5v.build.variant=standard
##############################################################
pro328.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega328
-pro328.upload.protocol=stk500
+pro328.upload.protocol=arduino
pro328.upload.maximum_size=30720
pro328.upload.speed=57600
@@ -276,12 +411,13 @@ pro328.bootloader.lock_bits=0x0F
pro328.build.mcu=atmega328p
pro328.build.f_cpu=8000000L
pro328.build.core=arduino
+pro328.build.variant=standard
##############################################################
pro.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega168
-pro.upload.protocol=stk500
+pro.upload.protocol=arduino
pro.upload.maximum_size=14336
pro.upload.speed=19200
@@ -296,12 +432,13 @@ pro.bootloader.lock_bits=0x0F
pro.build.mcu=atmega168
pro.build.f_cpu=8000000L
pro.build.core=arduino
+pro.build.variant=standard
##############################################################
atmega168.name=Arduino NG or older w/ ATmega168
-atmega168.upload.protocol=stk500
+atmega168.upload.protocol=arduino
atmega168.upload.maximum_size=14336
atmega168.upload.speed=19200
@@ -316,12 +453,13 @@ atmega168.bootloader.lock_bits=0x0F
atmega168.build.mcu=atmega168
atmega168.build.f_cpu=16000000L
atmega168.build.core=arduino
+atmega168.build.variant=standard
##############################################################
atmega8.name=Arduino NG or older w/ ATmega8
-atmega8.upload.protocol=stk500
+atmega8.upload.protocol=arduino
atmega8.upload.maximum_size=7168
atmega8.upload.speed=19200
@@ -335,4 +473,4 @@ atmega8.bootloader.lock_bits=0x0F
atmega8.build.mcu=atmega8
atmega8.build.f_cpu=16000000L
atmega8.build.core=arduino
-
+atmega8.build.variant=standard
diff --git a/hardware/arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex b/hardware/arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex
new file mode 100644
index 0000000..0d0c167
--- /dev/null
+++ b/hardware/arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex
@@ -0,0 +1,115 @@
+:1078000011241FBECFEFDAE0DEBFCDBFFFC04101C4
+:1078100042144505560455026403740300001E9586
+:1078200087020110030000C18081C106C0FF0A0069
+:107830000CA10185037508150026FF00954009017C
+:107840008102954009029102C0040309041A033021
+:1078500000300030003000300030003000300031A7
+:1078600000370030003100380341007200640075B9
+:107870000069006E006F0020004C0065006F006E14
+:10788000006100720064006F00200062006F006FF2
+:107890000074006C006F00610064006500720018E5
+:1078A00003410072006400750069006E006F0020E3
+:1078B000004C004C00430012010002020000404155
+:1078C0002334000001000203011201000200000045
+:1078D0004041233400000100020301090264000357
+:1078E00001008032080B00020202010009040000BE
+:1078F0000102020000052400100105240101010419
+:107900002402020524060001070581031000400936
+:10791000040100020A0000000705020240000007FF
+:107920000583024000000904020001030000000971
+:107930002101010001221E000705840340004000D0
+:1079400020918A0130918B012C5F3F4F30938B0146
+:1079500020938A01C901892F99278695982F803411
+:1079600018F08FE7891B982F990F921710F44798FA
+:107970000895479A08955D9A289A81E08093E000DF
+:107980001092E200EE27FF27099408950F931F93AA
+:10799000CF93DF93982FEB01042F10E088E760303E
+:1079A000780730F411E083E0FB0180935700E895FD
+:1079B000892F68E071E0402FF8D0112311F107B64C
+:1079C00000FCFDCF402F4695FE01A8E0B1E020E08D
+:1079D00031E009C08D919D910C0130935700E895DD
+:1079E000112432962F5F2417A8F385E0FE018093BF
+:1079F0005700E89507B600FCFDCF81E18093570062
+:107A0000E895DF91CF911F910F91089588E10FB60E
+:107A1000F89480936000109260000FBE5D9A289ADF
+:107A200047983F9A209A559A90E890936100109257
+:107A3000610081E885BF95BF9FD084E18093880174
+:107A400080E180938901E0E0F0E0859194918F5F7F
+:107A50009F4F19F081E080938F01EE24FF24BB2417
+:107A6000B39454EFC52E51E0D52E13D2082F8EE0DB
+:107A700098E7FC012491319602964491201711F069
+:107A80002223B9F7109291011092900182E068E0F0
+:107A900071E08BD0013479F4609108016058633053
+:107AA00028F0683111F064E001C063E0C62FD0E037
+:107AB000CF5DD7480EC0063571F480910801803340
+:107AC00011F011E022C080910A01C82FD0E0C25EFF
+:107AD000D74811E022C0053721F413E0CEE1D8E702
+:107AE0001CC0053539F4E0900801F0900901EE0C56
+:107AF000FF1C0AC0043631F482E0B701409109014D
+:107B000045DF02C0043721F010E0C5E2D8E705C028
+:107B100010910901E701E10EF11CBBD18097B1F48E
+:107B200083E068E871E041E050E059D0112329F08A
+:107B3000412F50E083E8BE0152D083E469E871E050
+:107B400041E050E04CD0013509F08FCFD092910147
+:107B5000C0929001B0928F01EE24FF2486CFFC01E9
+:107B6000289884E680938D0104C08091F100819370
+:107B700061506623D1F708951092910110929001FF
+:107B800010928E0110928F0181E08093D70080EADD
+:107B90008093D80082E189BD09B400FEFDCF80E961
+:107BA0008093D8001092E0000895FB018093E900D3
+:107BB00024E69BE611C08091E80085FFFCCF289861
+:107BC00020938D018091F10081938091E80085FDE3
+:107BD00002C09093E8004150442369F70895982F1C
+:107BE000FB01282F207287708093E90064E63AE356
+:107BF00017C08091E80085FFFCCF97FF02C08491F9
+:107C000001C080813196211180E05D9860938C01E4
+:107C10008093F1008091E80085FD02C03093E80078
+:107C2000415050408FEF4F3F580719F796FF03C060
+:107C30008AE38093E800089580919301813299F45A
+:107C40005D9884E680938C0120E030E003C0808161
+:107C50008093F100F901E050FF4F2F5F3F4F283034
+:107C60003105A9F714C0803261F48091E80082FFE9
+:107C7000FCCF80E091E067E072DF8BEF8093E8005B
+:107C800006C0823221F4809194018093070181E043
+:107C9000089520919501223289F1213081F480915B
+:107CA000980190919901089711F420939A0180917D
+:107CB0009A01882309F04FC0E9ECF8E74EC0223062
+:107CC00021F484E6EBEDF8E71CC0233009F041C055
+:107CD00080919401882319F4E9E4F8E73EC08230EA
+:107CE00019F4E7E6F8E739C0833019F4EDE4F8E772
+:107CF00034C0813071F5EFE9F8E72FC081E0EBE2A5
+:107D0000F8E790919801382F981708F4392F90913F
+:107D10008C0120E04EEF8091E8008570E1F38091C6
+:107D2000E80082FD12C02F5F84915D988093F1007E
+:107D3000822F8F7311F44093E800319694E6231755
+:107D400050F390938C0181E0089590938C0180E032
+:107D5000089580E00895E7EBF8E78491D2CF109280
+:107D6000E9008091E80083FF61C082E991E068E06A
+:107D7000F6DE82EF8093E8008091920187FF05C0D4
+:107D80008091E80080FFFCCF03C08EEF8093E80075
+:107D900080919301853051F48091E80080FFFCCF01
+:107DA0008091940180688093E30039C08930E1F4C8
+:107DB0008091940180938E01E7E2F8E791E031E051
+:107DC00026E39093E9003093EB0084918093EC00DC
+:107DD0002093ED009F5F3196953099F78EE7809361
+:107DE000EA001092EA001BC0883049F490918E019D
+:107DF0005D9884E680938C019093F10010C08823F5
+:107E000039F45D9884E680938C011092F10007C0EC
+:107E1000863011F43EDF01C00FDF882321F08EEFA2
+:107E20008093E800089581E28093EB0008958091AB
+:107E3000E1001092E100282F83FF0CC01092E900AE
+:107E400081E08093EB001092EC0082E38093ED00E0
+:107E500010928E0122FF1CC080918C01882331F08A
+:107E6000815080938C01882309F45D9A80918D0163
+:107E7000882331F0815080938D01882309F4289A5A
+:107E800080918F01882321F410929101109290012A
+:107E900008951F93CF93DF9312E0C0E9D1E05FDF35
+:107EA000C6DF1093E9008091E80085FF13C0289891
+:107EB00084E680938D019091F1008091E80085FD2A
+:107EC00003C08BE68093E800892F90E0DF91CF918B
+:107ED0001F91089580919001909191010197909345
+:107EE0009101809390018091900190919101892B53
+:0E7EF00009F441DDCE010197F1F722DDD0CF7C
+:087EFE0000E10000000000009B
+:040000030000780081
+:00000001FF
diff --git a/hardware/arduino/bootloaders/diskloader/Makefile b/hardware/arduino/bootloaders/diskloader/Makefile
new file mode 100644
index 0000000..6ac3db3
--- /dev/null
+++ b/hardware/arduino/bootloaders/diskloader/Makefile
@@ -0,0 +1,105 @@
+###############################################################################
+# Makefile for DiskLoader
+###############################################################################
+
+## General Flags
+PROJECT = DiskLoader
+TARGET = DiskLoader.elf
+CC = avr-gcc
+
+# BOARD2
+MCU = atmega32u4
+AVR_FREQ = 16000000L
+
+# Specify the Arduino model using the assigned PID. This is used by Descriptors.c
+# to set PID and product descriptor string
+# Arduino Leonardo PID
+ARDUINO_MODEL_PID = 0x0034
+# Arduino Micro PID
+#ARDUINO_MODEL_PID = 0x0035
+
+# Change if your programmer is different
+AVRDUDE_PROGRAMMER = avrispmkII
+AVRDUDE_PORT = usb
+
+# program name should not be changed...
+PROGRAM = DiskLoader
+
+AVRDUDE = avrdude
+AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -p $(MCU)
+
+## Options common to compile, link and assembly rules
+COMMON = -mmcu=$(MCU)
+
+override CFLAGS = -g -Wall -Os -mmcu=$(MCU) -DF_CPU=$(AVR_FREQ) -DARDUINO_MODEL_PID=$(ARDUINO_MODEL_PID) $(DEFS) -ffunction-sections -gdwarf-2 -fdata-sections -fno-split-wide-types
+
+## Assembly specific flags
+ASMFLAGS = $(COMMON)
+ASMFLAGS += $(CFLAGS)
+ASMFLAGS += -x assembler-with-cpp -Wa,-gdwarf2
+
+## Linker flags
+LDFLAGS = $(COMMON)
+LDFLAGS += -Wl,-gc-sections,-Map=DiskLoader.map,--section-start=.text=0x7800,--relax
+LDFLAGS += -nodefaultlibs -nostartfiles
+
+
+## Intel Hex file production flags
+HEX_EEPROM_FLAGS = -j .eeprom
+HEX_EEPROM_FLAGS += --set-section-flags=.eeprom="alloc,load"
+HEX_EEPROM_FLAGS += --change-section-lma .eeprom=0 --no-change-warnings
+
+## Objects explicitly added by the user
+LINKONLYOBJECTS =
+
+MODULES := .
+SRC_DIR := $(addprefix src/,$(MODULES))
+BUILD_DIR := $(addprefix build/,$(MODULES))
+
+SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cpp))
+OBJ := $(patsubst src/%.cpp,build/%.o,$(SRC))
+DEP := $(OBJ:%.o=%.d)
+INCLUDES := $(addprefix -I,$(SRC_DIR))
+
+vpath %.cpp $(SRC_DIR)
+
+.PHONY: all checkdirs clean
+
+all: checkdirs $(TARGET) DiskLoader.hex DiskLoader.lss size
+
+-include $(DEP)
+
+checkdirs: $(BUILD_DIR)
+
+$(BUILD_DIR):
+ @mkdir -p $@
+
+clean:
+ @rm -rf build/
+ @rm -f *.hex
+ @rm -f *.elf
+ @rm -f *.lss
+ @rm -f *.map
+
+define make-goal
+$1/%.o: %.cpp
+ $(CC) $(INCLUDES) $(CFLAGS) -c $$< -MD -o $$@
+endef
+
+$(foreach bdir,$(BUILD_DIR),$(eval $(call make-goal,$(bdir))))
+
+$(TARGET): $(OBJ)
+ $(CC) $(LDFLAGS) $(LINKONLYOBJECTS) $(LIBDIRS) $(LIBS) $^ -o $@
+
+%.hex: $(TARGET)
+ avr-objcopy -O ihex $(HEX_FLASH_FLAGS) $< $@
+
+%.lss: $(TARGET)
+ avr-objdump -h -S $< > $@
+
+size: $(TARGET)
+ @echo
+# @avr-size -C --mcu=${MCU} ${TARGET}.elf
+
+program: $(TARGET).hex
+ $(AVRDUDE) $(AVRDUDE_FLAGS) -B 5 -u -U flash:w:$(TARGET).hex
\ No newline at end of file
diff --git a/hardware/arduino/bootloaders/diskloader/src/DiskLoader.cpp b/hardware/arduino/bootloaders/diskloader/src/DiskLoader.cpp
new file mode 100644
index 0000000..6580618
--- /dev/null
+++ b/hardware/arduino/bootloaders/diskloader/src/DiskLoader.cpp
@@ -0,0 +1,239 @@
+
+
+#include "Platform.h"
+
+// This bootloader creates a composite Serial device
+//
+// The serial interface supports a STK500v1 protocol that is very similar to optiboot
+//
+// The bootloader will timeout and start the firmware after a few hundred milliseconds
+// if a usb connection is not detected.
+//
+// The tweakier code is to keep the bootloader below 2k (no interrupt table, for example)
+
+extern "C"
+void entrypoint(void) __attribute__ ((naked)) __attribute__ ((section (".vectors")));
+void entrypoint(void)
+{
+ asm volatile (
+ "eor r1, r1\n" // Zero register
+ "out 0x3F, r1\n" // SREG
+ "ldi r28, 0xFF\n"
+ "ldi r29, 0x0A\n"
+ "out 0x3E, r29\n" // SPH
+ "out 0x3D, r28\n" // SPL
+ "rjmp main" // Stack is all set up, start the main code
+ ::);
+}
+
+u8 _flashbuf[128];
+u8 _inSync;
+u8 _ok;
+extern volatile u8 _ejected;
+extern volatile u16 _timeout;
+
+void Program(u8 ep, u16 page, u8 count)
+{
+ u8 write = page < 30*1024; // Don't write over firmware please
+ if (write)
+ boot_page_erase(page);
+
+ Recv(ep,_flashbuf,count); // Read while page is erasing
+
+ if (!write)
+ return;
+
+ boot_spm_busy_wait(); // Wait until the memory is erased.
+
+ count >>= 1;
+ u16* p = (u16*)page;
+ u16* b = (u16*)_flashbuf;
+ for (u8 i = 0; i < count; i++)
+ boot_page_fill(p++, b[i]);
+
+ boot_page_write(page);
+ boot_spm_busy_wait();
+ boot_rww_enable ();
+}
+
+
+int USBGetChar();
+#define getch USBGetChar
+
+#define HW_VER 0x02
+#define SW_MAJOR 0x01
+#define SW_MINOR 0x10
+
+#define STK_OK 0x10
+#define STK_INSYNC 0x14 // ' '
+#define CRC_EOP 0x20 // 'SPACE'
+#define STK_GET_SYNC 0x30 // '0'
+
+#define STK_GET_PARAMETER 0x41 // 'A'
+#define STK_SET_DEVICE 0x42 // 'B'
+#define STK_SET_DEVICE_EXT 0x45 // 'E'
+#define STK_LOAD_ADDRESS 0x55 // 'U'
+#define STK_UNIVERSAL 0x56 // 'V'
+#define STK_PROG_PAGE 0x64 // 'd'
+#define STK_READ_PAGE 0x74 // 't'
+#define STK_READ_SIGN 0x75 // 'u'
+
+extern const u8 _readSize[] PROGMEM;
+const u8 _readSize[] =
+{
+ STK_GET_PARAMETER, 1,
+ STK_SET_DEVICE, 20,
+ STK_SET_DEVICE_EXT, 5,
+ STK_UNIVERSAL, 4,
+ STK_LOAD_ADDRESS, 2,
+ STK_PROG_PAGE, 3,
+ STK_READ_PAGE, 3,
+ 0,0
+};
+
+extern const u8 _consts[] PROGMEM;
+const u8 _consts[] =
+{
+ SIGNATURE_0,
+ SIGNATURE_1,
+ SIGNATURE_2,
+ HW_VER, // Hardware version
+ SW_MAJOR, // Software major version
+ SW_MINOR, // Software minor version
+ 0x03, // Unknown but seems to be required by avr studio 3.56
+ 0x00, //
+};
+
+
+void USBInit(void);
+int main(void) __attribute__ ((naked));
+
+// STK500v1 main loop, very similar to optiboot in protocol and implementation
+int main()
+{
+ wdt_disable();
+ TXLED0;
+ RXLED0;
+ LED0;
+ BOARD_INIT();
+ USBInit();
+
+ _inSync = STK_INSYNC;
+ _ok = STK_OK;
+
+ if (pgm_read_word(0) != -1)
+ _ejected = 1;
+
+ for(;;)
+ {
+ u8* packet = _flashbuf;
+ u16 address = 0;
+ for (;;)
+ {
+ u8 cmd = getch();
+
+ // Read packet contents
+ u8 len;
+ const u8* rs = _readSize;
+ for(;;)
+ {
+ u8 c = pgm_read_byte(rs++);
+ len = pgm_read_byte(rs++);
+ if (c == cmd || c == 0)
+ break;
+ }
+ _timeout = 0;
+ // Read params
+ Recv(CDC_RX,packet,len);
+
+ // Send a response
+ u8 send = 0;
+ const u8* pgm = _consts+7; // 0
+ if (STK_GET_PARAMETER == cmd)
+ {
+ u8 i = packet[0] - 0x80;
+ if (i > 2)
+ i = (i == 0x18) ? 3 : 4; // 0x80:HW_VER,0x81:SW_MAJOR,0x82:SW_MINOR,0x18:3 or 0
+ pgm = _consts + i + 3;
+ send = 1;
+ }
+
+ else if (STK_UNIVERSAL == cmd)
+ {
+ if (packet[0] == 0x30)
+ pgm = _consts + packet[2]; // read signature
+ send = 1;
+ }
+
+ // Read signature bytes
+ else if (STK_READ_SIGN == cmd)
+ {
+ pgm = _consts;
+ send = 3;
+ }
+
+ else if (STK_LOAD_ADDRESS == cmd)
+ {
+ address = *((u16*)packet); // word addresses
+ address += address;
+ }
+
+ else if (STK_PROG_PAGE == cmd)
+ {
+ Program(CDC_RX,address,packet[1]);
+ }
+
+ else if (STK_READ_PAGE == cmd)
+ {
+ send = packet[1];
+ pgm = (const u8*)address;
+ address += send; // not sure of this is required
+ }
+
+ // Check sync
+ if (getch() != ' ')
+ break;
+ Transfer(CDC_TX,&_inSync,1);
+
+ // Send result
+ if (send)
+ Transfer(CDC_TX|TRANSFER_PGM,pgm,send); // All from pgm memory
+
+ // Send ok
+ Transfer(CDC_TX|TRANSFER_RELEASE,&_ok,1);
+
+ if (cmd == 'Q')
+ break;
+ }
+ _timeout = 500; // wait a moment before exiting the bootloader - may need to finish responding to 'Q' for example
+ _ejected = 1;
+ }
+}
+
+// Nice breathing LED indicates we are in the firmware
+u16 _pulse;
+void LEDPulse()
+{
+ _pulse += 4;
+ u8 p = _pulse >> 9;
+ if (p > 63)
+ p = 127-p;
+ p += p;
+ if (((u8)_pulse) > p)
+ LED0;
+ else
+ LED1;
+}
+
+void Reboot()
+{
+ TXLED0; // switch off the RX and TX LEDs before starting the user sketch
+ RXLED0;
+ UDCON = 1; // Detatch USB
+ UDIEN = 0;
+ asm volatile ( // Reset vector to run firmware
+ "clr r30\n"
+ "clr r31\n"
+ "ijmp\n"
+ ::);
+}
diff --git a/hardware/arduino/bootloaders/diskloader/src/Platform.h b/hardware/arduino/bootloaders/diskloader/src/Platform.h
new file mode 100644
index 0000000..04c5b79
--- /dev/null
+++ b/hardware/arduino/bootloaders/diskloader/src/Platform.h
@@ -0,0 +1,51 @@
+
+#include <inttypes.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <avr/boot.h>
+#include <util/delay.h>
+#include <avr/interrupt.h>
+#include <avr/wdt.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned long u32;
+
+
+#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
+#define DISABLE_JTAG() MCUCR = (1 << JTD) | (1 << IVCE) | (0 << PUD); MCUCR = (1 << JTD) | (0 << IVSEL) | (0 << IVCE) | (0 << PUD);
+
+#define USB_PID_LEONARDO 0x0034
+#define USB_PID_MICRO 0x0035
+#define USB_VID 0x2341 // arduino LLC vid
+#define USB_PID ARDUINO_MODEL_PID // passed in by Makefile - 0x0034 for Leonardo, 0x0035 for MIcro
+
+#define USB_SERIAL_STRING '0','0','0','0','0','0','0','0','1','7','0','1'
+
+#define OEM_NAME 'l','e','o','n','a','r','d','o' // 8 chars
+#define BOARD_INIT() DDRC |= (1<<7); DDRB |= (1<<0); DDRD |= (1<<5); CPU_PRESCALE(0); DISABLE_JTAG();
+#define LED0 PORTC &= ~(1<<7)
+#define LED1 PORTC |= (1<<7)
+#define TXLED0 PORTD |= (1<<5)
+#define TXLED1 PORTD &= ~(1<<5)
+#define RXLED0 PORTB |= (1<<0)
+#define RXLED1 PORTB &= ~(1<<0)
+
+#define TRANSFER_PGM 0x80
+#define TRANSFER_RELEASE 0x40
+#define TRANSFER_ZERO 0x20
+
+void Transfer(u8 ep, const u8* data, int len);
+void Recv(u8 ep, u8* dst, u8 len);
+void Program(u8 ep, u16 page, u8 count);
+
+#define CDC_ENABLED
+
+#include "USBCore.h"
+#include "USBDesc.h"
+
+
diff --git a/hardware/arduino/bootloaders/diskloader/src/USBCore.cpp b/hardware/arduino/bootloaders/diskloader/src/USBCore.cpp
new file mode 100644
index 0000000..208121e
--- /dev/null
+++ b/hardware/arduino/bootloaders/diskloader/src/USBCore.cpp
@@ -0,0 +1,510 @@
+
+
+/* Copyright (c) 2010, Peter Barrett
+**
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.
+*/
+
+#include "Platform.h"
+
+#define CDC_TX CDC_ENDPOINT_IN
+#define CDC_RX CDC_ENDPOINT_OUT
+
+#define EP_TYPE_CONTROL 0x00
+#define EP_TYPE_BULK_IN 0x81
+#define EP_TYPE_BULK_OUT 0x80
+#define EP_TYPE_INTERRUPT_IN 0xC1
+#define EP_TYPE_INTERRUPT_OUT 0xC0
+#define EP_TYPE_ISOCHRONOUS_IN 0x41
+#define EP_TYPE_ISOCHRONOUS_OUT 0x40
+
+/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
+#define TX_RX_LED_PULSE_MS 100
+u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
+u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
+
+void Reboot();
+
+//==================================================================
+//==================================================================
+
+typedef struct
+{
+ u32 dwDTERate;
+ u8 bCharFormat;
+ u8 bParityType;
+ u8 bDataBits;
+ u8 lineState;
+} LineInfo;
+
+static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 };
+
+//==================================================================
+//==================================================================
+
+// 4 bytes of RAM
+volatile u8 _usbConfiguration;
+volatile u8 _ejected;
+volatile u16 _timeout;
+
+static inline void WaitIN(void)
+{
+ while (!(UEINTX & (1<<TXINI)));
+}
+
+static inline void ClearIN(void)
+{
+ UEINTX = ~(1<<TXINI);
+}
+
+static inline void WaitOUT(void)
+{
+ while (!(UEINTX & (1<<RXOUTI)))
+ ;
+}
+
+static inline u8 WaitForINOrOUT()
+{
+ while (!(UEINTX & ((1<<TXINI)|(1<<RXOUTI))))
+ ;
+ return (UEINTX & (1<<RXOUTI)) == 0;
+}
+
+static inline void ClearOUT(void)
+{
+ UEINTX = ~(1<<RXOUTI);
+}
+
+static
+void Send(volatile const u8* data, u8 count)
+{
+ TXLED1; // light the TX LED
+ TxLEDPulse = TX_RX_LED_PULSE_MS;
+ while (count--)
+ UEDATX = *data++;
+}
+
+void Recv(volatile u8* data, u8 count)
+{
+ RXLED1; // light the RX LED
+ RxLEDPulse = TX_RX_LED_PULSE_MS;
+ while (count--)
+ *data++ = UEDATX;
+}
+
+static inline u8 Recv8()
+{
+ RXLED1; // light the RX LED
+ RxLEDPulse = TX_RX_LED_PULSE_MS;
+ return UEDATX;
+}
+
+static inline void Send8(u8 d)
+{
+ TXLED1; // light the TX LED
+ TxLEDPulse = TX_RX_LED_PULSE_MS;
+ UEDATX = d;
+}
+
+static inline void SetEP(u8 ep)
+{
+ UENUM = ep;
+}
+
+static inline u8 FifoByteCount()
+{
+ return UEBCLX;
+}
+
+static inline u8 ReceivedSetupInt()
+{
+ return UEINTX & (1<<RXSTPI);
+}
+
+static inline void ClearSetupInt()
+{
+ UEINTX = ~((1<<RXSTPI) | (1<<RXOUTI) | (1<<TXINI));
+}
+
+static inline void Stall()
+{
+ UECONX = (1<<STALLRQ) | (1<<EPEN);
+}
+
+static inline u8 ReadWriteAllowed()
+{
+ return UEINTX & (1<<RWAL);
+}
+
+static inline u8 Stalled()
+{
+ return UEINTX & (1<<STALLEDI);
+}
+
+static inline u8 FifoFree()
+{
+ return UEINTX & (1<<FIFOCON);
+}
+
+static inline void ReleaseRX()
+{
+ UEINTX = 0x6B; // FIFOCON=0 NAKINI=1 RWAL=1 NAKOUTI=0 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=1
+}
+
+static inline void ReleaseTX()
+{
+ UEINTX = 0x3A; // FIFOCON=0 NAKINI=0 RWAL=1 NAKOUTI=1 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=0
+}
+
+static inline u8 FrameNumber()
+{
+ return UDFNUML;
+}
+
+//==================================================================
+//==================================================================
+
+#define EP_SINGLE_64 0x32 // EP0
+#define EP_DOUBLE_64 0x36 // Other endpoints
+
+static void InitEP(u8 index, u8 type, u8 size)
+{
+ UENUM = index;
+ UECONX = 1;
+ UECFG0X = type;
+ UECFG1X = size;
+}
+
+// API
+void USBInit(void)
+{
+ _timeout = 0;
+ _usbConfiguration = 0;
+ _ejected = 0;
+
+ UHWCON = 0x01; // power internal reg (don't need this?)
+ USBCON = (1<<USBE)|(1<<FRZCLK); // clock frozen, usb enabled
+ PLLCSR = 0x12; // Need 16 MHz xtal
+ while (!(PLLCSR & (1<<PLOCK))) // wait for lock pll
+ ;
+ USBCON = ((1<<USBE)|(1<<OTGPADE)); // start USB clock
+ UDCON = 0; // enable attach resistor
+}
+
+u8 USBGetConfiguration(void)
+{
+ return _usbConfiguration;
+}
+
+u8 HasData(u8 ep)
+{
+ SetEP(ep);
+ return ReadWriteAllowed(); // count in fifo
+}
+
+int USBGetChar();
+void Recv(u8 ep, u8* dst, u8 len)
+{
+ SetEP(ep);
+ while (len--)
+ {
+ while (!ReadWriteAllowed())
+ ;
+ *dst++ = Recv8();
+ if (!ReadWriteAllowed()) // release empty buffer
+ ReleaseRX();
+ }
+}
+
+// Transmit a packet to endpoint
+void Transfer(u8 ep, const u8* data, int len)
+{
+ u8 zero = ep & TRANSFER_ZERO;
+ SetEP(ep & 7);
+ while (len--)
+ {
+ while (!ReadWriteAllowed())
+ ; // TODO Check for STALL etc
+
+ u8 d = (ep & TRANSFER_PGM) ? pgm_read_byte(data) : data[0];
+ data++;
+ if (zero)
+ d = 0;
+ Send8(d);
+
+ if (!ReadWriteAllowed())
+ ReleaseTX();
+ }
+ if (ep & TRANSFER_RELEASE)
+ ReleaseTX();
+}
+
+extern const u8 _initEndpoints[] PROGMEM;
+const u8 _initEndpoints[] =
+{
+ 0,
+
+#ifdef CDC_ENABLED
+ EP_TYPE_INTERRUPT_IN, // CDC_ENDPOINT_ACM
+ EP_TYPE_BULK_OUT, // CDC_ENDPOINT_OUT
+ EP_TYPE_BULK_IN, // CDC_ENDPOINT_IN
+#endif
+
+ EP_TYPE_INTERRUPT_IN, // HID_ENDPOINT_INT
+};
+
+static void InitEndpoints()
+{
+ for (u8 i = 1; i < sizeof(_initEndpoints); i++)
+ {
+ UENUM = i;
+ UECONX = 1;
+ UECFG0X = pgm_read_byte(_initEndpoints+i);
+ UECFG1X = EP_DOUBLE_64;
+ }
+ UERST = 0x7E; // And reset them
+ UERST = 0;
+}
+
+typedef struct
+{
+ u8 bmRequestType;
+ u8 bRequest;
+ u8 wValueL;
+ u8 wValueH;
+ u16 wIndex;
+ u16 wLength;
+} Setup;
+Setup _setup;
+
+//bool USBHook(Setup& setup)
+bool USBHook()
+{
+ Setup& setup = _setup;
+ u8 r = setup.bRequest;
+
+ // CDC Requests
+ if (CDC_GET_LINE_CODING == r)
+ {
+ Send((const volatile u8*)&_usbLineInfo,7);
+ }
+
+ else if (CDC_SET_LINE_CODING == r)
+ {
+ WaitOUT();
+ Recv((volatile u8*)&_usbLineInfo,7);
+ ClearOUT();
+ }
+
+ else if (CDC_SET_CONTROL_LINE_STATE == r)
+ {
+ _usbLineInfo.lineState = setup.wValueL;
+ }
+
+ return true;
+}
+
+extern const u8 _rawHID[] PROGMEM;
+#define LSB(_x) ((_x) & 0xFF)
+#define MSB(_x) ((_x) >> 8)
+
+#define RAWHID_USAGE_PAGE 0xFFC0
+#define RAWHID_USAGE 0x0C00
+#define RAWHID_TX_SIZE 64
+#define RAWHID_RX_SIZE 64
+
+const u8 _rawHID[] =
+{
+ // RAW HID
+ 0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30
+ 0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
+
+ 0xA1, 0x01, // Collection 0x01
+ 0x85, 0x03, // REPORT_ID (3)
+ 0x75, 0x08, // report size = 8 bits
+ 0x15, 0x00, // logical minimum = 0
+ 0x26, 0xFF, 0x00, // logical maximum = 255
+
+ 0x95, 64, // report count TX
+ 0x09, 0x01, // usage
+ 0x81, 0x02, // Input (array)
+
+ 0x95, 64, // report count RX
+ 0x09, 0x02, // usage
+ 0x91, 0x02, // Output (array)
+ 0xC0 // end collection
+};
+
+u8 _cdcComposite = 0;
+
+bool SendDescriptor()
+{
+ Setup& setup = _setup;
+ u8 desc_length = 0;
+ const u8* desc_addr = 0;
+
+ u8 t = setup.wValueH;
+ if (0x22 == t)
+ {
+ desc_addr = _rawHID;
+ desc_length = sizeof(desc_length);
+ } else if (USB_DEVICE_DESCRIPTOR_TYPE == t)
+ {
+ if (setup.wLength == 8)
+ _cdcComposite = 1;
+ desc_addr = _cdcComposite ? (const u8*)&USB_DeviceDescriptorA : (const u8*)&USB_DeviceDescriptor;
+ }
+ else if (USB_CONFIGURATION_DESCRIPTOR_TYPE == t)
+ {
+ desc_addr = (const u8*)&USB_ConfigDescriptor;
+ desc_length = sizeof(USB_ConfigDescriptor);
+ }
+ else if (USB_STRING_DESCRIPTOR_TYPE == t)
+ {
+ if (setup.wValueL == 0)
+ desc_addr = (const u8*)&STRING_LANGUAGE;
+ else if (setup.wValueL == IPRODUCT)
+ desc_addr = (const u8*)&STRING_IPRODUCT;
+ else if (setup.wValueL == ISERIAL)
+ desc_addr = (const u8*)&STRING_SERIAL;
+ else if (setup.wValueL == IMANUFACTURER)
+ desc_addr = (const u8*)&STRING_IMANUFACTURER;
+ else
+ return false;
+ } else
+ return false;
+
+ if (desc_length == 0)
+ desc_length = pgm_read_byte(desc_addr);
+ if ((u8)setup.wLength < desc_length) // bit of a cheat limiting to 255 bytes TODO (saved 8 bytes)
+ desc_length = (u8)setup.wLength;
+
+ // Send descriptor
+ // EP0 is 64 bytes long
+ // RWAL and FIFOCON don't work on EP0
+ u8 n = 0;
+ do
+ {
+ if (!WaitForINOrOUT())
+ return false;
+ Send8(pgm_read_byte(&desc_addr[n++]));
+ u8 clr = n & 0x3F;
+ if (!clr)
+ ClearIN(); // Fifo is full, release this packet
+ } while (n < desc_length);
+ return true;
+}
+
+void USBSetupInterrupt()
+{
+ SetEP(0);
+ if (!ReceivedSetupInt())
+ return;
+
+ Setup& setup = _setup; // global saves ~30 bytes
+ Recv((u8*)&setup,8);
+ ClearSetupInt();
+
+ if (setup.bmRequestType & DEVICETOHOST)
+ WaitIN();
+ else
+ ClearIN();
+
+ bool ok = true;
+ u8 r = setup.bRequest;
+ if (SET_ADDRESS == r)
+ {
+ WaitIN();
+ UDADDR = setup.wValueL | (1<<ADDEN);
+ }
+ else if (SET_CONFIGURATION == r)
+ {
+ _usbConfiguration = setup.wValueL;
+ InitEndpoints();
+ }
+ else if (GET_CONFIGURATION == r)
+ {
+ Send8(_usbConfiguration);
+ }
+ else if (GET_STATUS == r)
+ {
+ Send8(0); // All good as far as I know
+ }
+ else if (GET_DESCRIPTOR == r)
+ {
+ ok = SendDescriptor();
+ }
+ else
+ {
+ ok = USBHook();
+ }
+
+ if (ok)
+ ClearIN();
+ else
+ Stall();
+}
+
+void USBGeneralInterrupt()
+{
+ u8 udint = UDINT;
+ UDINT = 0;
+
+ // End of Reset
+ if (udint & (1<<EORSTI))
+ {
+ InitEP(0,EP_TYPE_CONTROL,EP_SINGLE_64); // init ep0
+ _usbConfiguration = 0; // not configured yet
+ }
+
+ // Start of Frame - happens every millisecond so we use it for TX and RX LED one-shot timing, too
+ if (udint & (1<<SOFI))
+ {
+ // check whether the one-shot period has elapsed. if so, turn off the LED
+ if (TxLEDPulse && !(--TxLEDPulse))
+ TXLED0;
+ if (RxLEDPulse && !(--RxLEDPulse))
+ RXLED0;
+
+ if (!_ejected)
+ _timeout = 0;
+ }
+}
+
+void LEDPulse();
+int USBGetChar()
+{
+ for(;;)
+ {
+ USBSetupInterrupt();
+ USBGeneralInterrupt();
+
+ // Read a char
+ if (HasData(CDC_RX))
+ {
+ u8 c = Recv8();
+ if (!ReadWriteAllowed())
+ ReleaseRX();
+ return c;
+ }
+
+ if (!--_timeout) {
+ Reboot(); // USB not connected, run firmware
+ }
+
+ _delay_us(100); // stretch out the bootloader period to about 5 seconds after enumeration
+ LEDPulse();
+ }
+ return -1;
+}
diff --git a/hardware/arduino/bootloaders/diskloader/src/USBCore.h b/hardware/arduino/bootloaders/diskloader/src/USBCore.h
new file mode 100644
index 0000000..537c0ec
--- /dev/null
+++ b/hardware/arduino/bootloaders/diskloader/src/USBCore.h
@@ -0,0 +1,246 @@
+
+// Copyright (c) 2010, Peter Barrett
+/*
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.
+*/
+
+#ifndef __USBCORE_H__
+#define __USBCORE_H__
+
+#define GET_STATUS 0
+#define CLEAR_FEATURE 1
+#define SET_FEATURE 3
+#define SET_ADDRESS 5
+#define GET_DESCRIPTOR 6
+#define GET_CONFIGURATION 8
+#define SET_CONFIGURATION 9
+#define GET_INTERFACE 10
+#define SET_INTERFACE 11
+
+// bmRequestType
+#define HOSTTODEVICE 0x00
+#define DEVICETOHOST 0x80
+#define STANDARD 0x00
+#define CLASS 0x20
+#define VENDOR 0x40
+#define DEVICE 0x00
+#define INTERFACE 0x01
+#define ENDPOINT 0x02
+#define OTHER 0x03
+
+#define CDC_SET_LINE_CODING 0x20
+#define CDC_GET_LINE_CODING 0x21
+#define CDC_SET_CONTROL_LINE_STATE 0x22
+
+// Descriptors
+
+#define USB_DEVICE_DESC_SIZE 18
+#define USB_CONFIGUARTION_DESC_SIZE 9
+#define USB_INTERFACE_DESC_SIZE 9
+#define USB_ENDPOINT_DESC_SIZE 7
+
+#define USB_DEVICE_DESCRIPTOR_TYPE 1
+#define USB_CONFIGURATION_DESCRIPTOR_TYPE 2
+#define USB_STRING_DESCRIPTOR_TYPE 3
+#define USB_INTERFACE_DESCRIPTOR_TYPE 4
+#define USB_ENDPOINT_DESCRIPTOR_TYPE 5
+
+#define USB_DEVICE_CLASS_COMMUNICATIONS 0x02
+#define USB_DEVICE_CLASS_HUMAN_INTERFACE 0x03
+#define USB_DEVICE_CLASS_STORAGE 0x08
+#define USB_DEVICE_CLASS_VENDOR_SPECIFIC 0xFF
+
+#define USB_CONFIG_POWERED_MASK 0x40
+#define USB_CONFIG_BUS_POWERED 0x80
+#define USB_CONFIG_SELF_POWERED 0xC0
+#define USB_CONFIG_REMOTE_WAKEUP 0x20
+
+// bMaxPower in Configuration Descriptor
+#define USB_CONFIG_POWER_MA(mA) ((mA)/2)
+
+// bEndpointAddress in Endpoint Descriptor
+#define USB_ENDPOINT_DIRECTION_MASK 0x80
+#define USB_ENDPOINT_OUT(addr) ((addr) | 0x00)
+#define USB_ENDPOINT_IN(addr) ((addr) | 0x80)
+
+#define USB_ENDPOINT_TYPE_MASK 0x03
+#define USB_ENDPOINT_TYPE_CONTROL 0x00
+#define USB_ENDPOINT_TYPE_ISOCHRONOUS 0x01
+#define USB_ENDPOINT_TYPE_BULK 0x02
+#define USB_ENDPOINT_TYPE_INTERRUPT 0x03
+
+#define TOBYTES(x) ((x) & 0xFF),(((x) >> 8) & 0xFF)
+
+#define CDC_V1_10 0x0110
+#define CDC_COMMUNICATION_INTERFACE_CLASS 0x02
+
+#define CDC_CALL_MANAGEMENT 0x01
+#define CDC_ABSTRACT_CONTROL_MODEL 0x02
+#define CDC_HEADER 0x00
+#define CDC_ABSTRACT_CONTROL_MANAGEMENT 0x02
+#define CDC_UNION 0x06
+#define CDC_CS_INTERFACE 0x24
+#define CDC_CS_ENDPOINT 0x25
+#define CDC_DATA_INTERFACE_CLASS 0x0A
+
+
+// Device
+typedef struct {
+ u8 len; // 18
+ u8 dtype; // 1 USB_DEVICE_DESCRIPTOR_TYPE
+ u16 usbVersion; // 0x200
+ u8 deviceClass;
+ u8 deviceSubClass;
+ u8 deviceProtocol;
+ u8 packetSize0; // Packet 0
+ u16 idVendor;
+ u16 idProduct;
+ u16 deviceVersion; // 0x100
+ u8 iManufacturer;
+ u8 iProduct;
+ u8 iSerialNumber;
+ u8 bNumConfigurations;
+} DeviceDescriptor;
+
+// Config
+typedef struct {
+ u8 len; // 9
+ u8 dtype; // 2
+ u16 clen; // total length
+ u8 numInterfaces;
+ u8 config;
+ u8 iconfig;
+ u8 attributes;
+ u8 maxPower;
+} ConfigDescriptor;
+
+// String
+
+// Interface
+typedef struct
+{
+ u8 len; // 9
+ u8 dtype; // 4
+ u8 number;
+ u8 alternate;
+ u8 numEndpoints;
+ u8 interfaceClass;
+ u8 interfaceSubClass;
+ u8 protocol;
+ u8 iInterface;
+} InterfaceDescriptor;
+
+// Endpoint
+typedef struct
+{
+ u8 len; // 7
+ u8 dtype; // 5
+ u8 addr;
+ u8 attr;
+ u16 packetSize;
+ u8 interval;
+} EndpointDescriptor;
+
+// Interface Association Descriptor
+// Used to bind 2 interfaces together in CDC compostite device
+typedef struct
+{
+ u8 len; // 8
+ u8 dtype; // 11
+ u8 firstInterface;
+ u8 interfaceCount;
+ u8 functionClass;
+ u8 funtionSubClass;
+ u8 functionProtocol;
+ u8 iInterface;
+} IADDescriptor;
+
+// CDC CS interface descriptor
+typedef struct
+{
+ u8 len; // 5
+ u8 dtype; // 0x24
+ u8 subtype;
+ u8 d0;
+ u8 d1;
+} CDCCSInterfaceDescriptor;
+
+typedef struct
+{
+ u8 len; // 4
+ u8 dtype; // 0x24
+ u8 subtype;
+ u8 d0;
+} CDCCSInterfaceDescriptor4;
+
+typedef struct
+{
+ IADDescriptor iad; // Only needed on compound device
+
+ // Control
+ InterfaceDescriptor cif; //
+ CDCCSInterfaceDescriptor header;
+ CDCCSInterfaceDescriptor callManagement;
+ CDCCSInterfaceDescriptor4 controlManagement;
+ CDCCSInterfaceDescriptor functionalDescriptor;
+ EndpointDescriptor cifin;
+
+ // Data
+ InterfaceDescriptor dif;
+ EndpointDescriptor in;
+ EndpointDescriptor out;
+} CDCDescriptor;
+
+typedef struct
+{
+ u8 len; // 9
+ u8 dtype; // 0x21
+ u8 addr;
+ u8 versionL; // 0x101
+ u8 versionH; // 0x101
+ u8 country;
+ u8 desctype; // 0x22 report
+ u8 descLenL;
+ u8 descLenH;
+} HIDDescDescriptor;
+
+typedef struct
+{
+ InterfaceDescriptor hid;
+ HIDDescDescriptor desc;
+ EndpointDescriptor in;
+} HIDDescriptor;
+
+#define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
+ { 18, 1, 0x200, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
+
+#define D_CONFIG(_totalLength,_interfaces) \
+ { 9, 2, _totalLength,_interfaces, 1, 0, USB_CONFIG_BUS_POWERED, USB_CONFIG_POWER_MA(100) }
+
+#define D_INTERFACE(_n,_numEndpoints,_class,_subClass,_protocol) \
+ { 9, 4, _n, 0, _numEndpoints, _class,_subClass, _protocol, 0 }
+
+#define D_ENDPOINT(_addr,_attr,_packetSize, _interval) \
+ { 7, 5, _addr,_attr,_packetSize, _interval }
+
+#define D_IAD(_firstInterface, _count, _class, _subClass, _protocol) \
+ { 8, 11, _firstInterface, _count, _class, _subClass, _protocol, 0 }
+
+#define D_HIDREPORT(_descriptorLength) \
+ { 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength, 0 }
+
+#define D_CDCCS(_subtype,_d0,_d1) { 5, 0x24, _subtype, _d0, _d1 }
+#define D_CDCCS4(_subtype,_d0) { 4, 0x24, _subtype, _d0 }
+
+#endif
\ No newline at end of file
diff --git a/hardware/arduino/bootloaders/diskloader/src/USBDesc.cpp b/hardware/arduino/bootloaders/diskloader/src/USBDesc.cpp
new file mode 100644
index 0000000..ade072a
--- /dev/null
+++ b/hardware/arduino/bootloaders/diskloader/src/USBDesc.cpp
@@ -0,0 +1,87 @@
+
+
+/* Copyright (c) 2011, Peter Barrett
+**
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.
+*/
+
+#include "Platform.h"
+
+//====================================================================================================
+//====================================================================================================
+// Actual device descriptors
+
+const u16 STRING_LANGUAGE[2] = {
+ (3<<8) | (2+2),
+ 0x0409 // English
+};
+
+const u16 STRING_SERIAL[13] = {
+ (3<<8) | (2+2*12),
+ USB_SERIAL_STRING
+};
+
+const u16 STRING_IPRODUCT[28] = {
+ (3<<8) | (2+2*27),
+#if USB_PID == USB_PID_LEONARDO
+ 'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o',' ','b','o','o','t','l','o','a','d','e','r'
+#elif USB_PID == USB_PID_MICRO
+ 'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ','b','o','o','t','l','o','a','d','e','r',' ',' ',' '
+#endif
+};
+
+const u16 STRING_IMANUFACTURER[12] = {
+ (3<<8) | (2+2*11),
+ 'A','r','d','u','i','n','o',' ','L','L','C'
+};
+
+
+//#ifdef CDC_ENABLED
+DeviceDescriptor USB_DeviceDescriptorA = D_DEVICE(0X02,0X00,0X00,64,USB_VID,USB_PID,0x100,0,IPRODUCT,ISERIAL,1);
+//#else
+DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,0,IPRODUCT,ISERIAL,1);
+//#endif
+
+
+Config USB_ConfigDescriptor =
+{
+ D_CONFIG(sizeof(Config),INTERFACE_COUNT),
+
+#ifdef CDC_ENABLED
+ // CDC
+ {
+ D_IAD(0,2,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,1),
+
+ // CDC communication interface
+ D_INTERFACE(CDC_ACM_INTERFACE,1,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,0),
+ D_CDCCS(CDC_HEADER,0x10,0x01), // Header (1.10 bcd)
+ D_CDCCS(CDC_CALL_MANAGEMENT,1,1), // Device handles call management
+ D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT,2), // SET_LINE_CODING, GET_LINE_CODING, SET_CONTROL_LINE_STATE supported
+ D_CDCCS(CDC_UNION,CDC_ACM_INTERFACE,CDC_DATA_INTERFACE), // Communication interface is master, data interface is slave 0
+ D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_ACM),USB_ENDPOINT_TYPE_INTERRUPT,0x10,0x40),
+
+ // CDC data interface
+ D_INTERFACE(CDC_DATA_INTERFACE,2,CDC_DATA_INTERFACE_CLASS,0,0),
+ D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,0x40,0),
+ D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)
+ },
+#endif
+ // HID
+ {
+ D_INTERFACE(HID_INTERFACE,1,3,0,0),
+ D_HIDREPORT(30),
+ D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x40)
+ }
+};
+
diff --git a/hardware/arduino/bootloaders/diskloader/src/USBDesc.h b/hardware/arduino/bootloaders/diskloader/src/USBDesc.h
new file mode 100644
index 0000000..a970fa4
--- /dev/null
+++ b/hardware/arduino/bootloaders/diskloader/src/USBDesc.h
@@ -0,0 +1,65 @@
+
+
+/* Copyright (c) 2011, Peter Barrett
+**
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.
+*/
+
+
+#ifdef CDC_ENABLED
+
+#define CDC_ACM_INTERFACE 0 // CDC ACM
+#define CDC_DATA_INTERFACE 1 // CDC Data
+#define CDC_ENDPOINT_ACM 1
+#define CDC_ENDPOINT_OUT 2
+#define CDC_ENDPOINT_IN 3
+
+#define HID_INTERFACE 2 // HID Interface
+#define HID_ENDPOINT_INT 4
+
+#define INTERFACE_COUNT 3 // 2 for cdc + 1 for hid
+
+#else
+
+#define HID_INTERFACE 2 // HID Interface
+#define HID_ENDPOINT_INT 4
+
+#define INTERFACE_COUNT 1 // 1 for hid
+
+#endif
+
+typedef struct
+{
+ ConfigDescriptor config;
+#ifdef CDC_ENABLED
+ CDCDescriptor cdc;
+#endif
+ HIDDescriptor hid;
+} Config;
+
+extern Config USB_ConfigDescriptor PROGMEM;
+extern DeviceDescriptor USB_DeviceDescriptor PROGMEM;
+extern DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
+
+extern const u16 STRING_LANGUAGE[2] PROGMEM;
+extern const u16 STRING_IPRODUCT[28] PROGMEM;
+extern const u16 STRING_IMANUFACTURER[12] PROGMEM;
+extern const u16 STRING_SERIAL[13] PROGMEM;
+
+#define IMANUFACTURER 1
+#define IPRODUCT 2
+#define ISERIAL 3
+
+#define CDC_TX CDC_ENDPOINT_IN
+#define CDC_RX CDC_ENDPOINT_OUT
\ No newline at end of file
diff --git a/hardware/arduino/bootloaders/optiboot/Makefile b/hardware/arduino/bootloaders/optiboot/Makefile
index 0fd6005..b9f3ed5 100644
--- a/hardware/arduino/bootloaders/optiboot/Makefile
+++ b/hardware/arduino/bootloaders/optiboot/Makefile
@@ -19,13 +19,70 @@
# program name should not be changed...
PROGRAM = optiboot
+# The default behavior is to build using tools that are in the users
+# current path variables, but we can also build using an installed
+# Arduino user IDE setup, or the Arduino source tree.
+# Uncomment this next lines to build within the arduino environment,
+# using the arduino-included avrgcc toolset (mac and pc)
+# ENV ?= arduino
+# ENV ?= arduinodev
+# OS ?= macosx
+# OS ?= windows
+
+
# enter the parameters for the avrdude isp tool
ISPTOOL = stk500v2
ISPPORT = usb
ISPSPEED = -b 115200
MCU_TARGET = atmega168
-LDSECTION = --section-start=.text=0x3e00
+LDSECTIONS = -Wl,--section-start=.text=0x3e00 -Wl,--section-start=.version=0x3ffe
+
+# Build environments
+# Start of some ugly makefile-isms to allow optiboot to be built
+# in several different environments. See the README.TXT file for
+# details.
+
+# default
+fixpath = $(1)
+
+ifeq ($(ENV), arduino)
+# For Arduino, we assume that we're connected to the optiboot directory
+# included with the arduino distribution, which means that the full set
+# of avr-tools are "right up there" in standard places.
+TOOLROOT = ../../../tools
+GCCROOT = $(TOOLROOT)/avr/bin/
+AVRDUDE_CONF = -C$(TOOLROOT)/avr/etc/avrdude.conf
+
+ifeq ($(OS), windows)
+# On windows, SOME of the tool paths will need to have backslashes instead
+# of forward slashes (because they use windows cmd.exe for execution instead
+# of a unix/mingw shell?) We also have to ensure that a consistent shell
+# is used even if a unix shell is installed (ie as part of WINAVR)
+fixpath = $(subst /,\,$1)
+SHELL = cmd.exe
+endif
+
+else ifeq ($(ENV), arduinodev)
+# Arduino IDE source code environment. Use the unpacked compilers created
+# by the build (you'll need to do "ant build" first.)
+ifeq ($(OS), macosx)
+TOOLROOT = ../../../../build/macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools
+endif
+ifeq ($(OS), windows)
+TOOLROOT = ../../../../build/windows/work/hardware/tools
+endif
+
+GCCROOT = $(TOOLROOT)/avr/bin/
+AVRDUDE_CONF = -C$(TOOLROOT)/avr/etc/avrdude.conf
+
+else
+GCCROOT =
+AVRDUDE_CONF =
+endif
+#
+# End of build environment code.
+
# the efuse should really be 0xf8; since, however, only the lower
# three bits of that byte are used on the atmega168, avrdude gets
@@ -33,14 +90,17 @@ LDSECTION = --section-start=.text=0x3e00
# 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
+# unlock the bootloader section) and 0xcf instead of 0x2f (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
+ISPFUSES = $(GCCROOT)avrdude $(AVRDUDE_CONF) -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 = $(GCCROOT)avrdude $(AVRDUDE_CONF) -c $(ISPTOOL) \
+ -p $(MCU_TARGET) -P $(ISPPORT) $(ISPSPEED) \
+ -U flash:w:$(PROGRAM)_$(TARGET).hex -U lock:w:0x2f:m
STK500 = "C:\Program Files\Atmel\AVR Tools\STK500\Stk500.exe"
STK500-1 = $(STK500) -e -d$(MCU_TARGET) -pf -vf -if$(PROGRAM)_$(TARGET).hex \
@@ -53,15 +113,27 @@ OPTIMIZE = -Os -fno-inline-small-functions -fno-split-wide-types -mshort-calls
DEFS =
LIBS =
-CC = avr-gcc
+CC = $(GCCROOT)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
+override LDFLAGS = $(LDSECTIONS) -Wl,--relax -Wl,--gc-sections -nostartfiles -nostdlib
-OBJCOPY = avr-objcopy
-OBJDUMP = avr-objdump
+OBJCOPY = $(GCCROOT)avr-objcopy
+OBJDUMP = $(call fixpath,$(GCCROOT)avr-objdump)
+
+SIZE = $(GCCROOT)avr-size
+
+# Test platforms
+# Virtual boot block test
+virboot328: TARGET = atmega328
+virboot328: MCU_TARGET = atmega328p
+virboot328: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200' '-DVIRTUAL_BOOT'
+virboot328: AVR_FREQ = 16000000L
+virboot328: LDSECTIONS = -Wl,--section-start=.text=0x7e00 -Wl,--section-start=.version=0x7ffe
+virboot328: $(PROGRAM)_atmega328.hex
+virboot328: $(PROGRAM)_atmega328.lst
# 20MHz clocked platforms
#
@@ -69,6 +141,7 @@ OBJDUMP = avr-objdump
#
pro20: TARGET = pro_20mhz
+pro20: MCU_TARGET = atmega168
pro20: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
pro20: AVR_FREQ = 20000000L
pro20: $(PROGRAM)_pro_20mhz.hex
@@ -76,9 +149,12 @@ 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
+# 2.7V brownout
+pro20_isp: HFUSE = DD
+# Full swing xtal (20MHz) 258CK/14CK+4.1ms
+pro20_isp: LFUSE = C6
+# 512 byte boot
+pro20_isp: EFUSE = 04
pro20_isp: isp
# 16MHz clocked platforms
@@ -87,6 +163,7 @@ pro20_isp: isp
#
pro16: TARGET = pro_16MHz
+pro16: MCU_TARGET = atmega168
pro16: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
pro16: AVR_FREQ = 16000000L
pro16: $(PROGRAM)_pro_16MHz.hex
@@ -94,14 +171,37 @@ 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
+# 2.7V brownout
+pro16_isp: HFUSE = DD
+# Full swing xtal (20MHz) 258CK/14CK+4.1ms
+pro16_isp: LFUSE = C6
+# 512 byte boot
+pro16_isp: EFUSE = 04
pro16_isp: isp
-# Diecimila and NG use identical bootloaders
+# Diecimila, Duemilanove with m168, and NG use identical bootloaders
+# Call it "atmega168" for generality and clarity, keep "diecimila" for
+# backward compatibility of makefile
#
+atmega168: TARGET = atmega168
+atmega168: MCU_TARGET = atmega168
+atmega168: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
+atmega168: AVR_FREQ = 16000000L
+atmega168: $(PROGRAM)_atmega168.hex
+atmega168: $(PROGRAM)_atmega168.lst
+
+atmega168_isp: atmega168
+atmega168_isp: TARGET = atmega168
+# 2.7V brownout
+atmega168_isp: HFUSE = DD
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+atmega168_isp: LFUSE = FF
+# 512 byte boot
+atmega168_isp: EFUSE = 04
+atmega168_isp: isp
+
diecimila: TARGET = diecimila
+diecimila: MCU_TARGET = atmega168
diecimila: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
diecimila: AVR_FREQ = 16000000L
diecimila: $(PROGRAM)_diecimila.hex
@@ -109,85 +209,188 @@ 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
+# 2.7V brownout
+diecimila_isp: HFUSE = DD
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+diecimila_isp: LFUSE = FF
+# 512 byte boot
+diecimila_isp: EFUSE = 04
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: LDSECTIONS = -Wl,--section-start=.text=0x7e00 -Wl,--section-start=.version=0x7ffe
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
+# 512 byte boot, SPIEN
+atmega328_isp: HFUSE = DE
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+atmega328_isp: LFUSE = FF
+# 2.7V brownout
+atmega328_isp: EFUSE = 05
atmega328_isp: isp
+# Sanguino has a minimum boot size of 1024 bytes, so enable extra functions
+#
+sanguino: TARGET = atmega644p
+sanguino: MCU_TARGET = atmega644p
+sanguino: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200' '-DBIGBOOT'
+sanguino: AVR_FREQ = 16000000L
+sanguino: LDSECTIONS = -Wl,--section-start=.text=0xfc00
+sanguino: $(PROGRAM)_atmega644p.hex
+sanguino: $(PROGRAM)_atmega644p.lst
+
+sanguino_isp: sanguino
+sanguino_isp: TARGET = atmega644p
+sanguino_isp: MCU_TARGET = atmega644p
+# 1024 byte boot
+sanguino_isp: HFUSE = DE
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+sanguino_isp: LFUSE = FF
+# 2.7V brownout
+sanguino_isp: EFUSE = 05
+sanguino_isp: isp
+
+# Mega has a minimum boot size of 1024 bytes, so enable extra functions
+#mega: TARGET = atmega1280
+mega: MCU_TARGET = atmega1280
+mega: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200' '-DBIGBOOT'
+mega: AVR_FREQ = 16000000L
+mega: LDSECTIONS = -Wl,--section-start=.text=0x1fc00
+mega: $(PROGRAM)_atmega1280.hex
+mega: $(PROGRAM)_atmega1280.lst
+
+mega_isp: mega
+mega_isp: TARGET = atmega1280
+mega_isp: MCU_TARGET = atmega1280
+# 1024 byte boot
+mega_isp: HFUSE = DE
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+mega_isp: LFUSE = FF
+# 2.7V brownout
+mega_isp: EFUSE = 05
+mega_isp: isp
+
+# ATmega8
+#
+atmega8: TARGET = atmega8
+atmega8: MCU_TARGET = atmega8
+atmega8: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
+atmega8: AVR_FREQ = 16000000L
+atmega8: LDSECTIONS = -Wl,--section-start=.text=0x1e00 -Wl,--section-start=.version=0x1ffe
+atmega8: $(PROGRAM)_atmega8.hex
+atmega8: $(PROGRAM)_atmega8.lst
+
+atmega8_isp: atmega8
+atmega8_isp: TARGET = atmega8
+atmega8_isp: MCU_TARGET = atmega8
+# SPIEN, CKOPT, Bootsize=512B
+atmega8_isp: HFUSE = CC
+# 2.7V brownout, Low power xtal (16MHz) 16KCK/14CK+65ms
+atmega8_isp: LFUSE = BF
+atmega8_isp: isp
+
+# ATmega88
+#
+atmega88: TARGET = atmega88
+atmega88: MCU_TARGET = atmega88
+atmega88: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
+atmega88: AVR_FREQ = 16000000L
+atmega88: LDSECTIONS = -Wl,--section-start=.text=0x1e00 -Wl,--section-start=.version=0x1ffe
+atmega88: $(PROGRAM)_atmega88.hex
+atmega88: $(PROGRAM)_atmega88.lst
+
+atmega88_isp: atmega88
+atmega88_isp: TARGET = atmega88
+atmega88_isp: MCU_TARGET = atmega88
+# 2.7V brownout
+atmega88_isp: HFUSE = DD
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+atemga88_isp: LFUSE = FF
+# 512 byte boot
+atmega88_isp: EFUSE = 04
+atmega88_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: MCU_TARGET = atmega168
+lilypad: CFLAGS += '-DLED_START_FLASHES=3' '-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
+# 2.7V brownout
+lilypad_isp: HFUSE = DD
+# Internal 8MHz osc (8MHz) Slow rising power
+lilypad_isp: LFUSE = E2
+# 512 byte boot
+lilypad_isp: EFUSE = 04
lilypad_isp: isp
lilypad_resonator: TARGET = lilypad_resonator
-lilypad_resonator: CFLAGS += '-DLED_START_FLASHES=3' '-DSOFT_UART' '-DBAUD_RATE=115200'
+lilypad_resonator: MCU_TARGET = atmega168
+lilypad_resonator: CFLAGS += '-DLED_START_FLASHES=3' '-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
+# 2.7V brownout
+lilypad_resonator_isp: HFUSE = DD
+# Full swing xtal (20MHz) 258CK/14CK+4.1ms
+lilypad_resonator_isp: LFUSE = C6
+# 512 byte boot
+lilypad_resonator_isp: EFUSE = 04
lilypad_resonator_isp: isp
pro8: TARGET = pro_8MHz
-pro8: CFLAGS += '-DLED_START_FLASHES=3' '-DSOFT_UART' '-DBAUD_RATE=115200'
+pro8: MCU_TARGET = atmega168
+pro8: CFLAGS += '-DLED_START_FLASHES=3' '-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
+# 2.7V brownout
+pro8_isp: HFUSE = DD
+# Full swing xtal (20MHz) 258CK/14CK+4.1ms
+pro8_isp: LFUSE = C6
+# 512 byte boot
+pro8_isp: EFUSE = 04
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: LDSECTIONS = -Wl,--section-start=.text=0x7e00 -Wl,--section-start=.version=0x7ffe
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
+# 512 byte boot, SPIEN
+atmega328_pro8_isp: HFUSE = DE
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+atmega328_pro8_isp: LFUSE = FF
+# 2.7V brownout
+atmega328_pro8_isp: EFUSE = 05
atmega328_pro8_isp: isp
# 1MHz clocked platforms
@@ -200,18 +403,26 @@ 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: LDSECTIONS = -Wl,--section-start=.text=0x1d00 -Wl,--section-start=.version=0x1efe
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
+# Brownout disabled
+luminet_isp: HFUSE = DF
+# 1MHz internal oscillator, slowly rising power
+luminet_isp: LFUSE = 62
+# Self-programming enable
+luminet_isp: EFUSE = FE
luminet_isp: isp
+#
+# Generic build instructions
+#
+#
+
isp: $(TARGET)
$(ISPFUSES)
$(ISPFLASH)
@@ -222,6 +433,7 @@ isp-stk500: $(PROGRAM)_$(TARGET).hex
%.elf: $(OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ $(SIZE) $@
clean:
rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex
@@ -230,10 +442,10 @@ clean:
$(OBJDUMP) -h -S $< > $@
%.hex: %.elf
- $(OBJCOPY) -j .text -j .data -O ihex $< $@
+ $(OBJCOPY) -j .text -j .data -j .version --set-section-flags .version=alloc,load -O ihex $< $@
%.srec: %.elf
- $(OBJCOPY) -j .text -j .data -O srec $< $@
+ $(OBJCOPY) -j .text -j .data -j .version --set-section-flags .version=alloc,load -O srec $< $@
%.bin: %.elf
- $(OBJCOPY) -j .text -j .data -O binary $< $@
+ $(OBJCOPY) -j .text -j .data -j .version --set-section-flags .version=alloc,load -O binary $< $@
diff --git a/hardware/arduino/bootloaders/optiboot/README.TXT b/hardware/arduino/bootloaders/optiboot/README.TXT
new file mode 100644
index 0000000..cd79cd9
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/README.TXT
@@ -0,0 +1,81 @@
+This directory contains the Optiboot small bootloader for AVR
+microcontrollers, somewhat modified specifically for the Arduino
+environment.
+
+Optiboot is more fully described here: http://code.google.com/p/optiboot/
+and is the work of Peter Knight (aka Cathedrow), building on work of Jason P
+Kyle, Spiff, and Ladyada. Arduino-specific modification are by Bill
+Westfield (aka WestfW)
+
+Arduino-specific issues are tracked as part of the Arduino project
+at http://code.google.com/p/arduino
+
+
+------------------------------------------------------------
+Building optiboot for Arduino.
+
+Production builds of optiboot for Arduino are done on a Mac in "unix mode"
+using CrossPack-AVR-20100115. CrossPack tracks WINAVR (for windows), which
+is just a package of avr-gcc and related utilities, so similar builds should
+work on Windows or Linux systems.
+
+One of the Arduino-specific changes is modifications to the makefile to
+allow building optiboot using only the tools installed as part of the
+Arduino environment, or the Arduino source development tree. All three
+build procedures should yield identical binaries (.hex files) (although
+this may change if compiler versions drift apart between CrossPack and
+the Arduino IDE.)
+
+
+Building Optiboot in the Arduino IDE Install.
+
+Work in the .../hardware/arduino/bootloaders/optiboot/ and use the
+"omake <targets>" command, which just generates a command that uses
+the arduino-included "make" utility with a command like:
+ make OS=windows ENV=arduino <targets>
+or make OS=macosx ENV=arduino <targets>
+On windows, this assumes you're using the windows command shell. If
+you're using a cygwin or mingw shell, or have one of those in your
+path, the build will probably break due to slash vs backslash issues.
+On a Mac, if you have the developer tools installed, you can use the
+Apple-supplied version of make.
+The makefile uses relative paths ("../../../tools/" and such) to find
+the programs it needs, so you need to work in the existing optiboot
+directory (or something created at the same "level") for it to work.
+
+
+Building Optiboot in the Arduino Source Development Install.
+
+In this case, there is no special shell script, and you're assumed to
+have "make" installed somewhere in your path.
+Build the Arduino source ("ant build") to unpack the tools into the
+expected directory.
+Work in Arduino/hardware/arduino/bootloaders/optiboot and use
+ make OS=windows ENV=arduinodev <targets>
+or make OS=macosx ENV=arduinodev <targets>
+
+
+Programming Chips Using the _isp Targets
+
+The CPU targets have corresponding ISP targets that will actuall
+program the bootloader into a chip. "atmega328_isp" for the atmega328,
+for example. These will set the fuses and lock bits as appropriate as
+well as uploading the bootloader code.
+
+The makefiles default to using a USB programmer, but you can use
+a serial programmer like ArduinoISP by changing the appropriate
+variables when you invoke make:
+
+ make ISPTOOL=stk500v1 ISPPORT=/dev/tty.usbserial-A20e1eAN \
+ ISPSPEED=-b19200 atmega328_isp
+
+The "atmega8_isp" target does not currently work, because the mega8
+doesn't have the "extended" fuse that the generic ISP target wants to
+pass on to avrdude. You'll need to run avrdude manually.
+
+
+Standard Targets
+
+I've reduced the pre-built and source-version-controlled targets
+(.hex and .lst files included in the git repository) to just the
+three basic 16MHz targets: atmega8, atmega16, atmega328.
diff --git a/hardware/arduino/bootloaders/optiboot/boot.h b/hardware/arduino/bootloaders/optiboot/boot.h
new file mode 100644
index 0000000..2639cd8
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/boot.h
@@ -0,0 +1,848 @@
+/* Modified to use out for SPM access
+** Peter Knight, Optiboot project http://optiboot.googlecode.com
+**
+** Todo: Tidy up
+**
+** "_short" routines execute 1 cycle faster and use 1 less word of flash
+** by using "out" instruction instead of "sts".
+**
+** Additional elpm variants that trust the value of RAMPZ
+*/
+
+/* Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 Eric B. Weddington
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of the copyright holders nor the names of
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE. */
+
+/* $Id: boot.h,v 1.27.2.3 2008/09/30 13:58:48 arcanum Exp $ */
+
+#ifndef _AVR_BOOT_H_
+#define _AVR_BOOT_H_ 1
+
+/** \file */
+/** \defgroup avr_boot <avr/boot.h>: Bootloader Support Utilities
+ \code
+ #include <avr/io.h>
+ #include <avr/boot.h>
+ \endcode
+
+ The macros in this module provide a C language interface to the
+ bootloader support functionality of certain AVR processors. These
+ macros are designed to work with all sizes of flash memory.
+
+ Global interrupts are not automatically disabled for these macros. It
+ is left up to the programmer to do this. See the code example below.
+ Also see the processor datasheet for caveats on having global interrupts
+ enabled during writing of the Flash.
+
+ \note Not all AVR processors provide bootloader support. See your
+ processor datasheet to see if it provides bootloader support.
+
+ \todo From email with Marek: On smaller devices (all except ATmega64/128),
+ __SPM_REG is in the I/O space, accessible with the shorter "in" and "out"
+ instructions - since the boot loader has a limited size, this could be an
+ important optimization.
+
+ \par API Usage Example
+ The following code shows typical usage of the boot API.
+
+ \code
+ #include <inttypes.h>
+ #include <avr/interrupt.h>
+ #include <avr/pgmspace.h>
+
+ void boot_program_page (uint32_t page, uint8_t *buf)
+ {
+ uint16_t i;
+ uint8_t sreg;
+
+ // Disable interrupts.
+
+ sreg = SREG;
+ cli();
+
+ eeprom_busy_wait ();
+
+ boot_page_erase (page);
+ boot_spm_busy_wait (); // Wait until the memory is erased.
+
+ for (i=0; i<SPM_PAGESIZE; i+=2)
+ {
+ // Set up little-endian word.
+
+ uint16_t w = *buf++;
+ w += (*buf++) << 8;
+
+ boot_page_fill (page + i, w);
+ }
+
+ boot_page_write (page); // Store buffer in flash page.
+ boot_spm_busy_wait(); // Wait until the memory is written.
+
+ // Reenable RWW-section again. We need this if we want to jump back
+ // to the application after bootloading.
+
+ boot_rww_enable ();
+
+ // Re-enable interrupts (if they were ever enabled).
+
+ SREG = sreg;
+ }\endcode */
+
+#include <avr/eeprom.h>
+#include <avr/io.h>
+#include <inttypes.h>
+#include <limits.h>
+
+/* Check for SPM Control Register in processor. */
+#if defined (SPMCSR)
+# define __SPM_REG SPMCSR
+#elif defined (SPMCR)
+# define __SPM_REG SPMCR
+#else
+# error AVR processor does not provide bootloader support!
+#endif
+
+
+/* Check for SPM Enable bit. */
+#if defined(SPMEN)
+# define __SPM_ENABLE SPMEN
+#elif defined(SELFPRGEN)
+# define __SPM_ENABLE SELFPRGEN
+#else
+# error Cannot find SPM Enable bit definition!
+#endif
+
+/** \ingroup avr_boot
+ \def BOOTLOADER_SECTION
+
+ Used to declare a function or variable to be placed into a
+ new section called .bootloader. This section and its contents
+ can then be relocated to any address (such as the bootloader
+ NRWW area) at link-time. */
+
+#define BOOTLOADER_SECTION __attribute__ ((section (".bootloader")))
+
+/* Create common bit definitions. */
+#ifdef ASB
+#define __COMMON_ASB ASB
+#else
+#define __COMMON_ASB RWWSB
+#endif
+
+#ifdef ASRE
+#define __COMMON_ASRE ASRE
+#else
+#define __COMMON_ASRE RWWSRE
+#endif
+
+/* Define the bit positions of the Boot Lock Bits. */
+
+#define BLB12 5
+#define BLB11 4
+#define BLB02 3
+#define BLB01 2
+
+/** \ingroup avr_boot
+ \def boot_spm_interrupt_enable()
+ Enable the SPM interrupt. */
+
+#define boot_spm_interrupt_enable() (__SPM_REG |= (uint8_t)_BV(SPMIE))
+
+/** \ingroup avr_boot
+ \def boot_spm_interrupt_disable()
+ Disable the SPM interrupt. */
+
+#define boot_spm_interrupt_disable() (__SPM_REG &= (uint8_t)~_BV(SPMIE))
+
+/** \ingroup avr_boot
+ \def boot_is_spm_interrupt()
+ Check if the SPM interrupt is enabled. */
+
+#define boot_is_spm_interrupt() (__SPM_REG & (uint8_t)_BV(SPMIE))
+
+/** \ingroup avr_boot
+ \def boot_rww_busy()
+ Check if the RWW section is busy. */
+
+#define boot_rww_busy() (__SPM_REG & (uint8_t)_BV(__COMMON_ASB))
+
+/** \ingroup avr_boot
+ \def boot_spm_busy()
+ Check if the SPM instruction is busy. */
+
+#define boot_spm_busy() (__SPM_REG & (uint8_t)_BV(__SPM_ENABLE))
+
+/** \ingroup avr_boot
+ \def boot_spm_busy_wait()
+ Wait while the SPM instruction is busy. */
+
+#define boot_spm_busy_wait() do{}while(boot_spm_busy())
+
+#define __BOOT_PAGE_ERASE (_BV(__SPM_ENABLE) | _BV(PGERS))
+#define __BOOT_PAGE_WRITE (_BV(__SPM_ENABLE) | _BV(PGWRT))
+#define __BOOT_PAGE_FILL _BV(__SPM_ENABLE)
+#define __BOOT_RWW_ENABLE (_BV(__SPM_ENABLE) | _BV(__COMMON_ASRE))
+#define __BOOT_LOCK_BITS_SET (_BV(__SPM_ENABLE) | _BV(BLBSET))
+
+#define __boot_page_fill_short(address, data) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "movw r0, %3\n\t" \
+ "out %0, %1\n\t" \
+ "spm\n\t" \
+ "clr r1\n\t" \
+ : \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_PAGE_FILL), \
+ "z" ((uint16_t)address), \
+ "r" ((uint16_t)data) \
+ : "r0" \
+ ); \
+}))
+
+#define __boot_page_fill_normal(address, data) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "movw r0, %3\n\t" \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ "clr r1\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_PAGE_FILL), \
+ "z" ((uint16_t)address), \
+ "r" ((uint16_t)data) \
+ : "r0" \
+ ); \
+}))
+
+#define __boot_page_fill_alternate(address, data)\
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "movw r0, %3\n\t" \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ ".word 0xffff\n\t" \
+ "nop\n\t" \
+ "clr r1\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_PAGE_FILL), \
+ "z" ((uint16_t)address), \
+ "r" ((uint16_t)data) \
+ : "r0" \
+ ); \
+}))
+
+#define __boot_page_fill_extended(address, data) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "movw r0, %4\n\t" \
+ "movw r30, %A3\n\t" \
+ "sts %1, %C3\n\t" \
+ "sts %0, %2\n\t" \
+ "spm\n\t" \
+ "clr r1\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "i" (_SFR_MEM_ADDR(RAMPZ)), \
+ "r" ((uint8_t)__BOOT_PAGE_FILL), \
+ "r" ((uint32_t)address), \
+ "r" ((uint16_t)data) \
+ : "r0", "r30", "r31" \
+ ); \
+}))
+
+#define __boot_page_fill_extended_short(address, data) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "movw r0, %4\n\t" \
+ "movw r30, %A3\n\t" \
+ "out %1, %C3\n\t" \
+ "out %0, %2\n\t" \
+ "spm\n\t" \
+ "clr r1\n\t" \
+ : \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "i" (_SFR_IO_ADDR(RAMPZ)), \
+ "r" ((uint8_t)__BOOT_PAGE_FILL), \
+ "r" ((uint32_t)address), \
+ "r" ((uint16_t)data) \
+ : "r0", "r30", "r31" \
+ ); \
+}))
+
+#define __boot_page_erase_short(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "out %0, %1\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_PAGE_ERASE), \
+ "z" ((uint16_t)address) \
+ ); \
+}))
+
+
+#define __boot_page_erase_normal(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_PAGE_ERASE), \
+ "z" ((uint16_t)address) \
+ ); \
+}))
+
+#define __boot_page_erase_alternate(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ ".word 0xffff\n\t" \
+ "nop\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_PAGE_ERASE), \
+ "z" ((uint16_t)address) \
+ ); \
+}))
+
+#define __boot_page_erase_extended(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "movw r30, %A3\n\t" \
+ "sts %1, %C3\n\t" \
+ "sts %0, %2\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "i" (_SFR_MEM_ADDR(RAMPZ)), \
+ "r" ((uint8_t)__BOOT_PAGE_ERASE), \
+ "r" ((uint32_t)address) \
+ : "r30", "r31" \
+ ); \
+}))
+#define __boot_page_erase_extended_short(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "movw r30, %A3\n\t" \
+ "out %1, %C3\n\t" \
+ "out %0, %2\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "i" (_SFR_IO_ADDR(RAMPZ)), \
+ "r" ((uint8_t)__BOOT_PAGE_ERASE), \
+ "r" ((uint32_t)address) \
+ : "r30", "r31" \
+ ); \
+}))
+
+#define __boot_page_write_short(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "out %0, %1\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_PAGE_WRITE), \
+ "z" ((uint16_t)address) \
+ ); \
+}))
+
+#define __boot_page_write_normal(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_PAGE_WRITE), \
+ "z" ((uint16_t)address) \
+ ); \
+}))
+
+#define __boot_page_write_alternate(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ ".word 0xffff\n\t" \
+ "nop\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_PAGE_WRITE), \
+ "z" ((uint16_t)address) \
+ ); \
+}))
+
+#define __boot_page_write_extended(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "movw r30, %A3\n\t" \
+ "sts %1, %C3\n\t" \
+ "sts %0, %2\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "i" (_SFR_MEM_ADDR(RAMPZ)), \
+ "r" ((uint8_t)__BOOT_PAGE_WRITE), \
+ "r" ((uint32_t)address) \
+ : "r30", "r31" \
+ ); \
+}))
+#define __boot_page_write_extended_short(address) \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "movw r30, %A3\n\t" \
+ "out %1, %C3\n\t" \
+ "out %0, %2\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "i" (_SFR_IO_ADDR(RAMPZ)), \
+ "r" ((uint8_t)__BOOT_PAGE_WRITE), \
+ "r" ((uint32_t)address) \
+ : "r30", "r31" \
+ ); \
+}))
+
+#define __boot_rww_enable_short() \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "out %0, %1\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_RWW_ENABLE) \
+ ); \
+}))
+
+#define __boot_rww_enable() \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_RWW_ENABLE) \
+ ); \
+}))
+
+#define __boot_rww_enable_alternate() \
+(__extension__({ \
+ __asm__ __volatile__ \
+ ( \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ ".word 0xffff\n\t" \
+ "nop\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_RWW_ENABLE) \
+ ); \
+}))
+
+/* From the mega16/mega128 data sheets (maybe others):
+
+ Bits by SPM To set the Boot Loader Lock bits, write the desired data to
+ R0, write "X0001001" to SPMCR and execute SPM within four clock cycles
+ after writing SPMCR. The only accessible Lock bits are the Boot Lock bits
+ that may prevent the Application and Boot Loader section from any
+ software update by the MCU.
+
+ If bits 5..2 in R0 are cleared (zero), the corresponding Boot Lock bit
+ will be programmed if an SPM instruction is executed within four cycles
+ after BLBSET and SPMEN (or SELFPRGEN) are set in SPMCR. The Z-pointer is
+ don't care during this operation, but for future compatibility it is
+ recommended to load the Z-pointer with $0001 (same as used for reading the
+ Lock bits). For future compatibility It is also recommended to set bits 7,
+ 6, 1, and 0 in R0 to 1 when writing the Lock bits. When programming the
+ Lock bits the entire Flash can be read during the operation. */
+
+#define __boot_lock_bits_set_short(lock_bits) \
+(__extension__({ \
+ uint8_t value = (uint8_t)(~(lock_bits)); \
+ __asm__ __volatile__ \
+ ( \
+ "ldi r30, 1\n\t" \
+ "ldi r31, 0\n\t" \
+ "mov r0, %2\n\t" \
+ "out %0, %1\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_LOCK_BITS_SET), \
+ "r" (value) \
+ : "r0", "r30", "r31" \
+ ); \
+}))
+
+#define __boot_lock_bits_set(lock_bits) \
+(__extension__({ \
+ uint8_t value = (uint8_t)(~(lock_bits)); \
+ __asm__ __volatile__ \
+ ( \
+ "ldi r30, 1\n\t" \
+ "ldi r31, 0\n\t" \
+ "mov r0, %2\n\t" \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_LOCK_BITS_SET), \
+ "r" (value) \
+ : "r0", "r30", "r31" \
+ ); \
+}))
+
+#define __boot_lock_bits_set_alternate(lock_bits) \
+(__extension__({ \
+ uint8_t value = (uint8_t)(~(lock_bits)); \
+ __asm__ __volatile__ \
+ ( \
+ "ldi r30, 1\n\t" \
+ "ldi r31, 0\n\t" \
+ "mov r0, %2\n\t" \
+ "sts %0, %1\n\t" \
+ "spm\n\t" \
+ ".word 0xffff\n\t" \
+ "nop\n\t" \
+ : \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_LOCK_BITS_SET), \
+ "r" (value) \
+ : "r0", "r30", "r31" \
+ ); \
+}))
+
+/*
+ Reading lock and fuse bits:
+
+ Similarly to writing the lock bits above, set BLBSET and SPMEN (or
+ SELFPRGEN) bits in __SPMREG, and then (within four clock cycles) issue an
+ LPM instruction.
+
+ Z address: contents:
+ 0x0000 low fuse bits
+ 0x0001 lock bits
+ 0x0002 extended fuse bits
+ 0x0003 high fuse bits
+
+ Sounds confusing, doesn't it?
+
+ Unlike the macros in pgmspace.h, no need to care for non-enhanced
+ cores here as these old cores do not provide SPM support anyway.
+ */
+
+/** \ingroup avr_boot
+ \def GET_LOW_FUSE_BITS
+ address to read the low fuse bits, using boot_lock_fuse_bits_get
+ */
+#define GET_LOW_FUSE_BITS (0x0000)
+/** \ingroup avr_boot
+ \def GET_LOCK_BITS
+ address to read the lock bits, using boot_lock_fuse_bits_get
+ */
+#define GET_LOCK_BITS (0x0001)
+/** \ingroup avr_boot
+ \def GET_EXTENDED_FUSE_BITS
+ address to read the extended fuse bits, using boot_lock_fuse_bits_get
+ */
+#define GET_EXTENDED_FUSE_BITS (0x0002)
+/** \ingroup avr_boot
+ \def GET_HIGH_FUSE_BITS
+ address to read the high fuse bits, using boot_lock_fuse_bits_get
+ */
+#define GET_HIGH_FUSE_BITS (0x0003)
+
+/** \ingroup avr_boot
+ \def boot_lock_fuse_bits_get(address)
+
+ Read the lock or fuse bits at \c address.
+
+ Parameter \c address can be any of GET_LOW_FUSE_BITS,
+ GET_LOCK_BITS, GET_EXTENDED_FUSE_BITS, or GET_HIGH_FUSE_BITS.
+
+ \note The lock and fuse bits returned are the physical values,
+ i.e. a bit returned as 0 means the corresponding fuse or lock bit
+ is programmed.
+ */
+#define boot_lock_fuse_bits_get_short(address) \
+(__extension__({ \
+ uint8_t __result; \
+ __asm__ __volatile__ \
+ ( \
+ "ldi r30, %3\n\t" \
+ "ldi r31, 0\n\t" \
+ "out %1, %2\n\t" \
+ "lpm %0, Z\n\t" \
+ : "=r" (__result) \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_LOCK_BITS_SET), \
+ "M" (address) \
+ : "r0", "r30", "r31" \
+ ); \
+ __result; \
+}))
+
+#define boot_lock_fuse_bits_get(address) \
+(__extension__({ \
+ uint8_t __result; \
+ __asm__ __volatile__ \
+ ( \
+ "ldi r30, %3\n\t" \
+ "ldi r31, 0\n\t" \
+ "sts %1, %2\n\t" \
+ "lpm %0, Z\n\t" \
+ : "=r" (__result) \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t)__BOOT_LOCK_BITS_SET), \
+ "M" (address) \
+ : "r0", "r30", "r31" \
+ ); \
+ __result; \
+}))
+
+/** \ingroup avr_boot
+ \def boot_signature_byte_get(address)
+
+ Read the Signature Row byte at \c address. For some MCU types,
+ this function can also retrieve the factory-stored oscillator
+ calibration bytes.
+
+ Parameter \c address can be 0-0x1f as documented by the datasheet.
+ \note The values are MCU type dependent.
+*/
+
+#define __BOOT_SIGROW_READ (_BV(__SPM_ENABLE) | _BV(SIGRD))
+
+#define boot_signature_byte_get_short(addr) \
+(__extension__({ \
+ uint16_t __addr16 = (uint16_t)(addr); \
+ uint8_t __result; \
+ __asm__ __volatile__ \
+ ( \
+ "out %1, %2\n\t" \
+ "lpm %0, Z" "\n\t" \
+ : "=r" (__result) \
+ : "i" (_SFR_IO_ADDR(__SPM_REG)), \
+ "r" ((uint8_t) __BOOT_SIGROW_READ), \
+ "z" (__addr16) \
+ ); \
+ __result; \
+}))
+
+#define boot_signature_byte_get(addr) \
+(__extension__({ \
+ uint16_t __addr16 = (uint16_t)(addr); \
+ uint8_t __result; \
+ __asm__ __volatile__ \
+ ( \
+ "sts %1, %2\n\t" \
+ "lpm %0, Z" "\n\t" \
+ : "=r" (__result) \
+ : "i" (_SFR_MEM_ADDR(__SPM_REG)), \
+ "r" ((uint8_t) __BOOT_SIGROW_READ), \
+ "z" (__addr16) \
+ ); \
+ __result; \
+}))
+
+/** \ingroup avr_boot
+ \def boot_page_fill(address, data)
+
+ Fill the bootloader temporary page buffer for flash
+ address with data word.
+
+ \note The address is a byte address. The data is a word. The AVR
+ writes data to the buffer a word at a time, but addresses the buffer
+ per byte! So, increment your address by 2 between calls, and send 2
+ data bytes in a word format! The LSB of the data is written to the lower
+ address; the MSB of the data is written to the higher address.*/
+
+/** \ingroup avr_boot
+ \def boot_page_erase(address)
+
+ Erase the flash page that contains address.
+
+ \note address is a byte address in flash, not a word address. */
+
+/** \ingroup avr_boot
+ \def boot_page_write(address)
+
+ Write the bootloader temporary page buffer
+ to flash page that contains address.
+
+ \note address is a byte address in flash, not a word address. */
+
+/** \ingroup avr_boot
+ \def boot_rww_enable()
+
+ Enable the Read-While-Write memory section. */
+
+/** \ingroup avr_boot
+ \def boot_lock_bits_set(lock_bits)
+
+ Set the bootloader lock bits.
+
+ \param lock_bits A mask of which Boot Loader Lock Bits to set.
+
+ \note In this context, a 'set bit' will be written to a zero value.
+ Note also that only BLBxx bits can be programmed by this command.
+
+ For example, to disallow the SPM instruction from writing to the Boot
+ Loader memory section of flash, you would use this macro as such:
+
+ \code
+ boot_lock_bits_set (_BV (BLB11));
+ \endcode
+
+ \note Like any lock bits, the Boot Loader Lock Bits, once set,
+ cannot be cleared again except by a chip erase which will in turn
+ also erase the boot loader itself. */
+
+/* Normal versions of the macros use 16-bit addresses.
+ Extended versions of the macros use 32-bit addresses.
+ Alternate versions of the macros use 16-bit addresses and require special
+ instruction sequences after LPM.
+
+ FLASHEND is defined in the ioXXXX.h file.
+ USHRT_MAX is defined in <limits.h>. */
+
+#if defined(__AVR_ATmega161__) || defined(__AVR_ATmega163__) \
+ || defined(__AVR_ATmega323__)
+
+/* Alternate: ATmega161/163/323 and 16 bit address */
+#define boot_page_fill(address, data) __boot_page_fill_alternate(address, data)
+#define boot_page_erase(address) __boot_page_erase_alternate(address)
+#define boot_page_write(address) __boot_page_write_alternate(address)
+#define boot_rww_enable() __boot_rww_enable_alternate()
+#define boot_lock_bits_set(lock_bits) __boot_lock_bits_set_alternate(lock_bits)
+
+#elif (FLASHEND > USHRT_MAX)
+
+/* Extended: >16 bit address */
+#define boot_page_fill(address, data) __boot_page_fill_extended_short(address, data)
+#define boot_page_erase(address) __boot_page_erase_extended_short(address)
+#define boot_page_write(address) __boot_page_write_extended_short(address)
+#define boot_rww_enable() __boot_rww_enable_short()
+#define boot_lock_bits_set(lock_bits) __boot_lock_bits_set_short(lock_bits)
+
+#else
+
+/* Normal: 16 bit address */
+#define boot_page_fill(address, data) __boot_page_fill_short(address, data)
+#define boot_page_erase(address) __boot_page_erase_short(address)
+#define boot_page_write(address) __boot_page_write_short(address)
+#define boot_rww_enable() __boot_rww_enable_short()
+#define boot_lock_bits_set(lock_bits) __boot_lock_bits_set_short(lock_bits)
+
+#endif
+
+/** \ingroup avr_boot
+
+ Same as boot_page_fill() except it waits for eeprom and spm operations to
+ complete before filling the page. */
+
+#define boot_page_fill_safe(address, data) \
+do { \
+ boot_spm_busy_wait(); \
+ eeprom_busy_wait(); \
+ boot_page_fill(address, data); \
+} while (0)
+
+/** \ingroup avr_boot
+
+ Same as boot_page_erase() except it waits for eeprom and spm operations to
+ complete before erasing the page. */
+
+#define boot_page_erase_safe(address) \
+do { \
+ boot_spm_busy_wait(); \
+ eeprom_busy_wait(); \
+ boot_page_erase (address); \
+} while (0)
+
+/** \ingroup avr_boot
+
+ Same as boot_page_write() except it waits for eeprom and spm operations to
+ complete before writing the page. */
+
+#define boot_page_write_safe(address) \
+do { \
+ boot_spm_busy_wait(); \
+ eeprom_busy_wait(); \
+ boot_page_write (address); \
+} while (0)
+
+/** \ingroup avr_boot
+
+ Same as boot_rww_enable() except waits for eeprom and spm operations to
+ complete before enabling the RWW mameory. */
+
+#define boot_rww_enable_safe() \
+do { \
+ boot_spm_busy_wait(); \
+ eeprom_busy_wait(); \
+ boot_rww_enable(); \
+} while (0)
+
+/** \ingroup avr_boot
+
+ Same as boot_lock_bits_set() except waits for eeprom and spm operations to
+ complete before setting the lock bits. */
+
+#define boot_lock_bits_set_safe(lock_bits) \
+do { \
+ boot_spm_busy_wait(); \
+ eeprom_busy_wait(); \
+ boot_lock_bits_set (lock_bits); \
+} while (0)
+
+#endif /* _AVR_BOOT_H_ */
diff --git a/hardware/arduino/bootloaders/optiboot/makeall b/hardware/arduino/bootloaders/optiboot/makeall
index 7a0b82d..f076bc7 100755
--- a/hardware/arduino/bootloaders/optiboot/makeall
+++ b/hardware/arduino/bootloaders/optiboot/makeall
@@ -1,13 +1,20 @@
#!/bin/bash
make clean
+#
+# The "big three" standard bootloaders.
+make atmega8
+make atmega168
+make atmega328
+#
+# additional buildable platforms of
+# somewhat questionable support level
make lilypad
make lilypad_resonator
make pro8
make pro16
make pro20
-make diecimila
-make ng
-make atmega328
make atmega328_pro8
+make sanguino
+make mega
+make atmega88
make luminet
-
diff --git a/hardware/arduino/bootloaders/optiboot/omake b/hardware/arduino/bootloaders/optiboot/omake
new file mode 100644
index 0000000..cc7c6bc
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/omake
@@ -0,0 +1,2 @@
+echo ../../../tools/avr/bin/make OS=macosx ENV=arduino $*
+../../../tools/avr/bin/make OS=macosx ENV=arduino $*
diff --git a/hardware/arduino/bootloaders/optiboot/omake.bat b/hardware/arduino/bootloaders/optiboot/omake.bat
new file mode 100644
index 0000000..f6815da
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/omake.bat
@@ -0,0 +1 @@
+..\..\..\tools\avr\utils\bin\make OS=windows ENV=arduino %*
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot.c b/hardware/arduino/bootloaders/optiboot/optiboot.c
index c7d817a..d499d85 100644
--- a/hardware/arduino/bootloaders/optiboot/optiboot.c
+++ b/hardware/arduino/bootloaders/optiboot/optiboot.c
@@ -1,6 +1,11 @@
/**********************************************************/
/* Optiboot bootloader for Arduino */
/* */
+/* http://optiboot.googlecode.com */
+/* */
+/* Arduino-maintained version : See README.TXT */
+/* http://code.google.com/p/arduino/ */
+/* */
/* Heavily optimised bootloader that is faster and */
/* smaller than the Arduino standard bootloader */
/* */
@@ -10,6 +15,8 @@
/* Higher baud rate speeds up programming */
/* Written almost entirely in C */
/* Customisable timeout with accurate timeconstant */
+/* Optional virtual UART. No hardware UART required. */
+/* Optional virtual boot partition for devices without. */
/* */
/* What you lose: */
/* Implements a skeleton STK500 protocol which is */
@@ -18,12 +25,19 @@
/* High baud rate breaks compatibility with standard */
/* Arduino flash settings */
/* */
-/* Currently supports: */
-/* ATmega168 based devices (Diecimila etc) */
+/* Fully supported: */
+/* ATmega168 based devices (Diecimila etc) */
/* ATmega328P based devices (Duemilanove etc) */
/* */
+/* Alpha test */
+/* ATmega1280 based devices (Arduino Mega) */
+/* */
+/* Work in progress: */
+/* ATmega644P based devices (Sanguino) */
+/* ATtiny84 based devices (Luminet) */
+/* */
/* Does not support: */
-/* ATmega1280 based devices (eg. Mega) */
+/* USB based devices (eg. Teensy) */
/* */
/* Assumptions: */
/* The code makes several assumptions that reduce the */
@@ -64,102 +78,123 @@
/* */
/**********************************************************/
+
+/**********************************************************/
+/* */
+/* Optional defines: */
+/* */
+/**********************************************************/
+/* */
+/* BIG_BOOT: */
+/* Build a 1k bootloader, not 512 bytes. This turns on */
+/* extra functionality. */
+/* */
+/* BAUD_RATE: */
+/* Set bootloader baud rate. */
+/* */
+/* LUDICROUS_SPEED: */
+/* 230400 baud :-) */
+/* */
+/* SOFT_UART: */
+/* Use AVR305 soft-UART instead of hardware UART. */
+/* */
+/* LED_START_FLASHES: */
+/* Number of LED flashes on bootup. */
+/* */
+/* LED_DATA_FLASH: */
+/* Flash LED when transferring data. For boards without */
+/* TX or RX LEDs, or for people who like blinky lights. */
+/* */
+/* SUPPORT_EEPROM: */
+/* Support reading and writing from EEPROM. This is not */
+/* used by Arduino, so off by default. */
+/* */
+/* TIMEOUT_MS: */
+/* Bootloader timeout period, in milliseconds. */
+/* 500,1000,2000,4000,8000 supported. */
+/* */
+/**********************************************************/
+
+/**********************************************************/
+/* Version Numbers! */
+/* */
+/* Arduino Optiboot now includes this Version number in */
+/* the source and object code. */
+/* */
+/* Version 3 was released as zip from the optiboot */
+/* repository and was distributed with Arduino 0022. */
+/* Version 4 starts with the arduino repository commit */
+/* that brought the arduino repository up-to-date with */
+/* the optiboot source tree changes since v3. */
+/* */
+/**********************************************************/
+
+/**********************************************************/
+/* Edit History: */
+/* */
+/* 4.4 WestfW: add initialization of address to keep */
+/* the compiler happy. Change SC'ed targets. */
+/* Return the SW version via READ PARAM */
+/* 4.3 WestfW: catch framing errors in getch(), so that */
+/* AVRISP works without HW kludges. */
+/* http://code.google.com/p/arduino/issues/detail?id=368n*/
+/* 4.2 WestfW: reduce code size, fix timeouts, change */
+/* verifySpace to use WDT instead of appstart */
+/* 4.1 WestfW: put version number in binary. */
+/**********************************************************/
+
+#define OPTIBOOT_MAJVER 4
+#define OPTIBOOT_MINVER 4
+
+#define MAKESTR(a) #a
+#define MAKEVER(a, b) MAKESTR(a*256+b)
+
+asm(" .section .version\n"
+ "optiboot_version: .word " MAKEVER(OPTIBOOT_MAJVER, OPTIBOOT_MINVER) "\n"
+ " .section .text\n");
+
#include <inttypes.h>
#include <avr/io.h>
#include <avr/pgmspace.h>
-#include <avr/boot.h>
-//#define LED_DATA_FLASH
+// <avr/boot.h> uses sts instructions, but this version uses out instructions
+// This saves cycles and program memory.
+#include "boot.h"
+
+
+// We don't use <avr/wdt.h> as those routines have interrupt overhead we don't need.
+
+#include "pin_defs.h"
+#include "stk500.h"
#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 */
+#ifdef LUDICROUS_SPEED
+#define BAUD_RATE 230400L
+#endif
-/* set the UART baud rate */
+/* set the UART baud rate defaults */
#ifndef BAUD_RATE
-#define BAUD_RATE 19200
+#if F_CPU >= 8000000L
+#define BAUD_RATE 115200L // Highest rate Avrdude win32 will support
+#elsif F_CPU >= 1000000L
+#define BAUD_RATE 9600L // 19200 also supported, but with significant error
+#elsif F_CPU >= 128000L
+#define BAUD_RATE 4800L // Good for 128kHz internal RC
+#else
+#define BAUD_RATE 1200L // Good even at 32768Hz
+#endif
#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
+/* Switch in soft UART for hard baud rates */
+#if (F_CPU/BAUD_RATE) > 280 // > 57600 for 16MHz
+#ifndef SOFT_UART
+#define SOFT_UART
#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))
@@ -170,8 +205,10 @@
#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))
+#ifndef __AVR_ATmega8__
+#define WATCHDOG_4S (_BV(WDP3) | _BV(WDE))
+#define WATCHDOG_8S (_BV(WDP3) | _BV(WDP0) | _BV(WDE))
+#endif
/* Function Prototypes */
/* The main function is in init9, which removes the interrupt vector table */
@@ -191,18 +228,48 @@ void uartDelay() __attribute__ ((naked));
#endif
void appStart() __attribute__ ((naked));
+#if defined(__AVR_ATmega168__)
+#define RAMSTART (0x100)
+#define NRWWSTART (0x3800)
+#elif defined(__AVR_ATmega328P__)
+#define RAMSTART (0x100)
+#define NRWWSTART (0x7000)
+#elif defined (__AVR_ATmega644P__)
+#define RAMSTART (0x100)
+#define NRWWSTART (0xE000)
+#elif defined(__AVR_ATtiny84__)
+#define RAMSTART (0x100)
+#define NRWWSTART (0x0000)
+#elif defined(__AVR_ATmega1280__)
+#define RAMSTART (0x200)
+#define NRWWSTART (0xE000)
+#elif defined(__AVR_ATmega8__) || defined(__AVR_ATmega88__)
+#define RAMSTART (0x100)
+#define NRWWSTART (0x1800)
+#endif
+
/* 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))
+#define buff ((uint8_t*)(RAMSTART))
#ifdef VIRTUAL_BOOT_PARTITION
-#define rstVect (*(uint16_t*)(0x204))
-#define wdtVect (*(uint16_t*)(0x206))
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
#endif
+
/* main program starts here */
int main(void) {
+ uint8_t ch;
+
+ /*
+ * Making these local and in registers prevents the need for initializing
+ * them, and also saves space because code no longer stores to memory.
+ * (initializing address keeps the compiler happy, but isn't really
+ * necessary, and uses 4 bytes of flash.)
+ */
+ register uint16_t address = 0;
+ register uint8_t length;
+
// After the zero init loop, this is the first code to run.
//
// This code makes the following assumptions:
@@ -212,29 +279,36 @@ int main(void) {
//
// If not, uncomment the following instructions:
// cli();
- // SP=RAMEND; // This is done by hardware reset
asm volatile ("clr __zero_reg__");
+#ifdef __AVR_ATmega8__
+ SP=RAMEND; // This is done by hardware reset
+#endif
- uint8_t ch;
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ MCUSR = 0;
+ if (!(ch & _BV(EXTRF))) appStart();
#if LED_START_FLASHES > 0
// Set up Timer 1 for timeout counter
TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
#endif
#ifndef SOFT_UART
+#ifdef __AVR_ATmega8__
+ UCSRA = _BV(U2X); //Double speed mode USART
+ UCSRB = _BV(RXEN) | _BV(TXEN); // enable Rx & Tx
+ UCSRC = _BV(URSEL) | _BV(UCSZ1) | _BV(UCSZ0); // config USART; 8N1
+ UBRRL = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+#else
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();
+#endif
// Set up watchdog to trigger after 500ms
- watchdogConfig(WATCHDOG_500MS);
+ watchdogConfig(WATCHDOG_1S);
/* Set LED pin as output */
LED_DDR |= _BV(LED);
@@ -255,9 +329,22 @@ int main(void) {
ch = getch();
if(ch == STK_GET_PARAMETER) {
- // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
- getNch(1);
- putch(0x03);
+ unsigned char which = getch();
+ verifySpace();
+ if (which == 0x82) {
+ /*
+ * Send optiboot version as "minor SW version"
+ */
+ putch(OPTIBOOT_MINVER);
+ } else if (which == 0x81) {
+ putch(OPTIBOOT_MAJVER);
+ } else {
+ /*
+ * GET PARAMETER returns a generic 0x03 reply for
+ * other parameters - enough to keep Avrdude happy
+ */
+ putch(0x03);
+ }
}
else if(ch == STK_SET_DEVICE) {
// SET DEVICE is ignored
@@ -269,9 +356,15 @@ int main(void) {
}
else if(ch == STK_LOAD_ADDRESS) {
// LOAD ADDRESS
- address = getch();
- address = (address & 0xff) | (getch() << 8);
- address += address; // Convert from word address to byte address
+ uint16_t newAddress;
+ newAddress = getch();
+ newAddress = (newAddress & 0xff) | (getch() << 8);
+#ifdef RAMPZ
+ // Transfer top bit to RAMPZ
+ RAMPZ = (newAddress & 0x8000) ? 1 : 0;
+#endif
+ newAddress += newAddress; // Convert from word address to byte address
+ address = newAddress;
verifySpace();
}
else if(ch == STK_UNIVERSAL) {
@@ -279,25 +372,31 @@ int main(void) {
getNch(4);
putch(0x00);
}
- /* Write memory, length is big endian and is in bytes */
+ /* 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();
+ getch(); /* getlen() */
+ length = getch();
+ getch();
- // Immediately start page erase - this will 4.5ms
- boot_page_erase((uint16_t)(void*)address);
+ // If we are in RWW section, immediately start page erase
+ if (address < NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
// While that is going on, read in page contents
bufPtr = buff;
do *bufPtr++ = getch();
while (--length);
+ // If we are in NRWW section, page erase has to be delayed until now.
+ // Todo: Take RAMPZ into account
+ if (address >= NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+
// 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();
@@ -310,10 +409,10 @@ int main(void) {
// Move RESET vector to WDT vector
uint16_t vect = buff[0] | (buff[1]<<8);
rstVect = vect;
- wdtVect = buff[10] | (buff[11]<<8);
+ wdtVect = buff[8] | (buff[9]<<8);
vect -= 4; // Instruction is a relative jump (rjmp), so recalculate.
- buff[10] = vect & 0xff;
- buff[11] = vect >> 8;
+ buff[8] = vect & 0xff;
+ buff[9] = vect >> 8;
// Add jump to bootloader at RESET vector
buff[0] = 0x7f;
@@ -329,12 +428,12 @@ int main(void) {
uint16_t a;
a = *bufPtr++;
a |= (*bufPtr++) << 8;
- boot_page_fill((uint16_t)(void*)addrPtr,a);
+ __boot_page_fill_short((uint16_t)(void*)addrPtr,a);
addrPtr += 2;
} while (--ch);
-
+
// Write from programming buffer
- boot_page_write((uint16_t)(void*)address);
+ __boot_page_write_short((uint16_t)(void*)address);
boot_spm_busy_wait();
#if defined(RWWSRE)
@@ -346,23 +445,38 @@ int main(void) {
/* Read memory block mode, length is big endian. */
else if(ch == STK_READ_PAGE) {
// READ PAGE - we only read flash
- getLen();
+ getch(); /* getlen() */
+ length = getch();
+ getch();
+
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 if (address == 8) ch=wdtVect & 0xff;
+ else if (address == 9) ch=wdtVect >> 8;
else ch = pgm_read_byte_near(address);
address++;
putch(ch);
} while (--length);
#else
+#ifdef __AVR_ATmega1280__
+// do putch(pgm_read_byte_near(address++));
+// while (--length);
+ do {
+ uint8_t result;
+ __asm__ ("elpm %0,Z\n":"=r"(result):"z"(address));
+ putch(result);
+ address++;
+ }
+ while (--length);
+#else
do putch(pgm_read_byte_near(address++));
while (--length);
#endif
+#endif
}
/* Get device signature bytes */
@@ -419,11 +533,13 @@ void putch(char ch) {
uint8_t getch(void) {
uint8_t ch;
- watchdogReset();
-
#ifdef LED_DATA_FLASH
+#ifdef __AVR_ATmega8__
+ LED_PORT ^= _BV(LED);
+#else
LED_PIN |= _BV(LED);
#endif
+#endif
#ifdef SOFT_UART
__asm__ __volatile__ (
@@ -434,7 +550,7 @@ uint8_t getch(void) {
" rcall uartDelay\n" // Wait 1 bit period
" clc\n"
" sbic %[uartPin],%[uartBit]\n"
- " sec\n"
+ " sec\n"
" dec %[bitCnt]\n"
" breq 3f\n"
" ror %[ch]\n"
@@ -450,19 +566,37 @@ uint8_t getch(void) {
"r25"
);
#else
- while(!(UCSR0A & _BV(RXC0)));
+ while(!(UCSR0A & _BV(RXC0)))
+ ;
+ if (!(UCSR0A & _BV(FE0))) {
+ /*
+ * A Framing Error indicates (probably) that something is talking
+ * to us at the wrong bit rate. Assume that this is because it
+ * expects to be talking to the application, and DON'T reset the
+ * watchdog. This should cause the bootloader to abort and run
+ * the application "soon", if it keeps happening. (Note that we
+ * don't care that an invalid char is returned...)
+ */
+ watchdogReset();
+ }
+
ch = UDR0;
#endif
#ifdef LED_DATA_FLASH
+#ifdef __AVR_ATmega8__
+ LED_PORT ^= _BV(LED);
+#else
LED_PIN |= _BV(LED);
#endif
+#endif
return ch;
}
#ifdef SOFT_UART
-//#define UART_B_VALUE (((F_CPU/BAUD_RATE)-23)/6)
+// AVR350 equation: #define UART_B_VALUE (((F_CPU/BAUD_RATE)-23)/6)
+// Adding 3 to numerator simulates nearest rounding for more accurate baud rates
#define UART_B_VALUE (((F_CPU/BAUD_RATE)-20)/6)
#if UART_B_VALUE > 255
#error Baud rate too slow for soft UART
@@ -485,7 +619,11 @@ void getNch(uint8_t count) {
}
void verifySpace() {
- if (getch() != CRC_EOP) appStart();
+ if (getch() != CRC_EOP) {
+ watchdogConfig(WATCHDOG_16MS); // shorten WD timeout
+ while (1) // and busy-loop so that WD causes
+ ; // a reset and app start.
+ }
putch(STK_INSYNC);
}
@@ -495,18 +633,16 @@ void flash_led(uint8_t count) {
TCNT1 = -(F_CPU/(1024*16));
TIFR1 = _BV(TOV1);
while(!(TIFR1 & _BV(TOV1)));
+#ifdef __AVR_ATmega8__
+ LED_PORT ^= _BV(LED);
+#else
LED_PIN |= _BV(LED);
+#endif
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__ (
@@ -524,7 +660,7 @@ void appStart() {
__asm__ __volatile__ (
#ifdef VIRTUAL_BOOT_PARTITION
// Jump to WDT vector
- "ldi r30,5\n"
+ "ldi r30,4\n"
"clr r31\n"
#else
// Jump to RST vector
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega168.hex b/hardware/arduino/bootloaders/optiboot/optiboot_atmega168.hex
new file mode 100644
index 0000000..c2f2b5b
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/optiboot_atmega168.hex
@@ -0,0 +1,35 @@
+:103E0000112484B714BE81FFF0D085E08093810037
+:103E100082E08093C00088E18093C10086E08093B7
+:103E2000C20080E18093C4008EE0C9D0259A86E06C
+:103E300020E33CEF91E0309385002093840096BB13
+:103E4000B09BFECF1D9AA8958150A9F7CC24DD2404
+:103E500088248394B5E0AB2EA1E19A2EF3E0BF2E27
+:103E6000A2D0813461F49FD0082FAFD0023811F076
+:103E7000013811F484E001C083E08DD089C0823420
+:103E800011F484E103C0853419F485E0A6D080C024
+:103E9000853579F488D0E82EFF2485D0082F10E0EE
+:103EA000102F00270E291F29000F111F8ED0680127
+:103EB0006FC0863521F484E090D080E0DECF843678
+:103EC00009F040C070D06FD0082F6DD080E0C816C8
+:103ED00088E3D80618F4F601B7BEE895C0E0D1E053
+:103EE00062D089930C17E1F7F0E0CF16F8E3DF0614
+:103EF00018F0F601B7BEE89568D007B600FCFDCF14
+:103F0000A601A0E0B1E02C9130E011968C911197C0
+:103F100090E0982F8827822B932B1296FA010C01A0
+:103F200087BEE89511244E5F5F4FF1E0A038BF07D0
+:103F300051F7F601A7BEE89507B600FCFDCF97BE86
+:103F4000E89526C08437B1F42ED02DD0F82E2BD092
+:103F50003CD0F601EF2C8F010F5F1F4F84911BD0D7
+:103F6000EA94F801C1F70894C11CD11CFA94CF0C53
+:103F7000D11C0EC0853739F428D08EE10CD084E9ED
+:103F80000AD086E07ACF813511F488E018D01DD0B0
+:103F900080E101D065CF982F8091C00085FFFCCFD4
+:103FA0009093C60008958091C00087FFFCCF809158
+:103FB000C00084FD01C0A8958091C6000895E0E688
+:103FC000F0E098E1908380830895EDDF803219F06E
+:103FD00088E0F5DFFFCF84E1DECF1F93182FE3DF0A
+:103FE0001150E9F7F2DF1F91089580E0E8DFEE2736
+:043FF000FF2709940A
+:023FFE000404B9
+:0400000300003E00BB
+:00000001FF
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega168.lst b/hardware/arduino/bootloaders/optiboot/optiboot_atmega168.lst
new file mode 100644
index 0000000..06316db
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/optiboot_atmega168.lst
@@ -0,0 +1,598 @@
+
+optiboot_atmega168.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001f4 00003e00 00003e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .version 00000002 00003ffe 00003ffe 00000248 2**0
+ CONTENTS, READONLY
+ 2 .debug_aranges 00000028 00000000 00000000 0000024a 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_pubnames 0000005f 00000000 00000000 00000272 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_info 000002a8 00000000 00000000 000002d1 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_abbrev 00000178 00000000 00000000 00000579 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_line 00000488 00000000 00000000 000006f1 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_frame 00000080 00000000 00000000 00000b7c 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_str 0000014f 00000000 00000000 00000bfc 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_loc 000002d8 00000000 00000000 00000d4b 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 10 .debug_ranges 00000078 00000000 00000000 00001023 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00003e00 <main>:
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
+#endif
+
+/* main program starts here */
+int main(void) {
+ 3e00: 11 24 eor r1, r1
+#ifdef __AVR_ATmega8__
+ SP=RAMEND; // This is done by hardware reset
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 3e02: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 3e04: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 3e06: 81 ff sbrs r24, 1
+ 3e08: f0 d0 rcall .+480 ; 0x3fea <appStart>
+
+#if LED_START_FLASHES > 0
+ // Set up Timer 1 for timeout counter
+ TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
+ 3e0a: 85 e0 ldi r24, 0x05 ; 5
+ 3e0c: 80 93 81 00 sts 0x0081, r24
+ UCSRA = _BV(U2X); //Double speed mode USART
+ UCSRB = _BV(RXEN) | _BV(TXEN); // enable Rx & Tx
+ UCSRC = _BV(URSEL) | _BV(UCSZ1) | _BV(UCSZ0); // config USART; 8N1
+ UBRRL = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+#else
+ UCSR0A = _BV(U2X0); //Double speed mode USART0
+ 3e10: 82 e0 ldi r24, 0x02 ; 2
+ 3e12: 80 93 c0 00 sts 0x00C0, r24
+ UCSR0B = _BV(RXEN0) | _BV(TXEN0);
+ 3e16: 88 e1 ldi r24, 0x18 ; 24
+ 3e18: 80 93 c1 00 sts 0x00C1, r24
+ UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
+ 3e1c: 86 e0 ldi r24, 0x06 ; 6
+ 3e1e: 80 93 c2 00 sts 0x00C2, r24
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+ 3e22: 80 e1 ldi r24, 0x10 ; 16
+ 3e24: 80 93 c4 00 sts 0x00C4, r24
+#endif
+#endif
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_1S);
+ 3e28: 8e e0 ldi r24, 0x0E ; 14
+ 3e2a: c9 d0 rcall .+402 ; 0x3fbe <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 3e2c: 25 9a sbi 0x04, 5 ; 4
+ 3e2e: 86 e0 ldi r24, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e30: 20 e3 ldi r18, 0x30 ; 48
+ 3e32: 3c ef ldi r19, 0xFC ; 252
+ TIFR1 = _BV(TOV1);
+ 3e34: 91 e0 ldi r25, 0x01 ; 1
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 3e36: 30 93 85 00 sts 0x0085, r19
+ 3e3a: 20 93 84 00 sts 0x0084, r18
+ TIFR1 = _BV(TOV1);
+ 3e3e: 96 bb out 0x16, r25 ; 22
+ while(!(TIFR1 & _BV(TOV1)));
+ 3e40: b0 9b sbis 0x16, 0 ; 22
+ 3e42: fe cf rjmp .-4 ; 0x3e40 <main+0x40>
+#ifdef __AVR_ATmega8__
+ LED_PORT ^= _BV(LED);
+#else
+ LED_PIN |= _BV(LED);
+ 3e44: 1d 9a sbi 0x03, 5 ; 3
+}
+#endif
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3e46: a8 95 wdr
+ LED_PORT ^= _BV(LED);
+#else
+ LED_PIN |= _BV(LED);
+#endif
+ watchdogReset();
+ } while (--count);
+ 3e48: 81 50 subi r24, 0x01 ; 1
+ 3e4a: a9 f7 brne .-22 ; 0x3e36 <main+0x36>
+ 3e4c: cc 24 eor r12, r12
+ 3e4e: dd 24 eor r13, r13
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ __boot_page_fill_short((uint16_t)(void*)addrPtr,a);
+ 3e50: 88 24 eor r8, r8
+ 3e52: 83 94 inc r8
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ __boot_page_write_short((uint16_t)(void*)address);
+ 3e54: b5 e0 ldi r27, 0x05 ; 5
+ 3e56: ab 2e mov r10, r27
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3e58: a1 e1 ldi r26, 0x11 ; 17
+ 3e5a: 9a 2e mov r9, r26
+ do *bufPtr++ = getch();
+ while (--length);
+
+ // If we are in NRWW section, page erase has to be delayed until now.
+ // Todo: Take RAMPZ into account
+ if (address >= NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+ 3e5c: f3 e0 ldi r31, 0x03 ; 3
+ 3e5e: bf 2e mov r11, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 3e60: a2 d0 rcall .+324 ; 0x3fa6 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 3e62: 81 34 cpi r24, 0x41 ; 65
+ 3e64: 61 f4 brne .+24 ; 0x3e7e <main+0x7e>
+ unsigned char which = getch();
+ 3e66: 9f d0 rcall .+318 ; 0x3fa6 <getch>
+ 3e68: 08 2f mov r16, r24
+ verifySpace();
+ 3e6a: af d0 rcall .+350 ; 0x3fca <verifySpace>
+ if (which == 0x82) {
+ 3e6c: 02 38 cpi r16, 0x82 ; 130
+ 3e6e: 11 f0 breq .+4 ; 0x3e74 <main+0x74>
+ /*
+ * Send optiboot version as "minor SW version"
+ */
+ putch(OPTIBOOT_MINVER);
+ } else if (which == 0x81) {
+ 3e70: 01 38 cpi r16, 0x81 ; 129
+ 3e72: 11 f4 brne .+4 ; 0x3e78 <main+0x78>
+ putch(OPTIBOOT_MAJVER);
+ 3e74: 84 e0 ldi r24, 0x04 ; 4
+ 3e76: 01 c0 rjmp .+2 ; 0x3e7a <main+0x7a>
+ } else {
+ /*
+ * GET PARAMETER returns a generic 0x03 reply for
+ * other parameters - enough to keep Avrdude happy
+ */
+ putch(0x03);
+ 3e78: 83 e0 ldi r24, 0x03 ; 3
+ 3e7a: 8d d0 rcall .+282 ; 0x3f96 <putch>
+ 3e7c: 89 c0 rjmp .+274 ; 0x3f90 <main+0x190>
+ }
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 3e7e: 82 34 cpi r24, 0x42 ; 66
+ 3e80: 11 f4 brne .+4 ; 0x3e86 <main+0x86>
+ // SET DEVICE is ignored
+ getNch(20);
+ 3e82: 84 e1 ldi r24, 0x14 ; 20
+ 3e84: 03 c0 rjmp .+6 ; 0x3e8c <main+0x8c>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 3e86: 85 34 cpi r24, 0x45 ; 69
+ 3e88: 19 f4 brne .+6 ; 0x3e90 <main+0x90>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 3e8a: 85 e0 ldi r24, 0x05 ; 5
+ 3e8c: a6 d0 rcall .+332 ; 0x3fda <getNch>
+ 3e8e: 80 c0 rjmp .+256 ; 0x3f90 <main+0x190>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 3e90: 85 35 cpi r24, 0x55 ; 85
+ 3e92: 79 f4 brne .+30 ; 0x3eb2 <main+0xb2>
+ // LOAD ADDRESS
+ uint16_t newAddress;
+ newAddress = getch();
+ 3e94: 88 d0 rcall .+272 ; 0x3fa6 <getch>
+ newAddress = (newAddress & 0xff) | (getch() << 8);
+ 3e96: e8 2e mov r14, r24
+ 3e98: ff 24 eor r15, r15
+ 3e9a: 85 d0 rcall .+266 ; 0x3fa6 <getch>
+ 3e9c: 08 2f mov r16, r24
+ 3e9e: 10 e0 ldi r17, 0x00 ; 0
+ 3ea0: 10 2f mov r17, r16
+ 3ea2: 00 27 eor r16, r16
+ 3ea4: 0e 29 or r16, r14
+ 3ea6: 1f 29 or r17, r15
+#ifdef RAMPZ
+ // Transfer top bit to RAMPZ
+ RAMPZ = (newAddress & 0x8000) ? 1 : 0;
+#endif
+ newAddress += newAddress; // Convert from word address to byte address
+ 3ea8: 00 0f add r16, r16
+ 3eaa: 11 1f adc r17, r17
+ address = newAddress;
+ verifySpace();
+ 3eac: 8e d0 rcall .+284 ; 0x3fca <verifySpace>
+ 3eae: 68 01 movw r12, r16
+ 3eb0: 6f c0 rjmp .+222 ; 0x3f90 <main+0x190>
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 3eb2: 86 35 cpi r24, 0x56 ; 86
+ 3eb4: 21 f4 brne .+8 ; 0x3ebe <main+0xbe>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 3eb6: 84 e0 ldi r24, 0x04 ; 4
+ 3eb8: 90 d0 rcall .+288 ; 0x3fda <getNch>
+ putch(0x00);
+ 3eba: 80 e0 ldi r24, 0x00 ; 0
+ 3ebc: de cf rjmp .-68 ; 0x3e7a <main+0x7a>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 3ebe: 84 36 cpi r24, 0x64 ; 100
+ 3ec0: 09 f0 breq .+2 ; 0x3ec4 <main+0xc4>
+ 3ec2: 40 c0 rjmp .+128 ; 0x3f44 <main+0x144>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getch(); /* getlen() */
+ 3ec4: 70 d0 rcall .+224 ; 0x3fa6 <getch>
+ length = getch();
+ 3ec6: 6f d0 rcall .+222 ; 0x3fa6 <getch>
+ 3ec8: 08 2f mov r16, r24
+ getch();
+ 3eca: 6d d0 rcall .+218 ; 0x3fa6 <getch>
+
+ // If we are in RWW section, immediately start page erase
+ if (address < NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+ 3ecc: 80 e0 ldi r24, 0x00 ; 0
+ 3ece: c8 16 cp r12, r24
+ 3ed0: 88 e3 ldi r24, 0x38 ; 56
+ 3ed2: d8 06 cpc r13, r24
+ 3ed4: 18 f4 brcc .+6 ; 0x3edc <main+0xdc>
+ 3ed6: f6 01 movw r30, r12
+ 3ed8: b7 be out 0x37, r11 ; 55
+ 3eda: e8 95 spm
+ 3edc: c0 e0 ldi r28, 0x00 ; 0
+ 3ede: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 3ee0: 62 d0 rcall .+196 ; 0x3fa6 <getch>
+ 3ee2: 89 93 st Y+, r24
+ while (--length);
+ 3ee4: 0c 17 cp r16, r28
+ 3ee6: e1 f7 brne .-8 ; 0x3ee0 <main+0xe0>
+
+ // If we are in NRWW section, page erase has to be delayed until now.
+ // Todo: Take RAMPZ into account
+ if (address >= NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+ 3ee8: f0 e0 ldi r31, 0x00 ; 0
+ 3eea: cf 16 cp r12, r31
+ 3eec: f8 e3 ldi r31, 0x38 ; 56
+ 3eee: df 06 cpc r13, r31
+ 3ef0: 18 f0 brcs .+6 ; 0x3ef8 <main+0xf8>
+ 3ef2: f6 01 movw r30, r12
+ 3ef4: b7 be out 0x37, r11 ; 55
+ 3ef6: e8 95 spm
+
+ // Read command terminator, start reply
+ verifySpace();
+ 3ef8: 68 d0 rcall .+208 ; 0x3fca <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 3efa: 07 b6 in r0, 0x37 ; 55
+ 3efc: 00 fc sbrc r0, 0
+ 3efe: fd cf rjmp .-6 ; 0x3efa <main+0xfa>
+ 3f00: a6 01 movw r20, r12
+ 3f02: a0 e0 ldi r26, 0x00 ; 0
+ 3f04: b1 e0 ldi r27, 0x01 ; 1
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 3f06: 2c 91 ld r18, X
+ 3f08: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 3f0a: 11 96 adiw r26, 0x01 ; 1
+ 3f0c: 8c 91 ld r24, X
+ 3f0e: 11 97 sbiw r26, 0x01 ; 1
+ 3f10: 90 e0 ldi r25, 0x00 ; 0
+ 3f12: 98 2f mov r25, r24
+ 3f14: 88 27 eor r24, r24
+ 3f16: 82 2b or r24, r18
+ 3f18: 93 2b or r25, r19
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
+#endif
+
+/* main program starts here */
+int main(void) {
+ 3f1a: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ __boot_page_fill_short((uint16_t)(void*)addrPtr,a);
+ 3f1c: fa 01 movw r30, r20
+ 3f1e: 0c 01 movw r0, r24
+ 3f20: 87 be out 0x37, r8 ; 55
+ 3f22: e8 95 spm
+ 3f24: 11 24 eor r1, r1
+ addrPtr += 2;
+ 3f26: 4e 5f subi r20, 0xFE ; 254
+ 3f28: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 3f2a: f1 e0 ldi r31, 0x01 ; 1
+ 3f2c: a0 38 cpi r26, 0x80 ; 128
+ 3f2e: bf 07 cpc r27, r31
+ 3f30: 51 f7 brne .-44 ; 0x3f06 <main+0x106>
+
+ // Write from programming buffer
+ __boot_page_write_short((uint16_t)(void*)address);
+ 3f32: f6 01 movw r30, r12
+ 3f34: a7 be out 0x37, r10 ; 55
+ 3f36: e8 95 spm
+ boot_spm_busy_wait();
+ 3f38: 07 b6 in r0, 0x37 ; 55
+ 3f3a: 00 fc sbrc r0, 0
+ 3f3c: fd cf rjmp .-6 ; 0x3f38 <main+0x138>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 3f3e: 97 be out 0x37, r9 ; 55
+ 3f40: e8 95 spm
+ 3f42: 26 c0 rjmp .+76 ; 0x3f90 <main+0x190>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 3f44: 84 37 cpi r24, 0x74 ; 116
+ 3f46: b1 f4 brne .+44 ; 0x3f74 <main+0x174>
+ // READ PAGE - we only read flash
+ getch(); /* getlen() */
+ 3f48: 2e d0 rcall .+92 ; 0x3fa6 <getch>
+ length = getch();
+ 3f4a: 2d d0 rcall .+90 ; 0x3fa6 <getch>
+ 3f4c: f8 2e mov r15, r24
+ getch();
+ 3f4e: 2b d0 rcall .+86 ; 0x3fa6 <getch>
+
+ verifySpace();
+ 3f50: 3c d0 rcall .+120 ; 0x3fca <verifySpace>
+ 3f52: f6 01 movw r30, r12
+ 3f54: ef 2c mov r14, r15
+ putch(result);
+ address++;
+ }
+ while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 3f56: 8f 01 movw r16, r30
+ 3f58: 0f 5f subi r16, 0xFF ; 255
+ 3f5a: 1f 4f sbci r17, 0xFF ; 255
+ 3f5c: 84 91 lpm r24, Z+
+ 3f5e: 1b d0 rcall .+54 ; 0x3f96 <putch>
+ while (--length);
+ 3f60: ea 94 dec r14
+ 3f62: f8 01 movw r30, r16
+ 3f64: c1 f7 brne .-16 ; 0x3f56 <main+0x156>
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
+#endif
+
+/* main program starts here */
+int main(void) {
+ 3f66: 08 94 sec
+ 3f68: c1 1c adc r12, r1
+ 3f6a: d1 1c adc r13, r1
+ 3f6c: fa 94 dec r15
+ 3f6e: cf 0c add r12, r15
+ 3f70: d1 1c adc r13, r1
+ 3f72: 0e c0 rjmp .+28 ; 0x3f90 <main+0x190>
+#endif
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 3f74: 85 37 cpi r24, 0x75 ; 117
+ 3f76: 39 f4 brne .+14 ; 0x3f86 <main+0x186>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 3f78: 28 d0 rcall .+80 ; 0x3fca <verifySpace>
+ putch(SIGNATURE_0);
+ 3f7a: 8e e1 ldi r24, 0x1E ; 30
+ 3f7c: 0c d0 rcall .+24 ; 0x3f96 <putch>
+ putch(SIGNATURE_1);
+ 3f7e: 84 e9 ldi r24, 0x94 ; 148
+ 3f80: 0a d0 rcall .+20 ; 0x3f96 <putch>
+ putch(SIGNATURE_2);
+ 3f82: 86 e0 ldi r24, 0x06 ; 6
+ 3f84: 7a cf rjmp .-268 ; 0x3e7a <main+0x7a>
+ }
+ else if (ch == 'Q') {
+ 3f86: 81 35 cpi r24, 0x51 ; 81
+ 3f88: 11 f4 brne .+4 ; 0x3f8e <main+0x18e>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 3f8a: 88 e0 ldi r24, 0x08 ; 8
+ 3f8c: 18 d0 rcall .+48 ; 0x3fbe <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 3f8e: 1d d0 rcall .+58 ; 0x3fca <verifySpace>
+ }
+ putch(STK_OK);
+ 3f90: 80 e1 ldi r24, 0x10 ; 16
+ 3f92: 01 d0 rcall .+2 ; 0x3f96 <putch>
+ 3f94: 65 cf rjmp .-310 ; 0x3e60 <main+0x60>
+
+00003f96 <putch>:
+ }
+}
+
+void putch(char ch) {
+ 3f96: 98 2f mov r25, r24
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ 3f98: 80 91 c0 00 lds r24, 0x00C0
+ 3f9c: 85 ff sbrs r24, 5
+ 3f9e: fc cf rjmp .-8 ; 0x3f98 <putch+0x2>
+ UDR0 = ch;
+ 3fa0: 90 93 c6 00 sts 0x00C6, r25
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 3fa4: 08 95 ret
+
+00003fa6 <getch>:
+ [uartBit] "I" (UART_RX_BIT)
+ :
+ "r25"
+);
+#else
+ while(!(UCSR0A & _BV(RXC0)))
+ 3fa6: 80 91 c0 00 lds r24, 0x00C0
+ 3faa: 87 ff sbrs r24, 7
+ 3fac: fc cf rjmp .-8 ; 0x3fa6 <getch>
+ ;
+ if (!(UCSR0A & _BV(FE0))) {
+ 3fae: 80 91 c0 00 lds r24, 0x00C0
+ 3fb2: 84 fd sbrc r24, 4
+ 3fb4: 01 c0 rjmp .+2 ; 0x3fb8 <getch+0x12>
+}
+#endif
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 3fb6: a8 95 wdr
+ * don't care that an invalid char is returned...)
+ */
+ watchdogReset();
+ }
+
+ ch = UDR0;
+ 3fb8: 80 91 c6 00 lds r24, 0x00C6
+ LED_PIN |= _BV(LED);
+#endif
+#endif
+
+ return ch;
+}
+ 3fbc: 08 95 ret
+
+00003fbe <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 3fbe: e0 e6 ldi r30, 0x60 ; 96
+ 3fc0: f0 e0 ldi r31, 0x00 ; 0
+ 3fc2: 98 e1 ldi r25, 0x18 ; 24
+ 3fc4: 90 83 st Z, r25
+ WDTCSR = x;
+ 3fc6: 80 83 st Z, r24
+}
+ 3fc8: 08 95 ret
+
+00003fca <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) {
+ 3fca: ed df rcall .-38 ; 0x3fa6 <getch>
+ 3fcc: 80 32 cpi r24, 0x20 ; 32
+ 3fce: 19 f0 breq .+6 ; 0x3fd6 <verifySpace+0xc>
+ watchdogConfig(WATCHDOG_16MS); // shorten WD timeout
+ 3fd0: 88 e0 ldi r24, 0x08 ; 8
+ 3fd2: f5 df rcall .-22 ; 0x3fbe <watchdogConfig>
+ 3fd4: ff cf rjmp .-2 ; 0x3fd4 <verifySpace+0xa>
+ while (1) // and busy-loop so that WD causes
+ ; // a reset and app start.
+ }
+ putch(STK_INSYNC);
+ 3fd6: 84 e1 ldi r24, 0x14 ; 20
+}
+ 3fd8: de cf rjmp .-68 ; 0x3f96 <putch>
+
+00003fda <getNch>:
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 3fda: 1f 93 push r17
+ 3fdc: 18 2f mov r17, r24
+ do getch(); while (--count);
+ 3fde: e3 df rcall .-58 ; 0x3fa6 <getch>
+ 3fe0: 11 50 subi r17, 0x01 ; 1
+ 3fe2: e9 f7 brne .-6 ; 0x3fde <getNch+0x4>
+ verifySpace();
+ 3fe4: f2 df rcall .-28 ; 0x3fca <verifySpace>
+}
+ 3fe6: 1f 91 pop r17
+ 3fe8: 08 95 ret
+
+00003fea <appStart>:
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ WDTCSR = x;
+}
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 3fea: 80 e0 ldi r24, 0x00 ; 0
+ 3fec: e8 df rcall .-48 ; 0x3fbe <watchdogConfig>
+ __asm__ __volatile__ (
+ 3fee: ee 27 eor r30, r30
+ 3ff0: ff 27 eor r31, r31
+ 3ff2: 09 94 ijmp
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex b/hardware/arduino/bootloaders/optiboot/optiboot_atmega328-Mini.hex
similarity index 88%
rename from hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
rename to hardware/arduino/bootloaders/optiboot/optiboot_atmega328-Mini.hex
index d6ac145..02266ee 100644
--- a/hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
+++ b/hardware/arduino/bootloaders/optiboot/optiboot_atmega328-Mini.hex
@@ -1,33 +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
+:107E000085E08093810082E08093C00088E18093C8
+:107E1000C10086E08093C20080E18093C40084B7F3
+:107E200014BE81FFD0D089E2C8D0259A86E020E335
+: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/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.hex b/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.hex
index e8aa31c..a219f08 100644
--- a/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.hex
+++ b/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.hex
@@ -1,33 +1,35 @@
-:107E0000112485E08093810082E08093C00088E1A6
-:107E10008093C10086E08093C20080E18093C4001B
-:107E200084B714BE81FFD0D08DE0C8D0259A86E0FB
+:107E0000112484B714BE81FFF0D085E080938100F7
+:107E100082E08093C00088E18093C10086E0809377
+:107E2000C20080E18093C4008EE0C9D0259A86E02C
:107E300020E33CEF91E0309385002093840096BBD3
-:107E4000B09BFECF1D9AA8958150A9F7DD24D3944D
-:107E5000A5E0EA2EF1E1FF2EA4D0813421F481E0E7
-:107E6000BED083E024C0823411F484E103C08534A1
-:107E700019F485E0B4D08AC08535A1F492D0082FDA
-:107E800010E010930102009300028BD090E0982F35
-:107E90008827802B912B880F991F90930102809344
-:107EA000000273C0863529F484E099D080E071D057
-:107EB0006DC0843609F043C07CD0E0910002F0919F
-:107EC000010283E080935700E895C0E0D1E069D0DB
-:107ED0008993809102028150809302028823B9F72E
-:107EE00078D007B600FCFDCF40910002509101020E
-:107EF000A0E0B1E02C9130E011968C91119790E0C8
-:107F0000982F8827822B932B1296FA010C01D0927E
-:107F10005700E89511244E5F5F4FF1E0A038BF078E
-:107F200049F7E0910002F0910102E0925700E895D4
-:107F300007B600FCFDCFF0925700E89527C08437C4
-:107F4000B9F437D046D0E0910002F09101023196A9
-:107F5000F0930102E09300023197E4918E2F19D043
-:107F600080910202815080930202882361F70EC043
-:107F7000853739F42ED08EE10CD085E90AD08FE018
-:107F800096CF813511F488E019D023D080E101D05B
-:107F900063CF982F8091C00085FFFCCF9093C600DF
-:107FA0000895A8958091C00087FFFCCF8091C600FE
-:107FB0000895F7DFF6DF80930202F3CFE0E6F0E00A
-:107FC00098E190838083089580E0F8DFEE27FF2713
-:107FD0000994E7DF803209F0F7DF84E1DACF1F93FD
-:0E7FE000182FDFDF1150E9F7F4DF1F9108952D
+:107E4000B09BFECF1D9AA8958150A9F7CC24DD24C4
+:107E500088248394B5E0AB2EA1E19A2EF3E0BF2EE7
+:107E6000A2D0813461F49FD0082FAFD0023811F036
+:107E7000013811F484E001C083E08DD089C08234E0
+:107E800011F484E103C0853419F485E0A6D080C0E4
+:107E9000853579F488D0E82EFF2485D0082F10E0AE
+:107EA000102F00270E291F29000F111F8ED06801E7
+:107EB0006FC0863521F484E090D080E0DECF843638
+:107EC00009F040C070D06FD0082F6DD080E0C81688
+:107ED00080E7D80618F4F601B7BEE895C0E0D1E017
+:107EE00062D089930C17E1F7F0E0CF16F0E7DF06D8
+:107EF00018F0F601B7BEE89568D007B600FCFDCFD4
+:107F0000A601A0E0B1E02C9130E011968C91119780
+:107F100090E0982F8827822B932B1296FA010C0160
+:107F200087BEE89511244E5F5F4FF1E0A038BF0790
+:107F300051F7F601A7BEE89507B600FCFDCF97BE46
+:107F4000E89526C08437B1F42ED02DD0F82E2BD052
+:107F50003CD0F601EF2C8F010F5F1F4F84911BD097
+:107F6000EA94F801C1F70894C11CD11CFA94CF0C13
+:107F7000D11C0EC0853739F428D08EE10CD085E9AC
+:107F80000AD08FE07ACF813511F488E018D01DD067
+:107F900080E101D065CF982F8091C00085FFFCCF94
+:107FA0009093C60008958091C00087FFFCCF809118
+:107FB000C00084FD01C0A8958091C6000895E0E648
+:107FC000F0E098E1908380830895EDDF803219F02E
+:107FD00088E0F5DFFFCF84E1DECF1F93182FE3DFCA
+:107FE0001150E9F7F2DF1F91089580E0E8DFEE27F6
+:047FF000FF270994CA
+:027FFE00040479
:0400000300007E007B
:00000001FF
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.lst b/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.lst
index dd879dc..d9dd4cc 100644
--- a/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.lst
+++ b/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.lst
@@ -3,74 +3,81 @@ optiboot_atmega328.elf: file format elf32-avr
Sections:
Idx Name Size VMA LMA File off Algn
- 0 .text 000001ee 00007e00 00007e00 00000054 2**1
+ 0 .text 000001f4 00007e00 00007e00 00000054 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 1 .debug_aranges 00000028 00000000 00000000 00000242 2**0
+ 1 .version 00000002 00007ffe 00007ffe 00000248 2**0
+ CONTENTS, READONLY
+ 2 .debug_aranges 00000028 00000000 00000000 0000024a 2**0
CONTENTS, READONLY, DEBUGGING
- 2 .debug_pubnames 0000006a 00000000 00000000 0000026a 2**0
+ 3 .debug_pubnames 0000005f 00000000 00000000 00000272 2**0
CONTENTS, READONLY, DEBUGGING
- 3 .debug_info 00000269 00000000 00000000 000002d4 2**0
+ 4 .debug_info 000002a8 00000000 00000000 000002d1 2**0
CONTENTS, READONLY, DEBUGGING
- 4 .debug_abbrev 00000196 00000000 00000000 0000053d 2**0
+ 5 .debug_abbrev 00000178 00000000 00000000 00000579 2**0
CONTENTS, READONLY, DEBUGGING
- 5 .debug_line 000003db 00000000 00000000 000006d3 2**0
+ 6 .debug_line 00000488 00000000 00000000 000006f1 2**0
CONTENTS, READONLY, DEBUGGING
- 6 .debug_frame 00000090 00000000 00000000 00000ab0 2**2
+ 7 .debug_frame 00000080 00000000 00000000 00000b7c 2**2
CONTENTS, READONLY, DEBUGGING
- 7 .debug_str 00000124 00000000 00000000 00000b40 2**0
+ 8 .debug_str 0000014f 00000000 00000000 00000bfc 2**0
CONTENTS, READONLY, DEBUGGING
- 8 .debug_loc 000001d1 00000000 00000000 00000c64 2**0
+ 9 .debug_loc 000002d8 00000000 00000000 00000d4b 2**0
CONTENTS, READONLY, DEBUGGING
- 9 .debug_ranges 00000068 00000000 00000000 00000e35 2**0
+ 10 .debug_ranges 00000078 00000000 00000000 00001023 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))
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
#endif
+
/* main program starts here */
int main(void) {
7e00: 11 24 eor r1, r1
+#ifdef __AVR_ATmega8__
+ SP=RAMEND; // This is done by hardware reset
+#endif
- uint8_t ch;
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 7e02: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 7e04: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 7e06: 81 ff sbrs r24, 1
+ 7e08: f0 d0 rcall .+480 ; 0x7fea <appStart>
#if LED_START_FLASHES > 0
// Set up Timer 1 for timeout counter
TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
- 7e02: 85 e0 ldi r24, 0x05 ; 5
- 7e04: 80 93 81 00 sts 0x0081, r24
-#endif
-#ifndef SOFT_UART
+ 7e0a: 85 e0 ldi r24, 0x05 ; 5
+ 7e0c: 80 93 81 00 sts 0x0081, r24
+ UCSRA = _BV(U2X); //Double speed mode USART
+ UCSRB = _BV(RXEN) | _BV(TXEN); // enable Rx & Tx
+ UCSRC = _BV(URSEL) | _BV(UCSZ1) | _BV(UCSZ0); // config USART; 8N1
+ UBRRL = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+#else
UCSR0A = _BV(U2X0); //Double speed mode USART0
- 7e08: 82 e0 ldi r24, 0x02 ; 2
- 7e0a: 80 93 c0 00 sts 0x00C0, r24
+ 7e10: 82 e0 ldi r24, 0x02 ; 2
+ 7e12: 80 93 c0 00 sts 0x00C0, r24
UCSR0B = _BV(RXEN0) | _BV(TXEN0);
- 7e0e: 88 e1 ldi r24, 0x18 ; 24
- 7e10: 80 93 c1 00 sts 0x00C1, r24
+ 7e16: 88 e1 ldi r24, 0x18 ; 24
+ 7e18: 80 93 c1 00 sts 0x00C1, r24
UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
- 7e14: 86 e0 ldi r24, 0x06 ; 6
- 7e16: 80 93 c2 00 sts 0x00C2, r24
+ 7e1c: 86 e0 ldi r24, 0x06 ; 6
+ 7e1e: 80 93 c2 00 sts 0x00C2, r24
UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
- 7e1a: 80 e1 ldi r24, 0x10 ; 16
- 7e1c: 80 93 c4 00 sts 0x00C4, r24
+ 7e22: 80 e1 ldi r24, 0x10 ; 16
+ 7e24: 80 93 c4 00 sts 0x00C4, r24
+#endif
#endif
-
- // Adaboot no-wait mod
- ch = MCUSR;
- 7e20: 84 b7 in r24, 0x34 ; 52
- MCUSR = 0;
- 7e22: 14 be out 0x34, r1 ; 52
- if (!(ch & _BV(EXTRF))) appStart();
- 7e24: 81 ff sbrs r24, 1
- 7e26: d0 d0 rcall .+416 ; 0x7fc8 <appStart>
// Set up watchdog to trigger after 500ms
- watchdogConfig(WATCHDOG_500MS);
- 7e28: 8d e0 ldi r24, 0x0D ; 13
- 7e2a: c8 d0 rcall .+400 ; 0x7fbc <watchdogConfig>
+ watchdogConfig(WATCHDOG_1S);
+ 7e28: 8e e0 ldi r24, 0x0E ; 14
+ 7e2a: c9 d0 rcall .+402 ; 0x7fbe <watchdogConfig>
/* Set LED pin as output */
LED_DDR |= _BV(LED);
@@ -99,426 +106,493 @@ void flash_led(uint8_t count) {
while(!(TIFR1 & _BV(TOV1)));
7e40: b0 9b sbis 0x16, 0 ; 22
7e42: fe cf rjmp .-4 ; 0x7e40 <main+0x40>
+#ifdef __AVR_ATmega8__
+ LED_PORT ^= _BV(LED);
+#else
LED_PIN |= _BV(LED);
7e44: 1d 9a sbi 0x03, 5 ; 3
- return getch();
}
+#endif
// Watchdog functions. These are only safe with interrupts turned off.
void watchdogReset() {
__asm__ __volatile__ (
7e46: a8 95 wdr
- TCNT1 = -(F_CPU/(1024*16));
- TIFR1 = _BV(TOV1);
- while(!(TIFR1 & _BV(TOV1)));
+ LED_PORT ^= _BV(LED);
+#else
LED_PIN |= _BV(LED);
+#endif
watchdogReset();
} while (--count);
7e48: 81 50 subi r24, 0x01 ; 1
7e4a: a9 f7 brne .-22 ; 0x7e36 <main+0x36>
- /* 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);
- 7e4c: dd 24 eor r13, r13
- 7e4e: d3 94 inc r13
- boot_page_fill((uint16_t)(void*)addrPtr,a);
+ 7e4c: cc 24 eor r12, r12
+ 7e4e: dd 24 eor r13, r13
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ __boot_page_fill_short((uint16_t)(void*)addrPtr,a);
+ 7e50: 88 24 eor r8, r8
+ 7e52: 83 94 inc r8
addrPtr += 2;
} while (--ch);
-
+
// Write from programming buffer
- boot_page_write((uint16_t)(void*)address);
- 7e50: a5 e0 ldi r26, 0x05 ; 5
- 7e52: ea 2e mov r14, r26
+ __boot_page_write_short((uint16_t)(void*)address);
+ 7e54: b5 e0 ldi r27, 0x05 ; 5
+ 7e56: ab 2e mov r10, r27
boot_spm_busy_wait();
#if defined(RWWSRE)
// Reenable read access to flash
boot_rww_enable();
- 7e54: f1 e1 ldi r31, 0x11 ; 17
- 7e56: ff 2e mov r15, r31
+ 7e58: a1 e1 ldi r26, 0x11 ; 17
+ 7e5a: 9a 2e mov r9, r26
+ do *bufPtr++ = getch();
+ while (--length);
+
+ // If we are in NRWW section, page erase has to be delayed until now.
+ // Todo: Take RAMPZ into account
+ if (address >= NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+ 7e5c: f3 e0 ldi r31, 0x03 ; 3
+ 7e5e: bf 2e mov r11, r31
#endif
/* Forever loop */
for (;;) {
/* get character from UART */
ch = getch();
- 7e58: a4 d0 rcall .+328 ; 0x7fa2 <getch>
+ 7e60: a2 d0 rcall .+324 ; 0x7fa6 <getch>
if(ch == STK_GET_PARAMETER) {
- 7e5a: 81 34 cpi r24, 0x41 ; 65
- 7e5c: 21 f4 brne .+8 ; 0x7e66 <main+0x66>
- // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
- getNch(1);
- 7e5e: 81 e0 ldi r24, 0x01 ; 1
- 7e60: be d0 rcall .+380 ; 0x7fde <verifySpace+0xc>
- putch(0x03);
- 7e62: 83 e0 ldi r24, 0x03 ; 3
- 7e64: 24 c0 rjmp .+72 ; 0x7eae <main+0xae>
+ 7e62: 81 34 cpi r24, 0x41 ; 65
+ 7e64: 61 f4 brne .+24 ; 0x7e7e <main+0x7e>
+ unsigned char which = getch();
+ 7e66: 9f d0 rcall .+318 ; 0x7fa6 <getch>
+ 7e68: 08 2f mov r16, r24
+ verifySpace();
+ 7e6a: af d0 rcall .+350 ; 0x7fca <verifySpace>
+ if (which == 0x82) {
+ 7e6c: 02 38 cpi r16, 0x82 ; 130
+ 7e6e: 11 f0 breq .+4 ; 0x7e74 <main+0x74>
+ /*
+ * Send optiboot version as "minor SW version"
+ */
+ putch(OPTIBOOT_MINVER);
+ } else if (which == 0x81) {
+ 7e70: 01 38 cpi r16, 0x81 ; 129
+ 7e72: 11 f4 brne .+4 ; 0x7e78 <main+0x78>
+ putch(OPTIBOOT_MAJVER);
+ 7e74: 84 e0 ldi r24, 0x04 ; 4
+ 7e76: 01 c0 rjmp .+2 ; 0x7e7a <main+0x7a>
+ } else {
+ /*
+ * GET PARAMETER returns a generic 0x03 reply for
+ * other parameters - enough to keep Avrdude happy
+ */
+ putch(0x03);
+ 7e78: 83 e0 ldi r24, 0x03 ; 3
+ 7e7a: 8d d0 rcall .+282 ; 0x7f96 <putch>
+ 7e7c: 89 c0 rjmp .+274 ; 0x7f90 <main+0x190>
+ }
}
else if(ch == STK_SET_DEVICE) {
- 7e66: 82 34 cpi r24, 0x42 ; 66
- 7e68: 11 f4 brne .+4 ; 0x7e6e <main+0x6e>
+ 7e7e: 82 34 cpi r24, 0x42 ; 66
+ 7e80: 11 f4 brne .+4 ; 0x7e86 <main+0x86>
// SET DEVICE is ignored
getNch(20);
- 7e6a: 84 e1 ldi r24, 0x14 ; 20
- 7e6c: 03 c0 rjmp .+6 ; 0x7e74 <main+0x74>
+ 7e82: 84 e1 ldi r24, 0x14 ; 20
+ 7e84: 03 c0 rjmp .+6 ; 0x7e8c <main+0x8c>
}
else if(ch == STK_SET_DEVICE_EXT) {
- 7e6e: 85 34 cpi r24, 0x45 ; 69
- 7e70: 19 f4 brne .+6 ; 0x7e78 <main+0x78>
+ 7e86: 85 34 cpi r24, 0x45 ; 69
+ 7e88: 19 f4 brne .+6 ; 0x7e90 <main+0x90>
// SET DEVICE EXT is ignored
getNch(5);
- 7e72: 85 e0 ldi r24, 0x05 ; 5
- 7e74: b4 d0 rcall .+360 ; 0x7fde <verifySpace+0xc>
- 7e76: 8a c0 rjmp .+276 ; 0x7f8c <main+0x18c>
+ 7e8a: 85 e0 ldi r24, 0x05 ; 5
+ 7e8c: a6 d0 rcall .+332 ; 0x7fda <getNch>
+ 7e8e: 80 c0 rjmp .+256 ; 0x7f90 <main+0x190>
}
else if(ch == STK_LOAD_ADDRESS) {
- 7e78: 85 35 cpi r24, 0x55 ; 85
- 7e7a: a1 f4 brne .+40 ; 0x7ea4 <main+0xa4>
+ 7e90: 85 35 cpi r24, 0x55 ; 85
+ 7e92: 79 f4 brne .+30 ; 0x7eb2 <main+0xb2>
// LOAD ADDRESS
- address = getch();
- 7e7c: 92 d0 rcall .+292 ; 0x7fa2 <getch>
- 7e7e: 08 2f mov r16, r24
- 7e80: 10 e0 ldi r17, 0x00 ; 0
- 7e82: 10 93 01 02 sts 0x0201, r17
- 7e86: 00 93 00 02 sts 0x0200, r16
- address = (address & 0xff) | (getch() << 8);
- 7e8a: 8b d0 rcall .+278 ; 0x7fa2 <getch>
- 7e8c: 90 e0 ldi r25, 0x00 ; 0
- 7e8e: 98 2f mov r25, r24
- 7e90: 88 27 eor r24, r24
- 7e92: 80 2b or r24, r16
- 7e94: 91 2b or r25, r17
- address += address; // Convert from word address to byte address
- 7e96: 88 0f add r24, r24
- 7e98: 99 1f adc r25, r25
- 7e9a: 90 93 01 02 sts 0x0201, r25
- 7e9e: 80 93 00 02 sts 0x0200, r24
- 7ea2: 73 c0 rjmp .+230 ; 0x7f8a <main+0x18a>
+ uint16_t newAddress;
+ newAddress = getch();
+ 7e94: 88 d0 rcall .+272 ; 0x7fa6 <getch>
+ newAddress = (newAddress & 0xff) | (getch() << 8);
+ 7e96: e8 2e mov r14, r24
+ 7e98: ff 24 eor r15, r15
+ 7e9a: 85 d0 rcall .+266 ; 0x7fa6 <getch>
+ 7e9c: 08 2f mov r16, r24
+ 7e9e: 10 e0 ldi r17, 0x00 ; 0
+ 7ea0: 10 2f mov r17, r16
+ 7ea2: 00 27 eor r16, r16
+ 7ea4: 0e 29 or r16, r14
+ 7ea6: 1f 29 or r17, r15
+#ifdef RAMPZ
+ // Transfer top bit to RAMPZ
+ RAMPZ = (newAddress & 0x8000) ? 1 : 0;
+#endif
+ newAddress += newAddress; // Convert from word address to byte address
+ 7ea8: 00 0f add r16, r16
+ 7eaa: 11 1f adc r17, r17
+ address = newAddress;
verifySpace();
+ 7eac: 8e d0 rcall .+284 ; 0x7fca <verifySpace>
+ 7eae: 68 01 movw r12, r16
+ 7eb0: 6f c0 rjmp .+222 ; 0x7f90 <main+0x190>
}
else if(ch == STK_UNIVERSAL) {
- 7ea4: 86 35 cpi r24, 0x56 ; 86
- 7ea6: 29 f4 brne .+10 ; 0x7eb2 <main+0xb2>
+ 7eb2: 86 35 cpi r24, 0x56 ; 86
+ 7eb4: 21 f4 brne .+8 ; 0x7ebe <main+0xbe>
// UNIVERSAL command is ignored
getNch(4);
- 7ea8: 84 e0 ldi r24, 0x04 ; 4
- 7eaa: 99 d0 rcall .+306 ; 0x7fde <verifySpace+0xc>
+ 7eb6: 84 e0 ldi r24, 0x04 ; 4
+ 7eb8: 90 d0 rcall .+288 ; 0x7fda <getNch>
putch(0x00);
- 7eac: 80 e0 ldi r24, 0x00 ; 0
- 7eae: 71 d0 rcall .+226 ; 0x7f92 <putch>
- 7eb0: 6d c0 rjmp .+218 ; 0x7f8c <main+0x18c>
+ 7eba: 80 e0 ldi r24, 0x00 ; 0
+ 7ebc: de cf rjmp .-68 ; 0x7e7a <main+0x7a>
}
- /* Write memory, length is big endian and is in bytes */
+ /* Write memory, length is big endian and is in bytes */
else if(ch == STK_PROG_PAGE) {
- 7eb2: 84 36 cpi r24, 0x64 ; 100
- 7eb4: 09 f0 breq .+2 ; 0x7eb8 <main+0xb8>
- 7eb6: 43 c0 rjmp .+134 ; 0x7f3e <main+0x13e>
+ 7ebe: 84 36 cpi r24, 0x64 ; 100
+ 7ec0: 09 f0 breq .+2 ; 0x7ec4 <main+0xc4>
+ 7ec2: 40 c0 rjmp .+128 ; 0x7f44 <main+0x144>
// PROGRAM PAGE - we support flash programming only, not EEPROM
uint8_t *bufPtr;
uint16_t addrPtr;
- getLen();
- 7eb8: 7c d0 rcall .+248 ; 0x7fb2 <getLen>
-
- // Immediately start page erase - this will 4.5ms
- boot_page_erase((uint16_t)(void*)address);
- 7eba: e0 91 00 02 lds r30, 0x0200
- 7ebe: f0 91 01 02 lds r31, 0x0201
- 7ec2: 83 e0 ldi r24, 0x03 ; 3
- 7ec4: 80 93 57 00 sts 0x0057, r24
- 7ec8: e8 95 spm
- 7eca: c0 e0 ldi r28, 0x00 ; 0
- 7ecc: d1 e0 ldi r29, 0x01 ; 1
+ getch(); /* getlen() */
+ 7ec4: 70 d0 rcall .+224 ; 0x7fa6 <getch>
+ length = getch();
+ 7ec6: 6f d0 rcall .+222 ; 0x7fa6 <getch>
+ 7ec8: 08 2f mov r16, r24
+ getch();
+ 7eca: 6d d0 rcall .+218 ; 0x7fa6 <getch>
+
+ // If we are in RWW section, immediately start page erase
+ if (address < NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+ 7ecc: 80 e0 ldi r24, 0x00 ; 0
+ 7ece: c8 16 cp r12, r24
+ 7ed0: 80 e7 ldi r24, 0x70 ; 112
+ 7ed2: d8 06 cpc r13, r24
+ 7ed4: 18 f4 brcc .+6 ; 0x7edc <main+0xdc>
+ 7ed6: f6 01 movw r30, r12
+ 7ed8: b7 be out 0x37, r11 ; 55
+ 7eda: e8 95 spm
+ 7edc: c0 e0 ldi r28, 0x00 ; 0
+ 7ede: d1 e0 ldi r29, 0x01 ; 1
// While that is going on, read in page contents
bufPtr = buff;
do *bufPtr++ = getch();
- 7ece: 69 d0 rcall .+210 ; 0x7fa2 <getch>
- 7ed0: 89 93 st Y+, r24
+ 7ee0: 62 d0 rcall .+196 ; 0x7fa6 <getch>
+ 7ee2: 89 93 st Y+, r24
while (--length);
- 7ed2: 80 91 02 02 lds r24, 0x0202
- 7ed6: 81 50 subi r24, 0x01 ; 1
- 7ed8: 80 93 02 02 sts 0x0202, r24
- 7edc: 88 23 and r24, r24
- 7ede: b9 f7 brne .-18 ; 0x7ece <main+0xce>
+ 7ee4: 0c 17 cp r16, r28
+ 7ee6: e1 f7 brne .-8 ; 0x7ee0 <main+0xe0>
+
+ // If we are in NRWW section, page erase has to be delayed until now.
+ // Todo: Take RAMPZ into account
+ if (address >= NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+ 7ee8: f0 e0 ldi r31, 0x00 ; 0
+ 7eea: cf 16 cp r12, r31
+ 7eec: f0 e7 ldi r31, 0x70 ; 112
+ 7eee: df 06 cpc r13, r31
+ 7ef0: 18 f0 brcs .+6 ; 0x7ef8 <main+0xf8>
+ 7ef2: f6 01 movw r30, r12
+ 7ef4: b7 be out 0x37, r11 ; 55
+ 7ef6: e8 95 spm
// Read command terminator, start reply
verifySpace();
- 7ee0: 78 d0 rcall .+240 ; 0x7fd2 <verifySpace>
-
+ 7ef8: 68 d0 rcall .+208 ; 0x7fca <verifySpace>
+
// If only a partial page is to be programmed, the erase might not be complete.
// So check that here
boot_spm_busy_wait();
- 7ee2: 07 b6 in r0, 0x37 ; 55
- 7ee4: 00 fc sbrc r0, 0
- 7ee6: fd cf rjmp .-6 ; 0x7ee2 <main+0xe2>
- }
-#endif
-
- // Copy buffer into programming buffer
+ 7efa: 07 b6 in r0, 0x37 ; 55
+ 7efc: 00 fc sbrc r0, 0
+ 7efe: fd cf rjmp .-6 ; 0x7efa <main+0xfa>
+ 7f00: a6 01 movw r20, r12
+ 7f02: a0 e0 ldi r26, 0x00 ; 0
+ 7f04: b1 e0 ldi r27, 0x01 ; 1
bufPtr = buff;
addrPtr = (uint16_t)(void*)address;
- 7ee8: 40 91 00 02 lds r20, 0x0200
- 7eec: 50 91 01 02 lds r21, 0x0201
- 7ef0: a0 e0 ldi r26, 0x00 ; 0
- 7ef2: b1 e0 ldi r27, 0x01 ; 1
ch = SPM_PAGESIZE / 2;
do {
uint16_t a;
a = *bufPtr++;
- 7ef4: 2c 91 ld r18, X
- 7ef6: 30 e0 ldi r19, 0x00 ; 0
+ 7f06: 2c 91 ld r18, X
+ 7f08: 30 e0 ldi r19, 0x00 ; 0
a |= (*bufPtr++) << 8;
- 7ef8: 11 96 adiw r26, 0x01 ; 1
- 7efa: 8c 91 ld r24, X
- 7efc: 11 97 sbiw r26, 0x01 ; 1
- 7efe: 90 e0 ldi r25, 0x00 ; 0
- 7f00: 98 2f mov r25, r24
- 7f02: 88 27 eor r24, r24
- 7f04: 82 2b or r24, r18
- 7f06: 93 2b or r25, r19
-#ifdef VIRTUAL_BOOT_PARTITION
-#define rstVect (*(uint16_t*)(0x204))
-#define wdtVect (*(uint16_t*)(0x206))
+ 7f0a: 11 96 adiw r26, 0x01 ; 1
+ 7f0c: 8c 91 ld r24, X
+ 7f0e: 11 97 sbiw r26, 0x01 ; 1
+ 7f10: 90 e0 ldi r25, 0x00 ; 0
+ 7f12: 98 2f mov r25, r24
+ 7f14: 88 27 eor r24, r24
+ 7f16: 82 2b or r24, r18
+ 7f18: 93 2b or r25, r19
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
#endif
+
/* main program starts here */
int main(void) {
- 7f08: 12 96 adiw r26, 0x02 ; 2
+ 7f1a: 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);
- 7f0a: fa 01 movw r30, r20
- 7f0c: 0c 01 movw r0, r24
- 7f0e: d0 92 57 00 sts 0x0057, r13
- 7f12: e8 95 spm
- 7f14: 11 24 eor r1, r1
+ __boot_page_fill_short((uint16_t)(void*)addrPtr,a);
+ 7f1c: fa 01 movw r30, r20
+ 7f1e: 0c 01 movw r0, r24
+ 7f20: 87 be out 0x37, r8 ; 55
+ 7f22: e8 95 spm
+ 7f24: 11 24 eor r1, r1
addrPtr += 2;
- 7f16: 4e 5f subi r20, 0xFE ; 254
- 7f18: 5f 4f sbci r21, 0xFF ; 255
+ 7f26: 4e 5f subi r20, 0xFE ; 254
+ 7f28: 5f 4f sbci r21, 0xFF ; 255
} while (--ch);
- 7f1a: f1 e0 ldi r31, 0x01 ; 1
- 7f1c: a0 38 cpi r26, 0x80 ; 128
- 7f1e: bf 07 cpc r27, r31
- 7f20: 49 f7 brne .-46 ; 0x7ef4 <main+0xf4>
-
+ 7f2a: f1 e0 ldi r31, 0x01 ; 1
+ 7f2c: a0 38 cpi r26, 0x80 ; 128
+ 7f2e: bf 07 cpc r27, r31
+ 7f30: 51 f7 brne .-44 ; 0x7f06 <main+0x106>
+
// Write from programming buffer
- boot_page_write((uint16_t)(void*)address);
- 7f22: e0 91 00 02 lds r30, 0x0200
- 7f26: f0 91 01 02 lds r31, 0x0201
- 7f2a: e0 92 57 00 sts 0x0057, r14
- 7f2e: e8 95 spm
+ __boot_page_write_short((uint16_t)(void*)address);
+ 7f32: f6 01 movw r30, r12
+ 7f34: a7 be out 0x37, r10 ; 55
+ 7f36: e8 95 spm
boot_spm_busy_wait();
- 7f30: 07 b6 in r0, 0x37 ; 55
- 7f32: 00 fc sbrc r0, 0
- 7f34: fd cf rjmp .-6 ; 0x7f30 <main+0x130>
+ 7f38: 07 b6 in r0, 0x37 ; 55
+ 7f3a: 00 fc sbrc r0, 0
+ 7f3c: fd cf rjmp .-6 ; 0x7f38 <main+0x138>
#if defined(RWWSRE)
// Reenable read access to flash
boot_rww_enable();
- 7f36: f0 92 57 00 sts 0x0057, r15
- 7f3a: e8 95 spm
- 7f3c: 27 c0 rjmp .+78 ; 0x7f8c <main+0x18c>
+ 7f3e: 97 be out 0x37, r9 ; 55
+ 7f40: e8 95 spm
+ 7f42: 26 c0 rjmp .+76 ; 0x7f90 <main+0x190>
#endif
}
/* Read memory block mode, length is big endian. */
else if(ch == STK_READ_PAGE) {
- 7f3e: 84 37 cpi r24, 0x74 ; 116
- 7f40: b9 f4 brne .+46 ; 0x7f70 <main+0x170>
+ 7f44: 84 37 cpi r24, 0x74 ; 116
+ 7f46: b1 f4 brne .+44 ; 0x7f74 <main+0x174>
// READ PAGE - we only read flash
- getLen();
- 7f42: 37 d0 rcall .+110 ; 0x7fb2 <getLen>
+ getch(); /* getlen() */
+ 7f48: 2e d0 rcall .+92 ; 0x7fa6 <getch>
+ length = getch();
+ 7f4a: 2d d0 rcall .+90 ; 0x7fa6 <getch>
+ 7f4c: f8 2e mov r15, r24
+ getch();
+ 7f4e: 2b d0 rcall .+86 ; 0x7fa6 <getch>
+
verifySpace();
- 7f44: 46 d0 rcall .+140 ; 0x7fd2 <verifySpace>
- else ch = pgm_read_byte_near(address);
+ 7f50: 3c d0 rcall .+120 ; 0x7fca <verifySpace>
+ 7f52: f6 01 movw r30, r12
+ 7f54: ef 2c mov r14, r15
+ putch(result);
address++;
- putch(ch);
- } while (--length);
+ }
+ while (--length);
#else
do putch(pgm_read_byte_near(address++));
- 7f46: e0 91 00 02 lds r30, 0x0200
- 7f4a: f0 91 01 02 lds r31, 0x0201
- 7f4e: 31 96 adiw r30, 0x01 ; 1
- 7f50: f0 93 01 02 sts 0x0201, r31
- 7f54: e0 93 00 02 sts 0x0200, r30
- 7f58: 31 97 sbiw r30, 0x01 ; 1
- 7f5a: e4 91 lpm r30, Z+
- 7f5c: 8e 2f mov r24, r30
- 7f5e: 19 d0 rcall .+50 ; 0x7f92 <putch>
+ 7f56: 8f 01 movw r16, r30
+ 7f58: 0f 5f subi r16, 0xFF ; 255
+ 7f5a: 1f 4f sbci r17, 0xFF ; 255
+ 7f5c: 84 91 lpm r24, Z+
+ 7f5e: 1b d0 rcall .+54 ; 0x7f96 <putch>
while (--length);
- 7f60: 80 91 02 02 lds r24, 0x0202
- 7f64: 81 50 subi r24, 0x01 ; 1
- 7f66: 80 93 02 02 sts 0x0202, r24
- 7f6a: 88 23 and r24, r24
- 7f6c: 61 f7 brne .-40 ; 0x7f46 <main+0x146>
- 7f6e: 0e c0 rjmp .+28 ; 0x7f8c <main+0x18c>
+ 7f60: ea 94 dec r14
+ 7f62: f8 01 movw r30, r16
+ 7f64: c1 f7 brne .-16 ; 0x7f56 <main+0x156>
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
+#endif
+
+/* main program starts here */
+int main(void) {
+ 7f66: 08 94 sec
+ 7f68: c1 1c adc r12, r1
+ 7f6a: d1 1c adc r13, r1
+ 7f6c: fa 94 dec r15
+ 7f6e: cf 0c add r12, r15
+ 7f70: d1 1c adc r13, r1
+ 7f72: 0e c0 rjmp .+28 ; 0x7f90 <main+0x190>
+#endif
#endif
}
/* Get device signature bytes */
else if(ch == STK_READ_SIGN) {
- 7f70: 85 37 cpi r24, 0x75 ; 117
- 7f72: 39 f4 brne .+14 ; 0x7f82 <main+0x182>
+ 7f74: 85 37 cpi r24, 0x75 ; 117
+ 7f76: 39 f4 brne .+14 ; 0x7f86 <main+0x186>
// READ SIGN - return what Avrdude wants to hear
verifySpace();
- 7f74: 2e d0 rcall .+92 ; 0x7fd2 <verifySpace>
+ 7f78: 28 d0 rcall .+80 ; 0x7fca <verifySpace>
putch(SIGNATURE_0);
- 7f76: 8e e1 ldi r24, 0x1E ; 30
- 7f78: 0c d0 rcall .+24 ; 0x7f92 <putch>
+ 7f7a: 8e e1 ldi r24, 0x1E ; 30
+ 7f7c: 0c d0 rcall .+24 ; 0x7f96 <putch>
putch(SIGNATURE_1);
- 7f7a: 85 e9 ldi r24, 0x95 ; 149
- 7f7c: 0a d0 rcall .+20 ; 0x7f92 <putch>
+ 7f7e: 85 e9 ldi r24, 0x95 ; 149
+ 7f80: 0a d0 rcall .+20 ; 0x7f96 <putch>
putch(SIGNATURE_2);
- 7f7e: 8f e0 ldi r24, 0x0F ; 15
- 7f80: 96 cf rjmp .-212 ; 0x7eae <main+0xae>
+ 7f82: 8f e0 ldi r24, 0x0F ; 15
+ 7f84: 7a cf rjmp .-268 ; 0x7e7a <main+0x7a>
}
else if (ch == 'Q') {
- 7f82: 81 35 cpi r24, 0x51 ; 81
- 7f84: 11 f4 brne .+4 ; 0x7f8a <main+0x18a>
+ 7f86: 81 35 cpi r24, 0x51 ; 81
+ 7f88: 11 f4 brne .+4 ; 0x7f8e <main+0x18e>
// Adaboot no-wait mod
watchdogConfig(WATCHDOG_16MS);
- 7f86: 88 e0 ldi r24, 0x08 ; 8
- 7f88: 19 d0 rcall .+50 ; 0x7fbc <watchdogConfig>
+ 7f8a: 88 e0 ldi r24, 0x08 ; 8
+ 7f8c: 18 d0 rcall .+48 ; 0x7fbe <watchdogConfig>
verifySpace();
}
else {
// This covers the response to commands like STK_ENTER_PROGMODE
verifySpace();
- 7f8a: 23 d0 rcall .+70 ; 0x7fd2 <verifySpace>
+ 7f8e: 1d d0 rcall .+58 ; 0x7fca <verifySpace>
}
putch(STK_OK);
- 7f8c: 80 e1 ldi r24, 0x10 ; 16
- 7f8e: 01 d0 rcall .+2 ; 0x7f92 <putch>
- 7f90: 63 cf rjmp .-314 ; 0x7e58 <main+0x58>
+ 7f90: 80 e1 ldi r24, 0x10 ; 16
+ 7f92: 01 d0 rcall .+2 ; 0x7f96 <putch>
+ 7f94: 65 cf rjmp .-310 ; 0x7e60 <main+0x60>
-00007f92 <putch>:
+00007f96 <putch>:
}
}
void putch(char ch) {
- 7f92: 98 2f mov r25, r24
+ 7f96: 98 2f mov r25, r24
#ifndef SOFT_UART
while (!(UCSR0A & _BV(UDRE0)));
- 7f94: 80 91 c0 00 lds r24, 0x00C0
- 7f98: 85 ff sbrs r24, 5
- 7f9a: fc cf rjmp .-8 ; 0x7f94 <putch+0x2>
+ 7f98: 80 91 c0 00 lds r24, 0x00C0
+ 7f9c: 85 ff sbrs r24, 5
+ 7f9e: fc cf rjmp .-8 ; 0x7f98 <putch+0x2>
UDR0 = ch;
- 7f9c: 90 93 c6 00 sts 0x00C6, r25
+ 7fa0: 90 93 c6 00 sts 0x00C6, r25
[uartBit] "I" (UART_TX_BIT)
:
"r25"
);
#endif
}
- 7fa0: 08 95 ret
+ 7fa4: 08 95 ret
-00007fa2 <getch>:
- return getch();
-}
-
-// Watchdog functions. These are only safe with interrupts turned off.
-void watchdogReset() {
- __asm__ __volatile__ (
- 7fa2: a8 95 wdr
+00007fa6 <getch>:
[uartBit] "I" (UART_RX_BIT)
:
"r25"
);
#else
- while(!(UCSR0A & _BV(RXC0)));
- 7fa4: 80 91 c0 00 lds r24, 0x00C0
- 7fa8: 87 ff sbrs r24, 7
- 7faa: fc cf rjmp .-8 ; 0x7fa4 <getch+0x2>
+ while(!(UCSR0A & _BV(RXC0)))
+ 7fa6: 80 91 c0 00 lds r24, 0x00C0
+ 7faa: 87 ff sbrs r24, 7
+ 7fac: fc cf rjmp .-8 ; 0x7fa6 <getch>
+ ;
+ if (!(UCSR0A & _BV(FE0))) {
+ 7fae: 80 91 c0 00 lds r24, 0x00C0
+ 7fb2: 84 fd sbrc r24, 4
+ 7fb4: 01 c0 rjmp .+2 ; 0x7fb8 <getch+0x12>
+}
+#endif
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 7fb6: a8 95 wdr
+ * don't care that an invalid char is returned...)
+ */
+ watchdogReset();
+ }
+
ch = UDR0;
- 7fac: 80 91 c6 00 lds r24, 0x00C6
-#ifdef LED_DATA_FLASH
+ 7fb8: 80 91 c6 00 lds r24, 0x00C6
LED_PIN |= _BV(LED);
#endif
-
- return ch;
-}
- 7fb0: 08 95 ret
-
-00007fb2 <getLen>:
- } while (--count);
-}
#endif
-uint8_t getLen() {
- getch();
- 7fb2: f7 df rcall .-18 ; 0x7fa2 <getch>
- length = getch();
- 7fb4: f6 df rcall .-20 ; 0x7fa2 <getch>
- 7fb6: 80 93 02 02 sts 0x0202, r24
- return getch();
+ return ch;
}
- 7fba: f3 cf rjmp .-26 ; 0x7fa2 <getch>
+ 7fbc: 08 95 ret
-00007fbc <watchdogConfig>:
+00007fbe <watchdogConfig>:
"wdr\n"
);
}
void watchdogConfig(uint8_t x) {
WDTCSR = _BV(WDCE) | _BV(WDE);
- 7fbc: e0 e6 ldi r30, 0x60 ; 96
- 7fbe: f0 e0 ldi r31, 0x00 ; 0
- 7fc0: 98 e1 ldi r25, 0x18 ; 24
- 7fc2: 90 83 st Z, r25
+ 7fbe: e0 e6 ldi r30, 0x60 ; 96
+ 7fc0: f0 e0 ldi r31, 0x00 ; 0
+ 7fc2: 98 e1 ldi r25, 0x18 ; 24
+ 7fc4: 90 83 st Z, r25
WDTCSR = x;
- 7fc4: 80 83 st Z, r24
+ 7fc6: 80 83 st Z, r24
}
- 7fc6: 08 95 ret
-
-00007fc8 <appStart>:
-
-void appStart() {
- watchdogConfig(WATCHDOG_OFF);
- 7fc8: 80 e0 ldi r24, 0x00 ; 0
- 7fca: f8 df rcall .-16 ; 0x7fbc <watchdogConfig>
- __asm__ __volatile__ (
- 7fcc: ee 27 eor r30, r30
- 7fce: ff 27 eor r31, r31
- 7fd0: 09 94 ijmp
+ 7fc8: 08 95 ret
-00007fd2 <verifySpace>:
+00007fca <verifySpace>:
do getch(); while (--count);
verifySpace();
}
void verifySpace() {
- if (getch() != CRC_EOP) appStart();
- 7fd2: e7 df rcall .-50 ; 0x7fa2 <getch>
- 7fd4: 80 32 cpi r24, 0x20 ; 32
- 7fd6: 09 f0 breq .+2 ; 0x7fda <verifySpace+0x8>
- 7fd8: f7 df rcall .-18 ; 0x7fc8 <appStart>
+ if (getch() != CRC_EOP) {
+ 7fca: ed df rcall .-38 ; 0x7fa6 <getch>
+ 7fcc: 80 32 cpi r24, 0x20 ; 32
+ 7fce: 19 f0 breq .+6 ; 0x7fd6 <verifySpace+0xc>
+ watchdogConfig(WATCHDOG_16MS); // shorten WD timeout
+ 7fd0: 88 e0 ldi r24, 0x08 ; 8
+ 7fd2: f5 df rcall .-22 ; 0x7fbe <watchdogConfig>
+ 7fd4: ff cf rjmp .-2 ; 0x7fd4 <verifySpace+0xa>
+ while (1) // and busy-loop so that WD causes
+ ; // a reset and app start.
+ }
putch(STK_INSYNC);
- 7fda: 84 e1 ldi r24, 0x14 ; 20
+ 7fd6: 84 e1 ldi r24, 0x14 ; 20
}
- 7fdc: da cf rjmp .-76 ; 0x7f92 <putch>
+ 7fd8: de cf rjmp .-68 ; 0x7f96 <putch>
+
+00007fda <getNch>:
::[count] "M" (UART_B_VALUE)
);
}
#endif
void getNch(uint8_t count) {
- 7fde: 1f 93 push r17
- 7fe0: 18 2f mov r17, r24
-
-00007fe2 <getNch>:
+ 7fda: 1f 93 push r17
+ 7fdc: 18 2f mov r17, r24
do getch(); while (--count);
- 7fe2: df df rcall .-66 ; 0x7fa2 <getch>
- 7fe4: 11 50 subi r17, 0x01 ; 1
- 7fe6: e9 f7 brne .-6 ; 0x7fe2 <getNch>
+ 7fde: e3 df rcall .-58 ; 0x7fa6 <getch>
+ 7fe0: 11 50 subi r17, 0x01 ; 1
+ 7fe2: e9 f7 brne .-6 ; 0x7fde <getNch+0x4>
verifySpace();
- 7fe8: f4 df rcall .-24 ; 0x7fd2 <verifySpace>
+ 7fe4: f2 df rcall .-28 ; 0x7fca <verifySpace>
}
- 7fea: 1f 91 pop r17
- 7fec: 08 95 ret
+ 7fe6: 1f 91 pop r17
+ 7fe8: 08 95 ret
+
+00007fea <appStart>:
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ WDTCSR = x;
+}
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 7fea: 80 e0 ldi r24, 0x00 ; 0
+ 7fec: e8 df rcall .-48 ; 0x7fbe <watchdogConfig>
+ __asm__ __volatile__ (
+ 7fee: ee 27 eor r30, r30
+ 7ff0: ff 27 eor r31, r31
+ 7ff2: 09 94 ijmp
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega8.hex b/hardware/arduino/bootloaders/optiboot/optiboot_atmega8.hex
new file mode 100644
index 0000000..b04f276
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/optiboot_atmega8.hex
@@ -0,0 +1,33 @@
+:101E000011248FE594E09EBF8DBF84B714BE81FF7F
+:101E1000E2D085E08EBD82E08BB988E18AB986E8A0
+:101E200080BD80E189B98EE0C2D0BD9A96E020E302
+:101E30003CEF54E040E23DBD2CBD58BF08B602FE69
+:101E4000FDCF88B3842788BBA8959150A1F7CC24F7
+:101E5000DD2488248394B5E0AB2EA1E19A2EF3E033
+:101E6000BF2E9ED0813461F49BD0082FA4D00238BD
+:101E700011F0013811F484E001C083E08DD089C0F5
+:101E8000823411F484E103C0853419F485E09BD0D9
+:101E900080C0853579F484D0E82EFF2481D0082FC6
+:101EA00010E0102F00270E291F29000F111F83D0CB
+:101EB00068016FC0863521F484E085D080E0DECFF4
+:101EC000843609F040C06CD06BD0082F69D080E018
+:101ED000C81688E1D80618F4F601B7BEE895C0E048
+:101EE000D1E05ED089930C17E1F7F0E0CF16F8E16E
+:101EF000DF0618F0F601B7BEE8955DD007B600FC26
+:101F0000FDCFA601A0E0B1E02C9130E011968C91BC
+:101F1000119790E0982F8827822B932B1296FA0125
+:101F20000C0187BEE89511244E5F5F4FF1E0A034AD
+:101F3000BF0751F7F601A7BEE89507B600FCFDCF35
+:101F400097BEE89526C08437B1F42AD029D0F82E60
+:101F500027D031D0F601EF2C8F010F5F1F4F8491F6
+:101F60001BD0EA94F801C1F70894C11CD11CFA9463
+:101F7000CF0CD11C0EC0853739F41DD08EE10CD0AA
+:101F800083E90AD087E07ACF813511F488E00FD059
+:101F900012D080E101D065CF5D9BFECF8CB9089552
+:101FA0005F9BFECF5C9901C0A8958CB1089598E124
+:101FB00091BD81BD0895F4DF803219F088E0F7DF2C
+:101FC000FFCF84E1E9CF1F93182FEADF1150E9F723
+:101FD000F2DF1F91089580E0EADFEE27FF270994E2
+:021FFE000404D9
+:0400000300001E00DB
+:00000001FF
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega8.lst b/hardware/arduino/bootloaders/optiboot/optiboot_atmega8.lst
new file mode 100644
index 0000000..d921895
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/optiboot_atmega8.lst
@@ -0,0 +1,604 @@
+
+optiboot_atmega8.elf: file format elf32-avr
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 .text 000001e0 00001e00 00001e00 00000054 2**1
+ CONTENTS, ALLOC, LOAD, READONLY, CODE
+ 1 .version 00000002 00001ffe 00001ffe 00000234 2**0
+ CONTENTS, READONLY
+ 2 .debug_aranges 00000028 00000000 00000000 00000236 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 3 .debug_pubnames 0000005f 00000000 00000000 0000025e 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 4 .debug_info 000002a6 00000000 00000000 000002bd 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 5 .debug_abbrev 00000169 00000000 00000000 00000563 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 6 .debug_line 00000498 00000000 00000000 000006cc 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 7 .debug_frame 00000080 00000000 00000000 00000b64 2**2
+ CONTENTS, READONLY, DEBUGGING
+ 8 .debug_str 0000014f 00000000 00000000 00000be4 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 9 .debug_loc 000002ba 00000000 00000000 00000d33 2**0
+ CONTENTS, READONLY, DEBUGGING
+ 10 .debug_ranges 00000078 00000000 00000000 00000fed 2**0
+ CONTENTS, READONLY, DEBUGGING
+
+Disassembly of section .text:
+
+00001e00 <main>:
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
+#endif
+
+/* main program starts here */
+int main(void) {
+ 1e00: 11 24 eor r1, r1
+ //
+ // If not, uncomment the following instructions:
+ // cli();
+ asm volatile ("clr __zero_reg__");
+#ifdef __AVR_ATmega8__
+ SP=RAMEND; // This is done by hardware reset
+ 1e02: 8f e5 ldi r24, 0x5F ; 95
+ 1e04: 94 e0 ldi r25, 0x04 ; 4
+ 1e06: 9e bf out 0x3e, r25 ; 62
+ 1e08: 8d bf out 0x3d, r24 ; 61
+#endif
+
+ // Adaboot no-wait mod
+ ch = MCUSR;
+ 1e0a: 84 b7 in r24, 0x34 ; 52
+ MCUSR = 0;
+ 1e0c: 14 be out 0x34, r1 ; 52
+ if (!(ch & _BV(EXTRF))) appStart();
+ 1e0e: 81 ff sbrs r24, 1
+ 1e10: e2 d0 rcall .+452 ; 0x1fd6 <appStart>
+
+#if LED_START_FLASHES > 0
+ // Set up Timer 1 for timeout counter
+ TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
+ 1e12: 85 e0 ldi r24, 0x05 ; 5
+ 1e14: 8e bd out 0x2e, r24 ; 46
+#endif
+#ifndef SOFT_UART
+#ifdef __AVR_ATmega8__
+ UCSRA = _BV(U2X); //Double speed mode USART
+ 1e16: 82 e0 ldi r24, 0x02 ; 2
+ 1e18: 8b b9 out 0x0b, r24 ; 11
+ UCSRB = _BV(RXEN) | _BV(TXEN); // enable Rx & Tx
+ 1e1a: 88 e1 ldi r24, 0x18 ; 24
+ 1e1c: 8a b9 out 0x0a, r24 ; 10
+ UCSRC = _BV(URSEL) | _BV(UCSZ1) | _BV(UCSZ0); // config USART; 8N1
+ 1e1e: 86 e8 ldi r24, 0x86 ; 134
+ 1e20: 80 bd out 0x20, r24 ; 32
+ UBRRL = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+ 1e22: 80 e1 ldi r24, 0x10 ; 16
+ 1e24: 89 b9 out 0x09, r24 ; 9
+ UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
+#endif
+#endif
+
+ // Set up watchdog to trigger after 500ms
+ watchdogConfig(WATCHDOG_1S);
+ 1e26: 8e e0 ldi r24, 0x0E ; 14
+ 1e28: c2 d0 rcall .+388 ; 0x1fae <watchdogConfig>
+
+ /* Set LED pin as output */
+ LED_DDR |= _BV(LED);
+ 1e2a: bd 9a sbi 0x17, 5 ; 23
+ 1e2c: 96 e0 ldi r25, 0x06 ; 6
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 1e2e: 20 e3 ldi r18, 0x30 ; 48
+ 1e30: 3c ef ldi r19, 0xFC ; 252
+ TIFR1 = _BV(TOV1);
+ 1e32: 54 e0 ldi r21, 0x04 ; 4
+ while(!(TIFR1 & _BV(TOV1)));
+#ifdef __AVR_ATmega8__
+ LED_PORT ^= _BV(LED);
+ 1e34: 40 e2 ldi r20, 0x20 ; 32
+}
+
+#if LED_START_FLASHES > 0
+void flash_led(uint8_t count) {
+ do {
+ TCNT1 = -(F_CPU/(1024*16));
+ 1e36: 3d bd out 0x2d, r19 ; 45
+ 1e38: 2c bd out 0x2c, r18 ; 44
+ TIFR1 = _BV(TOV1);
+ 1e3a: 58 bf out 0x38, r21 ; 56
+ while(!(TIFR1 & _BV(TOV1)));
+ 1e3c: 08 b6 in r0, 0x38 ; 56
+ 1e3e: 02 fe sbrs r0, 2
+ 1e40: fd cf rjmp .-6 ; 0x1e3c <main+0x3c>
+#ifdef __AVR_ATmega8__
+ LED_PORT ^= _BV(LED);
+ 1e42: 88 b3 in r24, 0x18 ; 24
+ 1e44: 84 27 eor r24, r20
+ 1e46: 88 bb out 0x18, r24 ; 24
+}
+#endif
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 1e48: a8 95 wdr
+ LED_PORT ^= _BV(LED);
+#else
+ LED_PIN |= _BV(LED);
+#endif
+ watchdogReset();
+ } while (--count);
+ 1e4a: 91 50 subi r25, 0x01 ; 1
+ 1e4c: a1 f7 brne .-24 ; 0x1e36 <main+0x36>
+ 1e4e: cc 24 eor r12, r12
+ 1e50: dd 24 eor r13, r13
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ __boot_page_fill_short((uint16_t)(void*)addrPtr,a);
+ 1e52: 88 24 eor r8, r8
+ 1e54: 83 94 inc r8
+ addrPtr += 2;
+ } while (--ch);
+
+ // Write from programming buffer
+ __boot_page_write_short((uint16_t)(void*)address);
+ 1e56: b5 e0 ldi r27, 0x05 ; 5
+ 1e58: ab 2e mov r10, r27
+ boot_spm_busy_wait();
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 1e5a: a1 e1 ldi r26, 0x11 ; 17
+ 1e5c: 9a 2e mov r9, r26
+ do *bufPtr++ = getch();
+ while (--length);
+
+ // If we are in NRWW section, page erase has to be delayed until now.
+ // Todo: Take RAMPZ into account
+ if (address >= NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+ 1e5e: f3 e0 ldi r31, 0x03 ; 3
+ 1e60: bf 2e mov r11, r31
+#endif
+
+ /* Forever loop */
+ for (;;) {
+ /* get character from UART */
+ ch = getch();
+ 1e62: 9e d0 rcall .+316 ; 0x1fa0 <getch>
+
+ if(ch == STK_GET_PARAMETER) {
+ 1e64: 81 34 cpi r24, 0x41 ; 65
+ 1e66: 61 f4 brne .+24 ; 0x1e80 <main+0x80>
+ unsigned char which = getch();
+ 1e68: 9b d0 rcall .+310 ; 0x1fa0 <getch>
+ 1e6a: 08 2f mov r16, r24
+ verifySpace();
+ 1e6c: a4 d0 rcall .+328 ; 0x1fb6 <verifySpace>
+ if (which == 0x82) {
+ 1e6e: 02 38 cpi r16, 0x82 ; 130
+ 1e70: 11 f0 breq .+4 ; 0x1e76 <main+0x76>
+ /*
+ * Send optiboot version as "minor SW version"
+ */
+ putch(OPTIBOOT_MINVER);
+ } else if (which == 0x81) {
+ 1e72: 01 38 cpi r16, 0x81 ; 129
+ 1e74: 11 f4 brne .+4 ; 0x1e7a <main+0x7a>
+ putch(OPTIBOOT_MAJVER);
+ 1e76: 84 e0 ldi r24, 0x04 ; 4
+ 1e78: 01 c0 rjmp .+2 ; 0x1e7c <main+0x7c>
+ } else {
+ /*
+ * GET PARAMETER returns a generic 0x03 reply for
+ * other parameters - enough to keep Avrdude happy
+ */
+ putch(0x03);
+ 1e7a: 83 e0 ldi r24, 0x03 ; 3
+ 1e7c: 8d d0 rcall .+282 ; 0x1f98 <putch>
+ 1e7e: 89 c0 rjmp .+274 ; 0x1f92 <main+0x192>
+ }
+ }
+ else if(ch == STK_SET_DEVICE) {
+ 1e80: 82 34 cpi r24, 0x42 ; 66
+ 1e82: 11 f4 brne .+4 ; 0x1e88 <main+0x88>
+ // SET DEVICE is ignored
+ getNch(20);
+ 1e84: 84 e1 ldi r24, 0x14 ; 20
+ 1e86: 03 c0 rjmp .+6 ; 0x1e8e <main+0x8e>
+ }
+ else if(ch == STK_SET_DEVICE_EXT) {
+ 1e88: 85 34 cpi r24, 0x45 ; 69
+ 1e8a: 19 f4 brne .+6 ; 0x1e92 <main+0x92>
+ // SET DEVICE EXT is ignored
+ getNch(5);
+ 1e8c: 85 e0 ldi r24, 0x05 ; 5
+ 1e8e: 9b d0 rcall .+310 ; 0x1fc6 <getNch>
+ 1e90: 80 c0 rjmp .+256 ; 0x1f92 <main+0x192>
+ }
+ else if(ch == STK_LOAD_ADDRESS) {
+ 1e92: 85 35 cpi r24, 0x55 ; 85
+ 1e94: 79 f4 brne .+30 ; 0x1eb4 <main+0xb4>
+ // LOAD ADDRESS
+ uint16_t newAddress;
+ newAddress = getch();
+ 1e96: 84 d0 rcall .+264 ; 0x1fa0 <getch>
+ newAddress = (newAddress & 0xff) | (getch() << 8);
+ 1e98: e8 2e mov r14, r24
+ 1e9a: ff 24 eor r15, r15
+ 1e9c: 81 d0 rcall .+258 ; 0x1fa0 <getch>
+ 1e9e: 08 2f mov r16, r24
+ 1ea0: 10 e0 ldi r17, 0x00 ; 0
+ 1ea2: 10 2f mov r17, r16
+ 1ea4: 00 27 eor r16, r16
+ 1ea6: 0e 29 or r16, r14
+ 1ea8: 1f 29 or r17, r15
+#ifdef RAMPZ
+ // Transfer top bit to RAMPZ
+ RAMPZ = (newAddress & 0x8000) ? 1 : 0;
+#endif
+ newAddress += newAddress; // Convert from word address to byte address
+ 1eaa: 00 0f add r16, r16
+ 1eac: 11 1f adc r17, r17
+ address = newAddress;
+ verifySpace();
+ 1eae: 83 d0 rcall .+262 ; 0x1fb6 <verifySpace>
+ 1eb0: 68 01 movw r12, r16
+ 1eb2: 6f c0 rjmp .+222 ; 0x1f92 <main+0x192>
+ }
+ else if(ch == STK_UNIVERSAL) {
+ 1eb4: 86 35 cpi r24, 0x56 ; 86
+ 1eb6: 21 f4 brne .+8 ; 0x1ec0 <main+0xc0>
+ // UNIVERSAL command is ignored
+ getNch(4);
+ 1eb8: 84 e0 ldi r24, 0x04 ; 4
+ 1eba: 85 d0 rcall .+266 ; 0x1fc6 <getNch>
+ putch(0x00);
+ 1ebc: 80 e0 ldi r24, 0x00 ; 0
+ 1ebe: de cf rjmp .-68 ; 0x1e7c <main+0x7c>
+ }
+ /* Write memory, length is big endian and is in bytes */
+ else if(ch == STK_PROG_PAGE) {
+ 1ec0: 84 36 cpi r24, 0x64 ; 100
+ 1ec2: 09 f0 breq .+2 ; 0x1ec6 <main+0xc6>
+ 1ec4: 40 c0 rjmp .+128 ; 0x1f46 <main+0x146>
+ // PROGRAM PAGE - we support flash programming only, not EEPROM
+ uint8_t *bufPtr;
+ uint16_t addrPtr;
+
+ getch(); /* getlen() */
+ 1ec6: 6c d0 rcall .+216 ; 0x1fa0 <getch>
+ length = getch();
+ 1ec8: 6b d0 rcall .+214 ; 0x1fa0 <getch>
+ 1eca: 08 2f mov r16, r24
+ getch();
+ 1ecc: 69 d0 rcall .+210 ; 0x1fa0 <getch>
+
+ // If we are in RWW section, immediately start page erase
+ if (address < NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+ 1ece: 80 e0 ldi r24, 0x00 ; 0
+ 1ed0: c8 16 cp r12, r24
+ 1ed2: 88 e1 ldi r24, 0x18 ; 24
+ 1ed4: d8 06 cpc r13, r24
+ 1ed6: 18 f4 brcc .+6 ; 0x1ede <main+0xde>
+ 1ed8: f6 01 movw r30, r12
+ 1eda: b7 be out 0x37, r11 ; 55
+ 1edc: e8 95 spm
+ 1ede: c0 e0 ldi r28, 0x00 ; 0
+ 1ee0: d1 e0 ldi r29, 0x01 ; 1
+
+ // While that is going on, read in page contents
+ bufPtr = buff;
+ do *bufPtr++ = getch();
+ 1ee2: 5e d0 rcall .+188 ; 0x1fa0 <getch>
+ 1ee4: 89 93 st Y+, r24
+ while (--length);
+ 1ee6: 0c 17 cp r16, r28
+ 1ee8: e1 f7 brne .-8 ; 0x1ee2 <main+0xe2>
+
+ // If we are in NRWW section, page erase has to be delayed until now.
+ // Todo: Take RAMPZ into account
+ if (address >= NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
+ 1eea: f0 e0 ldi r31, 0x00 ; 0
+ 1eec: cf 16 cp r12, r31
+ 1eee: f8 e1 ldi r31, 0x18 ; 24
+ 1ef0: df 06 cpc r13, r31
+ 1ef2: 18 f0 brcs .+6 ; 0x1efa <main+0xfa>
+ 1ef4: f6 01 movw r30, r12
+ 1ef6: b7 be out 0x37, r11 ; 55
+ 1ef8: e8 95 spm
+
+ // Read command terminator, start reply
+ verifySpace();
+ 1efa: 5d d0 rcall .+186 ; 0x1fb6 <verifySpace>
+
+ // If only a partial page is to be programmed, the erase might not be complete.
+ // So check that here
+ boot_spm_busy_wait();
+ 1efc: 07 b6 in r0, 0x37 ; 55
+ 1efe: 00 fc sbrc r0, 0
+ 1f00: fd cf rjmp .-6 ; 0x1efc <main+0xfc>
+ 1f02: a6 01 movw r20, r12
+ 1f04: a0 e0 ldi r26, 0x00 ; 0
+ 1f06: b1 e0 ldi r27, 0x01 ; 1
+ bufPtr = buff;
+ addrPtr = (uint16_t)(void*)address;
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ 1f08: 2c 91 ld r18, X
+ 1f0a: 30 e0 ldi r19, 0x00 ; 0
+ a |= (*bufPtr++) << 8;
+ 1f0c: 11 96 adiw r26, 0x01 ; 1
+ 1f0e: 8c 91 ld r24, X
+ 1f10: 11 97 sbiw r26, 0x01 ; 1
+ 1f12: 90 e0 ldi r25, 0x00 ; 0
+ 1f14: 98 2f mov r25, r24
+ 1f16: 88 27 eor r24, r24
+ 1f18: 82 2b or r24, r18
+ 1f1a: 93 2b or r25, r19
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
+#endif
+
+/* main program starts here */
+int main(void) {
+ 1f1c: 12 96 adiw r26, 0x02 ; 2
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
+ __boot_page_fill_short((uint16_t)(void*)addrPtr,a);
+ 1f1e: fa 01 movw r30, r20
+ 1f20: 0c 01 movw r0, r24
+ 1f22: 87 be out 0x37, r8 ; 55
+ 1f24: e8 95 spm
+ 1f26: 11 24 eor r1, r1
+ addrPtr += 2;
+ 1f28: 4e 5f subi r20, 0xFE ; 254
+ 1f2a: 5f 4f sbci r21, 0xFF ; 255
+ } while (--ch);
+ 1f2c: f1 e0 ldi r31, 0x01 ; 1
+ 1f2e: a0 34 cpi r26, 0x40 ; 64
+ 1f30: bf 07 cpc r27, r31
+ 1f32: 51 f7 brne .-44 ; 0x1f08 <main+0x108>
+
+ // Write from programming buffer
+ __boot_page_write_short((uint16_t)(void*)address);
+ 1f34: f6 01 movw r30, r12
+ 1f36: a7 be out 0x37, r10 ; 55
+ 1f38: e8 95 spm
+ boot_spm_busy_wait();
+ 1f3a: 07 b6 in r0, 0x37 ; 55
+ 1f3c: 00 fc sbrc r0, 0
+ 1f3e: fd cf rjmp .-6 ; 0x1f3a <main+0x13a>
+
+#if defined(RWWSRE)
+ // Reenable read access to flash
+ boot_rww_enable();
+ 1f40: 97 be out 0x37, r9 ; 55
+ 1f42: e8 95 spm
+ 1f44: 26 c0 rjmp .+76 ; 0x1f92 <main+0x192>
+#endif
+
+ }
+ /* Read memory block mode, length is big endian. */
+ else if(ch == STK_READ_PAGE) {
+ 1f46: 84 37 cpi r24, 0x74 ; 116
+ 1f48: b1 f4 brne .+44 ; 0x1f76 <main+0x176>
+ // READ PAGE - we only read flash
+ getch(); /* getlen() */
+ 1f4a: 2a d0 rcall .+84 ; 0x1fa0 <getch>
+ length = getch();
+ 1f4c: 29 d0 rcall .+82 ; 0x1fa0 <getch>
+ 1f4e: f8 2e mov r15, r24
+ getch();
+ 1f50: 27 d0 rcall .+78 ; 0x1fa0 <getch>
+
+ verifySpace();
+ 1f52: 31 d0 rcall .+98 ; 0x1fb6 <verifySpace>
+ 1f54: f6 01 movw r30, r12
+ 1f56: ef 2c mov r14, r15
+ putch(result);
+ address++;
+ }
+ while (--length);
+#else
+ do putch(pgm_read_byte_near(address++));
+ 1f58: 8f 01 movw r16, r30
+ 1f5a: 0f 5f subi r16, 0xFF ; 255
+ 1f5c: 1f 4f sbci r17, 0xFF ; 255
+ 1f5e: 84 91 lpm r24, Z+
+ 1f60: 1b d0 rcall .+54 ; 0x1f98 <putch>
+ while (--length);
+ 1f62: ea 94 dec r14
+ 1f64: f8 01 movw r30, r16
+ 1f66: c1 f7 brne .-16 ; 0x1f58 <main+0x158>
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
+#endif
+
+/* main program starts here */
+int main(void) {
+ 1f68: 08 94 sec
+ 1f6a: c1 1c adc r12, r1
+ 1f6c: d1 1c adc r13, r1
+ 1f6e: fa 94 dec r15
+ 1f70: cf 0c add r12, r15
+ 1f72: d1 1c adc r13, r1
+ 1f74: 0e c0 rjmp .+28 ; 0x1f92 <main+0x192>
+#endif
+#endif
+ }
+
+ /* Get device signature bytes */
+ else if(ch == STK_READ_SIGN) {
+ 1f76: 85 37 cpi r24, 0x75 ; 117
+ 1f78: 39 f4 brne .+14 ; 0x1f88 <main+0x188>
+ // READ SIGN - return what Avrdude wants to hear
+ verifySpace();
+ 1f7a: 1d d0 rcall .+58 ; 0x1fb6 <verifySpace>
+ putch(SIGNATURE_0);
+ 1f7c: 8e e1 ldi r24, 0x1E ; 30
+ 1f7e: 0c d0 rcall .+24 ; 0x1f98 <putch>
+ putch(SIGNATURE_1);
+ 1f80: 83 e9 ldi r24, 0x93 ; 147
+ 1f82: 0a d0 rcall .+20 ; 0x1f98 <putch>
+ putch(SIGNATURE_2);
+ 1f84: 87 e0 ldi r24, 0x07 ; 7
+ 1f86: 7a cf rjmp .-268 ; 0x1e7c <main+0x7c>
+ }
+ else if (ch == 'Q') {
+ 1f88: 81 35 cpi r24, 0x51 ; 81
+ 1f8a: 11 f4 brne .+4 ; 0x1f90 <main+0x190>
+ // Adaboot no-wait mod
+ watchdogConfig(WATCHDOG_16MS);
+ 1f8c: 88 e0 ldi r24, 0x08 ; 8
+ 1f8e: 0f d0 rcall .+30 ; 0x1fae <watchdogConfig>
+ verifySpace();
+ }
+ else {
+ // This covers the response to commands like STK_ENTER_PROGMODE
+ verifySpace();
+ 1f90: 12 d0 rcall .+36 ; 0x1fb6 <verifySpace>
+ }
+ putch(STK_OK);
+ 1f92: 80 e1 ldi r24, 0x10 ; 16
+ 1f94: 01 d0 rcall .+2 ; 0x1f98 <putch>
+ 1f96: 65 cf rjmp .-310 ; 0x1e62 <main+0x62>
+
+00001f98 <putch>:
+ }
+}
+
+void putch(char ch) {
+#ifndef SOFT_UART
+ while (!(UCSR0A & _BV(UDRE0)));
+ 1f98: 5d 9b sbis 0x0b, 5 ; 11
+ 1f9a: fe cf rjmp .-4 ; 0x1f98 <putch>
+ UDR0 = ch;
+ 1f9c: 8c b9 out 0x0c, r24 ; 12
+ [uartBit] "I" (UART_TX_BIT)
+ :
+ "r25"
+ );
+#endif
+}
+ 1f9e: 08 95 ret
+
+00001fa0 <getch>:
+ [uartBit] "I" (UART_RX_BIT)
+ :
+ "r25"
+);
+#else
+ while(!(UCSR0A & _BV(RXC0)))
+ 1fa0: 5f 9b sbis 0x0b, 7 ; 11
+ 1fa2: fe cf rjmp .-4 ; 0x1fa0 <getch>
+ ;
+ if (!(UCSR0A & _BV(FE0))) {
+ 1fa4: 5c 99 sbic 0x0b, 4 ; 11
+ 1fa6: 01 c0 rjmp .+2 ; 0x1faa <getch+0xa>
+}
+#endif
+
+// Watchdog functions. These are only safe with interrupts turned off.
+void watchdogReset() {
+ __asm__ __volatile__ (
+ 1fa8: a8 95 wdr
+ * don't care that an invalid char is returned...)
+ */
+ watchdogReset();
+ }
+
+ ch = UDR0;
+ 1faa: 8c b1 in r24, 0x0c ; 12
+ LED_PIN |= _BV(LED);
+#endif
+#endif
+
+ return ch;
+}
+ 1fac: 08 95 ret
+
+00001fae <watchdogConfig>:
+ "wdr\n"
+ );
+}
+
+void watchdogConfig(uint8_t x) {
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ 1fae: 98 e1 ldi r25, 0x18 ; 24
+ 1fb0: 91 bd out 0x21, r25 ; 33
+ WDTCSR = x;
+ 1fb2: 81 bd out 0x21, r24 ; 33
+}
+ 1fb4: 08 95 ret
+
+00001fb6 <verifySpace>:
+ do getch(); while (--count);
+ verifySpace();
+}
+
+void verifySpace() {
+ if (getch() != CRC_EOP) {
+ 1fb6: f4 df rcall .-24 ; 0x1fa0 <getch>
+ 1fb8: 80 32 cpi r24, 0x20 ; 32
+ 1fba: 19 f0 breq .+6 ; 0x1fc2 <verifySpace+0xc>
+ watchdogConfig(WATCHDOG_16MS); // shorten WD timeout
+ 1fbc: 88 e0 ldi r24, 0x08 ; 8
+ 1fbe: f7 df rcall .-18 ; 0x1fae <watchdogConfig>
+ 1fc0: ff cf rjmp .-2 ; 0x1fc0 <verifySpace+0xa>
+ while (1) // and busy-loop so that WD causes
+ ; // a reset and app start.
+ }
+ putch(STK_INSYNC);
+ 1fc2: 84 e1 ldi r24, 0x14 ; 20
+}
+ 1fc4: e9 cf rjmp .-46 ; 0x1f98 <putch>
+
+00001fc6 <getNch>:
+ ::[count] "M" (UART_B_VALUE)
+ );
+}
+#endif
+
+void getNch(uint8_t count) {
+ 1fc6: 1f 93 push r17
+ 1fc8: 18 2f mov r17, r24
+ do getch(); while (--count);
+ 1fca: ea df rcall .-44 ; 0x1fa0 <getch>
+ 1fcc: 11 50 subi r17, 0x01 ; 1
+ 1fce: e9 f7 brne .-6 ; 0x1fca <getNch+0x4>
+ verifySpace();
+ 1fd0: f2 df rcall .-28 ; 0x1fb6 <verifySpace>
+}
+ 1fd2: 1f 91 pop r17
+ 1fd4: 08 95 ret
+
+00001fd6 <appStart>:
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ WDTCSR = x;
+}
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 1fd6: 80 e0 ldi r24, 0x00 ; 0
+ 1fd8: ea df rcall .-44 ; 0x1fae <watchdogConfig>
+ __asm__ __volatile__ (
+ 1fda: ee 27 eor r30, r30
+ 1fdc: ff 27 eor r31, r31
+ 1fde: 09 94 ijmp
diff --git a/hardware/arduino/bootloaders/optiboot/pin_defs.h b/hardware/arduino/bootloaders/optiboot/pin_defs.h
new file mode 100644
index 0000000..27d7772
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/pin_defs.h
@@ -0,0 +1,80 @@
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__) || defined(__AVR_ATmega88) || defined(__AVR_ATmega8__) || defined(__AVR_ATmega88__)
+/* 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_ATmega8__)
+ //Name conversion R.Wiersma
+ #define UCSR0A UCSRA
+ #define UDR0 UDR
+ #define UDRE0 UDRE
+ #define RXC0 RXC
+ #define FE0 FE
+ #define TIFR1 TIFR
+ #define WDTCSR WDTCR
+#endif
+
+/* Luminet support */
+#if defined(__AVR_ATtiny84__)
+/* Red LED is connected to pin PA4 */
+#define LED_DDR DDRA
+#define LED_PORT PORTA
+#define LED_PIN PINA
+#define LED PINA4
+/* Ports for soft UART - left port only for now. TX/RX on PA2/PA3 */
+#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
+
+/* Sanguino support */
+#if defined(__AVR_ATmega644P__)
+/* Onboard LED is connected to pin PB0 on Sanguino */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+#define LED PINB0
+
+/* 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
+
+/* Mega support */
+#if defined(__AVR_ATmega1280__)
+/* Onboard LED is connected to pin PB7 on Arduino Mega */
+#define LED_DDR DDRB
+#define LED_PORT PORTB
+#define LED_PIN PINB
+#define LED PINB7
+
+/* Ports for soft UART */
+#ifdef SOFT_UART
+#define UART_PORT PORTE
+#define UART_PIN PINE
+#define UART_DDR DDRE
+#define UART_TX_BIT 1
+#define UART_RX_BIT 0
+#endif
+#endif
diff --git a/hardware/arduino/bootloaders/optiboot/stk500.h b/hardware/arduino/bootloaders/optiboot/stk500.h
new file mode 100644
index 0000000..ca0dd91
--- /dev/null
+++ b/hardware/arduino/bootloaders/optiboot/stk500.h
@@ -0,0 +1,39 @@
+/* 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'
diff --git a/hardware/arduino/bootloaders/stk500v2/stk500boot.c b/hardware/arduino/bootloaders/stk500v2/stk500boot.c
index 3d5b095..13dec89 100755
--- a/hardware/arduino/bootloaders/stk500v2/stk500boot.c
+++ b/hardware/arduino/bootloaders/stk500v2/stk500boot.c
@@ -95,8 +95,7 @@ LICENSE:
#include "command.h"
-//#if defined(_MEGA_BOARD_) || defined(_BOARD_AMBER128_) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__)
-#if 0
+#if defined(_MEGA_BOARD_) || defined(_BOARD_AMBER128_) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__)
#define ENABLE_MONITOR
static void RunMonitor(void);
#endif
diff --git a/hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex b/hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
index ace9cb1..4f36699 100644
--- a/hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
+++ b/hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
@@ -1,141 +1,513 @@
:020000023000CC
-:10E000000D9472F00D9493F00D9493F00D9493F0A1
-:10E010000D9493F00D9493F00D9493F00D9493F070
-:10E020000D9493F00D9493F00D9493F00D9493F060
-:10E030000D9493F00D9493F00D9493F00D9493F050
-:10E040000D9493F00D9493F00D9493F00D9493F040
-:10E050000D9493F00D9493F00D9493F00D9493F030
-:10E060000D9493F00D9493F00D9493F00D9493F020
-:10E070000D9493F00D9493F00D9493F00D9493F010
-:10E080000D9493F00D9493F00D9493F00D9493F000
-:10E090000D9493F00D9493F00D9493F00D9493F0F0
-:10E0A0000D9493F00D9493F00D9493F00D9493F0E0
-:10E0B0000D9493F00D9493F00D9493F00D9493F0D0
-:10E0C0000D9493F00D9493F00D9493F00D9493F0C0
-:10E0D0000D9493F00D9493F00D9493F00D9493F0B0
-:10E0E0000D9493F011241FBECFEFD1E2DEBFCDBF60
-:10E0F00001E00CBF12E0A0E0B2E0E0EAF8EE03E0DD
-:10E100000BBF02C007900D92A030B107D9F70F9452
-:10E11000A3F00D944EF401E20EBF0FEF0DBF1124DA
-:10E120001FBE0D94A3F00D9400F020E030E040ED10
-:10E1300057E005C0FA013197F1F72F5F3F4F2817DD
-:10E140003907C0F308952F923F924F925F926F92DA
-:10E150007F928F929F92AF92BF92CF92DF92EF9277
-:10E16000FF920F931F93DF93CF93CDB7DEB7C852C3
-:10E17000D1400FB6F894DEBF0FBECDBF279A2F9ABD
-:10E180008091C00082608093C00080E18093C400D1
-:10E1900088E18093C1000000EE24FF248701E4E0C1
-:10E1A000AE2EB12CCC24DD2424C0C5010197F1F79B
-:10E1B0000894E11CF11C011D111D21E2E2162EE460
-:10E1C000F20620E0020720E0120718F071E0C72EE7
-:10E1D000D12CC801B70128E53BE140E050E00F94A5
-:10E1E0002CF4611571058105910519F485B18058EC
-:10E1F00085B98091C00087FD03C0C114D104A9F284
-:10E20000A6014F5F5F4FC25EDE4F59834883CE51F8
-:10E21000D140C25EDE4F68817981CE51D1406130FC
-:10E22000710509F0FCC222243324A0E0C05EDE4F59
-:10E230001882C052D1408824992454014424552482
-:10E240003201ABBEF40187919691C95DDE4F99838F
-:10E250008883C752D140DFC2C25EDE4FE881F981B8
-:10E26000CE51D140319709F53091C600C25EDE4FE4
-:10E2700019821882CE51D14022C04F5F5F4F6F4F3D
-:10E280007F4F4130F2E15F07FAE76F07F0E07F0769
-:10E2900080F0C95DDE4F28813981C752D1402F5FA0
-:10E2A0003F4F19F0EE27FF27099440E050E060E06F
-:10E2B00070E08091C00087FFE0CF3091C6009330BE
-:10E2C00061F1943028F4913089F0923008F508C05B
-:10E2D000953091F1953040F1963009F043C03EC041
-:10E2E0003B3109F0B9CF91E0ABE1B6CF313041F02D
-:10E2F000C05EDE4F5881C052D140351709F0AAC226
-:10E30000A327C05EDE4F3883C052D14092E0A4CF35
-:10E31000132F00E0A32793E09FCF832F90E0082BDB
-:10E32000192BA32794E098CF3E3009F093C2A3277E
-:10E3300095E02224332490CFE1E0F0E0EC0FFD1FC4
-:10E34000E20DF31D30830894211C311CA3272016F5
-:10E35000310609F081CF810196E07ECF3A1709F0AE
-:10E3600079C203C0973009F077CF8981833109F4EE
-:10E37000F4C08431C0F4863009F4C2C0873048F458
-:10E38000823069F1833009F45BC0813009F0C4C187
-:10E3900041C0813109F465C0823108F0ACC08031E0
-:10E3A00009F0BAC11CC0883109F474C0893150F435
-:10E3B000853109F4D2C0853108F443C1863109F0B2
-:10E3C000ABC13FC18A3109F45CC08A3108F482C014
-:10E3D0008B3109F44BC08D3109F09EC102C090E031
-:10E3E00041C08D81803311F090E00AC08F81882375
-:10E3F00011F49EE105C0813011F091E001C098E96F
-:10E400001A821B828D818C831D829E831F8247E02E
-:10E4100050E086C11A8288E08B8381E48C8386E594
-:10E420008D8382E58E8389E48F8383E5888780E509
-:10E4300089878FE58A8782E38B874BE050E070C144
-:10E440008A81813941F0823941F0803911F48FE0BD
-:10E4500005C080E003C082E001C08AE01A828B839D
-:10E4600047C091E01A8242E050E05BC18D81882371
-:10E4700011F48EE129C0813011F081E025C088E9D6
-:10E4800023C01A82E1E0F0E069E060935700E49174
-:10E49000EB831CC08B81803589F48C81883039F402
-:10E4A00029E0E2E0F0E02093570084910DC029E0DC
-:10E4B000E0E0F0E020935700849106C0E3E0F0E054
-:10E4C00039E03093570084911A828B831C8244E098
-:10E4D00050E026C18D81836C49E0E1E0F0E0082E38
-:10E4E00040935700E89507B600FCFDCF1A821B82C7
-:10E4F00043E050E015C11A824424552432010EC174
-:10E500008A8190E0A0E0B0E0B82EAA249924882463
-:10E510008B8190E0A0E0B0E0DC0199278827882A71
-:10E52000992AAA2ABB2A8D8190E0A0E0B0E0882A2F
-:10E53000992AAA2ABB2A8C8190E0A0E0B0E0BA2FE9
-:10E54000A92F982F8827882A992AAA2ABB2A880CBB
-:10E55000991CAA1CBB1C1A82E1C09A813B818331A1
-:10E5600019F0B501A40169C050E0451650EC5506FC
-:10E5700053E0650650E0750690F463E0F2016092A6
-:10E580005B0060935700E89507B600FCFDCF40E0C4
-:10E5900051E060E070E0440E551E661E771ECE5DB1
-:10E5A000DE4F9883C252D140CF5DDE4F1882C152F8
-:10E5B000D140032F10E0CF5DDE4F68817981C152D9
-:10E5C000D140062B172BB501A401DE011B968C91BF
-:10E5D00011962C9111971296CC5DDE4F2883C45270
-:10E5E000D140CD5DDE4F1882C352D14090E0CD5D69
-:10E5F000DE4FE881F981C352D1408E2B9F2B21E061
-:10E600000C01FA0160935B0020935700E8951124F8
-:10E610004E5F5F4F6F4F7F4F02501040C1F635E0A5
-:10E62000F401A0925B0030935700E89507B600FC18
-:10E63000FDCF81E180935700E8951A824A015B0182
-:10E640006DC09A81CA5DDE4F9883C652D140CB5DC2
-:10E65000DE4F1882C552D1408B81C82EDD24CB5DA0
-:10E66000DE4FA881B981C552D140CA2ADB2A1A825D
-:10E6700089818431E9F4A60123E0E22EF12CEC0E2D
-:10E68000FD1EABBEF40187919691F70180839183C3
-:10E6900022E030E0E20EF31E62E070E080E090E005
-:10E6A000860E971EA81EB91E4250504051F72EC02C
-:10E6B000B501A40193E0E92EF12CEC0EFD1E0894A7
-:10E6C000C108D108860120E030E00894C11CD11CAB
-:10E6D0000F5F1F4F2F4F3F4F080D191D2A1D3B1D68
-:10E6E00041BDBB27A72F962F852F82BD4F5F5F4F60
-:10E6F0006F4F7F4FF89A80B5D7018D937D014017FA
-:10E7000051076207730761F74A015B01A6014D5F7C
-:10E710005F4FF701108204C0F0ECFA8342E050E052
-:10E7200090E02BE12093C6008091C00086FFFCCFD3
-:10E730008091C00080648093C000C05EDE4F38814D
-:10E74000C052D1403093C6008091C00086FFFCCFFC
-:10E750008091C00080648093C000652F5093C600F4
-:10E760008091C00086FFFCCF8091C00080648093C0
-:10E77000C000342F4093C6008091C00086FFFCCFBC
-:10E780008091C00080648093C0008EE08093C600BA
-:10E790008091C00086FFFCCF8091C0008064809390
-:10E7A000C000A5E1C05EDE4F7881C052D140A727EE
-:10E7B000A327A627FE01319610C030813093C600F2
-:10E7C0008091C00086FFFCCF31968091C0008064AC
-:10E7D0008093C000A327415050404115510569F76F
-:10E7E000A093C6008091C00086FFFCCF8091C0003E
-:10E7F00080648093C00085B1805885B9992379F4ED
-:10E80000C05EDE4F8881C052D1408F5FC05EDE4F58
-:10E810008883C052D14090E000E010E01DCD2798E1
-:10E820002F9880E090E020ED37E0F9013197F1F783
-:10E83000019684369105C9F700008091C0008D7F54
-:10E840008093C00081E180935700E895EE27FF2771
-:10E850000994FFCF90E000CDA1E21A2EAA1BBB1BAA
-:10E86000FD010DC0AA1FBB1FEE1FFF1FA217B3079C
-:10E87000E407F50720F0A21BB30BE40BF50B661FB2
-:10E88000771F881F991F1A9469F760957095809576
-:10E8900090959B01AC01BD01CF010895F894FFCF85
+: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/hardware/arduino/cores/arduino/Arduino.h b/hardware/arduino/cores/arduino/Arduino.h
new file mode 100755
index 0000000..830c995
--- /dev/null
+++ b/hardware/arduino/cores/arduino/Arduino.h
@@ -0,0 +1,215 @@
+#ifndef Arduino_h
+#define Arduino_h
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+#include "binary.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#define HIGH 0x1
+#define LOW 0x0
+
+#define INPUT 0x0
+#define OUTPUT 0x1
+#define INPUT_PULLUP 0x2
+
+#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_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
+#define DEFAULT 0
+#define EXTERNAL 1
+#define INTERNAL 2
+#else
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284P__)
+#define INTERNAL1V1 2
+#define INTERNAL2V56 3
+#else
+#define INTERNAL 3
+#endif
+#define DEFAULT 1
+#define EXTERNAL 0
+#endif
+
+// 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) / clockCyclesPerMicrosecond() )
+#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
+
+#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);
+
+// 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.
+
+#define analogInPinToBit(P) (P)
+
+// 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))) )
+
+#define NOT_A_PIN 0
+#define NOT_A_PORT 0
+
+#ifdef ARDUINO_MAIN
+#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
+#endif
+
+#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 TIMER4D 14
+#define TIMER5A 15
+#define TIMER5B 16
+#define TIMER5C 17
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#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);
+
+#endif
+
+#include "pins_arduino.h"
+
+#endif
diff --git a/hardware/arduino/cores/arduino/CDC.cpp b/hardware/arduino/cores/arduino/CDC.cpp
new file mode 100644
index 0000000..14a0eae
--- /dev/null
+++ b/hardware/arduino/cores/arduino/CDC.cpp
@@ -0,0 +1,175 @@
+
+
+/* Copyright (c) 2011, Peter Barrett
+**
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.
+*/
+
+#include "Platform.h"
+#include "USBAPI.h"
+#include <avr/wdt.h>
+
+#if defined(USBCON)
+#ifdef CDC_ENABLED
+
+void Reboot()
+{
+ USB.detach();
+ cli();
+ asm volatile("jmp 0x7800"); // jump to bootloader - DiskLoader takes up last 2 kB
+}
+
+typedef struct
+{
+ u32 dwDTERate;
+ u8 bCharFormat;
+ u8 bParityType;
+ u8 bDataBits;
+ u8 lineState;
+} LineInfo;
+
+static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 };
+
+#define WEAK __attribute__ ((weak))
+
+extern const CDCDescriptor _cdcInterface PROGMEM;
+const CDCDescriptor _cdcInterface =
+{
+ D_IAD(0,2,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,1),
+
+ // CDC communication interface
+ D_INTERFACE(CDC_ACM_INTERFACE,1,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,0),
+ D_CDCCS(CDC_HEADER,0x10,0x01), // Header (1.10 bcd)
+ D_CDCCS(CDC_CALL_MANAGEMENT,1,1), // Device handles call management (not)
+ D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT,6), // SET_LINE_CODING, GET_LINE_CODING, SET_CONTROL_LINE_STATE supported
+ D_CDCCS(CDC_UNION,CDC_ACM_INTERFACE,CDC_DATA_INTERFACE), // Communication interface is master, data interface is slave 0
+ D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_ACM),USB_ENDPOINT_TYPE_INTERRUPT,0x10,0x40),
+
+ // CDC data interface
+ D_INTERFACE(CDC_DATA_INTERFACE,2,CDC_DATA_INTERFACE_CLASS,0,0),
+ D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,0x40,0),
+ D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)
+};
+
+int WEAK CDC_GetInterface(u8* interfaceNum)
+{
+ interfaceNum[0] += 2; // uses 2
+ return USB_SendControl(TRANSFER_PGM,&_cdcInterface,sizeof(_cdcInterface));
+}
+
+bool WEAK CDC_Setup(Setup& setup)
+{
+ u8 r = setup.bRequest;
+ u8 requestType = setup.bmRequestType;
+
+ if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
+ {
+ if (CDC_GET_LINE_CODING == r)
+ {
+ USB_SendControl(0,(void*)&_usbLineInfo,7);
+ return true;
+ }
+ }
+
+ if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
+ {
+ if (CDC_SET_LINE_CODING == r)
+ {
+ USB_RecvControl((void*)&_usbLineInfo,7);
+ return true;
+ }
+
+ if (CDC_SET_CONTROL_LINE_STATE == r)
+ {
+ if (0 != _usbLineInfo.lineState && 1200 == _usbLineInfo.dwDTERate) // auto-reset is triggered when the port, already open at 1200 bps, is closed
+ Reboot();
+ _usbLineInfo.lineState = setup.wValueL;
+ return true;
+ }
+ }
+ return false;
+}
+
+
+int _serialPeek = -1;
+void Serial_::begin(uint16_t baud_count)
+{
+}
+
+void Serial_::end(void)
+{
+}
+
+int Serial_::available(void)
+{
+ u8 avail = USB_Available(CDC_RX);
+ if (_serialPeek != -1)
+ avail++;
+ return avail;
+}
+
+// peek is nasty
+int Serial_::peek(void)
+{
+ if (_serialPeek == -1)
+ _serialPeek = read();
+ return _serialPeek;
+}
+
+int Serial_::read(void)
+{
+ int c;
+ if (_serialPeek != -1)
+ {
+ c = _serialPeek;
+ _serialPeek = -1;
+ } else {
+ c = USB_Recv(CDC_RX);
+ }
+ return c;
+}
+
+void Serial_::flush(void)
+{
+ USB_Flush(CDC_TX);
+}
+
+size_t Serial_::write(uint8_t c)
+{
+ /* only try to send bytes if the high-level CDC connection itself
+ is open (not just the pipe) - the OS should set lineState when the port
+ is opened and clear lineState when the port is closed.
+ bytes sent before the user opens the connection or after
+ the connection is closed are lost - just like with a UART. */
+
+ // TODO - ZE - check behavior on different OSes and test what happens if an
+ // open connection isn't broken cleanly (cable is yanked out, host dies
+ // or locks up, or host virtual serial port hangs)
+ if (_usbLineInfo.lineState > 0) {
+ int r = USB_Send(CDC_TX,&c,1);
+ if (r > 0) {
+ return r;
+ } else {
+ setWriteError();
+ return 0;
+ }
+ }
+ setWriteError();
+ return 0;
+}
+
+Serial_ Serial;
+
+#endif
+#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/hardware/arduino/cores/arduino/Client.h b/hardware/arduino/cores/arduino/Client.h
new file mode 100644
index 0000000..ea13483
--- /dev/null
+++ b/hardware/arduino/cores/arduino/Client.h
@@ -0,0 +1,26 @@
+#ifndef client_h
+#define client_h
+#include "Print.h"
+#include "Stream.h"
+#include "IPAddress.h"
+
+class Client : public Stream {
+
+public:
+ virtual int connect(IPAddress ip, uint16_t port) =0;
+ virtual int connect(const char *host, uint16_t port) =0;
+ virtual size_t write(uint8_t) =0;
+ virtual size_t write(const uint8_t *buf, size_t size) =0;
+ virtual int available() = 0;
+ virtual int read() = 0;
+ virtual int read(uint8_t *buf, size_t size) = 0;
+ virtual int peek() = 0;
+ virtual void flush() = 0;
+ virtual void stop() = 0;
+ virtual uint8_t connected() = 0;
+ virtual operator bool() = 0;
+protected:
+ uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };
+};
+
+#endif
diff --git a/hardware/arduino/cores/arduino/HID.cpp b/hardware/arduino/cores/arduino/HID.cpp
new file mode 100644
index 0000000..8ed1566
--- /dev/null
+++ b/hardware/arduino/cores/arduino/HID.cpp
@@ -0,0 +1,446 @@
+
+
+/* Copyright (c) 2011, Peter Barrett
+**
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.
+*/
+
+#include "Platform.h"
+#include "USBAPI.h"
+#include "USBDesc.h"
+
+#if defined(USBCON)
+#ifdef HID_ENABLED
+
+//#define RAWHID_ENABLED
+
+// Singletons for mouse and keyboard
+
+Mouse_ Mouse;
+Keyboard_ Keyboard;
+
+//================================================================================
+//================================================================================
+
+// HID report descriptor
+
+#define LSB(_x) ((_x) & 0xFF)
+#define MSB(_x) ((_x) >> 8)
+
+#define RAWHID_USAGE_PAGE 0xFFC0
+#define RAWHID_USAGE 0x0C00
+#define RAWHID_TX_SIZE 64
+#define RAWHID_RX_SIZE 64
+
+extern const u8 _hidReportDescriptor[] PROGMEM;
+const u8 _hidReportDescriptor[] = {
+
+ // Mouse
+ 0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 54
+ 0x09, 0x02, // USAGE (Mouse)
+ 0xa1, 0x01, // COLLECTION (Application)
+ 0x09, 0x01, // USAGE (Pointer)
+ 0xa1, 0x00, // COLLECTION (Physical)
+ 0x85, 0x01, // REPORT_ID (1)
+ 0x05, 0x09, // USAGE_PAGE (Button)
+ 0x19, 0x01, // USAGE_MINIMUM (Button 1)
+ 0x29, 0x03, // USAGE_MAXIMUM (Button 3)
+ 0x15, 0x00, // LOGICAL_MINIMUM (0)
+ 0x25, 0x01, // LOGICAL_MAXIMUM (1)
+ 0x95, 0x03, // REPORT_COUNT (3)
+ 0x75, 0x01, // REPORT_SIZE (1)
+ 0x81, 0x02, // INPUT (Data,Var,Abs)
+ 0x95, 0x01, // REPORT_COUNT (1)
+ 0x75, 0x05, // REPORT_SIZE (5)
+ 0x81, 0x03, // INPUT (Cnst,Var,Abs)
+ 0x05, 0x01, // USAGE_PAGE (Generic Desktop)
+ 0x09, 0x30, // USAGE (X)
+ 0x09, 0x31, // USAGE (Y)
+ 0x09, 0x38, // USAGE (Wheel)
+ 0x15, 0x81, // LOGICAL_MINIMUM (-127)
+ 0x25, 0x7f, // LOGICAL_MAXIMUM (127)
+ 0x75, 0x08, // REPORT_SIZE (8)
+ 0x95, 0x03, // REPORT_COUNT (3)
+ 0x81, 0x06, // INPUT (Data,Var,Rel)
+ 0xc0, // END_COLLECTION
+ 0xc0, // END_COLLECTION
+
+ // Keyboard
+ 0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 47
+ 0x09, 0x06, // USAGE (Keyboard)
+ 0xa1, 0x01, // COLLECTION (Application)
+ 0x85, 0x02, // REPORT_ID (2)
+ 0x05, 0x07, // USAGE_PAGE (Keyboard)
+
+ 0x19, 0xe0, // USAGE_MINIMUM (Keyboard LeftControl)
+ 0x29, 0xe7, // USAGE_MAXIMUM (Keyboard Right GUI)
+ 0x15, 0x00, // LOGICAL_MINIMUM (0)
+ 0x25, 0x01, // LOGICAL_MAXIMUM (1)
+ 0x75, 0x01, // REPORT_SIZE (1)
+
+ 0x95, 0x08, // REPORT_COUNT (8)
+ 0x81, 0x02, // INPUT (Data,Var,Abs)
+ 0x95, 0x01, // REPORT_COUNT (1)
+ 0x75, 0x08, // REPORT_SIZE (8)
+ 0x81, 0x03, // INPUT (Cnst,Var,Abs)
+
+ 0x95, 0x06, // REPORT_COUNT (6)
+ 0x75, 0x08, // REPORT_SIZE (8)
+ 0x15, 0x00, // LOGICAL_MINIMUM (0)
+ 0x25, 0x65, // LOGICAL_MAXIMUM (101)
+ 0x05, 0x07, // USAGE_PAGE (Keyboard)
+
+ 0x19, 0x00, // USAGE_MINIMUM (Reserved (no event indicated))
+ 0x29, 0x65, // USAGE_MAXIMUM (Keyboard Application)
+ 0x81, 0x00, // INPUT (Data,Ary,Abs)
+ 0xc0, // END_COLLECTION
+
+#if RAWHID_ENABLED
+ // RAW HID
+ 0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30
+ 0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
+
+ 0xA1, 0x01, // Collection 0x01
+ 0x85, 0x03, // REPORT_ID (3)
+ 0x75, 0x08, // report size = 8 bits
+ 0x15, 0x00, // logical minimum = 0
+ 0x26, 0xFF, 0x00, // logical maximum = 255
+
+ 0x95, 64, // report count TX
+ 0x09, 0x01, // usage
+ 0x81, 0x02, // Input (array)
+
+ 0x95, 64, // report count RX
+ 0x09, 0x02, // usage
+ 0x91, 0x02, // Output (array)
+ 0xC0 // end collection
+#endif
+};
+
+extern const HIDDescriptor _hidInterface PROGMEM;
+const HIDDescriptor _hidInterface =
+{
+ D_INTERFACE(HID_INTERFACE,1,3,0,0),
+ D_HIDREPORT(sizeof(_hidReportDescriptor)),
+ D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x01)
+};
+
+//================================================================================
+//================================================================================
+// Driver
+
+u8 _hid_protocol = 1;
+u8 _hid_idle = 1;
+
+#define WEAK __attribute__ ((weak))
+#define WEAK
+
+int WEAK HID_GetInterface(u8* interfaceNum)
+{
+ interfaceNum[0] += 1; // uses 1
+ return USB_SendControl(TRANSFER_PGM,&_hidInterface,sizeof(_hidInterface));
+}
+
+int WEAK HID_GetDescriptor(int i)
+{
+ return USB_SendControl(TRANSFER_PGM,_hidReportDescriptor,sizeof(_hidReportDescriptor));
+}
+
+void WEAK HID_SendReport(u8 id, const void* data, int len)
+{
+ USB_Send(HID_TX, &id, 1);
+ USB_Send(HID_TX | TRANSFER_RELEASE,data,len);
+}
+
+bool WEAK HID_Setup(Setup& setup)
+{
+ u8 r = setup.bRequest;
+ u8 requestType = setup.bmRequestType;
+ if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
+ {
+ if (HID_GET_REPORT == r)
+ {
+ //HID_GetReport();
+ return true;
+ }
+ if (HID_GET_PROTOCOL == r)
+ {
+ //Send8(_hid_protocol); // TODO
+ return true;
+ }
+ }
+
+ if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
+ {
+ if (HID_SET_PROTOCOL == r)
+ {
+ _hid_protocol = setup.wValueL;
+ return true;
+ }
+
+ if (HID_SET_IDLE == r)
+ {
+ _hid_idle = setup.wValueL;
+ return true;
+ }
+ }
+ return false;
+}
+
+//================================================================================
+//================================================================================
+// Mouse
+
+Mouse_::Mouse_() : _buttons(0)
+{
+}
+
+void Mouse_::click(uint8_t b)
+{
+ _buttons = b;
+ move(0,0,0);
+ _buttons = 0;
+ move(0,0,0);
+}
+
+void Mouse_::move(signed char x, signed char y, signed char wheel)
+{
+ u8 m[4];
+ m[0] = _buttons;
+ m[1] = x;
+ m[2] = y;
+ m[3] = wheel;
+ HID_SendReport(1,m,4);
+}
+
+void Mouse_::buttons(uint8_t b)
+{
+ if (b != _buttons)
+ {
+ _buttons = b;
+ move(0,0,0);
+ }
+}
+
+void Mouse_::press(uint8_t b)
+{
+ buttons(_buttons | b);
+}
+
+void Mouse_::release(uint8_t b)
+{
+ buttons(_buttons & ~b);
+}
+
+bool Mouse_::isPressed(uint8_t b)
+{
+ if (b & _buttons > 0)
+ return true;
+ return false;
+}
+
+//================================================================================
+//================================================================================
+// Keyboard
+
+Keyboard_::Keyboard_() : _keyMap(0)
+{
+}
+
+void Keyboard_::sendReport(KeyReport* keys)
+{
+ HID_SendReport(2,keys,sizeof(KeyReport));
+}
+
+void Keyboard_::setKeyMap(KeyMap* keyMap)
+{
+ _keyMap = keyMap;
+}
+
+extern
+const uint8_t _asciimap[128] PROGMEM;
+
+#define SHIFT 0x80
+const uint8_t _asciimap[128] =
+{
+ 0x00, // NUL
+ 0x00, // SOH
+ 0x00, // STX
+ 0x00, // ETX
+ 0x00, // EOT
+ 0x00, // ENQ
+ 0x00, // ACK
+ 0x00, // BEL
+ 0x2a, // BS Backspace
+ 0x2b, // TAB Tab
+ 0x28, // LF Enter
+ 0x00, // VT
+ 0x00, // FF
+ 0x00, // CR
+ 0x00, // SO
+ 0x00, // SI
+ 0x00, // DEL
+ 0x00, // DC1
+ 0x00, // DC2
+ 0x00, // DC3
+ 0x00, // DC4
+ 0x00, // NAK
+ 0x00, // SYN
+ 0x00, // ETB
+ 0x00, // CAN
+ 0x00, // EM
+ 0x00, // SUB
+ 0x00, // ESC
+ 0x00, // FS
+ 0x00, // GS
+ 0x00, // RS
+ 0x00, // US
+
+ 0x2c, // ' '
+ 0x1e|SHIFT, // !
+ 0x34|SHIFT, // "
+ 0x20|SHIFT, // #
+ 0x21|SHIFT, // $
+ 0x22|SHIFT, // %
+ 0x24|SHIFT, // &
+ 0x34, // '
+ 0x26|SHIFT, // (
+ 0x27|SHIFT, // )
+ 0x25|SHIFT, // *
+ 0x2e|SHIFT, // +
+ 0x36, // ,
+ 0x2d, // -
+ 0x37, // .
+ 0x38, // /
+ 0x27, // 0
+ 0x1e, // 1
+ 0x1f, // 2
+ 0x20, // 3
+ 0x21, // 4
+ 0x22, // 5
+ 0x23, // 6
+ 0x24, // 7
+ 0x25, // 8
+ 0x26, // 9
+ 0x33|SHIFT, // :
+ 0x33, // ;
+ 0x36|SHIFT, // <
+ 0x2e, // =
+ 0x37|SHIFT, // >
+ 0x38|SHIFT, // ?
+ 0x1f|SHIFT, // @
+ 0x04|SHIFT, // A
+ 0x05|SHIFT, // B
+ 0x06|SHIFT, // C
+ 0x07|SHIFT, // D
+ 0x08|SHIFT, // E
+ 0x09|SHIFT, // F
+ 0x0a|SHIFT, // G
+ 0x0b|SHIFT, // H
+ 0x0c|SHIFT, // I
+ 0x0d|SHIFT, // J
+ 0x0e|SHIFT, // K
+ 0x0f|SHIFT, // L
+ 0x10|SHIFT, // M
+ 0x11|SHIFT, // N
+ 0x12|SHIFT, // O
+ 0x13|SHIFT, // P
+ 0x14|SHIFT, // Q
+ 0x15|SHIFT, // R
+ 0x16|SHIFT, // S
+ 0x17|SHIFT, // T
+ 0x18|SHIFT, // U
+ 0x19|SHIFT, // V
+ 0x1a|SHIFT, // W
+ 0x1b|SHIFT, // X
+ 0x1c|SHIFT, // Y
+ 0x1d|SHIFT, // Z
+ 0x2f, // [
+ 0x31, // bslash
+ 0x30, // ]
+ 0x23|SHIFT, // ^
+ 0x2d|SHIFT, // _
+ 0x35, // `
+ 0x04, // a
+ 0x05, // b
+ 0x06, // c
+ 0x07, // d
+ 0x08, // e
+ 0x09, // f
+ 0x0a, // g
+ 0x0b, // h
+ 0x0c, // i
+ 0x0d, // j
+ 0x0e, // k
+ 0x0f, // l
+ 0x10, // m
+ 0x11, // n
+ 0x12, // o
+ 0x13, // p
+ 0x14, // q
+ 0x15, // r
+ 0x16, // s
+ 0x17, // t
+ 0x18, // u
+ 0x19, // v
+ 0x1a, // w
+ 0x1b, // x
+ 0x1c, // y
+ 0x1d, // z
+ 0x2f|SHIFT, //
+ 0x31|SHIFT, // |
+ 0x30|SHIFT, // }
+ 0x35|SHIFT, // ~
+ 0 // DEL
+};
+
+uint8_t USBPutChar(uint8_t c);
+size_t Keyboard_::write(uint8_t c)
+{
+ // Keydown
+ {
+ KeyReport keys = {0};
+ if (_keyMap)
+ _keyMap->charToKey(c,&keys);
+ else
+ {
+ if (c >= 128) {
+ setWriteError();
+ return 0;
+ }
+ c = pgm_read_byte(_asciimap + c);
+ if (!c) {
+ setWriteError();
+ return 0;
+ }
+ if (c & 0x80)
+ {
+ keys.modifiers |= KEY_MODIFIER_LEFT_SHIFT;
+ c &= 0x7F;
+ }
+ keys.keys[0] = c;
+ }
+ sendReport(&keys);
+ }
+ // Keyup
+ {
+ KeyReport keys = {0};
+ sendReport(&keys);
+ }
+ return 1;
+}
+
+#endif
+
+#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/hardware/arduino/cores/arduino/HardwareSerial.cpp b/hardware/arduino/cores/arduino/HardwareSerial.cpp
index b5dba1e..9985b78 100644
--- a/hardware/arduino/cores/arduino/HardwareSerial.cpp
+++ b/hardware/arduino/cores/arduino/HardwareSerial.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
-#include "wiring.h"
+#include "Arduino.h"
#include "wiring_private.h"
// this next line disables the entire HardwareSerial.cpp,
@@ -34,109 +34,96 @@
#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.
+// using a ring buffer (I think), in which head is the index of the location
+// to which to write the next incoming character and tail is the index of the
+// location from which to read.
#if (RAMEND < 1000)
- #define RX_BUFFER_SIZE 32
+ #define SERIAL_BUFFER_SIZE 16
#else
- #define RX_BUFFER_SIZE 128
+ #define SERIAL_BUFFER_SIZE 64
#endif
struct ring_buffer
{
- unsigned char buffer[RX_BUFFER_SIZE];
- int head;
- int tail;
+ unsigned char buffer[SERIAL_BUFFER_SIZE];
+ volatile unsigned int head;
+ volatile unsigned int tail;
};
+#if defined(USBCON)
+ ring_buffer rx_buffer = { { 0 }, 0, 0};
+ ring_buffer tx_buffer = { { 0 }, 0, 0};
+#endif
#if defined(UBRRH) || defined(UBRR0H)
ring_buffer rx_buffer = { { 0 }, 0, 0 };
+ ring_buffer tx_buffer = { { 0 }, 0, 0 };
#endif
#if defined(UBRR1H)
ring_buffer rx_buffer1 = { { 0 }, 0, 0 };
+ ring_buffer tx_buffer1 = { { 0 }, 0, 0 };
#endif
#if defined(UBRR2H)
ring_buffer rx_buffer2 = { { 0 }, 0, 0 };
+ ring_buffer tx_buffer2 = { { 0 }, 0, 0 };
#endif
#if defined(UBRR3H)
ring_buffer rx_buffer3 = { { 0 }, 0, 0 };
+ ring_buffer tx_buffer3 = { { 0 }, 0, 0 };
#endif
-inline void store_char(unsigned char c, ring_buffer *rx_buffer)
+inline void store_char(unsigned char c, ring_buffer *buffer)
{
- int i = (unsigned int)(rx_buffer->head + 1) % RX_BUFFER_SIZE;
+ int i = (unsigned int)(buffer->head + 1) % SERIAL_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 (i != buffer->tail) {
+ buffer->buffer[buffer->head] = c;
+ buffer->head = i;
}
}
+#if !defined(USART0_RX_vect) && defined(USART1_RX_vect)
+// do nothing - on the 32u4 the first USART is USART1
+#else
+#if !defined(USART_RX_vect) && !defined(SIG_USART0_RECV) && \
+ !defined(SIG_UART0_RECV) && !defined(USART0_RX_vect) && \
+ !defined(SIG_UART_RECV)
+ #error "Don't know what the Data Received vector is called for the first UART"
+#else
+ void serialEvent() __attribute__((weak));
+ void serialEvent() {}
+ #define serialEvent_implemented
#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)
+#elif defined(SIG_USART0_RECV)
SIGNAL(SIG_USART0_RECV)
- {
- unsigned char c = UDR0;
- store_char(c, &rx_buffer);
- }
-#elif defined(SIG_UART0_RECV) && defined(UDR0)
+#elif defined(SIG_UART0_RECV)
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)
+#elif defined(SIG_UART_RECV)
+ SIGNAL(SIG_UART_RECV)
+#endif
{
#if defined(UDR0)
unsigned char c = UDR0;
#elif defined(UDR)
- unsigned char c = UDR; // atmega8, atmega32
+ unsigned char c = UDR;
#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
#endif
-//#if defined(SIG_USART1_RECV)
#if defined(USART1_RX_vect)
- //SIGNAL(SIG_USART1_RECV)
+ void serialEvent1() __attribute__((weak));
+ void serialEvent1() {}
+ #define serialEvent1_implemented
SIGNAL(USART1_RX_vect)
{
unsigned char c = UDR1;
@@ -147,6 +134,9 @@ inline void store_char(unsigned char c, ring_buffer *rx_buffer)
#endif
#if defined(USART2_RX_vect) && defined(UDR2)
+ void serialEvent2() __attribute__((weak));
+ void serialEvent2() {}
+ #define serialEvent2_implemented
SIGNAL(USART2_RX_vect)
{
unsigned char c = UDR2;
@@ -157,6 +147,9 @@ inline void store_char(unsigned char c, ring_buffer *rx_buffer)
#endif
#if defined(USART3_RX_vect) && defined(UDR3)
+ void serialEvent3() __attribute__((weak));
+ void serialEvent3() {}
+ #define serialEvent3_implemented
SIGNAL(USART3_RX_vect)
{
unsigned char c = UDR3;
@@ -166,17 +159,126 @@ inline void store_char(unsigned char c, ring_buffer *rx_buffer)
#error SIG_USART3_RECV
#endif
+void serialEventRun(void)
+{
+#ifdef serialEvent_implemented
+ if (Serial.available()) serialEvent();
+#endif
+#ifdef serialEvent1_implemented
+ if (Serial1.available()) serialEvent1();
+#endif
+#ifdef serialEvent2_implemented
+ if (Serial2.available()) serialEvent2();
+#endif
+#ifdef serialEvent3_implemented
+ if (Serial3.available()) serialEvent3();
+#endif
+}
+
+
+#if !defined(USART0_UDRE_vect) && defined(USART1_UDRE_vect)
+// do nothing - on the 32u4 the first USART is USART1
+#else
+#if !defined(UART0_UDRE_vect) && !defined(UART_UDRE_vect) && !defined(USART0_UDRE_vect) && !defined(USART_UDRE_vect)
+ #error "Don't know what the Data Register Empty vector is called for the first UART"
+#else
+#if defined(UART0_UDRE_vect)
+ISR(UART0_UDRE_vect)
+#elif defined(UART_UDRE_vect)
+ISR(UART_UDRE_vect)
+#elif defined(USART0_UDRE_vect)
+ISR(USART0_UDRE_vect)
+#elif defined(USART_UDRE_vect)
+ISR(USART_UDRE_vect)
+#endif
+{
+ if (tx_buffer.head == tx_buffer.tail) {
+ // Buffer empty, so disable interrupts
+#if defined(UCSR0B)
+ cbi(UCSR0B, UDRIE0);
+#else
+ cbi(UCSRB, UDRIE);
+#endif
+ }
+ else {
+ // There is more data in the output buffer. Send the next byte
+ unsigned char c = tx_buffer.buffer[tx_buffer.tail];
+ tx_buffer.tail = (tx_buffer.tail + 1) % SERIAL_BUFFER_SIZE;
+
+ #if defined(UDR0)
+ UDR0 = c;
+ #elif defined(UDR)
+ UDR = c;
+ #else
+ #error UDR not defined
+ #endif
+ }
+}
+#endif
+#endif
+
+#ifdef USART1_UDRE_vect
+ISR(USART1_UDRE_vect)
+{
+ if (tx_buffer1.head == tx_buffer1.tail) {
+ // Buffer empty, so disable interrupts
+ cbi(UCSR1B, UDRIE1);
+ }
+ else {
+ // There is more data in the output buffer. Send the next byte
+ unsigned char c = tx_buffer1.buffer[tx_buffer1.tail];
+ tx_buffer1.tail = (tx_buffer1.tail + 1) % SERIAL_BUFFER_SIZE;
+
+ UDR1 = c;
+ }
+}
+#endif
+
+#ifdef USART2_UDRE_vect
+ISR(USART2_UDRE_vect)
+{
+ if (tx_buffer2.head == tx_buffer2.tail) {
+ // Buffer empty, so disable interrupts
+ cbi(UCSR2B, UDRIE2);
+ }
+ else {
+ // There is more data in the output buffer. Send the next byte
+ unsigned char c = tx_buffer2.buffer[tx_buffer2.tail];
+ tx_buffer2.tail = (tx_buffer2.tail + 1) % SERIAL_BUFFER_SIZE;
+
+ UDR2 = c;
+ }
+}
+#endif
+
+#ifdef USART3_UDRE_vect
+ISR(USART3_UDRE_vect)
+{
+ if (tx_buffer3.head == tx_buffer3.tail) {
+ // Buffer empty, so disable interrupts
+ cbi(UCSR3B, UDRIE3);
+ }
+ else {
+ // There is more data in the output buffer. Send the next byte
+ unsigned char c = tx_buffer3.buffer[tx_buffer3.tail];
+ tx_buffer3.tail = (tx_buffer3.tail + 1) % SERIAL_BUFFER_SIZE;
+
+ UDR3 = c;
+ }
+}
+#endif
// Constructors ////////////////////////////////////////////////////////////////
-HardwareSerial::HardwareSerial(ring_buffer *rx_buffer,
+HardwareSerial::HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_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)
+ uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udrie, uint8_t u2x)
{
_rx_buffer = rx_buffer;
+ _tx_buffer = tx_buffer;
_ubrrh = ubrrh;
_ubrrl = ubrrl;
_ucsra = ucsra;
@@ -185,7 +287,7 @@ HardwareSerial::HardwareSerial(ring_buffer *rx_buffer,
_rxen = rxen;
_txen = txen;
_rxcie = rxcie;
- _udre = udre;
+ _udrie = udrie;
_u2x = u2x;
}
@@ -228,18 +330,27 @@ try_again:
sbi(*_ucsrb, _rxen);
sbi(*_ucsrb, _txen);
sbi(*_ucsrb, _rxcie);
+ cbi(*_ucsrb, _udrie);
}
void HardwareSerial::end()
{
+ // wait for transmission of outgoing data
+ while (_tx_buffer->head != _tx_buffer->tail)
+ ;
+
cbi(*_ucsrb, _rxen);
cbi(*_ucsrb, _txen);
cbi(*_ucsrb, _rxcie);
+ cbi(*_ucsrb, _udrie);
+
+ // clear any received data
+ _rx_buffer->head = _rx_buffer->tail;
}
int HardwareSerial::available(void)
{
- return (unsigned int)(RX_BUFFER_SIZE + _rx_buffer->head - _rx_buffer->tail) % RX_BUFFER_SIZE;
+ return (unsigned int)(SERIAL_BUFFER_SIZE + _rx_buffer->head - _rx_buffer->tail) % SERIAL_BUFFER_SIZE;
}
int HardwareSerial::peek(void)
@@ -258,53 +369,55 @@ int HardwareSerial::read(void)
return -1;
} else {
unsigned char c = _rx_buffer->buffer[_rx_buffer->tail];
- _rx_buffer->tail = (unsigned int)(_rx_buffer->tail + 1) % RX_BUFFER_SIZE;
+ _rx_buffer->tail = (unsigned int)(_rx_buffer->tail + 1) % SERIAL_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;
+ while (_tx_buffer->head != _tx_buffer->tail)
+ ;
}
-void HardwareSerial::write(uint8_t c)
+size_t HardwareSerial::write(uint8_t c)
{
- while (!((*_ucsra) & (1 << _udre)))
+ int i = (_tx_buffer->head + 1) % SERIAL_BUFFER_SIZE;
+
+ // If the output buffer is full, there's nothing for it other than to
+ // wait for the interrupt handler to empty it a bit
+ // ???: return 0 here instead?
+ while (i == _tx_buffer->tail)
;
-
- *_udr = c;
+
+ _tx_buffer->buffer[_tx_buffer->head] = c;
+ _tx_buffer->head = i;
+
+ sbi(*_ucsrb, _udrie);
+
+ return 1;
}
// Preinstantiate Objects //////////////////////////////////////////////////////
#if defined(UBRRH) && defined(UBRRL)
- HardwareSerial Serial(&rx_buffer, &UBRRH, &UBRRL, &UCSRA, &UCSRB, &UDR, RXEN, TXEN, RXCIE, UDRE, U2X);
+ HardwareSerial Serial(&rx_buffer, &tx_buffer, &UBRRH, &UBRRL, &UCSRA, &UCSRB, &UDR, RXEN, TXEN, RXCIE, UDRIE, U2X);
#elif defined(UBRR0H) && defined(UBRR0L)
- HardwareSerial Serial(&rx_buffer, &UBRR0H, &UBRR0L, &UCSR0A, &UCSR0B, &UDR0, RXEN0, TXEN0, RXCIE0, UDRE0, U2X0);
+ HardwareSerial Serial(&rx_buffer, &tx_buffer, &UBRR0H, &UBRR0L, &UCSR0A, &UCSR0B, &UDR0, RXEN0, TXEN0, RXCIE0, UDRIE0, U2X0);
#elif defined(USBCON)
- #warning no serial port defined (port 0)
+ // do nothing - Serial object and buffers are initialized in CDC code
#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);
+ HardwareSerial Serial1(&rx_buffer1, &tx_buffer1, &UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UDR1, RXEN1, TXEN1, RXCIE1, UDRIE1, U2X1);
#endif
#if defined(UBRR2H)
- HardwareSerial Serial2(&rx_buffer2, &UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UDR2, RXEN2, TXEN2, RXCIE2, UDRE2, U2X2);
+ HardwareSerial Serial2(&rx_buffer2, &tx_buffer2, &UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UDR2, RXEN2, TXEN2, RXCIE2, UDRIE2, U2X2);
#endif
#if defined(UBRR3H)
- HardwareSerial Serial3(&rx_buffer3, &UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UDR3, RXEN3, TXEN3, RXCIE3, UDRE3, U2X3);
+ HardwareSerial Serial3(&rx_buffer3, &tx_buffer3, &UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UDR3, RXEN3, TXEN3, RXCIE3, UDRIE3, U2X3);
#endif
#endif // whole file
diff --git a/hardware/arduino/cores/arduino/HardwareSerial.h b/hardware/arduino/cores/arduino/HardwareSerial.h
index 9dc67c4..176abe1 100644
--- a/hardware/arduino/cores/arduino/HardwareSerial.h
+++ b/hardware/arduino/cores/arduino/HardwareSerial.h
@@ -32,6 +32,7 @@ class HardwareSerial : public Stream
{
private:
ring_buffer *_rx_buffer;
+ ring_buffer *_tx_buffer;
volatile uint8_t *_ubrrh;
volatile uint8_t *_ubrrl;
volatile uint8_t *_ucsra;
@@ -40,28 +41,29 @@ class HardwareSerial : public Stream
uint8_t _rxen;
uint8_t _txen;
uint8_t _rxcie;
- uint8_t _udre;
+ uint8_t _udrie;
uint8_t _u2x;
public:
- HardwareSerial(ring_buffer *rx_buffer,
+ HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_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);
+ uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udrie, uint8_t u2x);
void begin(unsigned long);
void end();
virtual int available(void);
virtual int peek(void);
virtual int read(void);
virtual void flush(void);
- virtual void write(uint8_t);
+ virtual size_t 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"
+ #include "USBAPI.h"
+// extern HardwareSerial Serial_;
#endif
#if defined(UBRR1H)
extern HardwareSerial Serial1;
@@ -73,4 +75,6 @@ class HardwareSerial : public Stream
extern HardwareSerial Serial3;
#endif
+extern void serialEventRun(void) __attribute__((weak));
+
#endif
diff --git a/hardware/arduino/cores/arduino/IPAddress.cpp b/hardware/arduino/cores/arduino/IPAddress.cpp
new file mode 100644
index 0000000..fe3deb7
--- /dev/null
+++ b/hardware/arduino/cores/arduino/IPAddress.cpp
@@ -0,0 +1,56 @@
+
+#include <Arduino.h>
+#include <IPAddress.h>
+
+IPAddress::IPAddress()
+{
+ memset(_address, 0, sizeof(_address));
+}
+
+IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
+{
+ _address[0] = first_octet;
+ _address[1] = second_octet;
+ _address[2] = third_octet;
+ _address[3] = fourth_octet;
+}
+
+IPAddress::IPAddress(uint32_t address)
+{
+ memcpy(_address, &address, sizeof(_address));
+}
+
+IPAddress::IPAddress(const uint8_t *address)
+{
+ memcpy(_address, address, sizeof(_address));
+}
+
+IPAddress& IPAddress::operator=(const uint8_t *address)
+{
+ memcpy(_address, address, sizeof(_address));
+ return *this;
+}
+
+IPAddress& IPAddress::operator=(uint32_t address)
+{
+ memcpy(_address, (const uint8_t *)&address, sizeof(_address));
+ return *this;
+}
+
+bool IPAddress::operator==(const uint8_t* addr)
+{
+ return memcmp(addr, _address, sizeof(_address)) == 0;
+}
+
+size_t IPAddress::printTo(Print& p) const
+{
+ size_t n = 0;
+ for (int i =0; i < 3; i++)
+ {
+ n += p.print(_address[i], DEC);
+ n += p.print('.');
+ }
+ n += p.print(_address[3], DEC);
+ return n;
+}
+
diff --git a/hardware/arduino/cores/arduino/IPAddress.h b/hardware/arduino/cores/arduino/IPAddress.h
new file mode 100644
index 0000000..2585aec
--- /dev/null
+++ b/hardware/arduino/cores/arduino/IPAddress.h
@@ -0,0 +1,76 @@
+/*
+ *
+ * MIT License:
+ * Copyright (c) 2011 Adrian McEwen
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * adrianm mcqn com 1/1/2011
+ */
+
+#ifndef IPAddress_h
+#define IPAddress_h
+
+#include <Printable.h>
+
+// A class to make it easier to handle and pass around IP addresses
+
+class IPAddress : public Printable {
+private:
+ uint8_t _address[4]; // IPv4 address
+ // Access the raw byte array containing the address. Because this returns a pointer
+ // to the internal structure rather than a copy of the address this function should only
+ // be used when you know that the usage of the returned uint8_t* will be transient and not
+ // stored.
+ uint8_t* raw_address() { return _address; };
+
+public:
+ // Constructors
+ IPAddress();
+ IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet);
+ IPAddress(uint32_t address);
+ IPAddress(const uint8_t *address);
+
+ // Overloaded cast operator to allow IPAddress objects to be used where a pointer
+ // to a four-byte uint8_t array is expected
+ operator uint32_t() { return *((uint32_t*)_address); };
+ bool operator==(const IPAddress& addr) { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); };
+ bool operator==(const uint8_t* addr);
+
+ // Overloaded index operator to allow getting and setting individual octets of the address
+ uint8_t operator[](int index) const { return _address[index]; };
+ uint8_t& operator[](int index) { return _address[index]; };
+
+ // Overloaded copy operators to allow initialisation of IPAddress objects from other types
+ IPAddress& operator=(const uint8_t *address);
+ IPAddress& operator=(uint32_t address);
+
+ virtual size_t printTo(Print& p) const;
+
+ friend class EthernetClass;
+ friend class UDP;
+ friend class Client;
+ friend class Server;
+ friend class DhcpClass;
+ friend class DNSClient;
+};
+
+const IPAddress INADDR_NONE(0,0,0,0);
+
+
+#endif
diff --git a/hardware/arduino/cores/arduino/Platform.h b/hardware/arduino/cores/arduino/Platform.h
new file mode 100644
index 0000000..8b8f742
--- /dev/null
+++ b/hardware/arduino/cores/arduino/Platform.h
@@ -0,0 +1,23 @@
+
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
+
+#include <inttypes.h>
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned long u32;
+
+#include "Arduino.h"
+
+#if defined(USBCON)
+ #include "USBDesc.h"
+ #include "USBCore.h"
+ #include "USBAPI.h"
+#endif /* if defined(USBCON) */
+
+#endif
diff --git a/hardware/arduino/cores/arduino/Print.cpp b/hardware/arduino/cores/arduino/Print.cpp
index fd68942..e541a6c 100755
--- a/hardware/arduino/cores/arduino/Print.cpp
+++ b/hardware/arduino/cores/arduino/Print.cpp
@@ -23,173 +23,213 @@
#include <stdio.h>
#include <string.h>
#include <math.h>
-#include "wiring.h"
+#include "Arduino.h"
#include "Print.h"
// Public Methods //////////////////////////////////////////////////////////////
/* default implementation: may be overridden */
-void Print::write(const char *str)
+size_t Print::write(const uint8_t *buffer, size_t size)
{
- while (*str)
- write(*str++);
+ size_t n = 0;
+ while (size--) {
+ n += write(*buffer++);
+ }
+ return n;
}
-/* default implementation: may be overridden */
-void Print::write(const uint8_t *buffer, size_t size)
+size_t Print::print(const __FlashStringHelper *ifsh)
{
- while (size--)
- write(*buffer++);
+ const char PROGMEM *p = (const char PROGMEM *)ifsh;
+ size_t n = 0;
+ while (1) {
+ unsigned char c = pgm_read_byte(p++);
+ if (c == 0) break;
+ n += write(c);
+ }
+ return n;
}
-void Print::print(const String &s)
+size_t Print::print(const String &s)
{
- for (unsigned int i = 0; i < s.length(); i++) {
- write(s[i]);
+ size_t n = 0;
+ for (uint16_t i = 0; i < s.length(); i++) {
+ n += write(s[i]);
}
+ return n;
}
-void Print::print(const char str[])
+size_t Print::print(const char str[])
{
- write(str);
+ return write(str);
}
-void Print::print(char c, int base)
+size_t Print::print(char c)
{
- print((long) c, base);
+ return write(c);
}
-void Print::print(unsigned char b, int base)
+size_t Print::print(unsigned char b, int base)
{
- print((unsigned long) b, base);
+ return print((unsigned long) b, base);
}
-void Print::print(int n, int base)
+size_t Print::print(int n, int base)
{
- print((long) n, base);
+ return print((long) n, base);
}
-void Print::print(unsigned int n, int base)
+size_t Print::print(unsigned int n, int base)
{
- print((unsigned long) n, base);
+ return print((unsigned long) n, base);
}
-void Print::print(long n, int base)
+size_t Print::print(long n, int base)
{
if (base == 0) {
- write(n);
+ return write(n);
} else if (base == 10) {
if (n < 0) {
- print('-');
+ int t = print('-');
n = -n;
+ return printNumber(n, 10) + t;
}
- printNumber(n, 10);
+ return printNumber(n, 10);
} else {
- printNumber(n, base);
+ return printNumber(n, base);
}
}
-void Print::print(unsigned long n, int base)
+size_t Print::print(unsigned long n, int base)
{
- if (base == 0) write(n);
- else printNumber(n, base);
+ if (base == 0) return write(n);
+ else return printNumber(n, base);
}
-void Print::print(double n, int digits)
+size_t Print::print(double n, int digits)
{
- printFloat(n, digits);
+ return printFloat(n, digits);
}
-void Print::println(void)
+size_t Print::println(const __FlashStringHelper *ifsh)
{
- print('\r');
- print('\n');
+ size_t n = print(ifsh);
+ n += println();
+ return n;
}
-void Print::println(const String &s)
+size_t Print::print(const Printable& x)
{
- print(s);
- println();
+ return x.printTo(*this);
}
-void Print::println(const char c[])
+size_t Print::println(void)
{
- print(c);
- println();
+ size_t n = print('\r');
+ n += print('\n');
+ return n;
}
-void Print::println(char c, int base)
+size_t Print::println(const String &s)
{
- print(c, base);
- println();
+ size_t n = print(s);
+ n += println();
+ return n;
}
-void Print::println(unsigned char b, int base)
+size_t Print::println(const char c[])
{
- print(b, base);
- println();
+ size_t n = print(c);
+ n += println();
+ return n;
}
-void Print::println(int n, int base)
+size_t Print::println(char c)
{
- print(n, base);
- println();
+ size_t n = print(c);
+ n += println();
+ return n;
}
-void Print::println(unsigned int n, int base)
+size_t Print::println(unsigned char b, int base)
{
- print(n, base);
- println();
+ size_t n = print(b, base);
+ n += println();
+ return n;
}
-void Print::println(long n, int base)
+size_t Print::println(int num, int base)
{
- print(n, base);
- println();
+ size_t n = print(num, base);
+ n += println();
+ return n;
}
-void Print::println(unsigned long n, int base)
+size_t Print::println(unsigned int num, int base)
{
- print(n, base);
- println();
+ size_t n = print(num, base);
+ n += println();
+ return n;
}
-void Print::println(double n, int digits)
+size_t Print::println(long num, int base)
{
- print(n, digits);
- println();
+ size_t n = print(num, base);
+ n += println();
+ return n;
}
-// Private Methods /////////////////////////////////////////////////////////////
+size_t Print::println(unsigned long num, int base)
+{
+ size_t n = print(num, base);
+ n += println();
+ return n;
+}
-void Print::printNumber(unsigned long n, uint8_t base)
+size_t Print::println(double num, int digits)
{
- unsigned char buf[8 * sizeof(long)]; // Assumes 8-bit chars.
- unsigned long i = 0;
+ size_t n = print(num, digits);
+ n += println();
+ return n;
+}
- if (n == 0) {
- print('0');
- return;
- }
+size_t Print::println(const Printable& x)
+{
+ size_t n = print(x);
+ n += println();
+ return n;
+}
- while (n > 0) {
- buf[i++] = n % base;
+// Private Methods /////////////////////////////////////////////////////////////
+
+size_t Print::printNumber(unsigned long n, uint8_t base) {
+ char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte.
+ char *str = &buf[sizeof(buf) - 1];
+
+ *str = '\0';
+
+ // prevent crash if called with base == 1
+ if (base < 2) base = 10;
+
+ do {
+ unsigned long m = n;
n /= base;
- }
+ char c = m - base * n;
+ *--str = c < 10 ? c + '0' : c + 'A' - 10;
+ } while(n);
- for (; i > 0; i--)
- print((char) (buf[i - 1] < 10 ?
- '0' + buf[i - 1] :
- 'A' + buf[i - 1] - 10));
+ return write(str);
}
-void Print::printFloat(double number, uint8_t digits)
+size_t Print::printFloat(double number, uint8_t digits)
{
+ size_t n = 0;
+
// Handle negative numbers
if (number < 0.0)
{
- print('-');
+ n += print('-');
number = -number;
}
@@ -203,18 +243,21 @@ void Print::printFloat(double number, uint8_t digits)
// 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);
+ n += print(int_part);
// Print the decimal point, but only if there are digits beyond
- if (digits > 0)
- print(".");
+ if (digits > 0) {
+ n += print(".");
+ }
// Extract digits from the remainder one at a time
while (digits-- > 0)
{
remainder *= 10.0;
int toPrint = int(remainder);
- print(toPrint);
+ n += print(toPrint);
remainder -= toPrint;
}
+
+ return n;
}
diff --git a/hardware/arduino/cores/arduino/Print.h b/hardware/arduino/cores/arduino/Print.h
index b092ae5..1af6b72 100755
--- a/hardware/arduino/cores/arduino/Print.h
+++ b/hardware/arduino/cores/arduino/Print.h
@@ -24,43 +24,55 @@
#include <stdio.h> // for size_t
#include "WString.h"
+#include "Printable.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);
+ int write_error;
+ size_t printNumber(unsigned long, uint8_t);
+ size_t printFloat(double, uint8_t);
+ protected:
+ void setWriteError(int err = 1) { write_error = err; }
public:
- virtual void write(uint8_t) = 0;
- virtual void write(const char *str);
- virtual void write(const uint8_t *buffer, size_t size);
+ Print() : write_error(0) {}
+
+ int getWriteError() { return write_error; }
+ void clearWriteError() { setWriteError(0); }
+
+ virtual size_t write(uint8_t) = 0;
+ size_t write(const char *str) { return write((const uint8_t *)str, strlen(str)); }
+ virtual size_t 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);
+ size_t print(const __FlashStringHelper *);
+ size_t print(const String &);
+ size_t print(const char[]);
+ size_t print(char);
+ size_t print(unsigned char, int = DEC);
+ size_t print(int, int = DEC);
+ size_t print(unsigned int, int = DEC);
+ size_t print(long, int = DEC);
+ size_t print(unsigned long, int = DEC);
+ size_t print(double, int = 2);
+ size_t print(const Printable&);
- 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);
+ size_t println(const __FlashStringHelper *);
+ size_t println(const String &s);
+ size_t println(const char[]);
+ size_t println(char);
+ size_t println(unsigned char, int = DEC);
+ size_t println(int, int = DEC);
+ size_t println(unsigned int, int = DEC);
+ size_t println(long, int = DEC);
+ size_t println(unsigned long, int = DEC);
+ size_t println(double, int = 2);
+ size_t println(const Printable&);
+ size_t println(void);
};
#endif
diff --git a/hardware/arduino/cores/arduino/Printable.h b/hardware/arduino/cores/arduino/Printable.h
new file mode 100644
index 0000000..d03c9af
--- /dev/null
+++ b/hardware/arduino/cores/arduino/Printable.h
@@ -0,0 +1,40 @@
+/*
+ Printable.h - Interface class that allows printing of complex types
+ Copyright (c) 2011 Adrian McEwen. 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 Printable_h
+#define Printable_h
+
+#include <new.h>
+
+class Print;
+
+/** The Printable class provides a way for new classes to allow themselves to be printed.
+ By deriving from Printable and implementing the printTo method, it will then be possible
+ for users to print out instances of this class by passing them into the usual
+ Print::print and Print::println methods.
+*/
+
+class Printable
+{
+ public:
+ virtual size_t printTo(Print& p) const = 0;
+};
+
+#endif
+
diff --git a/hardware/arduino/cores/arduino/Server.h b/hardware/arduino/cores/arduino/Server.h
new file mode 100644
index 0000000..9674c76
--- /dev/null
+++ b/hardware/arduino/cores/arduino/Server.h
@@ -0,0 +1,9 @@
+#ifndef server_h
+#define server_h
+
+class Server : public Print {
+public:
+ virtual void begin() =0;
+};
+
+#endif
diff --git a/hardware/arduino/cores/arduino/Stream.cpp b/hardware/arduino/cores/arduino/Stream.cpp
new file mode 100644
index 0000000..3d5b905
--- /dev/null
+++ b/hardware/arduino/cores/arduino/Stream.cpp
@@ -0,0 +1,246 @@
+/*
+ Stream.cpp - adds parsing methods to Stream class
+ 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
+
+ Created July 2011
+ parsing functions based on TextFinder library by Michael Margolis
+ */
+
+#include "Arduino.h"
+#include "Stream.h"
+
+#define PARSE_TIMEOUT 1000 // default number of milli-seconds to wait
+#define NO_SKIP_CHAR 1 // a magic char not found in a valid ASCII numeric field
+
+// private method to read stream with timeout
+int Stream::timedRead()
+{
+ int c;
+ _startMillis = millis();
+ do {
+ c = read();
+ if (c >= 0) return c;
+ } while(millis() - _startMillis < _timeout);
+ return -1; // -1 indicates timeout
+}
+
+// private method to peek stream with timeout
+int Stream::timedPeek()
+{
+ int c;
+ _startMillis = millis();
+ do {
+ c = peek();
+ if (c >= 0) return c;
+ } while(millis() - _startMillis < _timeout);
+ return -1; // -1 indicates timeout
+}
+
+// returns peek of the next digit in the stream or -1 if timeout
+// discards non-numeric characters
+int Stream::peekNextDigit()
+{
+ int c;
+ while (1) {
+ c = timedPeek();
+ if (c < 0) return c; // timeout
+ if (c == '-') return c;
+ if (c >= '0' && c <= '9') return c;
+ read(); // discard non-numeric
+ }
+}
+
+// Public Methods
+//////////////////////////////////////////////////////////////
+
+void Stream::setTimeout(unsigned long timeout) // sets the maximum number of milliseconds to wait
+{
+ _timeout = timeout;
+}
+
+ // find returns true if the target string is found
+bool Stream::find(char *target)
+{
+ return findUntil(target, NULL);
+}
+
+// reads data from the stream until the target string of given length is found
+// returns true if target string is found, false if timed out
+bool Stream::find(char *target, size_t length)
+{
+ return findUntil(target, length, NULL, 0);
+}
+
+// as find but search ends if the terminator string is found
+bool Stream::findUntil(char *target, char *terminator)
+{
+ return findUntil(target, strlen(target), terminator, strlen(terminator));
+}
+
+// reads data from the stream until the target string of the given length is found
+// search terminated if the terminator string is found
+// returns true if target string is found, false if terminated or timed out
+bool Stream::findUntil(char *target, size_t targetLen, char *terminator, size_t termLen)
+{
+ size_t index = 0; // maximum target string length is 64k bytes!
+ size_t termIndex = 0;
+ int c;
+
+ if( *target == 0)
+ return true; // return true if target is a null string
+ while( (c = timedRead()) > 0){
+
+ if(c != target[index])
+ index = 0; // reset index if any char does not match
+
+ if( c == target[index]){
+ //////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1);
+ if(++index >= targetLen){ // return true if all chars in the target match
+ return true;
+ }
+ }
+
+ if(termLen > 0 && c == terminator[termIndex]){
+ if(++termIndex >= termLen)
+ return false; // return false if terminate string found before target string
+ }
+ else
+ termIndex = 0;
+ }
+ return false;
+}
+
+
+// returns the first valid (long) integer value from the current position.
+// initial characters that are not digits (or the minus sign) are skipped
+// function is terminated by the first character that is not a digit.
+long Stream::parseInt()
+{
+ return parseInt(NO_SKIP_CHAR); // terminate on first non-digit character (or timeout)
+}
+
+// as above but a given skipChar is ignored
+// this allows format characters (typically commas) in values to be ignored
+long Stream::parseInt(char skipChar)
+{
+ boolean isNegative = false;
+ long value = 0;
+ int c;
+
+ c = peekNextDigit();
+ // ignore non numeric leading characters
+ if(c < 0)
+ return 0; // zero returned if timeout
+
+ do{
+ if(c == skipChar)
+ ; // ignore this charactor
+ else if(c == '-')
+ isNegative = true;
+ else if(c >= '0' && c <= '9') // is c a digit?
+ value = value * 10 + c - '0';
+ read(); // consume the character we got with peek
+ c = timedPeek();
+ }
+ while( (c >= '0' && c <= '9') || c == skipChar );
+
+ if(isNegative)
+ value = -value;
+ return value;
+}
+
+
+// as parseInt but returns a floating point value
+float Stream::parseFloat()
+{
+ return parseFloat(NO_SKIP_CHAR);
+}
+
+// as above but the given skipChar is ignored
+// this allows format characters (typically commas) in values to be ignored
+float Stream::parseFloat(char skipChar){
+ boolean isNegative = false;
+ boolean isFraction = false;
+ long value = 0;
+ char c;
+ float fraction = 1.0;
+
+ c = peekNextDigit();
+ // ignore non numeric leading characters
+ if(c < 0)
+ return 0; // zero returned if timeout
+
+ do{
+ if(c == skipChar)
+ ; // ignore
+ else if(c == '-')
+ isNegative = true;
+ else if (c == '.')
+ isFraction = true;
+ else if(c >= '0' && c <= '9') { // is c a digit?
+ value = value * 10 + c - '0';
+ if(isFraction)
+ fraction *= 0.1;
+ }
+ read(); // consume the character we got with peek
+ c = timedPeek();
+ }
+ while( (c >= '0' && c <= '9') || c == '.' || c == skipChar );
+
+ if(isNegative)
+ value = -value;
+ if(isFraction)
+ return value * fraction;
+ else
+ return value;
+}
+
+// read characters from stream into buffer
+// terminates if length characters have been read, or timeout (see setTimeout)
+// returns the number of characters placed in the buffer
+// the buffer is NOT null terminated.
+//
+size_t Stream::readBytes(char *buffer, size_t length)
+{
+ size_t count = 0;
+ while (count < length) {
+ int c = timedRead();
+ if (c < 0) break;
+ *buffer++ = (char)c;
+ count++;
+ }
+ return count;
+}
+
+
+// as readBytes with terminator character
+// terminates if length characters have been read, timeout, or if the terminator character detected
+// returns the number of characters placed in the buffer (0 means no valid data found)
+
+size_t Stream::readBytesUntil(char terminator, char *buffer, size_t length)
+{
+ if (length < 1) return 0;
+ size_t index = 0;
+ while (index < length) {
+ int c = timedRead();
+ if (c < 0 || c == terminator) break;
+ *buffer++ = (char)c;
+ index++;
+ }
+ return index; // return number of characters, not including null terminator
+}
+
diff --git a/hardware/arduino/cores/arduino/Stream.h b/hardware/arduino/cores/arduino/Stream.h
index 93d8275..13f11be 100644
--- a/hardware/arduino/cores/arduino/Stream.h
+++ b/hardware/arduino/cores/arduino/Stream.h
@@ -15,6 +15,8 @@
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
+
+ parsing functions based on TextFinder library by Michael Margolis
*/
#ifndef Stream_h
@@ -23,13 +25,70 @@
#include <inttypes.h>
#include "Print.h"
+// compatability macros for testing
+/*
+#define getInt() parseInt()
+#define getInt(skipChar) parseInt(skipchar)
+#define getFloat() parseFloat()
+#define getFloat(skipChar) parseFloat(skipChar)
+#define getString( pre_string, post_string, buffer, length)
+readBytesBetween( pre_string, terminator, buffer, length)
+*/
+
class Stream : public Print
{
+ private:
+ unsigned long _timeout; // number of milliseconds to wait for the next char before aborting timed read
+ unsigned long _startMillis; // used for timeout measurement
+ int timedRead(); // private method to read stream with timeout
+ int timedPeek(); // private method to peek stream with timeout
+ int peekNextDigit(); // returns the next numeric digit in the stream or -1 if timeout
+
public:
virtual int available() = 0;
virtual int read() = 0;
virtual int peek() = 0;
virtual void flush() = 0;
+
+ Stream() {_timeout=1000;}
+
+// parsing methods
+
+ void setTimeout(unsigned long timeout); // sets maximum milliseconds to wait for stream data, default is 1 second
+
+ bool find(char *target); // reads data from the stream until the target string is found
+ // returns true if target string is found, false if timed out (see setTimeout)
+
+ bool find(char *target, size_t length); // reads data from the stream until the target string of given length is found
+ // returns true if target string is found, false if timed out
+
+ bool findUntil(char *target, char *terminator); // as find but search ends if the terminator string is found
+
+ bool findUntil(char *target, size_t targetLen, char *terminate, size_t termLen); // as above but search ends if the terminate string is found
+
+
+ long parseInt(); // returns the first valid (long) integer value from the current position.
+ // initial characters that are not digits (or the minus sign) are skipped
+ // integer is terminated by the first character that is not a digit.
+
+ float parseFloat(); // float version of parseInt
+
+ size_t readBytes( char *buffer, size_t length); // read chars from stream into buffer
+ // terminates if length characters have been read or timeout (see setTimeout)
+ // returns the number of characters placed in the buffer (0 means no valid data found)
+
+ size_t readBytesUntil( char terminator, char *buffer, size_t length); // as readBytes with terminator character
+ // terminates if length characters have been read, timeout, or if the terminator character detected
+ // returns the number of characters placed in the buffer (0 means no valid data found)
+
+ // Arduino String functions to be added here
+
+ protected:
+ long parseInt(char skipChar); // as above but the given skipChar is ignored
+ // as above but the given skipChar is ignored
+ // this allows format characters (typically commas) in values to be ignored
+
+ float parseFloat(char skipChar); // as above but the given skipChar is ignored
};
#endif
diff --git a/hardware/arduino/cores/arduino/Tone.cpp b/hardware/arduino/cores/arduino/Tone.cpp
index c3910e7..20eed3f 100755
--- a/hardware/arduino/cores/arduino/Tone.cpp
+++ b/hardware/arduino/cores/arduino/Tone.cpp
@@ -33,7 +33,7 @@ Version Modified By Date Comments
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
-#include "wiring.h"
+#include "Arduino.h"
#include "pins_arduino.h"
#if defined(__AVR_ATmega8__) || defined(__AVR_ATmega128__)
diff --git a/hardware/arduino/cores/arduino/USBAPI.h b/hardware/arduino/cores/arduino/USBAPI.h
new file mode 100644
index 0000000..26a2032
--- /dev/null
+++ b/hardware/arduino/cores/arduino/USBAPI.h
@@ -0,0 +1,166 @@
+
+
+#ifndef __USBAPI__
+#define __USBAPI__
+
+#if defined(USBCON)
+
+//================================================================================
+//================================================================================
+// USB
+
+class USB_
+{
+public:
+ USB_();
+ bool configured();
+
+ void attach();
+ void detach(); // Serial port goes down too...
+ void poll();
+};
+extern USB_ USB;
+
+//================================================================================
+//================================================================================
+// Serial over CDC (Serial1 is the physical port)
+
+class Serial_ : public Stream
+{
+public:
+ void begin(uint16_t baud_count);
+ void end(void);
+
+ virtual int available(void);
+ virtual int peek(void);
+ virtual int read(void);
+ virtual void flush(void);
+ virtual size_t write(uint8_t);
+};
+extern Serial_ Serial;
+
+//================================================================================
+//================================================================================
+// Mouse
+
+#define MOUSE_LEFT 1
+#define MOUSE_RIGHT 2
+#define MOUSE_MIDDLE 4
+#define MOUSE_ALL (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)
+
+class Mouse_
+{
+private:
+ uint8_t _buttons;
+ void buttons(uint8_t b);
+public:
+ Mouse_();
+ void click(uint8_t b = MOUSE_LEFT);
+ void move(signed char x, signed char y, signed char wheel = 0);
+ void press(uint8_t b = MOUSE_LEFT); // press LEFT by default
+ void release(uint8_t b = MOUSE_LEFT); // release LEFT by default
+ bool isPressed(uint8_t b = MOUSE_ALL); // check all buttons by default
+};
+extern Mouse_ Mouse;
+
+//================================================================================
+//================================================================================
+// Keyboard
+
+#define KEY_MODIFIER_LEFT_CTRL 0x01
+#define KEY_MODIFIER_LEFT_SHIFT 0x02
+#define KEY_MODIFIER_LEFT_ALT 0x04
+#define KEY_MODIFIER_LEFT_GUI 0x08
+#define KEY_MODIFIER_RIGHT_CTRL 0x010
+#define KEY_MODIFIER_RIGHT_SHIFT 0x020
+#define KEY_MODIFIER_RIGHT_ALT 0x040
+#define KEY_MODIFIER_RIGHT_GUI 0x080
+
+// Low level key report: up to 6 keys and shift, ctrl etc at once
+typedef struct
+{
+ uint8_t modifiers;
+ uint8_t reserved;
+ uint8_t keys[6];
+} KeyReport;
+
+// Map a character into a key report
+// Called from Print to map text to keycodes
+class KeyMap
+{
+public:
+ virtual void charToKey(int c, KeyReport* keyReport) = 0;
+};
+
+//
+class Keyboard_ : public Print
+{
+private:
+ KeyMap* _keyMap;
+ void sendReport(KeyReport* keys);
+ void setKeyMap(KeyMap* keyMap);
+public:
+ Keyboard_();
+ virtual size_t write(uint8_t);
+};
+extern Keyboard_ Keyboard;
+
+//================================================================================
+//================================================================================
+// Low level API
+
+typedef struct
+{
+ uint8_t bmRequestType;
+ uint8_t bRequest;
+ uint8_t wValueL;
+ uint8_t wValueH;
+ uint16_t wIndex;
+ uint16_t wLength;
+} Setup;
+
+//================================================================================
+//================================================================================
+// HID 'Driver'
+
+int HID_GetInterface(uint8_t* interfaceNum);
+int HID_GetDescriptor(int i);
+bool HID_Setup(Setup& setup);
+void HID_SendReport(uint8_t id, const void* data, int len);
+
+//================================================================================
+//================================================================================
+// MSC 'Driver'
+
+int MSC_GetInterface(uint8_t* interfaceNum);
+int MSC_GetDescriptor(int i);
+bool MSC_Setup(Setup& setup);
+bool MSC_Data(uint8_t rx,uint8_t tx);
+
+//================================================================================
+//================================================================================
+// CSC 'Driver'
+
+int CDC_GetInterface(uint8_t* interfaceNum);
+int CDC_GetDescriptor(int i);
+bool CDC_Setup(Setup& setup);
+
+//================================================================================
+//================================================================================
+
+#define TRANSFER_PGM 0x80
+#define TRANSFER_RELEASE 0x40
+#define TRANSFER_ZERO 0x20
+
+int USB_SendControl(uint8_t flags, const void* d, int len);
+int USB_RecvControl(void* d, int len);
+
+uint8_t USB_Available(uint8_t ep);
+int USB_Send(uint8_t ep, const void* data, int len); // blocking
+int USB_Recv(uint8_t ep, void* data, int len); // non-blocking
+int USB_Recv(uint8_t ep); // non-blocking
+void USB_Flush(uint8_t ep);
+
+#endif
+
+#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/hardware/arduino/cores/arduino/USBCore.cpp b/hardware/arduino/cores/arduino/USBCore.cpp
new file mode 100644
index 0000000..398bc73
--- /dev/null
+++ b/hardware/arduino/cores/arduino/USBCore.cpp
@@ -0,0 +1,660 @@
+
+
+/* Copyright (c) 2010, Peter Barrett
+**
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.
+*/
+
+#include "Platform.h"
+#include "USBAPI.h"
+#include "USBDesc.h"
+
+#if defined(USBCON)
+
+#define EP_TYPE_CONTROL 0x00
+#define EP_TYPE_BULK_IN 0x81
+#define EP_TYPE_BULK_OUT 0x80
+#define EP_TYPE_INTERRUPT_IN 0xC1
+#define EP_TYPE_INTERRUPT_OUT 0xC0
+#define EP_TYPE_ISOCHRONOUS_IN 0x41
+#define EP_TYPE_ISOCHRONOUS_OUT 0x40
+
+/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
+#define TX_RX_LED_PULSE_MS 100
+volatile u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
+volatile u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
+
+//==================================================================
+//==================================================================
+
+extern const u16 STRING_LANGUAGE[] PROGMEM;
+extern const u16 STRING_IPRODUCT[] PROGMEM;
+extern const u16 STRING_IMANUFACTURER[] PROGMEM;
+extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM;
+extern const DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
+
+const u16 STRING_LANGUAGE[2] = {
+ (3<<8) | (2+2),
+ 0x0409 // English
+};
+
+const u16 STRING_IPRODUCT[17] = {
+ (3<<8) | (2+2*16),
+#if USB_PID == USB_PID_LEONARDO
+ 'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
+#elif USB_PID == USB_PID_MICRO
+ 'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
+#endif
+};
+
+const u16 STRING_IMANUFACTURER[12] = {
+ (3<<8) | (2+2*11),
+ 'A','r','d','u','i','n','o',' ','L','L','C'
+};
+
+#ifdef CDC_ENABLED
+#define DEVICE_CLASS 0x02
+#else
+#define DEVICE_CLASS 0x00
+#endif
+
+// DEVICE DESCRIPTOR
+const DeviceDescriptor USB_DeviceDescriptor =
+ D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+
+const DeviceDescriptor USB_DeviceDescriptorA =
+ D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+
+//==================================================================
+//==================================================================
+
+volatile u8 _usbConfiguration = 0;
+
+static inline void WaitIN(void)
+{
+ while (!(UEINTX & (1<<TXINI)));
+}
+
+static inline void ClearIN(void)
+{
+ UEINTX = ~(1<<TXINI);
+}
+
+static inline void WaitOUT(void)
+{
+ while (!(UEINTX & (1<<RXOUTI)))
+ ;
+}
+
+static inline u8 WaitForINOrOUT()
+{
+ while (!(UEINTX & ((1<<TXINI)|(1<<RXOUTI))))
+ ;
+ return (UEINTX & (1<<RXOUTI)) == 0;
+}
+
+static inline void ClearOUT(void)
+{
+ UEINTX = ~(1<<RXOUTI);
+}
+
+void Recv(volatile u8* data, u8 count)
+{
+ while (count--)
+ *data++ = UEDATX;
+
+ RXLED1; // light the RX LED
+ RxLEDPulse = TX_RX_LED_PULSE_MS;
+}
+
+static inline u8 Recv8()
+{
+ RXLED1; // light the RX LED
+ RxLEDPulse = TX_RX_LED_PULSE_MS;
+
+ return UEDATX;
+}
+
+static inline void Send8(u8 d)
+{
+ UEDATX = d;
+}
+
+static inline void SetEP(u8 ep)
+{
+ UENUM = ep;
+}
+
+static inline u8 FifoByteCount()
+{
+ return UEBCLX;
+}
+
+static inline u8 ReceivedSetupInt()
+{
+ return UEINTX & (1<<RXSTPI);
+}
+
+static inline void ClearSetupInt()
+{
+ UEINTX = ~((1<<RXSTPI) | (1<<RXOUTI) | (1<<TXINI));
+}
+
+static inline void Stall()
+{
+ UECONX = (1<<STALLRQ) | (1<<EPEN);
+}
+
+static inline u8 ReadWriteAllowed()
+{
+ return UEINTX & (1<<RWAL);
+}
+
+static inline u8 Stalled()
+{
+ return UEINTX & (1<<STALLEDI);
+}
+
+static inline u8 FifoFree()
+{
+ return UEINTX & (1<<FIFOCON);
+}
+
+static inline void ReleaseRX()
+{
+ UEINTX = 0x6B; // FIFOCON=0 NAKINI=1 RWAL=1 NAKOUTI=0 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=1
+}
+
+static inline void ReleaseTX()
+{
+ UEINTX = 0x3A; // FIFOCON=0 NAKINI=0 RWAL=1 NAKOUTI=1 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=0
+}
+
+static inline u8 FrameNumber()
+{
+ return UDFNUML;
+}
+
+//==================================================================
+//==================================================================
+
+u8 USBGetConfiguration(void)
+{
+ return _usbConfiguration;
+}
+
+#define USB_RECV_TIMEOUT
+class LockEP
+{
+ u8 _sreg;
+public:
+ LockEP(u8 ep) : _sreg(SREG)
+ {
+ cli();
+ SetEP(ep & 7);
+ }
+ ~LockEP()
+ {
+ SREG = _sreg;
+ }
+};
+
+// Number of bytes, assumes a rx endpoint
+u8 USB_Available(u8 ep)
+{
+ LockEP lock(ep);
+ return FifoByteCount();
+}
+
+// Non Blocking receive
+// Return number of bytes read
+int USB_Recv(u8 ep, void* d, int len)
+{
+ if (!_usbConfiguration || len < 0)
+ return -1;
+
+ LockEP lock(ep);
+ u8 n = FifoByteCount();
+ len = min(n,len);
+ n = len;
+ u8* dst = (u8*)d;
+ while (n--)
+ *dst++ = Recv8();
+ if (len && !FifoByteCount()) // release empty buffer
+ ReleaseRX();
+
+ return len;
+}
+
+// Recv 1 byte if ready
+int USB_Recv(u8 ep)
+{
+ u8 c;
+ if (USB_Recv(ep,&c,1) != 1)
+ return -1;
+ return c;
+}
+
+// Space in send EP
+u8 USB_SendSpace(u8 ep)
+{
+ LockEP lock(ep);
+ if (!ReadWriteAllowed())
+ return 0;
+ return 64 - FifoByteCount();
+}
+
+// Blocking Send of data to an endpoint
+int USB_Send(u8 ep, const void* d, int len)
+{
+ if (!_usbConfiguration)
+ return -1;
+
+ int r = len;
+ const u8* data = (const u8*)d;
+ u8 zero = ep & TRANSFER_ZERO;
+ u8 timeout = 250; // 250ms timeout on send? TODO
+ while (len)
+ {
+ u8 n = USB_SendSpace(ep);
+ if (n == 0)
+ {
+ if (!(--timeout))
+ return -1;
+ delay(1);
+ continue;
+ }
+
+ if (n > len)
+ n = len;
+ len -= n;
+ {
+ LockEP lock(ep);
+ if (ep & TRANSFER_ZERO)
+ {
+ while (n--)
+ Send8(0);
+ }
+ else if (ep & TRANSFER_PGM)
+ {
+ while (n--)
+ Send8(pgm_read_byte(data++));
+ }
+ else
+ {
+ while (n--)
+ Send8(*data++);
+ }
+ if (!ReadWriteAllowed() || ((len == 0) && (ep & TRANSFER_RELEASE))) // Release full buffer
+ ReleaseTX();
+ }
+ }
+ TXLED1; // light the TX LED
+ TxLEDPulse = TX_RX_LED_PULSE_MS;
+ return r;
+}
+
+extern const u8 _initEndpoints[] PROGMEM;
+const u8 _initEndpoints[] =
+{
+ 0,
+
+#ifdef CDC_ENABLED
+ EP_TYPE_INTERRUPT_IN, // CDC_ENDPOINT_ACM
+ EP_TYPE_BULK_OUT, // CDC_ENDPOINT_OUT
+ EP_TYPE_BULK_IN, // CDC_ENDPOINT_IN
+#endif
+
+#ifdef HID_ENABLED
+ EP_TYPE_INTERRUPT_IN // HID_ENDPOINT_INT
+#endif
+};
+
+#define EP_SINGLE_64 0x32 // EP0
+#define EP_DOUBLE_64 0x36 // Other endpoints
+
+static
+void InitEP(u8 index, u8 type, u8 size)
+{
+ UENUM = index;
+ UECONX = 1;
+ UECFG0X = type;
+ UECFG1X = size;
+}
+
+static
+void InitEndpoints()
+{
+ for (u8 i = 1; i < sizeof(_initEndpoints); i++)
+ {
+ UENUM = i;
+ UECONX = 1;
+ UECFG0X = pgm_read_byte(_initEndpoints+i);
+ UECFG1X = EP_DOUBLE_64;
+ }
+ UERST = 0x7E; // And reset them
+ UERST = 0;
+}
+
+// Handle CLASS_INTERFACE requests
+static
+bool ClassInterfaceRequest(Setup& setup)
+{
+ u8 i = setup.wIndex;
+
+#ifdef CDC_ENABLED
+ if (CDC_ACM_INTERFACE == i)
+ return CDC_Setup(setup);
+#endif
+
+#ifdef HID_ENABLED
+ if (HID_INTERFACE == i)
+ return HID_Setup(setup);
+#endif
+ return false;
+}
+
+int _cmark;
+int _cend;
+void InitControl(int end)
+{
+ SetEP(0);
+ _cmark = 0;
+ _cend = end;
+}
+
+static
+bool SendControl(u8 d)
+{
+ if (_cmark < _cend)
+ {
+ if (!WaitForINOrOUT())
+ return false;
+ Send8(d);
+ if (!((_cmark + 1) & 0x3F))
+ ClearIN(); // Fifo is full, release this packet
+ }
+ _cmark++;
+ return true;
+};
+
+// Clipped by _cmark/_cend
+int USB_SendControl(u8 flags, const void* d, int len)
+{
+ int sent = len;
+ const u8* data = (const u8*)d;
+ bool pgm = flags & TRANSFER_PGM;
+ while (len--)
+ {
+ u8 c = pgm ? pgm_read_byte(data++) : *data++;
+ if (!SendControl(c))
+ return -1;
+ }
+ return sent;
+}
+
+// Does not timeout or cross fifo boundaries
+// Will only work for transfers <= 64 bytes
+// TODO
+int USB_RecvControl(void* d, int len)
+{
+ WaitOUT();
+ Recv((u8*)d,len);
+ ClearOUT();
+ return len;
+}
+
+int SendInterfaces()
+{
+ int total = 0;
+ u8 interfaces = 0;
+
+#ifdef CDC_ENABLED
+ total = CDC_GetInterface(&interfaces);
+#endif
+
+#ifdef HID_ENABLED
+ total += HID_GetInterface(&interfaces);
+#endif
+
+ return interfaces;
+}
+
+// Construct a dynamic configuration descriptor
+// This really needs dynamic endpoint allocation etc
+// TODO
+static
+bool SendConfiguration(int maxlen)
+{
+ // Count and measure interfaces
+ InitControl(0);
+ int interfaces = SendInterfaces();
+ ConfigDescriptor config = D_CONFIG(_cmark + sizeof(ConfigDescriptor),interfaces);
+
+ // Now send them
+ InitControl(maxlen);
+ USB_SendControl(0,&config,sizeof(ConfigDescriptor));
+ SendInterfaces();
+ return true;
+}
+
+u8 _cdcComposite = 0;
+
+static
+bool SendDescriptor(Setup& setup)
+{
+ u8 t = setup.wValueH;
+ if (USB_CONFIGURATION_DESCRIPTOR_TYPE == t)
+ return SendConfiguration(setup.wLength);
+
+ InitControl(setup.wLength);
+#ifdef HID_ENABLED
+ if (HID_REPORT_DESCRIPTOR_TYPE == t)
+ return HID_GetDescriptor(t);
+#endif
+
+ u8 desc_length = 0;
+ const u8* desc_addr = 0;
+ if (USB_DEVICE_DESCRIPTOR_TYPE == t)
+ {
+ if (setup.wLength == 8)
+ _cdcComposite = 1;
+ desc_addr = _cdcComposite ? (const u8*)&USB_DeviceDescriptorA : (const u8*)&USB_DeviceDescriptor;
+ }
+ else if (USB_STRING_DESCRIPTOR_TYPE == t)
+ {
+ if (setup.wValueL == 0)
+ desc_addr = (const u8*)&STRING_LANGUAGE;
+ else if (setup.wValueL == IPRODUCT)
+ desc_addr = (const u8*)&STRING_IPRODUCT;
+ else if (setup.wValueL == IMANUFACTURER)
+ desc_addr = (const u8*)&STRING_IMANUFACTURER;
+ else
+ return false;
+ }
+
+ if (desc_addr == 0)
+ return false;
+ if (desc_length == 0)
+ desc_length = pgm_read_byte(desc_addr);
+
+ USB_SendControl(TRANSFER_PGM,desc_addr,desc_length);
+ return true;
+}
+
+// Endpoint 0 interrupt
+ISR(USB_COM_vect)
+{
+ SetEP(0);
+ if (!ReceivedSetupInt())
+ return;
+
+ Setup setup;
+ Recv((u8*)&setup,8);
+ ClearSetupInt();
+
+ u8 requestType = setup.bmRequestType;
+ if (requestType & REQUEST_DEVICETOHOST)
+ WaitIN();
+ else
+ ClearIN();
+
+ bool ok = true;
+ if (REQUEST_STANDARD == (requestType & REQUEST_TYPE))
+ {
+ // Standard Requests
+ u8 r = setup.bRequest;
+ if (GET_STATUS == r)
+ {
+ Send8(0); // TODO
+ Send8(0);
+ }
+ else if (CLEAR_FEATURE == r)
+ {
+ }
+ else if (SET_FEATURE == r)
+ {
+ }
+ else if (SET_ADDRESS == r)
+ {
+ WaitIN();
+ UDADDR = setup.wValueL | (1<<ADDEN);
+ }
+ else if (GET_DESCRIPTOR == r)
+ {
+ ok = SendDescriptor(setup);
+ }
+ else if (SET_DESCRIPTOR == r)
+ {
+ ok = false;
+ }
+ else if (GET_CONFIGURATION == r)
+ {
+ Send8(1);
+ }
+ else if (SET_CONFIGURATION == r)
+ {
+ if (REQUEST_DEVICE == (requestType & REQUEST_RECIPIENT))
+ {
+ InitEndpoints();
+ _usbConfiguration = setup.wValueL;
+ } else
+ ok = false;
+ }
+ else if (GET_INTERFACE == r)
+ {
+ }
+ else if (SET_INTERFACE == r)
+ {
+ }
+ }
+ else
+ {
+ InitControl(setup.wLength); // Max length of transfer
+ ok = ClassInterfaceRequest(setup);
+ }
+
+ if (ok)
+ ClearIN();
+ else
+ {
+ Stall();
+ }
+}
+
+void USB_Flush(u8 ep)
+{
+ SetEP(ep);
+ if (FifoByteCount())
+ ReleaseTX();
+}
+
+// General interrupt
+ISR(USB_GEN_vect)
+{
+ u8 udint = UDINT;
+ UDINT = 0;
+
+ // End of Reset
+ if (udint & (1<<EORSTI))
+ {
+ InitEP(0,EP_TYPE_CONTROL,EP_SINGLE_64); // init ep0
+ _usbConfiguration = 0; // not configured yet
+ UEIENX = 1 << RXSTPE; // Enable interrupts for ep0
+ }
+
+ // Start of Frame - happens every millisecond so we use it for TX and RX LED one-shot timing, too
+ if (udint & (1<<SOFI))
+ {
+#ifdef CDC_ENABLED
+ USB_Flush(CDC_TX); // Send a tx frame if found
+#endif
+
+ // check whether the one-shot period has elapsed. if so, turn off the LED
+ if (TxLEDPulse && !(--TxLEDPulse))
+ TXLED0;
+ if (RxLEDPulse && !(--RxLEDPulse))
+ RXLED0;
+ }
+}
+
+// VBUS or counting frames
+// Any frame counting?
+u8 USBConnected()
+{
+ u8 f = UDFNUML;
+ delay(3);
+ return f != UDFNUML;
+}
+
+//=======================================================================
+//=======================================================================
+
+USB_ USB;
+
+USB_::USB_()
+{
+}
+
+void USB_::attach()
+{
+ _usbConfiguration = 0;
+ UHWCON = 0x01; // power internal reg
+ USBCON = (1<<USBE)|(1<<FRZCLK); // clock frozen, usb enabled
+ PLLCSR = 0x12; // Need 16 MHz xtal
+ while (!(PLLCSR & (1<<PLOCK))) // wait for lock pll
+ ;
+ USBCON = ((1<<USBE)|(1<<OTGPADE)); // start USB clock
+ UDIEN = (1<<EORSTE)|(1<<SOFE); // Enable interrupts for EOR (End of Reset) and SOF (start of frame)
+ UDCON = 0; // enable attach resistor
+
+ TX_RX_LED_INIT;
+}
+
+void USB_::detach()
+{
+}
+
+// Check for interrupts
+// TODO: VBUS detection
+bool USB_::configured()
+{
+ return _usbConfiguration;
+}
+
+void USB_::poll()
+{
+}
+
+#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/hardware/arduino/cores/arduino/USBCore.h b/hardware/arduino/cores/arduino/USBCore.h
new file mode 100644
index 0000000..8d13806
--- /dev/null
+++ b/hardware/arduino/cores/arduino/USBCore.h
@@ -0,0 +1,303 @@
+
+// Copyright (c) 2010, Peter Barrett
+/*
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.
+*/
+
+#ifndef __USBCORE_H__
+#define __USBCORE_H__
+
+// Standard requests
+#define GET_STATUS 0
+#define CLEAR_FEATURE 1
+#define SET_FEATURE 3
+#define SET_ADDRESS 5
+#define GET_DESCRIPTOR 6
+#define SET_DESCRIPTOR 7
+#define GET_CONFIGURATION 8
+#define SET_CONFIGURATION 9
+#define GET_INTERFACE 10
+#define SET_INTERFACE 11
+
+
+// bmRequestType
+#define REQUEST_HOSTTODEVICE 0x00
+#define REQUEST_DEVICETOHOST 0x80
+#define REQUEST_DIRECTION 0x80
+
+#define REQUEST_STANDARD 0x00
+#define REQUEST_CLASS 0x20
+#define REQUEST_VENDOR 0x40
+#define REQUEST_TYPE 0x60
+
+#define REQUEST_DEVICE 0x00
+#define REQUEST_INTERFACE 0x01
+#define REQUEST_ENDPOINT 0x02
+#define REQUEST_OTHER 0x03
+#define REQUEST_RECIPIENT 0x03
+
+#define REQUEST_DEVICETOHOST_CLASS_INTERFACE (REQUEST_DEVICETOHOST + REQUEST_CLASS + REQUEST_INTERFACE)
+#define REQUEST_HOSTTODEVICE_CLASS_INTERFACE (REQUEST_HOSTTODEVICE + REQUEST_CLASS + REQUEST_INTERFACE)
+
+// Class requests
+
+#define CDC_SET_LINE_CODING 0x20
+#define CDC_GET_LINE_CODING 0x21
+#define CDC_SET_CONTROL_LINE_STATE 0x22
+
+#define MSC_RESET 0xFF
+#define MSC_GET_MAX_LUN 0xFE
+
+#define HID_GET_REPORT 0x01
+#define HID_GET_IDLE 0x02
+#define HID_GET_PROTOCOL 0x03
+#define HID_SET_REPORT 0x09
+#define HID_SET_IDLE 0x0A
+#define HID_SET_PROTOCOL 0x0B
+
+// Descriptors
+
+#define USB_DEVICE_DESC_SIZE 18
+#define USB_CONFIGUARTION_DESC_SIZE 9
+#define USB_INTERFACE_DESC_SIZE 9
+#define USB_ENDPOINT_DESC_SIZE 7
+
+#define USB_DEVICE_DESCRIPTOR_TYPE 1
+#define USB_CONFIGURATION_DESCRIPTOR_TYPE 2
+#define USB_STRING_DESCRIPTOR_TYPE 3
+#define USB_INTERFACE_DESCRIPTOR_TYPE 4
+#define USB_ENDPOINT_DESCRIPTOR_TYPE 5
+
+#define USB_DEVICE_CLASS_COMMUNICATIONS 0x02
+#define USB_DEVICE_CLASS_HUMAN_INTERFACE 0x03
+#define USB_DEVICE_CLASS_STORAGE 0x08
+#define USB_DEVICE_CLASS_VENDOR_SPECIFIC 0xFF
+
+#define USB_CONFIG_POWERED_MASK 0x40
+#define USB_CONFIG_BUS_POWERED 0x80
+#define USB_CONFIG_SELF_POWERED 0xC0
+#define USB_CONFIG_REMOTE_WAKEUP 0x20
+
+// bMaxPower in Configuration Descriptor
+#define USB_CONFIG_POWER_MA(mA) ((mA)/2)
+
+// bEndpointAddress in Endpoint Descriptor
+#define USB_ENDPOINT_DIRECTION_MASK 0x80
+#define USB_ENDPOINT_OUT(addr) ((addr) | 0x00)
+#define USB_ENDPOINT_IN(addr) ((addr) | 0x80)
+
+#define USB_ENDPOINT_TYPE_MASK 0x03
+#define USB_ENDPOINT_TYPE_CONTROL 0x00
+#define USB_ENDPOINT_TYPE_ISOCHRONOUS 0x01
+#define USB_ENDPOINT_TYPE_BULK 0x02
+#define USB_ENDPOINT_TYPE_INTERRUPT 0x03
+
+#define TOBYTES(x) ((x) & 0xFF),(((x) >> 8) & 0xFF)
+
+#define CDC_V1_10 0x0110
+#define CDC_COMMUNICATION_INTERFACE_CLASS 0x02
+
+#define CDC_CALL_MANAGEMENT 0x01
+#define CDC_ABSTRACT_CONTROL_MODEL 0x02
+#define CDC_HEADER 0x00
+#define CDC_ABSTRACT_CONTROL_MANAGEMENT 0x02
+#define CDC_UNION 0x06
+#define CDC_CS_INTERFACE 0x24
+#define CDC_CS_ENDPOINT 0x25
+#define CDC_DATA_INTERFACE_CLASS 0x0A
+
+#define MSC_SUBCLASS_SCSI 0x06
+#define MSC_PROTOCOL_BULK_ONLY 0x50
+
+#define HID_HID_DESCRIPTOR_TYPE 0x21
+#define HID_REPORT_DESCRIPTOR_TYPE 0x22
+#define HID_PHYSICAL_DESCRIPTOR_TYPE 0x23
+
+
+// Device
+typedef struct {
+ u8 len; // 18
+ u8 dtype; // 1 USB_DEVICE_DESCRIPTOR_TYPE
+ u16 usbVersion; // 0x200
+ u8 deviceClass;
+ u8 deviceSubClass;
+ u8 deviceProtocol;
+ u8 packetSize0; // Packet 0
+ u16 idVendor;
+ u16 idProduct;
+ u16 deviceVersion; // 0x100
+ u8 iManufacturer;
+ u8 iProduct;
+ u8 iSerialNumber;
+ u8 bNumConfigurations;
+} DeviceDescriptor;
+
+// Config
+typedef struct {
+ u8 len; // 9
+ u8 dtype; // 2
+ u16 clen; // total length
+ u8 numInterfaces;
+ u8 config;
+ u8 iconfig;
+ u8 attributes;
+ u8 maxPower;
+} ConfigDescriptor;
+
+// String
+
+// Interface
+typedef struct
+{
+ u8 len; // 9
+ u8 dtype; // 4
+ u8 number;
+ u8 alternate;
+ u8 numEndpoints;
+ u8 interfaceClass;
+ u8 interfaceSubClass;
+ u8 protocol;
+ u8 iInterface;
+} InterfaceDescriptor;
+
+// Endpoint
+typedef struct
+{
+ u8 len; // 7
+ u8 dtype; // 5
+ u8 addr;
+ u8 attr;
+ u16 packetSize;
+ u8 interval;
+} EndpointDescriptor;
+
+// Interface Association Descriptor
+// Used to bind 2 interfaces together in CDC compostite device
+typedef struct
+{
+ u8 len; // 8
+ u8 dtype; // 11
+ u8 firstInterface;
+ u8 interfaceCount;
+ u8 functionClass;
+ u8 funtionSubClass;
+ u8 functionProtocol;
+ u8 iInterface;
+} IADDescriptor;
+
+// CDC CS interface descriptor
+typedef struct
+{
+ u8 len; // 5
+ u8 dtype; // 0x24
+ u8 subtype;
+ u8 d0;
+ u8 d1;
+} CDCCSInterfaceDescriptor;
+
+typedef struct
+{
+ u8 len; // 4
+ u8 dtype; // 0x24
+ u8 subtype;
+ u8 d0;
+} CDCCSInterfaceDescriptor4;
+
+typedef struct
+{
+ u8 len;
+ u8 dtype; // 0x24
+ u8 subtype; // 1
+ u8 bmCapabilities;
+ u8 bDataInterface;
+} CMFunctionalDescriptor;
+
+typedef struct
+{
+ u8 len;
+ u8 dtype; // 0x24
+ u8 subtype; // 1
+ u8 bmCapabilities;
+} ACMFunctionalDescriptor;
+
+typedef struct
+{
+ // IAD
+ IADDescriptor iad; // Only needed on compound device
+
+ // Control
+ InterfaceDescriptor cif; //
+ CDCCSInterfaceDescriptor header;
+ CMFunctionalDescriptor callManagement; // Call Management
+ ACMFunctionalDescriptor controlManagement; // ACM
+ CDCCSInterfaceDescriptor functionalDescriptor; // CDC_UNION
+ EndpointDescriptor cifin;
+
+ // Data
+ InterfaceDescriptor dif;
+ EndpointDescriptor in;
+ EndpointDescriptor out;
+} CDCDescriptor;
+
+typedef struct
+{
+ InterfaceDescriptor msc;
+ EndpointDescriptor in;
+ EndpointDescriptor out;
+} MSCDescriptor;
+
+typedef struct
+{
+ u8 len; // 9
+ u8 dtype; // 0x21
+ u8 addr;
+ u8 versionL; // 0x101
+ u8 versionH; // 0x101
+ u8 country;
+ u8 desctype; // 0x22 report
+ u8 descLenL;
+ u8 descLenH;
+} HIDDescDescriptor;
+
+typedef struct
+{
+ InterfaceDescriptor hid;
+ HIDDescDescriptor desc;
+ EndpointDescriptor in;
+} HIDDescriptor;
+
+
+#define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
+ { 18, 1, 0x200, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
+
+#define D_CONFIG(_totalLength,_interfaces) \
+ { 9, 2, _totalLength,_interfaces, 1, 0, USB_CONFIG_BUS_POWERED, USB_CONFIG_POWER_MA(500) }
+
+#define D_INTERFACE(_n,_numEndpoints,_class,_subClass,_protocol) \
+ { 9, 4, _n, 0, _numEndpoints, _class,_subClass, _protocol, 0 }
+
+#define D_ENDPOINT(_addr,_attr,_packetSize, _interval) \
+ { 7, 5, _addr,_attr,_packetSize, _interval }
+
+#define D_IAD(_firstInterface, _count, _class, _subClass, _protocol) \
+ { 8, 11, _firstInterface, _count, _class, _subClass, _protocol, 0 }
+
+#define D_HIDREPORT(_descriptorLength) \
+ { 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength, 0 }
+
+#define D_CDCCS(_subtype,_d0,_d1) { 5, 0x24, _subtype, _d0, _d1 }
+#define D_CDCCS4(_subtype,_d0) { 4, 0x24, _subtype, _d0 }
+
+
+#endif
\ No newline at end of file
diff --git a/hardware/arduino/cores/arduino/USBDesc.h b/hardware/arduino/cores/arduino/USBDesc.h
new file mode 100644
index 0000000..549ed9e
--- /dev/null
+++ b/hardware/arduino/cores/arduino/USBDesc.h
@@ -0,0 +1,67 @@
+
+
+/* Copyright (c) 2011, Peter Barrett
+**
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.
+*/
+
+#define CDC_ENABLED
+#define HID_ENABLED
+
+
+#ifdef CDC_ENABLED
+#define CDC_INTERFACE_COUNT 2
+#define CDC_ENPOINT_COUNT 3
+#else
+#define CDC_INTERFACE_COUNT 0
+#define CDC_ENPOINT_COUNT 0
+#endif
+
+#ifdef HID_ENABLED
+#define HID_INTERFACE_COUNT 1
+#define HID_ENPOINT_COUNT 1
+#else
+#define HID_INTERFACE_COUNT 0
+#define HID_ENPOINT_COUNT 0
+#endif
+
+#define CDC_ACM_INTERFACE 0 // CDC ACM
+#define CDC_DATA_INTERFACE 1 // CDC Data
+#define CDC_FIRST_ENDPOINT 1
+#define CDC_ENDPOINT_ACM (CDC_FIRST_ENDPOINT) // CDC First
+#define CDC_ENDPOINT_OUT (CDC_FIRST_ENDPOINT+1)
+#define CDC_ENDPOINT_IN (CDC_FIRST_ENDPOINT+2)
+
+#define HID_INTERFACE (CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT) // HID Interface
+#define HID_FIRST_ENDPOINT (CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT)
+#define HID_ENDPOINT_INT (HID_FIRST_ENDPOINT)
+
+#define INTERFACE_COUNT (MSC_INTERFACE + MSC_INTERFACE_COUNT)
+
+#ifdef CDC_ENABLED
+#define CDC_RX CDC_ENDPOINT_OUT
+#define CDC_TX CDC_ENDPOINT_IN
+#endif
+
+#ifdef HID_ENABLED
+#define HID_TX HID_ENDPOINT_INT
+#endif
+
+#define IMANUFACTURER 1
+#define IPRODUCT 2
+#define USB_PID_LEONARDO 0x0034
+#define USB_PID_MICRO 0x0035
+#define USB_VID 0x2341 // arduino LLC vid
+#define USB_PID ARDUINO_MODEL_USB_PID
+
diff --git a/hardware/arduino/cores/arduino/Udp.h b/hardware/arduino/cores/arduino/Udp.h
new file mode 100644
index 0000000..dc5644b
--- /dev/null
+++ b/hardware/arduino/cores/arduino/Udp.h
@@ -0,0 +1,88 @@
+/*
+ * Udp.cpp: Library to send/receive UDP packets.
+ *
+ * NOTE: UDP is fast, but has some important limitations (thanks to Warren Gray for mentioning these)
+ * 1) UDP does not guarantee the order in which assembled UDP packets are received. This
+ * might not happen often in practice, but in larger network topologies, a UDP
+ * packet can be received out of sequence.
+ * 2) UDP does not guard against lost packets - so packets *can* disappear without the sender being
+ * aware of it. Again, this may not be a concern in practice on small local networks.
+ * For more information, see http://www.cafeaulait.org/course/week12/35.html
+ *
+ * MIT License:
+ * Copyright (c) 2008 Bjoern Hartmann
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * bjoern cs stanford edu 12/30/2008
+ */
+
+#ifndef udp_h
+#define udp_h
+
+#include <Stream.h>
+#include <IPAddress.h>
+
+class UDP : public Stream {
+
+public:
+ virtual uint8_t begin(uint16_t) =0; // initialize, start listening on specified port. Returns 1 if successful, 0 if there are no sockets available to use
+ virtual void stop() =0; // Finish with the UDP socket
+
+ // Sending UDP packets
+
+ // Start building up a packet to send to the remote host specific in ip and port
+ // Returns 1 if successful, 0 if there was a problem with the supplied IP address or port
+ virtual int beginPacket(IPAddress ip, uint16_t port) =0;
+ // Start building up a packet to send to the remote host specific in host and port
+ // Returns 1 if successful, 0 if there was a problem resolving the hostname or port
+ virtual int beginPacket(const char *host, uint16_t port) =0;
+ // Finish off this packet and send it
+ // Returns 1 if the packet was sent successfully, 0 if there was an error
+ virtual int endPacket() =0;
+ // Write a single byte into the packet
+ virtual size_t write(uint8_t) =0;
+ // Write size bytes from buffer into the packet
+ virtual size_t write(const uint8_t *buffer, size_t size) =0;
+
+ // Start processing the next available incoming packet
+ // Returns the size of the packet in bytes, or 0 if no packets are available
+ virtual int parsePacket() =0;
+ // Number of bytes remaining in the current packet
+ virtual int available() =0;
+ // Read a single byte from the current packet
+ virtual int read() =0;
+ // Read up to len bytes from the current packet and place them into buffer
+ // Returns the number of bytes read, or 0 if none are available
+ virtual int read(unsigned char* buffer, size_t len) =0;
+ // Read up to len characters from the current packet and place them into buffer
+ // Returns the number of characters read, or 0 if none are available
+ virtual int read(char* buffer, size_t len) =0;
+ // Return the next byte from the current packet without moving on to the next byte
+ virtual int peek() =0;
+ virtual void flush() =0; // Finish reading the current packet
+
+ // Return the IP address of the host who sent the current incoming packet
+ virtual IPAddress remoteIP() =0;
+ // Return the port of the host who sent the current incoming packet
+ virtual uint16_t remotePort() =0;
+protected:
+ uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };
+};
+
+#endif
diff --git a/hardware/arduino/cores/arduino/WInterrupts.c b/hardware/arduino/cores/arduino/WInterrupts.c
index 3b3e0c9..3b9fe08 100755
--- a/hardware/arduino/cores/arduino/WInterrupts.c
+++ b/hardware/arduino/cores/arduino/WInterrupts.c
@@ -30,10 +30,9 @@
#include <avr/pgmspace.h>
#include <stdio.h>
-#include "WConstants.h"
#include "wiring_private.h"
-volatile static voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
+static volatile voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
// volatile static voidFuncPtr twiIntFunc;
void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) {
@@ -111,6 +110,19 @@ void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) {
#warning attachInterrupt may need some more work for this cpu (case 1)
#endif
break;
+
+ case 2:
+ #if defined(EICRA) && defined(ISC20) && defined(ISC21) && defined(EIMSK)
+ EICRA = (EICRA & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
+ EIMSK |= (1 << INT2);
+ #elif defined(MCUCR) && defined(ISC20) && defined(ISC21) && defined(GICR)
+ MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
+ GICR |= (1 << INT2);
+ #elif defined(MCUCR) && defined(ISC20) && defined(GIMSK) && defined(GIMSK)
+ MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
+ GIMSK |= (1 << INT2);
+ #endif
+ break;
#endif
}
}
@@ -238,6 +250,13 @@ SIGNAL(INT1_vect) {
intFunc[EXTERNAL_INT_1]();
}
+#if defined(EICRA) && defined(ISC20)
+SIGNAL(INT2_vect) {
+ if(intFunc[EXTERNAL_INT_2])
+ intFunc[EXTERNAL_INT_2]();
+}
+#endif
+
#endif
/*
diff --git a/hardware/arduino/cores/arduino/WString.cpp b/hardware/arduino/cores/arduino/WString.cpp
index db5a441..c6839fc 100644
--- a/hardware/arduino/cores/arduino/WString.cpp
+++ b/hardware/arduino/cores/arduino/WString.cpp
@@ -1,6 +1,8 @@
/*
WString.cpp - String library for Wiring & Arduino
+ ...mostly rewritten by Paul Stoffregen...
Copyright (c) 2009-10 Hernando Barragan. All rights reserved.
+ Copyright 2011, Paul Stoffregen, paul pjrc com
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -17,427 +19,627 @@
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 )
+/*********************************************/
+/* Constructors */
+/*********************************************/
+
+String::String(const char *cstr)
{
- if ( value == NULL )
- value = "";
- getBuffer( _length = strlen( value ) );
- if ( _buffer != NULL )
- strcpy( _buffer, value );
+ init();
+ if (cstr) copy(cstr, strlen(cstr));
}
-String::String( const String &value )
+String::String(const String &value)
{
- getBuffer( _length = value._length );
- if ( _buffer != NULL )
- strcpy( _buffer, value._buffer );
+ init();
+ *this = value;
}
-String::String( const char value )
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+String::String(String &&rval)
{
- _length = 1;
- getBuffer(1);
- if ( _buffer != NULL ) {
- _buffer[0] = value;
- _buffer[1] = 0;
- }
+ init();
+ move(rval);
}
-
-String::String( const unsigned char value )
+String::String(StringSumHelper &&rval)
{
- _length = 1;
- getBuffer(1);
- if ( _buffer != NULL) {
- _buffer[0] = value;
- _buffer[1] = 0;
- }
+ init();
+ move(rval);
}
+#endif
-String::String( const int value, const int base )
+String::String(char c)
{
- char buf[33];
- itoa((signed long)value, buf, base);
- getBuffer( _length = strlen(buf) );
- if ( _buffer != NULL )
- strcpy( _buffer, buf );
+ init();
+ char buf[2];
+ buf[0] = c;
+ buf[1] = 0;
+ *this = buf;
}
-String::String( const unsigned int value, const int base )
+String::String(unsigned char value, unsigned char base)
{
- char buf[33];
- ultoa((unsigned long)value, buf, base);
- getBuffer( _length = strlen(buf) );
- if ( _buffer != NULL )
- strcpy( _buffer, buf );
+ init();
+ char buf[9];
+ utoa(value, buf, base);
+ *this = buf;
}
-String::String( const long value, const int base )
+String::String(int value, unsigned char base)
{
- char buf[33];
- ltoa(value, buf, base);
- getBuffer( _length = strlen(buf) );
- if ( _buffer != NULL )
- strcpy( _buffer, buf );
+ init();
+ char buf[18];
+ itoa(value, buf, base);
+ *this = buf;
}
-String::String( const unsigned long value, const int base )
+String::String(unsigned int value, unsigned char base)
{
- char buf[33];
- ultoa(value, buf, 10);
- getBuffer( _length = strlen(buf) );
- if ( _buffer != NULL )
- strcpy( _buffer, buf );
+ init();
+ char buf[17];
+ utoa(value, buf, base);
+ *this = buf;
}
-char String::charAt( unsigned int loc ) const
+String::String(long value, unsigned char base)
{
- return operator[]( loc );
+ init();
+ char buf[34];
+ ltoa(value, buf, base);
+ *this = buf;
}
-void String::setCharAt( unsigned int loc, const char aChar )
+String::String(unsigned long value, unsigned char base)
{
- if(_buffer == NULL) return;
- if(_length > loc) {
- _buffer[loc] = aChar;
- }
+ init();
+ char buf[33];
+ ultoa(value, buf, base);
+ *this = buf;
}
-int String::compareTo( const String &s2 ) const
+String::~String()
{
- return strcmp( _buffer, s2._buffer );
+ free(buffer);
}
-const String & String::concat( const String &s2 )
+/*********************************************/
+/* Memory Management */
+/*********************************************/
+
+inline void String::init(void)
{
- return (*this) += s2;
+ buffer = NULL;
+ capacity = 0;
+ len = 0;
+ flags = 0;
}
-const String & String::operator=( const String &rhs )
+void String::invalidate(void)
{
- 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;
+ if (buffer) free(buffer);
+ buffer = NULL;
+ capacity = len = 0;
}
-//const String & String::operator+=( const char aChar )
-//{
-// if ( _length == _capacity )
-// doubleBuffer();
-//
-// _buffer[ _length++ ] = aChar;
-// _buffer[ _length ] = '\0';
-// return *this;
-//}
+unsigned char String::reserve(unsigned int size)
+{
+ if (buffer && capacity >= size) return 1;
+ if (changeBuffer(size)) {
+ if (len == 0) buffer[0] = 0;
+ return 1;
+ }
+ return 0;
+}
-const String & String::operator+=( const String &other )
+unsigned char String::changeBuffer(unsigned int maxStrLen)
{
- _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;
+ char *newbuffer = (char *)realloc(buffer, maxStrLen + 1);
+ if (newbuffer) {
+ buffer = newbuffer;
+ capacity = maxStrLen;
+ return 1;
+ }
+ return 0;
}
+/*********************************************/
+/* Copy and Move */
+/*********************************************/
-int String::operator==( const String &rhs ) const
+String & String::copy(const char *cstr, unsigned int length)
{
- return ( _length == rhs._length && strcmp( _buffer, rhs._buffer ) == 0 );
+ if (!reserve(length)) {
+ invalidate();
+ return *this;
+ }
+ len = length;
+ strcpy(buffer, cstr);
+ return *this;
}
-int String::operator!=( const String &rhs ) const
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+void String::move(String &rhs)
{
- return ( _length != rhs.length() || strcmp( _buffer, rhs._buffer ) != 0 );
+ if (buffer) {
+ if (capacity >= rhs.len) {
+ strcpy(buffer, rhs.buffer);
+ len = rhs.len;
+ rhs.len = 0;
+ return;
+ } else {
+ free(buffer);
+ }
+ }
+ buffer = rhs.buffer;
+ capacity = rhs.capacity;
+ len = rhs.len;
+ rhs.buffer = NULL;
+ rhs.capacity = 0;
+ rhs.len = 0;
}
+#endif
-int String::operator<( const String &rhs ) const
+String & String::operator = (const String &rhs)
{
- return strcmp( _buffer, rhs._buffer ) < 0;
+ if (this == &rhs) return *this;
+
+ if (rhs.buffer) copy(rhs.buffer, rhs.len);
+ else invalidate();
+
+ return *this;
}
-int String::operator>( const String &rhs ) const
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+String & String::operator = (String &&rval)
{
- return strcmp( _buffer, rhs._buffer ) > 0;
+ if (this != &rval) move(rval);
+ return *this;
}
-int String::operator<=( const String &rhs ) const
+String & String::operator = (StringSumHelper &&rval)
{
- return strcmp( _buffer, rhs._buffer ) <= 0;
+ if (this != &rval) move(rval);
+ return *this;
}
+#endif
-int String::operator>=( const String & rhs ) const
+String & String::operator = (const char *cstr)
{
- return strcmp( _buffer, rhs._buffer ) >= 0;
+ if (cstr) copy(cstr, strlen(cstr));
+ else invalidate();
+
+ return *this;
}
-char & String::operator[]( unsigned int index )
+/*********************************************/
+/* concat */
+/*********************************************/
+
+unsigned char String::concat(const String &s)
{
- static char dummy_writable_char;
- if (index >= _length || !_buffer) {
- dummy_writable_char = 0;
- return dummy_writable_char;
- }
- return _buffer[ index ];
+ return concat(s.buffer, s.len);
}
-char String::operator[]( unsigned int index ) const
+unsigned char String::concat(const char *cstr, unsigned int length)
{
- // need to check for valid index, to do later
- return _buffer[ index ];
+ unsigned int newlen = len + length;
+ if (!cstr) return 0;
+ if (length == 0) return 1;
+ if (!reserve(newlen)) return 0;
+ strcpy(buffer + len, cstr);
+ len = newlen;
+ return 1;
}
-boolean String::endsWith( const String &s2 ) const
+unsigned char String::concat(const char *cstr)
{
- if ( _length < s2._length )
- return 0;
-
- return strcmp( &_buffer[ _length - s2._length], s2._buffer ) == 0;
+ if (!cstr) return 0;
+ return concat(cstr, strlen(cstr));
}
-boolean String::equals( const String &s2 ) const
+unsigned char String::concat(char c)
{
- return ( _length == s2._length && strcmp( _buffer,s2._buffer ) == 0 );
+ char buf[2];
+ buf[0] = c;
+ buf[1] = 0;
+ return concat(buf, 1);
}
-boolean String::equalsIgnoreCase( const String &s2 ) const
+unsigned char String::concat(unsigned char num)
{
- if ( this == &s2 )
- return true; //1;
- else if ( _length != s2._length )
- return false; //0;
+ char buf[4];
+ itoa(num, buf, 10);
+ return concat(buf, strlen(buf));
+}
- return strcmp(toLowerCase()._buffer, s2.toLowerCase()._buffer) == 0;
+unsigned char String::concat(int num)
+{
+ char buf[7];
+ itoa(num, buf, 10);
+ return concat(buf, strlen(buf));
}
-String String::replace( char findChar, char replaceChar )
+unsigned char String::concat(unsigned int num)
{
- if ( _buffer == NULL ) return *this;
- String theReturn = _buffer;
- char* temp = theReturn._buffer;
- while( (temp = strchr( temp, findChar )) != 0 )
- *temp = replaceChar;
+ char buf[6];
+ utoa(num, buf, 10);
+ return concat(buf, strlen(buf));
+}
- return theReturn;
+unsigned char String::concat(long num)
+{
+ char buf[12];
+ ltoa(num, buf, 10);
+ return concat(buf, strlen(buf));
}
-String String::replace( const String& match, const String& replace )
+unsigned char String::concat(unsigned long num)
{
- if ( _buffer == NULL ) return *this;
- String temp = _buffer, newString;
+ char buf[11];
+ ultoa(num, buf, 10);
+ return concat(buf, strlen(buf));
+}
+
+/*********************************************/
+/* Concatenate */
+/*********************************************/
- 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;
+StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs)
+{
+ StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+ if (!a.concat(rhs.buffer, rhs.len)) a.invalidate();
+ return a;
}
-int String::indexOf( char temp ) const
+StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr)
{
- return indexOf( temp, 0 );
+ StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+ if (!cstr || !a.concat(cstr, strlen(cstr))) a.invalidate();
+ return a;
}
-int String::indexOf( char ch, unsigned int fromIndex ) const
+StringSumHelper & operator + (const StringSumHelper &lhs, char c)
{
- if ( fromIndex >= _length )
- return -1;
+ StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+ if (!a.concat(c)) a.invalidate();
+ return a;
+}
- const char* temp = strchr( &_buffer[fromIndex], ch );
- if ( temp == NULL )
- return -1;
+StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num)
+{
+ StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+ if (!a.concat(num)) a.invalidate();
+ return a;
+}
- return temp - _buffer;
+StringSumHelper & operator + (const StringSumHelper &lhs, int num)
+{
+ StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+ if (!a.concat(num)) a.invalidate();
+ return a;
}
-int String::indexOf( const String &s2 ) const
+StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num)
{
- return indexOf( s2, 0 );
+ StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+ if (!a.concat(num)) a.invalidate();
+ return a;
}
-int String::indexOf( const String &s2, unsigned int fromIndex ) const
+StringSumHelper & operator + (const StringSumHelper &lhs, long num)
{
- if ( fromIndex >= _length )
- return -1;
+ StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+ if (!a.concat(num)) a.invalidate();
+ return a;
+}
- const char *theFind = strstr( &_buffer[ fromIndex ], s2._buffer );
+StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num)
+{
+ StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+ if (!a.concat(num)) a.invalidate();
+ return a;
+}
- if ( theFind == NULL )
- return -1;
+/*********************************************/
+/* Comparison */
+/*********************************************/
- return theFind - _buffer; // pointer subtraction
+int String::compareTo(const String &s) const
+{
+ if (!buffer || !s.buffer) {
+ if (s.buffer && s.len > 0) return 0 - *(unsigned char *)s.buffer;
+ if (buffer && len > 0) return *(unsigned char *)buffer;
+ return 0;
+ }
+ return strcmp(buffer, s.buffer);
}
-int String::lastIndexOf( char theChar ) const
+unsigned char String::equals(const String &s2) const
{
- return lastIndexOf( theChar, _length - 1 );
+ return (len == s2.len && compareTo(s2) == 0);
}
-int String::lastIndexOf( char ch, unsigned int fromIndex ) const
+unsigned char String::equals(const char *cstr) const
{
- if ( fromIndex >= _length )
- return -1;
+ if (len == 0) return (cstr == NULL || *cstr == 0);
+ if (cstr == NULL) return buffer[0] == 0;
+ return strcmp(buffer, cstr) == 0;
+}
- char tempchar = _buffer[fromIndex + 1];
- _buffer[fromIndex + 1] = '\0';
- char* temp = strrchr( _buffer, ch );
- _buffer[fromIndex + 1] = tempchar;
+unsigned char String::operator<(const String &rhs) const
+{
+ return compareTo(rhs) < 0;
+}
- if ( temp == NULL )
- return -1;
+unsigned char String::operator>(const String &rhs) const
+{
+ return compareTo(rhs) > 0;
+}
- return temp - _buffer;
+unsigned char String::operator<=(const String &rhs) const
+{
+ return compareTo(rhs) <= 0;
}
-int String::lastIndexOf( const String &s2 ) const
+unsigned char String::operator>=(const String &rhs) const
{
- return lastIndexOf( s2, _length - s2._length );
+ return compareTo(rhs) >= 0;
}
-int String::lastIndexOf( const String &s2, unsigned int fromIndex ) const
+unsigned char String::equalsIgnoreCase( const String &s2 ) const
{
- // check for empty strings
- if ( s2._length == 0 || s2._length - 1 > fromIndex || fromIndex >= _length )
- return -1;
+ if (this == &s2) return 1;
+ if (len != s2.len) return 0;
+ if (len == 0) return 1;
+ const char *p1 = buffer;
+ const char *p2 = s2.buffer;
+ while (*p1) {
+ if (tolower(*p1++) != tolower(*p2++)) return 0;
+ }
+ return 1;
+}
- // matching first character
- char temp = s2[ 0 ];
+unsigned char String::startsWith( const String &s2 ) const
+{
+ if (len < s2.len) return 0;
+ return startsWith(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;
+unsigned char String::startsWith( const String &s2, unsigned int offset ) const
+{
+ if (offset > len - s2.len || !buffer || !s2.buffer) return 0;
+ return strncmp( &buffer[offset], s2.buffer, s2.len ) == 0;
}
-boolean String::startsWith( const String &s2 ) const
+unsigned char String::endsWith( const String &s2 ) const
{
- if ( _length < s2._length )
- return 0;
+ if ( len < s2.len || !buffer || !s2.buffer) return 0;
+ return strcmp(&buffer[len - s2.len], s2.buffer) == 0;
+}
+
+/*********************************************/
+/* Character Access */
+/*********************************************/
- return startsWith( s2, 0 );
+char String::charAt(unsigned int loc) const
+{
+ return operator[](loc);
}
-boolean String::startsWith( const String &s2, unsigned int offset ) const
+void String::setCharAt(unsigned int loc, char c)
{
- if ( offset > _length - s2._length )
- return 0;
+ if (loc < len) buffer[loc] = c;
+}
- return strncmp( &_buffer[offset], s2._buffer, s2._length ) == 0;
+char & String::operator[](unsigned int index)
+{
+ static char dummy_writable_char;
+ if (index >= len || !buffer) {
+ dummy_writable_char = 0;
+ return dummy_writable_char;
+ }
+ return buffer[index];
}
-String String::substring( unsigned int left ) const
+char String::operator[]( unsigned int index ) const
{
- return substring( left, _length );
+ if (index >= len || !buffer) return 0;
+ return buffer[index];
}
-String String::substring( unsigned int left, unsigned int right ) const
+void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index) const
{
- if ( left > right )
- {
- int temp = right;
- right = left;
- left = temp;
- }
+ if (!bufsize || !buf) return;
+ if (index >= len) {
+ buf[0] = 0;
+ return;
+ }
+ unsigned int n = bufsize - 1;
+ if (n > len - index) n = len - index;
+ strncpy((char *)buf, buffer + index, n);
+ buf[n] = 0;
+}
- if ( right > _length )
- {
- right = _length;
- }
+/*********************************************/
+/* Search */
+/*********************************************/
- char temp = _buffer[ right ]; // save the replaced character
- _buffer[ right ] = '\0';
- String outPut = ( _buffer + left ); // pointer arithmetic
- _buffer[ right ] = temp; //restore character
- return outPut;
+int String::indexOf(char c) const
+{
+ return indexOf(c, 0);
}
-String String::toLowerCase() const
+int String::indexOf( char ch, unsigned int fromIndex ) const
{
- String temp = _buffer;
-
- for ( unsigned int i = 0; i < _length; i++ )
- temp._buffer[ i ] = (char)tolower( temp._buffer[ i ] );
- return temp;
+ if (fromIndex >= len) return -1;
+ const char* temp = strchr(buffer + fromIndex, ch);
+ if (temp == NULL) return -1;
+ return temp - buffer;
}
-String String::toUpperCase() const
+int String::indexOf(const String &s2) const
{
- String temp = _buffer;
-
- for ( unsigned int i = 0; i < _length; i++ )
- temp._buffer[ i ] = (char)toupper( temp._buffer[ i ] );
- return temp;
+ return indexOf(s2, 0);
}
-String String::trim() const
+int String::indexOf(const String &s2, unsigned int fromIndex) const
{
- if ( _buffer == NULL ) return *this;
- String temp = _buffer;
- unsigned int i,j;
+ if (fromIndex >= len) return -1;
+ const char *found = strstr(buffer + fromIndex, s2.buffer);
+ if (found == NULL) return -1;
+ return found - buffer;
+}
- for ( i = 0; i < _length; i++ )
- {
- if ( !isspace(_buffer[i]) )
- break;
- }
+int String::lastIndexOf( char theChar ) const
+{
+ return lastIndexOf(theChar, len - 1);
+}
- for ( j = temp._length - 1; j > i; j-- )
- {
- if ( !isspace(_buffer[j]) )
- break;
- }
+int String::lastIndexOf(char ch, unsigned int fromIndex) const
+{
+ if (fromIndex >= len) 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;
+}
- return temp.substring( i, j + 1);
+int String::lastIndexOf(const String &s2) const
+{
+ return lastIndexOf(s2, len - s2.len);
}
-void String::getBytes(unsigned char *buf, unsigned int bufsize)
+int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
{
- if (!bufsize || !buf) return;
- unsigned int len = bufsize - 1;
- if (len > _length) len = _length;
- strncpy((char *)buf, _buffer, len);
- buf[len] = 0;
+ if (s2.len == 0 || len == 0 || s2.len > len) return -1;
+ if (fromIndex >= len) fromIndex = len - 1;
+ int found = -1;
+ for (char *p = buffer; p <= buffer + fromIndex; p++) {
+ p = strstr(p, s2.buffer);
+ if (!p) break;
+ if ((unsigned int)(p - buffer) <= fromIndex) found = p - buffer;
+ }
+ return found;
}
-void String::toCharArray(char *buf, unsigned int bufsize)
+String String::substring( unsigned int left ) const
{
- if (!bufsize || !buf) return;
- unsigned int len = bufsize - 1;
- if (len > _length) len = _length;
- strncpy(buf, _buffer, len);
- buf[len] = 0;
+ return substring(left, len);
+}
+
+String String::substring(unsigned int left, unsigned int right) const
+{
+ if (left > right) {
+ unsigned int temp = right;
+ right = left;
+ left = temp;
+ }
+ String out;
+ if (left > len) return out;
+ if (right > len) right = len;
+ char temp = buffer[right]; // save the replaced character
+ buffer[right] = '\0';
+ out = buffer + left; // pointer arithmetic
+ buffer[right] = temp; //restore character
+ return out;
+}
+
+/*********************************************/
+/* Modification */
+/*********************************************/
+
+void String::replace(char find, char replace)
+{
+ if (!buffer) return;
+ for (char *p = buffer; *p; p++) {
+ if (*p == find) *p = replace;
+ }
+}
+
+void String::replace(const String& find, const String& replace)
+{
+ if (len == 0 || find.len == 0) return;
+ int diff = replace.len - find.len;
+ char *readFrom = buffer;
+ char *foundAt;
+ if (diff == 0) {
+ while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
+ memcpy(foundAt, replace.buffer, replace.len);
+ readFrom = foundAt + replace.len;
+ }
+ } else if (diff < 0) {
+ char *writeTo = buffer;
+ while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
+ unsigned int n = foundAt - readFrom;
+ memcpy(writeTo, readFrom, n);
+ writeTo += n;
+ memcpy(writeTo, replace.buffer, replace.len);
+ writeTo += replace.len;
+ readFrom = foundAt + find.len;
+ len += diff;
+ }
+ strcpy(writeTo, readFrom);
+ } else {
+ unsigned int size = len; // compute size needed for result
+ while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
+ readFrom = foundAt + find.len;
+ size += diff;
+ }
+ if (size == len) return;
+ if (size > capacity && !changeBuffer(size)) return; // XXX: tell user!
+ int index = len - 1;
+ while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) {
+ readFrom = buffer + index + find.len;
+ memmove(readFrom + diff, readFrom, len - (readFrom - buffer));
+ len += diff;
+ buffer[len] = 0;
+ memcpy(buffer + index, replace.buffer, replace.len);
+ index--;
+ }
+ }
+}
+
+void String::toLowerCase(void)
+{
+ if (!buffer) return;
+ for (char *p = buffer; *p; p++) {
+ *p = tolower(*p);
+ }
+}
+
+void String::toUpperCase(void)
+{
+ if (!buffer) return;
+ for (char *p = buffer; *p; p++) {
+ *p = toupper(*p);
+ }
+}
+
+void String::trim(void)
+{
+ if (!buffer || len == 0) return;
+ char *begin = buffer;
+ while (isspace(*begin)) begin++;
+ char *end = buffer + len - 1;
+ while (isspace(*end) && end >= begin) end--;
+ len = end + 1 - begin;
+ if (begin > buffer) memcpy(buffer, begin, len);
+ buffer[len] = 0;
+}
+
+/*********************************************/
+/* Parsing / Conversion */
+/*********************************************/
+
+long String::toInt(void) const
+{
+ if (buffer) return atol(buffer);
+ return 0;
}
-long String::toInt() {
- return atol(_buffer);
-}
diff --git a/hardware/arduino/cores/arduino/WString.h b/hardware/arduino/cores/arduino/WString.h
index 56faf9a..d76d2a3 100644
--- a/hardware/arduino/cores/arduino/WString.h
+++ b/hardware/arduino/cores/arduino/WString.h
@@ -1,6 +1,8 @@
/*
WString.h - String library for Wiring & Arduino
+ ...mostly rewritten by Paul Stoffregen...
Copyright (c) 2009-10 Hernando Barragan. All right reserved.
+ Copyright 2011, Paul Stoffregen, paul pjrc com
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -17,96 +19,187 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef String_h
-#define String_h
+#ifndef String_class_h
+#define String_class_h
+#ifdef __cplusplus
-//#include "WProgram.h"
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <avr/pgmspace.h>
+// When compiling programs with this class, the following gcc parameters
+// dramatically increase performance and memory (RAM) efficiency, typically
+// with little or no increase in code size.
+// -felide-constructors
+// -std=c++0x
+
+class __FlashStringHelper;
+#define F(string_literal) (reinterpret_cast<__FlashStringHelper *>(PSTR(string_literal)))
+
+// An inherited class for holding the result of a concatenation. These
+// result objects are assumed to be writable by subsequent concatenations.
+class StringSumHelper;
+
+// The string class
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;
- 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:
+ // use a function pointer to allow for "if (s)" without the
+ // complications of an operator bool(). for more information, see:
+ // http://www.artima.com/cppsource/safebool.html
+ typedef void (String::*StringIfHelperType)() const;
+ void StringIfHelper() const {}
-};
+public:
+ // constructors
+ // creates a copy of the initial value.
+ // if the initial value is null or invalid, or if memory allocation
+ // fails, the string will be marked as invalid (i.e. "if (s)" will
+ // be false).
+ String(const char *cstr = "");
+ String(const String &str);
+ #ifdef __GXX_EXPERIMENTAL_CXX0X__
+ String(String &&rval);
+ String(StringSumHelper &&rval);
+ #endif
+ explicit String(char c);
+ explicit String(unsigned char, unsigned char base=10);
+ explicit String(int, unsigned char base=10);
+ explicit String(unsigned int, unsigned char base=10);
+ explicit String(long, unsigned char base=10);
+ explicit String(unsigned long, unsigned char base=10);
+ ~String(void);
-// allocate buffer space
-inline void String::getBuffer(unsigned int maxStrLen)
-{
- _capacity = maxStrLen;
- _buffer = (char *) malloc(_capacity + 1);
- if (_buffer == NULL) _length = _capacity = 0;
-}
+ // memory management
+ // return true on success, false on failure (in which case, the string
+ // is left unchanged). reserve(0), if successful, will validate an
+ // invalid string (i.e., "if (s)" will be true afterwards)
+ unsigned char reserve(unsigned int size);
+ inline unsigned int length(void) const {return len;}
-inline String operator+( String lhs, const String &rhs )
-{
- return lhs += rhs;
-}
+ // creates a copy of the assigned value. if the value is null or
+ // invalid, or if the memory allocation fails, the string will be
+ // marked as invalid ("if (s)" will be false).
+ String & operator = (const String &rhs);
+ String & operator = (const char *cstr);
+ #ifdef __GXX_EXPERIMENTAL_CXX0X__
+ String & operator = (String &&rval);
+ String & operator = (StringSumHelper &&rval);
+ #endif
+
+ // concatenate (works w/ built-in types)
+
+ // returns true on success, false on failure (in which case, the string
+ // is left unchanged). if the argument is null or invalid, the
+ // concatenation is considered unsucessful.
+ unsigned char concat(const String &str);
+ unsigned char concat(const char *cstr);
+ unsigned char concat(char c);
+ unsigned char concat(unsigned char c);
+ unsigned char concat(int num);
+ unsigned char concat(unsigned int num);
+ unsigned char concat(long num);
+ unsigned char concat(unsigned long num);
+
+ // if there's not enough memory for the concatenated value, the string
+ // will be left unchanged (but this isn't signalled in any way)
+ String & operator += (const String &rhs) {concat(rhs); return (*this);}
+ String & operator += (const char *cstr) {concat(cstr); return (*this);}
+ String & operator += (char c) {concat(c); return (*this);}
+ String & operator += (unsigned char num) {concat(num); return (*this);}
+ String & operator += (int num) {concat(num); return (*this);}
+ String & operator += (unsigned int num) {concat(num); return (*this);}
+ String & operator += (long num) {concat(num); return (*this);}
+ String & operator += (unsigned long num) {concat(num); return (*this);}
+
+ friend StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs);
+ friend StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr);
+ friend StringSumHelper & operator + (const StringSumHelper &lhs, char c);
+ friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num);
+ friend StringSumHelper & operator + (const StringSumHelper &lhs, int num);
+ friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num);
+ friend StringSumHelper & operator + (const StringSumHelper &lhs, long num);
+ friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num);
+
+ // comparison (only works w/ Strings and "strings")
+ operator StringIfHelperType() const { return buffer ? &String::StringIfHelper : 0; }
+ int compareTo(const String &s) const;
+ unsigned char equals(const String &s) const;
+ unsigned char equals(const char *cstr) const;
+ unsigned char operator == (const String &rhs) const {return equals(rhs);}
+ unsigned char operator == (const char *cstr) const {return equals(cstr);}
+ unsigned char operator != (const String &rhs) const {return !equals(rhs);}
+ unsigned char operator != (const char *cstr) const {return !equals(cstr);}
+ unsigned char operator < (const String &rhs) const;
+ unsigned char operator > (const String &rhs) const;
+ unsigned char operator <= (const String &rhs) const;
+ unsigned char operator >= (const String &rhs) const;
+ unsigned char equalsIgnoreCase(const String &s) const;
+ unsigned char startsWith( const String &prefix) const;
+ unsigned char startsWith(const String &prefix, unsigned int offset) const;
+ unsigned char endsWith(const String &suffix) const;
+ // character acccess
+ char charAt(unsigned int index) const;
+ void setCharAt(unsigned int index, char c);
+ char operator [] (unsigned int index) const;
+ char& operator [] (unsigned int index);
+ void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;
+ void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
+ {getBytes((unsigned char *)buf, bufsize, index);}
+
+ // search
+ 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;
+ String substring( unsigned int beginIndex ) const;
+ String substring( unsigned int beginIndex, unsigned int endIndex ) const;
+
+ // modification
+ void replace(char find, char replace);
+ void replace(const String& find, const String& replace);
+ void toLowerCase(void);
+ void toUpperCase(void);
+ void trim(void);
+
+ // parsing/conversion
+ long toInt(void) const;
+
+protected:
+ char *buffer; // the actual char array
+ unsigned int capacity; // the array length minus one (for the '\0')
+ unsigned int len; // the String length (not counting the '\0')
+ unsigned char flags; // unused, for future features
+protected:
+ void init(void);
+ void invalidate(void);
+ unsigned char changeBuffer(unsigned int maxStrLen);
+ unsigned char concat(const char *cstr, unsigned int length);
+
+ // copy and move
+ String & copy(const char *cstr, unsigned int length);
+ #ifdef __GXX_EXPERIMENTAL_CXX0X__
+ void move(String &rhs);
+ #endif
+};
+
+class StringSumHelper : public String
+{
+public:
+ StringSumHelper(const String &s) : String(s) {}
+ StringSumHelper(const char *p) : String(p) {}
+ StringSumHelper(char c) : String(c) {}
+ StringSumHelper(unsigned char num) : String(num) {}
+ StringSumHelper(int num) : String(num) {}
+ StringSumHelper(unsigned int num) : String(num) {}
+ StringSumHelper(long num) : String(num) {}
+ StringSumHelper(unsigned long num) : String(num) {}
+};
-#endif
+#endif // __cplusplus
+#endif // String_class_h
diff --git a/hardware/arduino/cores/arduino/main.cpp b/hardware/arduino/cores/arduino/main.cpp
index cc6e81d..34450f4 100755
--- a/hardware/arduino/cores/arduino/main.cpp
+++ b/hardware/arduino/cores/arduino/main.cpp
@@ -1,13 +1,19 @@
-#include <WProgram.h>
+#include <Arduino.h>
int main(void)
{
init();
+#if defined(USBCON)
+ USB.attach();
+#endif
+
setup();
- for (;;)
+ for (;;) {
loop();
+ if (serialEventRun) serialEventRun();
+ }
return 0;
}
diff --git a/hardware/arduino/cores/arduino/new.cpp b/hardware/arduino/cores/arduino/new.cpp
new file mode 100644
index 0000000..0f6d422
--- /dev/null
+++ b/hardware/arduino/cores/arduino/new.cpp
@@ -0,0 +1,18 @@
+#include <new.h>
+
+void * operator new(size_t size)
+{
+ return malloc(size);
+}
+
+void operator delete(void * ptr)
+{
+ free(ptr);
+}
+
+int __cxa_guard_acquire(__guard *g) {return !*(char *)(g);};
+void __cxa_guard_release (__guard *g) {*(char *)g = 1;};
+void __cxa_guard_abort (__guard *) {};
+
+void __cxa_pure_virtual(void) {};
+
diff --git a/hardware/arduino/cores/arduino/new.h b/hardware/arduino/cores/arduino/new.h
new file mode 100644
index 0000000..cd940ce
--- /dev/null
+++ b/hardware/arduino/cores/arduino/new.h
@@ -0,0 +1,22 @@
+/* Header to define new/delete operators as they aren't provided by avr-gcc by default
+ Taken from http://www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&t=59453
+ */
+
+#ifndef NEW_H
+#define NEW_H
+
+#include <stdlib.h>
+
+void * operator new(size_t size);
+void operator delete(void * ptr);
+
+__extension__ typedef int __guard __attribute__((mode (__DI__)));
+
+extern "C" int __cxa_guard_acquire(__guard *);
+extern "C" void __cxa_guard_release (__guard *);
+extern "C" void __cxa_guard_abort (__guard *);
+
+extern "C" void __cxa_pure_virtual(void);
+
+#endif
+
diff --git a/hardware/arduino/cores/arduino/wiring.c b/hardware/arduino/cores/arduino/wiring.c
index b90d07e..e7f7cde 100755
--- a/hardware/arduino/cores/arduino/wiring.c
+++ b/hardware/arduino/cores/arduino/wiring.c
@@ -41,7 +41,11 @@ volatile unsigned long timer0_overflow_count = 0;
volatile unsigned long timer0_millis = 0;
static unsigned char timer0_fract = 0;
+#if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
+SIGNAL(TIM0_OVF_vect)
+#else
SIGNAL(TIMER0_OVF_vect)
+#endif
{
// copy these to local variables so they can be stored in registers
// (volatile variables must be read from memory on every access)
@@ -120,8 +124,26 @@ 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 >= 20000000L
+ // for the 20 MHz clock on rare Arduino boards
+
+ // for a one-microsecond delay, simply wait 2 cycle and return. The overhead
+ // of the function call yields a delay of exactly a one microsecond.
+ __asm__ __volatile__ (
+ "nop" "\n\t"
+ "nop"); //just waiting 2 cycle
+ if (--us == 0)
+ return;
+
+ // the following loop takes a 1/5 of a microsecond (4 cycles)
+ // per iteration, so execute it five times for each microsecond of
+ // delay requested.
+ us = (us<<2) + us; // x5 us
-#if F_CPU >= 16000000L
+ // account for the time taken in the preceeding commands.
+ us -= 2;
+
+#elif F_CPU >= 16000000L
// for the 16 MHz clock on most Arduino boards
// for a one-microsecond delay, simply return. the overhead
@@ -212,16 +234,20 @@ void init()
// note, however, that fast pwm mode can achieve a frequency of up
// 8 MHz (with a 16 MHz clock) at 50% duty cycle
+#if defined(TCCR1B) && defined(CS11) && defined(CS10)
TCCR1B = 0;
// set timer 1 prescale factor to 64
-#if defined(TCCR1B) && defined(CS11) && defined(CS10)
sbi(TCCR1B, CS11);
+#if F_CPU >= 8000000L
sbi(TCCR1B, CS10);
+#endif
#elif defined(TCCR1) && defined(CS11) && defined(CS10)
sbi(TCCR1, CS11);
+#if F_CPU >= 8000000L
sbi(TCCR1, CS10);
#endif
+#endif
// put timer 1 in 8-bit phase correct pwm mode
#if defined(TCCR1A) && defined(WGM10)
sbi(TCCR1A, WGM10);
diff --git a/hardware/arduino/cores/arduino/wiring_analog.c b/hardware/arduino/cores/arduino/wiring_analog.c
index d248f4c..a8bc817 100644
--- a/hardware/arduino/cores/arduino/wiring_analog.c
+++ b/hardware/arduino/cores/arduino/wiring_analog.c
@@ -43,11 +43,18 @@ int analogRead(uint8_t pin)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
if (pin >= 54) pin -= 54; // allow for channel or pin numbers
+#elif defined(__AVR_ATmega32U4__)
+ if (pin >= 18) pin -= 18; // allow for channel or pin numbers
+#elif defined(__AVR_ATmega1284__)
+ if (pin >= 24) pin -= 24; // allow for channel or pin numbers
#else
if (pin >= 14) pin -= 14; // allow for channel or pin numbers
#endif
-
-#if defined(ADCSRB) && defined(MUX5)
+
+#if defined(__AVR_ATmega32U4__)
+ pin = analogPinToChannel(pin);
+ ADCSRB = (ADCSRB & ~(1 << MUX5)) | (((pin >> 3) & 0x01) << MUX5);
+#elif 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);
@@ -222,6 +229,14 @@ void analogWrite(uint8_t pin, int val)
OCR4C = val; // set pwm duty
break;
#endif
+
+ #if defined(TCCR4A) && defined(COM4D1)
+ case TIMER4D:
+ // connect pwm to pin on timer 4, channel D
+ sbi(TCCR4A, COM4D1);
+ OCR4D = val; // set pwm duty
+ break;
+ #endif
#if defined(TCCR5A) && defined(COM5A1)
case TIMER5A:
diff --git a/hardware/arduino/cores/arduino/wiring_digital.c b/hardware/arduino/cores/arduino/wiring_digital.c
index 0949da4..584a28a 100755
--- a/hardware/arduino/cores/arduino/wiring_digital.c
+++ b/hardware/arduino/cores/arduino/wiring_digital.c
@@ -24,6 +24,7 @@
$Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
*/
+#define ARDUINO_MAIN
#include "wiring_private.h"
#include "pins_arduino.h"
@@ -31,17 +32,25 @@ void pinMode(uint8_t pin, uint8_t mode)
{
uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin);
- volatile uint8_t *reg;
+ volatile uint8_t *reg, *out;
if (port == NOT_A_PIN) return;
// JWS: can I let the optimizer do this?
reg = portModeRegister(port);
+ out = portOutputRegister(port);
if (mode == INPUT) {
uint8_t oldSREG = SREG;
cli();
*reg &= ~bit;
+ *out &= ~bit;
+ SREG = oldSREG;
+ } else if (mode == INPUT_PULLUP) {
+ uint8_t oldSREG = SREG;
+ cli();
+ *reg &= ~bit;
+ *out |= bit;
SREG = oldSREG;
} else {
uint8_t oldSREG = SREG;
@@ -136,17 +145,16 @@ void digitalWrite(uint8_t pin, uint8_t val)
out = portOutputRegister(port);
+ uint8_t oldSREG = SREG;
+ cli();
+
if (val == LOW) {
- uint8_t oldSREG = SREG;
- cli();
*out &= ~bit;
- SREG = oldSREG;
} else {
- uint8_t oldSREG = SREG;
- cli();
*out |= bit;
- SREG = oldSREG;
}
+
+ SREG = oldSREG;
}
int digitalRead(uint8_t pin)
diff --git a/hardware/arduino/cores/arduino/wiring_private.h b/hardware/arduino/cores/arduino/wiring_private.h
index 11f6f00..f0ceb0c 100755
--- a/hardware/arduino/cores/arduino/wiring_private.h
+++ b/hardware/arduino/cores/arduino/wiring_private.h
@@ -27,11 +27,10 @@
#include <avr/io.h>
#include <avr/interrupt.h>
-#include <avr/delay.h>
#include <stdio.h>
#include <stdarg.h>
-#include "wiring.h"
+#include "Arduino.h"
#ifdef __cplusplus
extern "C"{
@@ -55,6 +54,8 @@ extern "C"{
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define EXTERNAL_NUM_INTERRUPTS 8
+#elif defined(__AVR_ATmega1284P__)
+#define EXTERNAL_NUM_INTERRUPTS 3
#else
#define EXTERNAL_NUM_INTERRUPTS 2
#endif
diff --git a/hardware/arduino/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Mega2560-Rev3.hex b/hardware/arduino/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Mega2560-Rev3.hex
new file mode 100644
index 0000000..7720cf4
--- /dev/null
+++ b/hardware/arduino/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Mega2560-Rev3.hex
@@ -0,0 +1,467 @@
+:1000000090C00000A9C00000A7C00000A5C000006B
+:10001000A3C00000A1C000009FC000009DC0000060
+:100020009BC0000099C0000097C0000048C40000B9
+:100030000CC4000091C000008FC000008DC0000003
+:100040008BC0000089C0000087C0000085C0000090
+:1000500083C0000081C000007FC0000002C100001A
+:100060007BC0000079C0000077C0000075C00000B0
+:1000700073C0000071C000006FC000006DC00000C0
+:100080006BC0000069C0000067C0000065C00000D0
+:1000900063C0000061C000001201100102000008EE
+:1000A0004123420001000102DC0109023E0002017D
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:10012000000011241FBECFEFD2E0DEBFCDBF11E033
+:10013000A0E0B1E0ECEAFFE002C005900D92A6312C
+:10014000B107D9F712E0A6E1B1E001C01D92AF32CC
+:10015000B107E1F7F1D028C753CF9C01DC01AE57BE
+:10016000BF4FED91FC91119741911196FC93EE9345
+:1001700080589F4FE817F90711F42D933C939FB7D0
+:10018000F894F901EC57FF4F8081815080839FBF25
+:10019000842F0895DF92EF92FF920F931F93FC013B
+:1001A0008489813019F0823021F405C040E3D42ED7
+:1001B00004C0DD2402C030E2D32E8389823011F4E2
+:1001C00088E0D82A8589873031F0883031F0863050
+:1001D00031F482E003C084E001C086E0D82A1092A6
+:1001E000C9001092C8001092CA00E784F088018903
+:1001F000128980E0E81681EEF80680E0080780E0CA
+:10020000180719F420E130E00FC0C801B701969536
+:1002100087957795679560587B47814E9F4FA801DA
+:100220009701A0D6215030403093CD002093CC00D0
+:10023000D092CA0080E0E81681EEF80680E0080758
+:1002400080E0180711F082E001C080E08093C800D0
+:1002500088E98093C9001F910F91FF90EF90DF9084
+:1002600008951F920F920FB60F9211242F938F9320
+:100270009F93EF93FF939091CE008EB38430F1F46F
+:10028000E0919901F0919A019083E0919901F091A8
+:100290009A01CF01019690939A018093990189590F
+:1002A000914021F489E191E0928381839FB7F89492
+:1002B00080919D018F5F80939D019FBFFF91EF9182
+:1002C0009F918F912F910F900FBE0F901F901895B7
+:1002D000FC01858580FF02C05F9808955F9A0895AC
+:1002E00080E091E0D5C580E091E088C584B7877F44
+:1002F00084BF28E10FB6F89420936000109260004C
+:100300000FBE87E690E09093CD008093CC0086E00E
+:100310008093CA001092C8002093C900539A5A9A39
+:100320008AB180638AB98BB180638BB983D284E050
+:1003300085BD5F9A579A08950F931F93CF93DF93CC
+:10034000D5DF2FB7F8948EE991E090931F02809348
+:100350001E0290932102809320022FBF2FB7F894A2
+:1003600089E191E090939A018093990190939C0187
+:1003700080939B012FBF7894CEE9D1E003E08FB743
+:10038000F894909122028FBF903809F180E091E0BB
+:10039000ABD497FD1CC0E0911E02F0911F02808338
+:1003A000E0911E02F0911F02CF01019690931F026F
+:1003B00080931E028E51924011F4D283C1839FB765
+:1003C000F894809122028F5F809322029FBF8FB7A3
+:1003D000F89410919D018FBFA89902C0113678F151
+:1003E000A89A80919D01882361F05D980093160181
+:1003F00008C089E191E0B1DE682F80E091E0DAD4B5
+:1004000011501123B1F780911601882351F080918A
+:10041000160181508093160180911601882309F4FA
+:100420005D9A80911701882351F0809117018150C6
+:100430008093170180911701882309F45C9A8FB784
+:10044000F894909122028FBF992369F08EE991E090
+:1004500084DE982F8091C80085FFFCCF9093CE005A
+:100460005C980093170180E091E095D42AD487CF5F
+:10047000DA01923049F0933061F09130F9F4E8E913
+:10048000F0E022E130E01EC0EAEAF0E02EE330E0E6
+:1004900019C0813049F0813018F0823079F408C0F9
+:1004A000E8EEF0E0849107C0ECEEF0E0849103C048
+:1004B000E0E2F1E08491282F30E004C0E0E0F0E0D9
+:1004C00020E030E0ED93FC93C901089528E030E08E
+:1004D00040E003C04F5F220F331F28173907D0F3C6
+:1004E000842F8295807F08958093E9008091EB00AE
+:1004F00081608093EB001092ED006093EC004093DC
+:10050000ED008091EE00881F8827881F08951092C3
+:10051000F40090E09093E9001092F0001092E8004F
+:100520001092ED008091EB008E7F8093EB009F5F37
+:10053000953081F708958091270288238CF403C0B9
+:100540008EB38823B1F08091E80082FFF9CF8091CB
+:10055000E8008B778093E80008958EB3882349F0F4
+:100560008091E80080FFF9CF8091E8008E7780933A
+:10057000E800089594E68091EC0080FF05C080912A
+:10058000E80080FF05C023C08091E80082FD1FC005
+:100590008EB3882311F482E008958EB3853011F470
+:1005A00083E008958091EB0085FF02C081E008950B
+:1005B0008091E10082FFDFCF8091E1008B7F80930B
+:1005C000E100992311F484E008959150D4CF80E0A4
+:1005D00008959C0140912D0250912E024617570715
+:1005E00018F4F90120E038C06115710511F0AB0174
+:1005F000F8CF8091E8008E778093E80040E050E0EB
+:10060000F0CF8091E80083FF02C081E008958091DF
+:10061000E80082FD2DC08EB3882381F18EB3853032
+:1006200079F18091E80080FF17C09091F20006C038
+:1006300081918093F100415050409F5F41155105D9
+:1006400011F09830A8F320E0983009F421E080916F
+:10065000E8008E778093E8004115510591F622233A
+:1006600081F606C08EB3882349F08EB3853041F001
+:100670008091E80082FFF6CF80E0089582E008953F
+:1006800083E008959C0140912D0250912E0246175F
+:10069000570710F490E03BC06115710511F0AB01F4
+:1006A000F9CF8091E8008E778093E80040E050E039
+:1006B000F1CF8091E80083FF02C081E0089580912E
+:1006C000E80082FD30C08EB3882399F18EB3853067
+:1006D00091F18091E80080FF1AC08091F20009C07A
+:1006E000F9012F5F3F4FE491E093F10041505040FA
+:1006F0008F5F4115510511F0883090F390E08830FC
+:1007000009F491E08091E8008E778093E80041152C
+:10071000510579F6992369F606C08EB3882349F00E
+:100720008EB3853041F08091E80082FFF6CF80E003
+:10073000089582E0089583E008959C016115710594
+:1007400029F48091E8008B778093E800F90120C0BC
+:100750008091E80083FF02C081E008958EB3882372
+:1007600039F18EB3853031F18091E80082FFF0CF0E
+:1007700006C08091F10081936150704021F080911A
+:10078000F2008823B1F78091E8008B778093E8002E
+:1007900061157105E9F606C08EB3882349F08EB362
+:1007A000853041F08091E80080FFF6CF80E0089529
+:1007B00082E0089583E0089542D044D01EBA10929A
+:1007C0002502109224021092230284E089BD89B58B
+:1007D000826089BD09B400FEFDCF8091D800982FBA
+:1007E0009F779093D80080688093D80080916300B1
+:1007F0008E7F809363008091D8008F7D8093D80096
+:100800008091E0008E7F8093E0008091E1008E7FF8
+:100810008093E1008091E20081608093E20080910A
+:10082000E100877F8093E1008091E20088608093FF
+:10083000E2000895C1DF81E08093260208951092BE
+:10084000E20008951092E10008951F920F920FB6F2
+:100850000F9211241F932F933F934F935F936F93A6
+:100860007F938F939F93AF93BF93EF93FF93E9EEA3
+:10087000F0E0108117701082E0EFF0E08081877F58
+:1008800080837894C3D0F894A9EEB0E01C92E0EF96
+:10089000F0E08081886080831C93FF91EF91BF918D
+:1008A000AF919F918F917F916F915F914F913F9108
+:1008B0002F911F910F900FBE0F901F9018951F92B0
+:1008C0000F920FB60F9211242F933F934F935F9384
+:1008D0006F937F938F939F93AF93BF93EF93FF9308
+:1008E0008091E10080FF1BC08091E20080FF17C073
+:1008F0008091E1008E7F8093E1008091E2008E7F05
+:100900008093E2008091E20080618093E200809118
+:10091000D80080628093D80019BC1EBAD1D18091D2
+:10092000E10084FF29C08091E20084FF25C084E0BB
+:1009300089BD89B5826089BD09B400FEFDCF809173
+:10094000D8008F7D8093D8008091E1008F7E8093C6
+:10095000E1008091E2008F7E8093E2008091E200CE
+:1009600081608093E20080912502882311F481E068
+:1009700001C084E08EBBA4D18091E10083FF27C039
+:100980008091E20083FF23C08091E100877F809304
+:10099000E10082E08EBB109225028091E1008E7F03
+:1009A0008093E1008091E2008E7F8093E20080914D
+:1009B000E20080618093E200AADD80E060E042E036
+:1009C00093DD8091F00088608093F00079D1809170
+:1009D000E10082FF0AC08091E20082FF06C08091A0
+:1009E000E1008B7F8093E1006BD1FF91EF91BF918C
+:1009F000AF919F918F917F916F915F914F913F91B7
+:100A00002F910F900FBE0F901F9018951F93DF939B
+:100A1000CF93CDB7DEB7AC970FB6F894DEBF0FBE5D
+:100A2000CDBFE7E2F2E08091F100819322E0EF3266
+:100A3000F207C9F78091270230912802353009F476
+:100A400087C0363040F43130C9F1313070F0333086
+:100A500009F01DC133C0383009F4EFC0393009F452
+:100A6000FEC0363009F013C192C0803821F08238C0
+:100A700009F00DC108C090912302809124028823BF
+:100A800099F0926011C080912B0287708093E900E9
+:100A90008091EB0090E025E0969587952A95E1F707
+:100AA000982F91701092E9008091E800877F8093E1
+:100AB000E8009093F1001092F100CAC0882319F069
+:100AC000823009F0E4C090E08F719070009721F0BF
+:100AD000029709F0DDC00CC080912902813009F035
+:100AE000D7C010922402333069F5809324022AC0C3
+:100AF00080912902882331F520912B02277009F477
+:100B0000C7C02093E9008091EB0080FFC1C0333063
+:100B100021F48091EB00806213C08091EB00806132
+:100B20008093EB0081E090E002C0880F991F2A9526
+:100B3000E2F78093EA001092EA008091EB0088606F
+:100B40008093EB001092E9008091E800877F83C0DA
+:100B5000882309F09CC0109129028091E800877FCA
+:100B60008093E800E8DC04C08EB3882309F490C0C9
+:100B70008091E80080FFF8CF812F8F7711F492E009
+:100B800001C093E09EBB80688093E30081C08058E1
+:100B9000823008F07CC08091290290912A0223E0E3
+:100BA0008C3D920799F55FB7F894DE0115964EE0FB
+:100BB00020E030E061E2E42FF0E0609357008491A0
+:100BC00020FF03C082958F704F5F982F9F70892FF1
+:100BD000805D8A3308F0895F8C9311961C9211977F
+:100BE0002F5F3F4F12962431310529F75FBF8AE20C
+:100BF0008B8383E08C838091E800877F8093E8007B
+:100C0000CE0103966AE270E0E4DC11C060912B0231
+:100C1000AE014F5F5F4F2CDCBC010097C9F18091A2
+:100C2000E800877F8093E80089819A812BDD80919D
+:100C3000E8008B778093E8002BC0803841F58091E5
+:100C4000E800877F8093E800809125028093F1007F
+:100C50008091E8008E778093E8006DDC19C08823CE
+:100C6000B1F490912902923098F48091E800877F46
+:100C70008093E800909325025EDC80912502882312
+:100C800011F483E001C084E08EBB2DDB01C028DBC2
+:100C90008091E80083FF0AC08091EB00806280931E
+:100CA000EB008091E800877F8093E800AC960FB658
+:100CB000F894DEBF0FBECDBFCF91DF911F91089595
+:100CC00008951F938EB3882361F01091E90010926C
+:100CD000E9008091E80083FF01C098DE177010934F
+:100CE000E9001F9108950895FC018EB3843021F529
+:100CF00087859089A189B2890097A105B105E1F0A6
+:100D000085818093E9008091E80082FF15C0809181
+:100D1000F200882319F42FEF3FEF04C08091F10017
+:100D2000282F30E08091F200882341F48091E80080
+:100D30008B778093E80002C02FEF3FEFC901089541
+:100D4000FC018EB3843011F587859089A189B28921
+:100D50000097A105B105D1F081818093E9008091D0
+:100D6000F2008823A9F09091E8008091E8008E7746
+:100D70008093E80095FD0CC0FDDB982F882349F493
+:100D80008091E8008E778093E80003C092E001C074
+:100D900090E0892F0895FC018EB3843051F487854B
+:100DA0009089A189B2890097A105B10511F0CF0101
+:100DB000C7CF08951F93FC01162F8EB38430D9F44A
+:100DC00087859089A189B2890097A105B10599F01D
+:100DD00081818093E9008091E80085FD08C08091C1
+:100DE000E8008E778093E800C5DB882329F4109310
+:100DF000F10080E001C082E01F9108950F931F93DE
+:100E0000CF93DF93EC010D96FC0189E0DF011D9289
+:100E10008A95E9F72A813B8109818C81882311F425
+:100E200010E001C014E0C90151DB182B1260802FC3
+:100E300061E8412F59DB882329F12E813F810D8103
+:100E40008885882311F410E001C014E0C9013EDB5D
+:100E5000182B1260802F60E8412F46DB882391F029
+:100E60002A853B8509858C85882311F410E001C013
+:100E700014E0C9012BDB182B1260802F61EC412F8D
+:100E800033DB01C080E0DF91CF911F910F91089576
+:100E9000CF93DF93EC018091E80083FF60C08881ED
+:100EA00090E020912B0230912C022817390709F08D
+:100EB00056C080912802813261F0823220F4803263
+:100EC00009F04DC019C0823269F1833209F047C080
+:100ED00038C080912702813A09F041C08091E80032
+:100EE000877F8093E800CE010F9667E070E071DBAA
+:100EF0008091E8008B7713C080912702813279F5C9
+:100F00008091E800877F8093E800CE010F9667E02C
+:100F100070E013DCCE013ED98091E8008E7780939B
+:100F2000E8001DC0809127028132C9F48091E80059
+:100F3000877F8093E800809129028D87CE01C8D9F0
+:100F40000DC080912702813251F48091E800877FA3
+:100F50008093E800CE0160912902C5DEECDADF91D2
+:100F6000CF910895A1E21A2EAA1BBB1BFD010DC053
+:100F7000AA1FBB1FEE1FFF1FA217B307E407F50749
+:100F800020F0A21BB30BE40BF50B661F771F881F25
+:100F9000991F1A9469F760957095809590959B01BB
+:0C0FA000AC01BD01CF010895F894FFCF13
+:100FAC0000034000000440000002080000000000A4
+:060FBC000000000000002F
+:103000004BC0000064C0000062C0000060C000004F
+:103010005EC000005CC000005AC0000058C0000044
+:1030200056C0000054C0000052C00000EEC40000B2
+:103030004EC000004CC000004AC0000048C0000064
+:1030400046C0000044C0000042C0000040C0000074
+:103050003EC000003CC000003AC0000038C0000084
+:1030600036C0000034C0000032C0000030C0000094
+:103070002EC000002CC000002AC0000028C00000A4
+:1030800026C0000024C0000022C0000020C00000B4
+:103090001EC000001CC0000011241FBECFEFD2E0F4
+:1030A000DEBFCDBF11E0A0E0B1E0EAEFFCE302C07B
+:1030B00005900D92AA33B107D9F711E0AAE3B1E068
+:1030C00001C01D92AB35B107E1F772D314C698CF9A
+:1030D000982F15C08091F200882371F48091E80048
+:1030E0008B7F8093E80003C08EB3882351F08091DA
+:1030F000E80082FFF9CF02C08091F100915099233E
+:1031000049F7089520914A01309149018091480181
+:103110009091470180933F0190934001C9018093B2
+:103120004101909342010895DF93CF9300D000D0E6
+:1031300000D0CDB7DEB780914501843009F45AC084
+:10314000853030F4813059F0833009F0D7C01FC08A
+:10315000853009F4A0C0863009F0D0C0C3C080918A
+:103160004601823008F0CAC0CDDF80914601882335
+:1031700061F480913F019091400123E0FC01209394
+:103180005700E89507B600FCFDCF85E008C08091A8
+:103190004601882311F0823029F4B4DF89E080935E
+:1031A0000101ACC0813009F0A9C020E030E040E06E
+:1031B00050E0F90184918F3F81F0CA01AA27BB2713
+:1031C00080933E013093400120933F018AE0809339
+:1031D000010185E080933B0191C02F5F3F4F4F4F2E
+:1031E0005F4F2030F0E33F07F0E04F07F0E05F076C
+:1031F00001F784C080914601833051F581E08093CE
+:103200003A0180914B0190914C01892B71F0809192
+:103210004701813009F072C080914A0190914901C3
+:1032200090933D0180933C0169C0809147018823C0
+:1032300061F42CE088E190E00FB6F894A8958093B3
+:1032400060000FBE2093600059C01092000156C06C
+:10325000882309F053C0809147018F3F09F04EC089
+:10326000E0E0F0E093E085E090935700E89507B642
+:1032700000FCFDCF80935700E89507B600FCFDCF1A
+:10328000E058FF4F20E3E030F20771F781E18093CF
+:103290005700E89533C0DE011196E5E0F1E083E0E8
+:1032A00001900D928150E1F7DE011496E2E0F1E029
+:1032B00083E001900D928150E1F790914701809158
+:1032C0004601882329F4FE01E90FF11D818107C021
+:1032D0008130A1F4FE01BC97E90FF11D808180933C
+:1032E00050010CC080914601833041F48091470128
+:1032F000882321F48091480180933E0126960FB6E1
+:10330000F894DEBF0FBECDBFCF91DF9108952F920D
+:103310003F924F925F926F927F929F92AF92BF9235
+:10332000CF92DF92EF92FF920F931F93CF93DF9391
+:103330008091590190915A0190934C0180934B01D7
+:1033400080914D01882351F080914D0181508093EF
+:103350004D0180914D01882309F45D9A80914E01C1
+:10336000882351F080914E01815080934E018091CD
+:103370004E01882309F45C9A80915401833009F44A
+:10338000B2C1843030F4813071F0823009F0E3C191
+:1033900011C1853009F4C5C1853008F4BAC1863041
+:1033A00009F0D9C1CDC15C9883E080934E01809132
+:1033B000E800877F8093E80080913A01882329F014
+:1033C000B3DE5D9A5C9A10923A0120914B013091E4
+:1033D0004C012115310529F42AC08EB3882309F444
+:1033E000BAC18091E80082FFF8CF8091F10080930C
+:1033F00045012150304030934C0120934B01E6E4CD
+:10340000F1E00CC08091F10081932150304081E0C7
+:10341000EB34F80719F43183208308C08091F2005F
+:10342000882381F730934C0120934B017DDE8091FE
+:103430000101853009F0BAC080914B0190914C0197
+:10344000892B21F482E080930101B0C08AE140DE43
+:1034500080913F018F713CDEC0914101D0914201CA
+:1034600020913F013091400121968E01021B130BE8
+:10347000219780914601882309F093C01801369462
+:103480002794C901A0913E01B0E09C01AD0162E02A
+:10349000E62EF12C012D112DE20EF31E041F151F37
+:1034A00059016A0190E099249394B5E0A3E048C0E3
+:1034B0008091F200882371F48091E8008B7F8093E3
+:1034C000E80004C08EB3882309F445C18091E80068
+:1034D00082FFF8CF0894210831088091F100682F0D
+:1034E0008091F100782FF5010B0190925700E8953B
+:1034F00011249F5F903419F021143104A1F4F901D3
+:10350000B0935700E89507B600FCFDCF21143104B5
+:1035100051F0F701A0935700E89507B600FCFDCFE6
+:10352000A801970190E042E0442E512C612C712CAF
+:10353000E40CF51C061D171DA40CB51CC61CD71CDD
+:103540002114310409F0B4CFD0934001C0933F015E
+:1035500081E180935700E89527C08091F20088238D
+:1035600071F48091E8008B7F8093E80004C08EB3F3
+:10357000882309F4F0C08091E80082FFF8CF6091C1
+:10358000F10080913F0190914001A7D380913F01CC
+:103590009091400101969093400180933F0101502A
+:1035A000104001151105C9F680E192DD8091E80017
+:1035B0008B7FC3C08091E800877F8093E8005D988F
+:1035C00083E080934D0104C08EB3882309F4C3C007
+:1035D0008091E80080FFF8CF80910101893091F05F
+:1035E0008A3069F480914601813049F480913F012D
+:1035F000909140018093F1009093F1009BC08091E5
+:10360000500196C0609141017091420120913F01AB
+:10361000309140016F5F7F4F7B01E21AF30A6150E6
+:10362000704080914601882389F58701169507959A
+:10363000C901A0913E01B0E09C01AD011FC0809185
+:10364000F200803271F48091E8008E7F8093E80070
+:1036500004C08EB3882309F47EC08091E80080FF07
+:10366000F8CFF901859194918093F1009093F10046
+:10367000015010402E5F3F4F4F4F5F4F0115110516
+:10368000F1F67093400160933F0129C0823039F513
+:1036900023C08091F200803271F48091E8008E7F27
+:1036A0008093E80004C08EB3882309F454C080914D
+:1036B000E80080FFF8CF00913F0110914001C80160
+:1036C00004D38093F1000F5F1F4F109340010093CC
+:1036D0003F010894E108F108E114F104D1F682E019
+:1036E0008093010127C08091E800877F8093E800E4
+:1036F00080913B018093F1001092F1001092F10053
+:103700001092F100809101018093F1001092F1007C
+:1037100011C08091E800877F8093E80010923B0100
+:1037200019C08091E800877F8093E80080910101B3
+:103730008093F1008091E8008E7F8093E8000AC0BA
+:103740008091E800877F8093E8005D9A5C9A82E030
+:103750008093010187D0DF91CF911F910F91FF904E
+:10376000EF90DF90CF90BF90AF909F907F906F9041
+:103770005F904F903F902F9008952BD181E085BFAF
+:1037800015BE089584B7877F84BF88E10FB6F8948B
+:1037900080936000109260000FBE81E085BF82E0E0
+:1037A00085BF8AB180638AB98BB180638BB90CC144
+:1037B000E9DF789401C080D2809100018823D9F795
+:1037C00080913A018823B9F7D8DFE0913C01F0916C
+:1037D0003D010995FA01923071F0933089F09130F2
+:1037E00029F488E091E022E130E019C080E090E027
+:1037F00020E030E014C08AE191E02BE130E00FC01E
+:10380000882339F480913501282F30E085E391E059
+:1038100006C080914301282F30E083E491E091833A
+:103820008083C90108958091EB0081608093EB0053
+:103830001092ED006093EC004093ED008091EE005B
+:10384000881F8827881F08951092F4001092F000B6
+:103850001092E8001092ED00EBEEF0E080818E7F98
+:10386000808308958091530188238CF403C08EB324
+:103870008823B1F08091E80082FFF9CF8091E800C1
+:103880008B7F8093E80008958EB3882349F0809160
+:10389000E80080FFF9CF8091E8008E7F8093E800F8
+:1038A00008959C014091590150915A0146175707BC
+:1038B00018F4F90120E038C06115710511F0AB0171
+:1038C000F8CF8091E8008E7F8093E80040E050E0E0
+:1038D000F0CF8091E80083FF02C081E008958091DD
+:1038E000E80082FD2DC08EB3882381F18EB3853030
+:1038F00079F18091E80080FF17C09091F20006C036
+:1039000081918093F100415050409F5F41155105D6
+:1039100011F09032A8F320E0903209F421E0809178
+:10392000E8008E7F8093E8004115510591F622232F
+:1039300081F606C08EB3882349F08EB3853041F0FE
+:103940008091E80082FFF6CF80E0089582E008953C
+:1039500083E0089554D056D01EBA1092510184E0ED
+:1039600089BD89B5826089BD09B400FEFDCF809113
+:10397000D800982F9F779093D80080688093D800C4
+:10398000809163008E7F809363008091D8008F7D4B
+:103990008093D8008091E0008E7F8093E00080913A
+:1039A000E1008E7F8093E1008091E200816080934E
+:1039B000E2008091E100877F8093E1008091E20046
+:1039C00088608093E2000895C5DF81E08093520112
+:1039D0000895C0DFE0EEF0E0808181608083E8ED53
+:1039E000F0E080818F7780830AD00CD019BCE3E6A9
+:1039F000F0E08081816080831092520108951092DE
+:103A0000E20008951092E10008951F920F920FB600
+:103A10000F9211242F933F934F935F936F937F9354
+:103A20008F939F93AF93BF93EF93FF938091E100A8
+:103A300080FF1BC08091E20080FF17C08091E100F1
+:103A40008E7F8093E1008091E2008E7F8093E20080
+:103A50008091E20080618093E2008091D8008062D2
+:103A60008093D80019BC1EBA26D18091E10084FF52
+:103A700029C08091E20084FF25C084E089BD89B51A
+:103A8000826089BD09B400FEFDCF8091D8008F7D92
+:103A90008093D8008091E1008F7E8093E100809137
+:103AA000E2008F7E8093E2008091E200816080934B
+:103AB000E20080915101882311F481E001C084E08B
+:103AC0008EBBF9D08091E10083FF22C08091E2009B
+:103AD00083FF1EC08091E100877F8093E10082E038
+:103AE0008EBB109251018091E1008E7F8093E100A6
+:103AF0008091E2008E7F8093E2008091E2008061FD
+:103B00008093E200A1DE80E060E042E28CDED3D070
+:103B10008091E10082FF0AC08091E20082FF06C02E
+:103B20008091E1008B7F8093E100C5D0FF91EF9100
+:103B3000BF91AF919F918F917F916F915F914F91C5
+:103B40003F912F910F900FBE0F901F9018951F93CC
+:103B5000DF93CF9300D0CDB7DEB7E3E5F1E08091FE
+:103B6000F100819381E0EB35F807C9F7909153019B
+:103B700080915401853011F1863040F48130B9F0E4
+:103B8000813070F0833009F081C011C0883009F4B1
+:103B900053C0893009F462C0863009F077C02DC067
+:103BA000903809F474C0923809F070C070C099233D
+:103BB00009F46DC0923009F069C069C0992309F019
+:103BC00065C0109155018091E800877F8093E800DF
+:103BD00049DE04C08EB3882309F459C08091E800FF
+:103BE00080FFF8CF812F8F7711F492E001C093E02E
+:103BF0009EBB80688093E3004AC09058923008F0E2
+:103C000045C0809155019091560160915701AE01D8
+:103C10004F5F5F4FDFDDBC010097C9F18091E80085
+:103C2000877F8093E80089819A813BDE8091E8005C
+:103C30008B7F8093E8002BC0903841F58091E8009D
+:103C4000877F8093E800809151018093F1008091FB
+:103C5000E8008E7F8093E80005DE19C09923B1F457
+:103C600090915501923098F48091E800877F80937D
+:103C7000E80090935101F6DD80915101882311F401
+:103C800083E001C084E08EBB16D001C040DB809190
+:103C9000E80083FF0AC08091EB0080628093EB0014
+:103CA0008091E800877F8093E8000F900F90CF917C
+:103CB000DF911F91089508958EB3882329F0809194
+:103CC000E80083FF01C043CF0895F999FECF92BD6C
+:103CD00081BDF89A992780B50895262FF999FECFCE
+:103CE0001FBA92BD81BD20BD0FB6F894FA9AF99A19
+:0A3CF0000FBE01960895F894FFCF6F
+:103CFA0001021E948920DCFB120110010000002041
+:103D0A00EB03EF2F00000001000109021B00010173
+:103D1A000080320904000000FE01020009210300AC
+:0A3D2A0000000C000104030904006E
+:0400000300003000C9
+:00000001FF
diff --git a/hardware/arduino/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex b/hardware/arduino/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex
new file mode 100644
index 0000000..b47bdf6
--- /dev/null
+++ b/hardware/arduino/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex
@@ -0,0 +1,467 @@
+:1000000090C00000A9C00000A7C00000A5C000006B
+:10001000A3C00000A1C000009FC000009DC0000060
+:100020009BC0000099C0000097C0000048C40000B9
+:100030000CC4000091C000008FC000008DC0000003
+:100040008BC0000089C0000087C0000085C0000090
+:1000500083C0000081C000007FC0000002C100001A
+:100060007BC0000079C0000077C0000075C00000B0
+:1000700073C0000071C000006FC000006DC00000C0
+:100080006BC0000069C0000067C0000065C00000D0
+:1000900063C0000061C000001201100102000008EE
+:1000A0004123440001000102DC0109023E0002017B
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:10012000000011241FBECFEFD2E0DEBFCDBF11E033
+:10013000A0E0B1E0ECEAFFE002C005900D92A6312C
+:10014000B107D9F712E0A6E1B1E001C01D92AF32CC
+:10015000B107E1F7F1D028C753CF9C01DC01AE57BE
+:10016000BF4FED91FC91119741911196FC93EE9345
+:1001700080589F4FE817F90711F42D933C939FB7D0
+:10018000F894F901EC57FF4F8081815080839FBF25
+:10019000842F0895DF92EF92FF920F931F93FC013B
+:1001A0008489813019F0823021F405C040E3D42ED7
+:1001B00004C0DD2402C030E2D32E8389823011F4E2
+:1001C00088E0D82A8589873031F0883031F0863050
+:1001D00031F482E003C084E001C086E0D82A1092A6
+:1001E000C9001092C8001092CA00E784F088018903
+:1001F000128980E0E81681EEF80680E0080780E0CA
+:10020000180719F420E130E00FC0C801B701969536
+:1002100087957795679560587B47814E9F4FA801DA
+:100220009701A0D6215030403093CD002093CC00D0
+:10023000D092CA0080E0E81681EEF80680E0080758
+:1002400080E0180711F082E001C080E08093C800D0
+:1002500088E98093C9001F910F91FF90EF90DF9084
+:1002600008951F920F920FB60F9211242F938F9320
+:100270009F93EF93FF939091CE008EB38430F1F46F
+:10028000E0919901F0919A019083E0919901F091A8
+:100290009A01CF01019690939A018093990189590F
+:1002A000914021F489E191E0928381839FB7F89492
+:1002B00080919D018F5F80939D019FBFFF91EF9182
+:1002C0009F918F912F910F900FBE0F901F901895B7
+:1002D000FC01858580FF02C05F9808955F9A0895AC
+:1002E00080E091E0D5C580E091E088C584B7877F44
+:1002F00084BF28E10FB6F89420936000109260004C
+:100300000FBE87E690E09093CD008093CC0086E00E
+:100310008093CA001092C8002093C900539A5A9A39
+:100320008AB180638AB98BB180638BB983D284E050
+:1003300085BD5F9A579A08950F931F93CF93DF93CC
+:10034000D5DF2FB7F8948EE991E090931F02809348
+:100350001E0290932102809320022FBF2FB7F894A2
+:1003600089E191E090939A018093990190939C0187
+:1003700080939B012FBF7894CEE9D1E003E08FB743
+:10038000F894909122028FBF903809F180E091E0BB
+:10039000ABD497FD1CC0E0911E02F0911F02808338
+:1003A000E0911E02F0911F02CF01019690931F026F
+:1003B00080931E028E51924011F4D283C1839FB765
+:1003C000F894809122028F5F809322029FBF8FB7A3
+:1003D000F89410919D018FBFA89902C0113678F151
+:1003E000A89A80919D01882361F05D980093160181
+:1003F00008C089E191E0B1DE682F80E091E0DAD4B5
+:1004000011501123B1F780911601882351F080918A
+:10041000160181508093160180911601882309F4FA
+:100420005D9A80911701882351F0809117018150C6
+:100430008093170180911701882309F45C9A8FB784
+:10044000F894909122028FBF992369F08EE991E090
+:1004500084DE982F8091C80085FFFCCF9093CE005A
+:100460005C980093170180E091E095D42AD487CF5F
+:10047000DA01923049F0933061F09130F9F4E8E913
+:10048000F0E022E130E01EC0EAEAF0E02EE330E0E6
+:1004900019C0813049F0813018F0823079F408C0F9
+:1004A000E8EEF0E0849107C0ECEEF0E0849103C048
+:1004B000E0E2F1E08491282F30E004C0E0E0F0E0D9
+:1004C00020E030E0ED93FC93C901089528E030E08E
+:1004D00040E003C04F5F220F331F28173907D0F3C6
+:1004E000842F8295807F08958093E9008091EB00AE
+:1004F00081608093EB001092ED006093EC004093DC
+:10050000ED008091EE00881F8827881F08951092C3
+:10051000F40090E09093E9001092F0001092E8004F
+:100520001092ED008091EB008E7F8093EB009F5F37
+:10053000953081F708958091270288238CF403C0B9
+:100540008EB38823B1F08091E80082FFF9CF8091CB
+:10055000E8008B778093E80008958EB3882349F0F4
+:100560008091E80080FFF9CF8091E8008E7780933A
+:10057000E800089594E68091EC0080FF05C080912A
+:10058000E80080FF05C023C08091E80082FD1FC005
+:100590008EB3882311F482E008958EB3853011F470
+:1005A00083E008958091EB0085FF02C081E008950B
+:1005B0008091E10082FFDFCF8091E1008B7F80930B
+:1005C000E100992311F484E008959150D4CF80E0A4
+:1005D00008959C0140912D0250912E024617570715
+:1005E00018F4F90120E038C06115710511F0AB0174
+:1005F000F8CF8091E8008E778093E80040E050E0EB
+:10060000F0CF8091E80083FF02C081E008958091DF
+:10061000E80082FD2DC08EB3882381F18EB3853032
+:1006200079F18091E80080FF17C09091F20006C038
+:1006300081918093F100415050409F5F41155105D9
+:1006400011F09830A8F320E0983009F421E080916F
+:10065000E8008E778093E8004115510591F622233A
+:1006600081F606C08EB3882349F08EB3853041F001
+:100670008091E80082FFF6CF80E0089582E008953F
+:1006800083E008959C0140912D0250912E0246175F
+:10069000570710F490E03BC06115710511F0AB01F4
+:1006A000F9CF8091E8008E778093E80040E050E039
+:1006B000F1CF8091E80083FF02C081E0089580912E
+:1006C000E80082FD30C08EB3882399F18EB3853067
+:1006D00091F18091E80080FF1AC08091F20009C07A
+:1006E000F9012F5F3F4FE491E093F10041505040FA
+:1006F0008F5F4115510511F0883090F390E08830FC
+:1007000009F491E08091E8008E778093E80041152C
+:10071000510579F6992369F606C08EB3882349F00E
+:100720008EB3853041F08091E80082FFF6CF80E003
+:10073000089582E0089583E008959C016115710594
+:1007400029F48091E8008B778093E800F90120C0BC
+:100750008091E80083FF02C081E008958EB3882372
+:1007600039F18EB3853031F18091E80082FFF0CF0E
+:1007700006C08091F10081936150704021F080911A
+:10078000F2008823B1F78091E8008B778093E8002E
+:1007900061157105E9F606C08EB3882349F08EB362
+:1007A000853041F08091E80080FFF6CF80E0089529
+:1007B00082E0089583E0089542D044D01EBA10929A
+:1007C0002502109224021092230284E089BD89B58B
+:1007D000826089BD09B400FEFDCF8091D800982FBA
+:1007E0009F779093D80080688093D80080916300B1
+:1007F0008E7F809363008091D8008F7D8093D80096
+:100800008091E0008E7F8093E0008091E1008E7FF8
+:100810008093E1008091E20081608093E20080910A
+:10082000E100877F8093E1008091E20088608093FF
+:10083000E2000895C1DF81E08093260208951092BE
+:10084000E20008951092E10008951F920F920FB6F2
+:100850000F9211241F932F933F934F935F936F93A6
+:100860007F938F939F93AF93BF93EF93FF93E9EEA3
+:10087000F0E0108117701082E0EFF0E08081877F58
+:1008800080837894C3D0F894A9EEB0E01C92E0EF96
+:10089000F0E08081886080831C93FF91EF91BF918D
+:1008A000AF919F918F917F916F915F914F913F9108
+:1008B0002F911F910F900FBE0F901F9018951F92B0
+:1008C0000F920FB60F9211242F933F934F935F9384
+:1008D0006F937F938F939F93AF93BF93EF93FF9308
+:1008E0008091E10080FF1BC08091E20080FF17C073
+:1008F0008091E1008E7F8093E1008091E2008E7F05
+:100900008093E2008091E20080618093E200809118
+:10091000D80080628093D80019BC1EBAD1D18091D2
+:10092000E10084FF29C08091E20084FF25C084E0BB
+:1009300089BD89B5826089BD09B400FEFDCF809173
+:10094000D8008F7D8093D8008091E1008F7E8093C6
+:10095000E1008091E2008F7E8093E2008091E200CE
+:1009600081608093E20080912502882311F481E068
+:1009700001C084E08EBBA4D18091E10083FF27C039
+:100980008091E20083FF23C08091E100877F809304
+:10099000E10082E08EBB109225028091E1008E7F03
+:1009A0008093E1008091E2008E7F8093E20080914D
+:1009B000E20080618093E200AADD80E060E042E036
+:1009C00093DD8091F00088608093F00079D1809170
+:1009D000E10082FF0AC08091E20082FF06C08091A0
+:1009E000E1008B7F8093E1006BD1FF91EF91BF918C
+:1009F000AF919F918F917F916F915F914F913F91B7
+:100A00002F910F900FBE0F901F9018951F93DF939B
+:100A1000CF93CDB7DEB7AC970FB6F894DEBF0FBE5D
+:100A2000CDBFE7E2F2E08091F100819322E0EF3266
+:100A3000F207C9F78091270230912802353009F476
+:100A400087C0363040F43130C9F1313070F0333086
+:100A500009F01DC133C0383009F4EFC0393009F452
+:100A6000FEC0363009F013C192C0803821F08238C0
+:100A700009F00DC108C090912302809124028823BF
+:100A800099F0926011C080912B0287708093E900E9
+:100A90008091EB0090E025E0969587952A95E1F707
+:100AA000982F91701092E9008091E800877F8093E1
+:100AB000E8009093F1001092F100CAC0882319F069
+:100AC000823009F0E4C090E08F719070009721F0BF
+:100AD000029709F0DDC00CC080912902813009F035
+:100AE000D7C010922402333069F5809324022AC0C3
+:100AF00080912902882331F520912B02277009F477
+:100B0000C7C02093E9008091EB0080FFC1C0333063
+:100B100021F48091EB00806213C08091EB00806132
+:100B20008093EB0081E090E002C0880F991F2A9526
+:100B3000E2F78093EA001092EA008091EB0088606F
+:100B40008093EB001092E9008091E800877F83C0DA
+:100B5000882309F09CC0109129028091E800877FCA
+:100B60008093E800E8DC04C08EB3882309F490C0C9
+:100B70008091E80080FFF8CF812F8F7711F492E009
+:100B800001C093E09EBB80688093E30081C08058E1
+:100B9000823008F07CC08091290290912A0223E0E3
+:100BA0008C3D920799F55FB7F894DE0115964EE0FB
+:100BB00020E030E061E2E42FF0E0609357008491A0
+:100BC00020FF03C082958F704F5F982F9F70892FF1
+:100BD000805D8A3308F0895F8C9311961C9211977F
+:100BE0002F5F3F4F12962431310529F75FBF8AE20C
+:100BF0008B8383E08C838091E800877F8093E8007B
+:100C0000CE0103966AE270E0E4DC11C060912B0231
+:100C1000AE014F5F5F4F2CDCBC010097C9F18091A2
+:100C2000E800877F8093E80089819A812BDD80919D
+:100C3000E8008B778093E8002BC0803841F58091E5
+:100C4000E800877F8093E800809125028093F1007F
+:100C50008091E8008E778093E8006DDC19C08823CE
+:100C6000B1F490912902923098F48091E800877F46
+:100C70008093E800909325025EDC80912502882312
+:100C800011F483E001C084E08EBB2DDB01C028DBC2
+:100C90008091E80083FF0AC08091EB00806280931E
+:100CA000EB008091E800877F8093E800AC960FB658
+:100CB000F894DEBF0FBECDBFCF91DF911F91089595
+:100CC00008951F938EB3882361F01091E90010926C
+:100CD000E9008091E80083FF01C098DE177010934F
+:100CE000E9001F9108950895FC018EB3843021F529
+:100CF00087859089A189B2890097A105B105E1F0A6
+:100D000085818093E9008091E80082FF15C0809181
+:100D1000F200882319F42FEF3FEF04C08091F10017
+:100D2000282F30E08091F200882341F48091E80080
+:100D30008B778093E80002C02FEF3FEFC901089541
+:100D4000FC018EB3843011F587859089A189B28921
+:100D50000097A105B105D1F081818093E9008091D0
+:100D6000F2008823A9F09091E8008091E8008E7746
+:100D70008093E80095FD0CC0FDDB982F882349F493
+:100D80008091E8008E778093E80003C092E001C074
+:100D900090E0892F0895FC018EB3843051F487854B
+:100DA0009089A189B2890097A105B10511F0CF0101
+:100DB000C7CF08951F93FC01162F8EB38430D9F44A
+:100DC00087859089A189B2890097A105B10599F01D
+:100DD00081818093E9008091E80085FD08C08091C1
+:100DE000E8008E778093E800C5DB882329F4109310
+:100DF000F10080E001C082E01F9108950F931F93DE
+:100E0000CF93DF93EC010D96FC0189E0DF011D9289
+:100E10008A95E9F72A813B8109818C81882311F425
+:100E200010E001C014E0C90151DB182B1260802FC3
+:100E300061E8412F59DB882329F12E813F810D8103
+:100E40008885882311F410E001C014E0C9013EDB5D
+:100E5000182B1260802F60E8412F46DB882391F029
+:100E60002A853B8509858C85882311F410E001C013
+:100E700014E0C9012BDB182B1260802F61EC412F8D
+:100E800033DB01C080E0DF91CF911F910F91089576
+:100E9000CF93DF93EC018091E80083FF60C08881ED
+:100EA00090E020912B0230912C022817390709F08D
+:100EB00056C080912802813261F0823220F4803263
+:100EC00009F04DC019C0823269F1833209F047C080
+:100ED00038C080912702813A09F041C08091E80032
+:100EE000877F8093E800CE010F9667E070E071DBAA
+:100EF0008091E8008B7713C080912702813279F5C9
+:100F00008091E800877F8093E800CE010F9667E02C
+:100F100070E013DCCE013ED98091E8008E7780939B
+:100F2000E8001DC0809127028132C9F48091E80059
+:100F3000877F8093E800809129028D87CE01C8D9F0
+:100F40000DC080912702813251F48091E800877FA3
+:100F50008093E800CE0160912902C5DEECDADF91D2
+:100F6000CF910895A1E21A2EAA1BBB1BFD010DC053
+:100F7000AA1FBB1FEE1FFF1FA217B307E407F50749
+:100F800020F0A21BB30BE40BF50B661F771F881F25
+:100F9000991F1A9469F760957095809590959B01BB
+:0C0FA000AC01BD01CF010895F894FFCF13
+:100FAC0000034000000440000002080000000000A4
+:060FBC000000000000002F
+:103000004BC0000064C0000062C0000060C000004F
+:103010005EC000005CC000005AC0000058C0000044
+:1030200056C0000054C0000052C00000EEC40000B2
+:103030004EC000004CC000004AC0000048C0000064
+:1030400046C0000044C0000042C0000040C0000074
+:103050003EC000003CC000003AC0000038C0000084
+:1030600036C0000034C0000032C0000030C0000094
+:103070002EC000002CC000002AC0000028C00000A4
+:1030800026C0000024C0000022C0000020C00000B4
+:103090001EC000001CC0000011241FBECFEFD2E0F4
+:1030A000DEBFCDBF11E0A0E0B1E0EAEFFCE302C07B
+:1030B00005900D92AA33B107D9F711E0AAE3B1E068
+:1030C00001C01D92AB35B107E1F772D314C698CF9A
+:1030D000982F15C08091F200882371F48091E80048
+:1030E0008B7F8093E80003C08EB3882351F08091DA
+:1030F000E80082FFF9CF02C08091F100915099233E
+:1031000049F7089520914A01309149018091480181
+:103110009091470180933F0190934001C9018093B2
+:103120004101909342010895DF93CF9300D000D0E6
+:1031300000D0CDB7DEB780914501843009F45AC084
+:10314000853030F4813059F0833009F0D7C01FC08A
+:10315000853009F4A0C0863009F0D0C0C3C080918A
+:103160004601823008F0CAC0CDDF80914601882335
+:1031700061F480913F019091400123E0FC01209394
+:103180005700E89507B600FCFDCF85E008C08091A8
+:103190004601882311F0823029F4B4DF89E080935E
+:1031A0000101ACC0813009F0A9C020E030E040E06E
+:1031B00050E0F90184918F3F81F0CA01AA27BB2713
+:1031C00080933E013093400120933F018AE0809339
+:1031D000010185E080933B0191C02F5F3F4F4F4F2E
+:1031E0005F4F2030F0E33F07F0E04F07F0E05F076C
+:1031F00001F784C080914601833051F581E08093CE
+:103200003A0180914B0190914C01892B71F0809192
+:103210004701813009F072C080914A0190914901C3
+:1032200090933D0180933C0169C0809147018823C0
+:1032300061F42CE088E190E00FB6F894A8958093B3
+:1032400060000FBE2093600059C01092000156C06C
+:10325000882309F053C0809147018F3F09F04EC089
+:10326000E0E0F0E093E085E090935700E89507B642
+:1032700000FCFDCF80935700E89507B600FCFDCF1A
+:10328000E058FF4F20E3E030F20771F781E18093CF
+:103290005700E89533C0DE011196E5E0F1E083E0E8
+:1032A00001900D928150E1F7DE011496E2E0F1E029
+:1032B00083E001900D928150E1F790914701809158
+:1032C0004601882329F4FE01E90FF11D818107C021
+:1032D0008130A1F4FE01BC97E90FF11D808180933C
+:1032E00050010CC080914601833041F48091470128
+:1032F000882321F48091480180933E0126960FB6E1
+:10330000F894DEBF0FBECDBFCF91DF9108952F920D
+:103310003F924F925F926F927F929F92AF92BF9235
+:10332000CF92DF92EF92FF920F931F93CF93DF9391
+:103330008091590190915A0190934C0180934B01D7
+:1033400080914D01882351F080914D0181508093EF
+:103350004D0180914D01882309F45D9A80914E01C1
+:10336000882351F080914E01815080934E018091CD
+:103370004E01882309F45C9A80915401833009F44A
+:10338000B2C1843030F4813071F0823009F0E3C191
+:1033900011C1853009F4C5C1853008F4BAC1863041
+:1033A00009F0D9C1CDC15C9883E080934E01809132
+:1033B000E800877F8093E80080913A01882329F014
+:1033C000B3DE5D9A5C9A10923A0120914B013091E4
+:1033D0004C012115310529F42AC08EB3882309F444
+:1033E000BAC18091E80082FFF8CF8091F10080930C
+:1033F00045012150304030934C0120934B01E6E4CD
+:10340000F1E00CC08091F10081932150304081E0C7
+:10341000EB34F80719F43183208308C08091F2005F
+:10342000882381F730934C0120934B017DDE8091FE
+:103430000101853009F0BAC080914B0190914C0197
+:10344000892B21F482E080930101B0C08AE140DE43
+:1034500080913F018F713CDEC0914101D0914201CA
+:1034600020913F013091400121968E01021B130BE8
+:10347000219780914601882309F093C01801369462
+:103480002794C901A0913E01B0E09C01AD0162E02A
+:10349000E62EF12C012D112DE20EF31E041F151F37
+:1034A00059016A0190E099249394B5E0A3E048C0E3
+:1034B0008091F200882371F48091E8008B7F8093E3
+:1034C000E80004C08EB3882309F445C18091E80068
+:1034D00082FFF8CF0894210831088091F100682F0D
+:1034E0008091F100782FF5010B0190925700E8953B
+:1034F00011249F5F903419F021143104A1F4F901D3
+:10350000B0935700E89507B600FCFDCF21143104B5
+:1035100051F0F701A0935700E89507B600FCFDCFE6
+:10352000A801970190E042E0442E512C612C712CAF
+:10353000E40CF51C061D171DA40CB51CC61CD71CDD
+:103540002114310409F0B4CFD0934001C0933F015E
+:1035500081E180935700E89527C08091F20088238D
+:1035600071F48091E8008B7F8093E80004C08EB3F3
+:10357000882309F4F0C08091E80082FFF8CF6091C1
+:10358000F10080913F0190914001A7D380913F01CC
+:103590009091400101969093400180933F0101502A
+:1035A000104001151105C9F680E192DD8091E80017
+:1035B0008B7FC3C08091E800877F8093E8005D988F
+:1035C00083E080934D0104C08EB3882309F4C3C007
+:1035D0008091E80080FFF8CF80910101893091F05F
+:1035E0008A3069F480914601813049F480913F012D
+:1035F000909140018093F1009093F1009BC08091E5
+:10360000500196C0609141017091420120913F01AB
+:10361000309140016F5F7F4F7B01E21AF30A6150E6
+:10362000704080914601882389F58701169507959A
+:10363000C901A0913E01B0E09C01AD011FC0809185
+:10364000F200803271F48091E8008E7F8093E80070
+:1036500004C08EB3882309F47EC08091E80080FF07
+:10366000F8CFF901859194918093F1009093F10046
+:10367000015010402E5F3F4F4F4F5F4F0115110516
+:10368000F1F67093400160933F0129C0823039F513
+:1036900023C08091F200803271F48091E8008E7F27
+:1036A0008093E80004C08EB3882309F454C080914D
+:1036B000E80080FFF8CF00913F0110914001C80160
+:1036C00004D38093F1000F5F1F4F109340010093CC
+:1036D0003F010894E108F108E114F104D1F682E019
+:1036E0008093010127C08091E800877F8093E800E4
+:1036F00080913B018093F1001092F1001092F10053
+:103700001092F100809101018093F1001092F1007C
+:1037100011C08091E800877F8093E80010923B0100
+:1037200019C08091E800877F8093E80080910101B3
+:103730008093F1008091E8008E7F8093E8000AC0BA
+:103740008091E800877F8093E8005D9A5C9A82E030
+:103750008093010187D0DF91CF911F910F91FF904E
+:10376000EF90DF90CF90BF90AF909F907F906F9041
+:103770005F904F903F902F9008952BD181E085BFAF
+:1037800015BE089584B7877F84BF88E10FB6F8948B
+:1037900080936000109260000FBE81E085BF82E0E0
+:1037A00085BF8AB180638AB98BB180638BB90CC144
+:1037B000E9DF789401C080D2809100018823D9F795
+:1037C00080913A018823B9F7D8DFE0913C01F0916C
+:1037D0003D010995FA01923071F0933089F09130F2
+:1037E00029F488E091E022E130E019C080E090E027
+:1037F00020E030E014C08AE191E02BE130E00FC01E
+:10380000882339F480913501282F30E085E391E059
+:1038100006C080914301282F30E083E491E091833A
+:103820008083C90108958091EB0081608093EB0053
+:103830001092ED006093EC004093ED008091EE005B
+:10384000881F8827881F08951092F4001092F000B6
+:103850001092E8001092ED00EBEEF0E080818E7F98
+:10386000808308958091530188238CF403C08EB324
+:103870008823B1F08091E80082FFF9CF8091E800C1
+:103880008B7F8093E80008958EB3882349F0809160
+:10389000E80080FFF9CF8091E8008E7F8093E800F8
+:1038A00008959C014091590150915A0146175707BC
+:1038B00018F4F90120E038C06115710511F0AB0171
+:1038C000F8CF8091E8008E7F8093E80040E050E0E0
+:1038D000F0CF8091E80083FF02C081E008958091DD
+:1038E000E80082FD2DC08EB3882381F18EB3853030
+:1038F00079F18091E80080FF17C09091F20006C036
+:1039000081918093F100415050409F5F41155105D6
+:1039100011F09032A8F320E0903209F421E0809178
+:10392000E8008E7F8093E8004115510591F622232F
+:1039300081F606C08EB3882349F08EB3853041F0FE
+:103940008091E80082FFF6CF80E0089582E008953C
+:1039500083E0089554D056D01EBA1092510184E0ED
+:1039600089BD89B5826089BD09B400FEFDCF809113
+:10397000D800982F9F779093D80080688093D800C4
+:10398000809163008E7F809363008091D8008F7D4B
+:103990008093D8008091E0008E7F8093E00080913A
+:1039A000E1008E7F8093E1008091E200816080934E
+:1039B000E2008091E100877F8093E1008091E20046
+:1039C00088608093E2000895C5DF81E08093520112
+:1039D0000895C0DFE0EEF0E0808181608083E8ED53
+:1039E000F0E080818F7780830AD00CD019BCE3E6A9
+:1039F000F0E08081816080831092520108951092DE
+:103A0000E20008951092E10008951F920F920FB600
+:103A10000F9211242F933F934F935F936F937F9354
+:103A20008F939F93AF93BF93EF93FF938091E100A8
+:103A300080FF1BC08091E20080FF17C08091E100F1
+:103A40008E7F8093E1008091E2008E7F8093E20080
+:103A50008091E20080618093E2008091D8008062D2
+:103A60008093D80019BC1EBA26D18091E10084FF52
+:103A700029C08091E20084FF25C084E089BD89B51A
+:103A8000826089BD09B400FEFDCF8091D8008F7D92
+:103A90008093D8008091E1008F7E8093E100809137
+:103AA000E2008F7E8093E2008091E200816080934B
+:103AB000E20080915101882311F481E001C084E08B
+:103AC0008EBBF9D08091E10083FF22C08091E2009B
+:103AD00083FF1EC08091E100877F8093E10082E038
+:103AE0008EBB109251018091E1008E7F8093E100A6
+:103AF0008091E2008E7F8093E2008091E2008061FD
+:103B00008093E200A1DE80E060E042E28CDED3D070
+:103B10008091E10082FF0AC08091E20082FF06C02E
+:103B20008091E1008B7F8093E100C5D0FF91EF9100
+:103B3000BF91AF919F918F917F916F915F914F91C5
+:103B40003F912F910F900FBE0F901F9018951F93CC
+:103B5000DF93CF9300D0CDB7DEB7E3E5F1E08091FE
+:103B6000F100819381E0EB35F807C9F7909153019B
+:103B700080915401853011F1863040F48130B9F0E4
+:103B8000813070F0833009F081C011C0883009F4B1
+:103B900053C0893009F462C0863009F077C02DC067
+:103BA000903809F474C0923809F070C070C099233D
+:103BB00009F46DC0923009F069C069C0992309F019
+:103BC00065C0109155018091E800877F8093E800DF
+:103BD00049DE04C08EB3882309F459C08091E800FF
+:103BE00080FFF8CF812F8F7711F492E001C093E02E
+:103BF0009EBB80688093E3004AC09058923008F0E2
+:103C000045C0809155019091560160915701AE01D8
+:103C10004F5F5F4FDFDDBC010097C9F18091E80085
+:103C2000877F8093E80089819A813BDE8091E8005C
+:103C30008B7F8093E8002BC0903841F58091E8009D
+:103C4000877F8093E800809151018093F1008091FB
+:103C5000E8008E7F8093E80005DE19C09923B1F457
+:103C600090915501923098F48091E800877F80937D
+:103C7000E80090935101F6DD80915101882311F401
+:103C800083E001C084E08EBB16D001C040DB809190
+:103C9000E80083FF0AC08091EB0080628093EB0014
+:103CA0008091E800877F8093E8000F900F90CF917C
+:103CB000DF911F91089508958EB3882329F0809194
+:103CC000E80083FF01C043CF0895F999FECF92BD6C
+:103CD00081BDF89A992780B50895262FF999FECFCE
+:103CE0001FBA92BD81BD20BD0FB6F894FA9AF99A19
+:0A3CF0000FBE01960895F894FFCF6F
+:103CFA0001021E948920DCFB120110010000002041
+:103D0A00EB03EF2F00000001000109021B00010173
+:103D1A000080320904000000FE01020009210300AC
+:0A3D2A0000000C000104030904006E
+:0400000300003000C9
+:00000001FF
diff --git a/hardware/arduino/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Uno-Rev3.hex b/hardware/arduino/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Uno-Rev3.hex
new file mode 100644
index 0000000..c2c7b2d
--- /dev/null
+++ b/hardware/arduino/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Uno-Rev3.hex
@@ -0,0 +1,467 @@
+:1000000090C00000A9C00000A7C00000A5C000006B
+:10001000A3C00000A1C000009FC000009DC0000060
+:100020009BC0000099C0000097C0000048C40000B9
+:100030000CC4000091C000008FC000008DC0000003
+:100040008BC0000089C0000087C0000085C0000090
+:1000500083C0000081C000007FC0000002C100001A
+:100060007BC0000079C0000077C0000075C00000B0
+:1000700073C0000071C000006FC000006DC00000C0
+:100080006BC0000069C0000067C0000065C00000D0
+:1000900063C0000061C000001201100102000008EE
+:1000A0004123430001000102DC0109023E0002017C
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:10012000000011241FBECFEFD2E0DEBFCDBF11E033
+:10013000A0E0B1E0ECEAFFE002C005900D92A6312C
+:10014000B107D9F712E0A6E1B1E001C01D92AF32CC
+:10015000B107E1F7F1D028C753CF9C01DC01AE57BE
+:10016000BF4FED91FC91119741911196FC93EE9345
+:1001700080589F4FE817F90711F42D933C939FB7D0
+:10018000F894F901EC57FF4F8081815080839FBF25
+:10019000842F0895DF92EF92FF920F931F93FC013B
+:1001A0008489813019F0823021F405C040E3D42ED7
+:1001B00004C0DD2402C030E2D32E8389823011F4E2
+:1001C00088E0D82A8589873031F0883031F0863050
+:1001D00031F482E003C084E001C086E0D82A1092A6
+:1001E000C9001092C8001092CA00E784F088018903
+:1001F000128980E0E81681EEF80680E0080780E0CA
+:10020000180719F420E130E00FC0C801B701969536
+:1002100087957795679560587B47814E9F4FA801DA
+:100220009701A0D6215030403093CD002093CC00D0
+:10023000D092CA0080E0E81681EEF80680E0080758
+:1002400080E0180711F082E001C080E08093C800D0
+:1002500088E98093C9001F910F91FF90EF90DF9084
+:1002600008951F920F920FB60F9211242F938F9320
+:100270009F93EF93FF939091CE008EB38430F1F46F
+:10028000E0919901F0919A019083E0919901F091A8
+:100290009A01CF01019690939A018093990189590F
+:1002A000914021F489E191E0928381839FB7F89492
+:1002B00080919D018F5F80939D019FBFFF91EF9182
+:1002C0009F918F912F910F900FBE0F901F901895B7
+:1002D000FC01858580FF02C05F9808955F9A0895AC
+:1002E00080E091E0D5C580E091E088C584B7877F44
+:1002F00084BF28E10FB6F89420936000109260004C
+:100300000FBE87E690E09093CD008093CC0086E00E
+:100310008093CA001092C8002093C900539A5A9A39
+:100320008AB180638AB98BB180638BB983D284E050
+:1003300085BD5F9A579A08950F931F93CF93DF93CC
+:10034000D5DF2FB7F8948EE991E090931F02809348
+:100350001E0290932102809320022FBF2FB7F894A2
+:1003600089E191E090939A018093990190939C0187
+:1003700080939B012FBF7894CEE9D1E003E08FB743
+:10038000F894909122028FBF903809F180E091E0BB
+:10039000ABD497FD1CC0E0911E02F0911F02808338
+:1003A000E0911E02F0911F02CF01019690931F026F
+:1003B00080931E028E51924011F4D283C1839FB765
+:1003C000F894809122028F5F809322029FBF8FB7A3
+:1003D000F89410919D018FBFA89902C0113678F151
+:1003E000A89A80919D01882361F05D980093160181
+:1003F00008C089E191E0B1DE682F80E091E0DAD4B5
+:1004000011501123B1F780911601882351F080918A
+:10041000160181508093160180911601882309F4FA
+:100420005D9A80911701882351F0809117018150C6
+:100430008093170180911701882309F45C9A8FB784
+:10044000F894909122028FBF992369F08EE991E090
+:1004500084DE982F8091C80085FFFCCF9093CE005A
+:100460005C980093170180E091E095D42AD487CF5F
+:10047000DA01923049F0933061F09130F9F4E8E913
+:10048000F0E022E130E01EC0EAEAF0E02EE330E0E6
+:1004900019C0813049F0813018F0823079F408C0F9
+:1004A000E8EEF0E0849107C0ECEEF0E0849103C048
+:1004B000E0E2F1E08491282F30E004C0E0E0F0E0D9
+:1004C00020E030E0ED93FC93C901089528E030E08E
+:1004D00040E003C04F5F220F331F28173907D0F3C6
+:1004E000842F8295807F08958093E9008091EB00AE
+:1004F00081608093EB001092ED006093EC004093DC
+:10050000ED008091EE00881F8827881F08951092C3
+:10051000F40090E09093E9001092F0001092E8004F
+:100520001092ED008091EB008E7F8093EB009F5F37
+:10053000953081F708958091270288238CF403C0B9
+:100540008EB38823B1F08091E80082FFF9CF8091CB
+:10055000E8008B778093E80008958EB3882349F0F4
+:100560008091E80080FFF9CF8091E8008E7780933A
+:10057000E800089594E68091EC0080FF05C080912A
+:10058000E80080FF05C023C08091E80082FD1FC005
+:100590008EB3882311F482E008958EB3853011F470
+:1005A00083E008958091EB0085FF02C081E008950B
+:1005B0008091E10082FFDFCF8091E1008B7F80930B
+:1005C000E100992311F484E008959150D4CF80E0A4
+:1005D00008959C0140912D0250912E024617570715
+:1005E00018F4F90120E038C06115710511F0AB0174
+:1005F000F8CF8091E8008E778093E80040E050E0EB
+:10060000F0CF8091E80083FF02C081E008958091DF
+:10061000E80082FD2DC08EB3882381F18EB3853032
+:1006200079F18091E80080FF17C09091F20006C038
+:1006300081918093F100415050409F5F41155105D9
+:1006400011F09830A8F320E0983009F421E080916F
+:10065000E8008E778093E8004115510591F622233A
+:1006600081F606C08EB3882349F08EB3853041F001
+:100670008091E80082FFF6CF80E0089582E008953F
+:1006800083E008959C0140912D0250912E0246175F
+:10069000570710F490E03BC06115710511F0AB01F4
+:1006A000F9CF8091E8008E778093E80040E050E039
+:1006B000F1CF8091E80083FF02C081E0089580912E
+:1006C000E80082FD30C08EB3882399F18EB3853067
+:1006D00091F18091E80080FF1AC08091F20009C07A
+:1006E000F9012F5F3F4FE491E093F10041505040FA
+:1006F0008F5F4115510511F0883090F390E08830FC
+:1007000009F491E08091E8008E778093E80041152C
+:10071000510579F6992369F606C08EB3882349F00E
+:100720008EB3853041F08091E80082FFF6CF80E003
+:10073000089582E0089583E008959C016115710594
+:1007400029F48091E8008B778093E800F90120C0BC
+:100750008091E80083FF02C081E008958EB3882372
+:1007600039F18EB3853031F18091E80082FFF0CF0E
+:1007700006C08091F10081936150704021F080911A
+:10078000F2008823B1F78091E8008B778093E8002E
+:1007900061157105E9F606C08EB3882349F08EB362
+:1007A000853041F08091E80080FFF6CF80E0089529
+:1007B00082E0089583E0089542D044D01EBA10929A
+:1007C0002502109224021092230284E089BD89B58B
+:1007D000826089BD09B400FEFDCF8091D800982FBA
+:1007E0009F779093D80080688093D80080916300B1
+:1007F0008E7F809363008091D8008F7D8093D80096
+:100800008091E0008E7F8093E0008091E1008E7FF8
+:100810008093E1008091E20081608093E20080910A
+:10082000E100877F8093E1008091E20088608093FF
+:10083000E2000895C1DF81E08093260208951092BE
+:10084000E20008951092E10008951F920F920FB6F2
+:100850000F9211241F932F933F934F935F936F93A6
+:100860007F938F939F93AF93BF93EF93FF93E9EEA3
+:10087000F0E0108117701082E0EFF0E08081877F58
+:1008800080837894C3D0F894A9EEB0E01C92E0EF96
+:10089000F0E08081886080831C93FF91EF91BF918D
+:1008A000AF919F918F917F916F915F914F913F9108
+:1008B0002F911F910F900FBE0F901F9018951F92B0
+:1008C0000F920FB60F9211242F933F934F935F9384
+:1008D0006F937F938F939F93AF93BF93EF93FF9308
+:1008E0008091E10080FF1BC08091E20080FF17C073
+:1008F0008091E1008E7F8093E1008091E2008E7F05
+:100900008093E2008091E20080618093E200809118
+:10091000D80080628093D80019BC1EBAD1D18091D2
+:10092000E10084FF29C08091E20084FF25C084E0BB
+:1009300089BD89B5826089BD09B400FEFDCF809173
+:10094000D8008F7D8093D8008091E1008F7E8093C6
+:10095000E1008091E2008F7E8093E2008091E200CE
+:1009600081608093E20080912502882311F481E068
+:1009700001C084E08EBBA4D18091E10083FF27C039
+:100980008091E20083FF23C08091E100877F809304
+:10099000E10082E08EBB109225028091E1008E7F03
+:1009A0008093E1008091E2008E7F8093E20080914D
+:1009B000E20080618093E200AADD80E060E042E036
+:1009C00093DD8091F00088608093F00079D1809170
+:1009D000E10082FF0AC08091E20082FF06C08091A0
+:1009E000E1008B7F8093E1006BD1FF91EF91BF918C
+:1009F000AF919F918F917F916F915F914F913F91B7
+:100A00002F910F900FBE0F901F9018951F93DF939B
+:100A1000CF93CDB7DEB7AC970FB6F894DEBF0FBE5D
+:100A2000CDBFE7E2F2E08091F100819322E0EF3266
+:100A3000F207C9F78091270230912802353009F476
+:100A400087C0363040F43130C9F1313070F0333086
+:100A500009F01DC133C0383009F4EFC0393009F452
+:100A6000FEC0363009F013C192C0803821F08238C0
+:100A700009F00DC108C090912302809124028823BF
+:100A800099F0926011C080912B0287708093E900E9
+:100A90008091EB0090E025E0969587952A95E1F707
+:100AA000982F91701092E9008091E800877F8093E1
+:100AB000E8009093F1001092F100CAC0882319F069
+:100AC000823009F0E4C090E08F719070009721F0BF
+:100AD000029709F0DDC00CC080912902813009F035
+:100AE000D7C010922402333069F5809324022AC0C3
+:100AF00080912902882331F520912B02277009F477
+:100B0000C7C02093E9008091EB0080FFC1C0333063
+:100B100021F48091EB00806213C08091EB00806132
+:100B20008093EB0081E090E002C0880F991F2A9526
+:100B3000E2F78093EA001092EA008091EB0088606F
+:100B40008093EB001092E9008091E800877F83C0DA
+:100B5000882309F09CC0109129028091E800877FCA
+:100B60008093E800E8DC04C08EB3882309F490C0C9
+:100B70008091E80080FFF8CF812F8F7711F492E009
+:100B800001C093E09EBB80688093E30081C08058E1
+:100B9000823008F07CC08091290290912A0223E0E3
+:100BA0008C3D920799F55FB7F894DE0115964EE0FB
+:100BB00020E030E061E2E42FF0E0609357008491A0
+:100BC00020FF03C082958F704F5F982F9F70892FF1
+:100BD000805D8A3308F0895F8C9311961C9211977F
+:100BE0002F5F3F4F12962431310529F75FBF8AE20C
+:100BF0008B8383E08C838091E800877F8093E8007B
+:100C0000CE0103966AE270E0E4DC11C060912B0231
+:100C1000AE014F5F5F4F2CDCBC010097C9F18091A2
+:100C2000E800877F8093E80089819A812BDD80919D
+:100C3000E8008B778093E8002BC0803841F58091E5
+:100C4000E800877F8093E800809125028093F1007F
+:100C50008091E8008E778093E8006DDC19C08823CE
+:100C6000B1F490912902923098F48091E800877F46
+:100C70008093E800909325025EDC80912502882312
+:100C800011F483E001C084E08EBB2DDB01C028DBC2
+:100C90008091E80083FF0AC08091EB00806280931E
+:100CA000EB008091E800877F8093E800AC960FB658
+:100CB000F894DEBF0FBECDBFCF91DF911F91089595
+:100CC00008951F938EB3882361F01091E90010926C
+:100CD000E9008091E80083FF01C098DE177010934F
+:100CE000E9001F9108950895FC018EB3843021F529
+:100CF00087859089A189B2890097A105B105E1F0A6
+:100D000085818093E9008091E80082FF15C0809181
+:100D1000F200882319F42FEF3FEF04C08091F10017
+:100D2000282F30E08091F200882341F48091E80080
+:100D30008B778093E80002C02FEF3FEFC901089541
+:100D4000FC018EB3843011F587859089A189B28921
+:100D50000097A105B105D1F081818093E9008091D0
+:100D6000F2008823A9F09091E8008091E8008E7746
+:100D70008093E80095FD0CC0FDDB982F882349F493
+:100D80008091E8008E778093E80003C092E001C074
+:100D900090E0892F0895FC018EB3843051F487854B
+:100DA0009089A189B2890097A105B10511F0CF0101
+:100DB000C7CF08951F93FC01162F8EB38430D9F44A
+:100DC00087859089A189B2890097A105B10599F01D
+:100DD00081818093E9008091E80085FD08C08091C1
+:100DE000E8008E778093E800C5DB882329F4109310
+:100DF000F10080E001C082E01F9108950F931F93DE
+:100E0000CF93DF93EC010D96FC0189E0DF011D9289
+:100E10008A95E9F72A813B8109818C81882311F425
+:100E200010E001C014E0C90151DB182B1260802FC3
+:100E300061E8412F59DB882329F12E813F810D8103
+:100E40008885882311F410E001C014E0C9013EDB5D
+:100E5000182B1260802F60E8412F46DB882391F029
+:100E60002A853B8509858C85882311F410E001C013
+:100E700014E0C9012BDB182B1260802F61EC412F8D
+:100E800033DB01C080E0DF91CF911F910F91089576
+:100E9000CF93DF93EC018091E80083FF60C08881ED
+:100EA00090E020912B0230912C022817390709F08D
+:100EB00056C080912802813261F0823220F4803263
+:100EC00009F04DC019C0823269F1833209F047C080
+:100ED00038C080912702813A09F041C08091E80032
+:100EE000877F8093E800CE010F9667E070E071DBAA
+:100EF0008091E8008B7713C080912702813279F5C9
+:100F00008091E800877F8093E800CE010F9667E02C
+:100F100070E013DCCE013ED98091E8008E7780939B
+:100F2000E8001DC0809127028132C9F48091E80059
+:100F3000877F8093E800809129028D87CE01C8D9F0
+:100F40000DC080912702813251F48091E800877FA3
+:100F50008093E800CE0160912902C5DEECDADF91D2
+:100F6000CF910895A1E21A2EAA1BBB1BFD010DC053
+:100F7000AA1FBB1FEE1FFF1FA217B307E407F50749
+:100F800020F0A21BB30BE40BF50B661F771F881F25
+:100F9000991F1A9469F760957095809590959B01BB
+:0C0FA000AC01BD01CF010895F894FFCF13
+:100FAC0000034000000440000002080000000000A4
+:060FBC000000000000002F
+:103000004BC0000064C0000062C0000060C000004F
+:103010005EC000005CC000005AC0000058C0000044
+:1030200056C0000054C0000052C00000EEC40000B2
+:103030004EC000004CC000004AC0000048C0000064
+:1030400046C0000044C0000042C0000040C0000074
+:103050003EC000003CC000003AC0000038C0000084
+:1030600036C0000034C0000032C0000030C0000094
+:103070002EC000002CC000002AC0000028C00000A4
+:1030800026C0000024C0000022C0000020C00000B4
+:103090001EC000001CC0000011241FBECFEFD2E0F4
+:1030A000DEBFCDBF11E0A0E0B1E0EAEFFCE302C07B
+:1030B00005900D92AA33B107D9F711E0AAE3B1E068
+:1030C00001C01D92AB35B107E1F772D314C698CF9A
+:1030D000982F15C08091F200882371F48091E80048
+:1030E0008B7F8093E80003C08EB3882351F08091DA
+:1030F000E80082FFF9CF02C08091F100915099233E
+:1031000049F7089520914A01309149018091480181
+:103110009091470180933F0190934001C9018093B2
+:103120004101909342010895DF93CF9300D000D0E6
+:1031300000D0CDB7DEB780914501843009F45AC084
+:10314000853030F4813059F0833009F0D7C01FC08A
+:10315000853009F4A0C0863009F0D0C0C3C080918A
+:103160004601823008F0CAC0CDDF80914601882335
+:1031700061F480913F019091400123E0FC01209394
+:103180005700E89507B600FCFDCF85E008C08091A8
+:103190004601882311F0823029F4B4DF89E080935E
+:1031A0000101ACC0813009F0A9C020E030E040E06E
+:1031B00050E0F90184918F3F81F0CA01AA27BB2713
+:1031C00080933E013093400120933F018AE0809339
+:1031D000010185E080933B0191C02F5F3F4F4F4F2E
+:1031E0005F4F2030F0E33F07F0E04F07F0E05F076C
+:1031F00001F784C080914601833051F581E08093CE
+:103200003A0180914B0190914C01892B71F0809192
+:103210004701813009F072C080914A0190914901C3
+:1032200090933D0180933C0169C0809147018823C0
+:1032300061F42CE088E190E00FB6F894A8958093B3
+:1032400060000FBE2093600059C01092000156C06C
+:10325000882309F053C0809147018F3F09F04EC089
+:10326000E0E0F0E093E085E090935700E89507B642
+:1032700000FCFDCF80935700E89507B600FCFDCF1A
+:10328000E058FF4F20E3E030F20771F781E18093CF
+:103290005700E89533C0DE011196E5E0F1E083E0E8
+:1032A00001900D928150E1F7DE011496E2E0F1E029
+:1032B00083E001900D928150E1F790914701809158
+:1032C0004601882329F4FE01E90FF11D818107C021
+:1032D0008130A1F4FE01BC97E90FF11D808180933C
+:1032E00050010CC080914601833041F48091470128
+:1032F000882321F48091480180933E0126960FB6E1
+:10330000F894DEBF0FBECDBFCF91DF9108952F920D
+:103310003F924F925F926F927F929F92AF92BF9235
+:10332000CF92DF92EF92FF920F931F93CF93DF9391
+:103330008091590190915A0190934C0180934B01D7
+:1033400080914D01882351F080914D0181508093EF
+:103350004D0180914D01882309F45D9A80914E01C1
+:10336000882351F080914E01815080934E018091CD
+:103370004E01882309F45C9A80915401833009F44A
+:10338000B2C1843030F4813071F0823009F0E3C191
+:1033900011C1853009F4C5C1853008F4BAC1863041
+:1033A00009F0D9C1CDC15C9883E080934E01809132
+:1033B000E800877F8093E80080913A01882329F014
+:1033C000B3DE5D9A5C9A10923A0120914B013091E4
+:1033D0004C012115310529F42AC08EB3882309F444
+:1033E000BAC18091E80082FFF8CF8091F10080930C
+:1033F00045012150304030934C0120934B01E6E4CD
+:10340000F1E00CC08091F10081932150304081E0C7
+:10341000EB34F80719F43183208308C08091F2005F
+:10342000882381F730934C0120934B017DDE8091FE
+:103430000101853009F0BAC080914B0190914C0197
+:10344000892B21F482E080930101B0C08AE140DE43
+:1034500080913F018F713CDEC0914101D0914201CA
+:1034600020913F013091400121968E01021B130BE8
+:10347000219780914601882309F093C01801369462
+:103480002794C901A0913E01B0E09C01AD0162E02A
+:10349000E62EF12C012D112DE20EF31E041F151F37
+:1034A00059016A0190E099249394B5E0A3E048C0E3
+:1034B0008091F200882371F48091E8008B7F8093E3
+:1034C000E80004C08EB3882309F445C18091E80068
+:1034D00082FFF8CF0894210831088091F100682F0D
+:1034E0008091F100782FF5010B0190925700E8953B
+:1034F00011249F5F903419F021143104A1F4F901D3
+:10350000B0935700E89507B600FCFDCF21143104B5
+:1035100051F0F701A0935700E89507B600FCFDCFE6
+:10352000A801970190E042E0442E512C612C712CAF
+:10353000E40CF51C061D171DA40CB51CC61CD71CDD
+:103540002114310409F0B4CFD0934001C0933F015E
+:1035500081E180935700E89527C08091F20088238D
+:1035600071F48091E8008B7F8093E80004C08EB3F3
+:10357000882309F4F0C08091E80082FFF8CF6091C1
+:10358000F10080913F0190914001A7D380913F01CC
+:103590009091400101969093400180933F0101502A
+:1035A000104001151105C9F680E192DD8091E80017
+:1035B0008B7FC3C08091E800877F8093E8005D988F
+:1035C00083E080934D0104C08EB3882309F4C3C007
+:1035D0008091E80080FFF8CF80910101893091F05F
+:1035E0008A3069F480914601813049F480913F012D
+:1035F000909140018093F1009093F1009BC08091E5
+:10360000500196C0609141017091420120913F01AB
+:10361000309140016F5F7F4F7B01E21AF30A6150E6
+:10362000704080914601882389F58701169507959A
+:10363000C901A0913E01B0E09C01AD011FC0809185
+:10364000F200803271F48091E8008E7F8093E80070
+:1036500004C08EB3882309F47EC08091E80080FF07
+:10366000F8CFF901859194918093F1009093F10046
+:10367000015010402E5F3F4F4F4F5F4F0115110516
+:10368000F1F67093400160933F0129C0823039F513
+:1036900023C08091F200803271F48091E8008E7F27
+:1036A0008093E80004C08EB3882309F454C080914D
+:1036B000E80080FFF8CF00913F0110914001C80160
+:1036C00004D38093F1000F5F1F4F109340010093CC
+:1036D0003F010894E108F108E114F104D1F682E019
+:1036E0008093010127C08091E800877F8093E800E4
+:1036F00080913B018093F1001092F1001092F10053
+:103700001092F100809101018093F1001092F1007C
+:1037100011C08091E800877F8093E80010923B0100
+:1037200019C08091E800877F8093E80080910101B3
+:103730008093F1008091E8008E7F8093E8000AC0BA
+:103740008091E800877F8093E8005D9A5C9A82E030
+:103750008093010187D0DF91CF911F910F91FF904E
+:10376000EF90DF90CF90BF90AF909F907F906F9041
+:103770005F904F903F902F9008952BD181E085BFAF
+:1037800015BE089584B7877F84BF88E10FB6F8948B
+:1037900080936000109260000FBE81E085BF82E0E0
+:1037A00085BF8AB180638AB98BB180638BB90CC144
+:1037B000E9DF789401C080D2809100018823D9F795
+:1037C00080913A018823B9F7D8DFE0913C01F0916C
+:1037D0003D010995FA01923071F0933089F09130F2
+:1037E00029F488E091E022E130E019C080E090E027
+:1037F00020E030E014C08AE191E02BE130E00FC01E
+:10380000882339F480913501282F30E085E391E059
+:1038100006C080914301282F30E083E491E091833A
+:103820008083C90108958091EB0081608093EB0053
+:103830001092ED006093EC004093ED008091EE005B
+:10384000881F8827881F08951092F4001092F000B6
+:103850001092E8001092ED00EBEEF0E080818E7F98
+:10386000808308958091530188238CF403C08EB324
+:103870008823B1F08091E80082FFF9CF8091E800C1
+:103880008B7F8093E80008958EB3882349F0809160
+:10389000E80080FFF9CF8091E8008E7F8093E800F8
+:1038A00008959C014091590150915A0146175707BC
+:1038B00018F4F90120E038C06115710511F0AB0171
+:1038C000F8CF8091E8008E7F8093E80040E050E0E0
+:1038D000F0CF8091E80083FF02C081E008958091DD
+:1038E000E80082FD2DC08EB3882381F18EB3853030
+:1038F00079F18091E80080FF17C09091F20006C036
+:1039000081918093F100415050409F5F41155105D6
+:1039100011F09032A8F320E0903209F421E0809178
+:10392000E8008E7F8093E8004115510591F622232F
+:1039300081F606C08EB3882349F08EB3853041F0FE
+:103940008091E80082FFF6CF80E0089582E008953C
+:1039500083E0089554D056D01EBA1092510184E0ED
+:1039600089BD89B5826089BD09B400FEFDCF809113
+:10397000D800982F9F779093D80080688093D800C4
+:10398000809163008E7F809363008091D8008F7D4B
+:103990008093D8008091E0008E7F8093E00080913A
+:1039A000E1008E7F8093E1008091E200816080934E
+:1039B000E2008091E100877F8093E1008091E20046
+:1039C00088608093E2000895C5DF81E08093520112
+:1039D0000895C0DFE0EEF0E0808181608083E8ED53
+:1039E000F0E080818F7780830AD00CD019BCE3E6A9
+:1039F000F0E08081816080831092520108951092DE
+:103A0000E20008951092E10008951F920F920FB600
+:103A10000F9211242F933F934F935F936F937F9354
+:103A20008F939F93AF93BF93EF93FF938091E100A8
+:103A300080FF1BC08091E20080FF17C08091E100F1
+:103A40008E7F8093E1008091E2008E7F8093E20080
+:103A50008091E20080618093E2008091D8008062D2
+:103A60008093D80019BC1EBA26D18091E10084FF52
+:103A700029C08091E20084FF25C084E089BD89B51A
+:103A8000826089BD09B400FEFDCF8091D8008F7D92
+:103A90008093D8008091E1008F7E8093E100809137
+:103AA000E2008F7E8093E2008091E200816080934B
+:103AB000E20080915101882311F481E001C084E08B
+:103AC0008EBBF9D08091E10083FF22C08091E2009B
+:103AD00083FF1EC08091E100877F8093E10082E038
+:103AE0008EBB109251018091E1008E7F8093E100A6
+:103AF0008091E2008E7F8093E2008091E2008061FD
+:103B00008093E200A1DE80E060E042E28CDED3D070
+:103B10008091E10082FF0AC08091E20082FF06C02E
+:103B20008091E1008B7F8093E100C5D0FF91EF9100
+:103B3000BF91AF919F918F917F916F915F914F91C5
+:103B40003F912F910F900FBE0F901F9018951F93CC
+:103B5000DF93CF9300D0CDB7DEB7E3E5F1E08091FE
+:103B6000F100819381E0EB35F807C9F7909153019B
+:103B700080915401853011F1863040F48130B9F0E4
+:103B8000813070F0833009F081C011C0883009F4B1
+:103B900053C0893009F462C0863009F077C02DC067
+:103BA000903809F474C0923809F070C070C099233D
+:103BB00009F46DC0923009F069C069C0992309F019
+:103BC00065C0109155018091E800877F8093E800DF
+:103BD00049DE04C08EB3882309F459C08091E800FF
+:103BE00080FFF8CF812F8F7711F492E001C093E02E
+:103BF0009EBB80688093E3004AC09058923008F0E2
+:103C000045C0809155019091560160915701AE01D8
+:103C10004F5F5F4FDFDDBC010097C9F18091E80085
+:103C2000877F8093E80089819A813BDE8091E8005C
+:103C30008B7F8093E8002BC0903841F58091E8009D
+:103C4000877F8093E800809151018093F1008091FB
+:103C5000E8008E7F8093E80005DE19C09923B1F457
+:103C600090915501923098F48091E800877F80937D
+:103C7000E80090935101F6DD80915101882311F401
+:103C800083E001C084E08EBB16D001C040DB809190
+:103C9000E80083FF0AC08091EB0080628093EB0014
+:103CA0008091E800877F8093E8000F900F90CF917C
+:103CB000DF911F91089508958EB3882329F0809194
+:103CC000E80083FF01C043CF0895F999FECF92BD6C
+:103CD00081BDF89A992780B50895262FF999FECFCE
+:103CE0001FBA92BD81BD20BD0FB6F894FA9AF99A19
+:0A3CF0000FBE01960895F894FFCF6F
+:103CFA0001021E948920DCFB120110010000002041
+:103D0A00EB03EF2F00000001000109021B00010173
+:103D1A000080320904000000FE01020009210300AC
+:0A3D2A0000000C000104030904006E
+:0400000300003000C9
+:00000001FF
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Mega2560-Rev3.hex b/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Mega2560-Rev3.hex
new file mode 100644
index 0000000..efbbf15
--- /dev/null
+++ b/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Mega2560-Rev3.hex
@@ -0,0 +1,254 @@
+:1000000090C00000A9C00000A7C00000A5C000006B
+:10001000A3C00000A1C000009FC000009DC0000060
+:100020009BC0000099C0000097C0000048C40000B9
+:100030000CC4000091C000008FC000008DC0000003
+:100040008BC0000089C0000087C0000085C0000090
+:1000500083C0000081C000007FC0000002C100001A
+:100060007BC0000079C0000077C0000075C00000B0
+:1000700073C0000071C000006FC000006DC00000C0
+:100080006BC0000069C0000067C0000065C00000D0
+:1000900063C0000061C000001201100102000008EE
+:1000A0004123420001000102DC0109023E0002017D
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:10012000000011241FBECFEFD2E0DEBFCDBF11E033
+:10013000A0E0B1E0ECEAFFE002C005900D92A6312C
+:10014000B107D9F712E0A6E1B1E001C01D92AF32CC
+:10015000B107E1F7F1D028C753CF9C01DC01AE57BE
+:10016000BF4FED91FC91119741911196FC93EE9345
+:1001700080589F4FE817F90711F42D933C939FB7D0
+:10018000F894F901EC57FF4F8081815080839FBF25
+:10019000842F0895DF92EF92FF920F931F93FC013B
+:1001A0008489813019F0823021F405C040E3D42ED7
+:1001B00004C0DD2402C030E2D32E8389823011F4E2
+:1001C00088E0D82A8589873031F0883031F0863050
+:1001D00031F482E003C084E001C086E0D82A1092A6
+:1001E000C9001092C8001092CA00E784F088018903
+:1001F000128980E0E81681EEF80680E0080780E0CA
+:10020000180719F420E130E00FC0C801B701969536
+:1002100087957795679560587B47814E9F4FA801DA
+:100220009701A0D6215030403093CD002093CC00D0
+:10023000D092CA0080E0E81681EEF80680E0080758
+:1002400080E0180711F082E001C080E08093C800D0
+:1002500088E98093C9001F910F91FF90EF90DF9084
+:1002600008951F920F920FB60F9211242F938F9320
+:100270009F93EF93FF939091CE008EB38430F1F46F
+:10028000E0919901F0919A019083E0919901F091A8
+:100290009A01CF01019690939A018093990189590F
+:1002A000914021F489E191E0928381839FB7F89492
+:1002B00080919D018F5F80939D019FBFFF91EF9182
+:1002C0009F918F912F910F900FBE0F901F901895B7
+:1002D000FC01858580FF02C05F9808955F9A0895AC
+:1002E00080E091E0D5C580E091E088C584B7877F44
+:1002F00084BF28E10FB6F89420936000109260004C
+:100300000FBE87E690E09093CD008093CC0086E00E
+:100310008093CA001092C8002093C900539A5A9A39
+:100320008AB180638AB98BB180638BB983D284E050
+:1003300085BD5F9A579A08950F931F93CF93DF93CC
+:10034000D5DF2FB7F8948EE991E090931F02809348
+:100350001E0290932102809320022FBF2FB7F894A2
+:1003600089E191E090939A018093990190939C0187
+:1003700080939B012FBF7894CEE9D1E003E08FB743
+:10038000F894909122028FBF903809F180E091E0BB
+:10039000ABD497FD1CC0E0911E02F0911F02808338
+:1003A000E0911E02F0911F02CF01019690931F026F
+:1003B00080931E028E51924011F4D283C1839FB765
+:1003C000F894809122028F5F809322029FBF8FB7A3
+:1003D000F89410919D018FBFA89902C0113678F151
+:1003E000A89A80919D01882361F05D980093160181
+:1003F00008C089E191E0B1DE682F80E091E0DAD4B5
+:1004000011501123B1F780911601882351F080918A
+:10041000160181508093160180911601882309F4FA
+:100420005D9A80911701882351F0809117018150C6
+:100430008093170180911701882309F45C9A8FB784
+:10044000F894909122028FBF992369F08EE991E090
+:1004500084DE982F8091C80085FFFCCF9093CE005A
+:100460005C980093170180E091E095D42AD487CF5F
+:10047000DA01923049F0933061F09130F9F4E8E913
+:10048000F0E022E130E01EC0EAEAF0E02EE330E0E6
+:1004900019C0813049F0813018F0823079F408C0F9
+:1004A000E8EEF0E0849107C0ECEEF0E0849103C048
+:1004B000E0E2F1E08491282F30E004C0E0E0F0E0D9
+:1004C00020E030E0ED93FC93C901089528E030E08E
+:1004D00040E003C04F5F220F331F28173907D0F3C6
+:1004E000842F8295807F08958093E9008091EB00AE
+:1004F00081608093EB001092ED006093EC004093DC
+:10050000ED008091EE00881F8827881F08951092C3
+:10051000F40090E09093E9001092F0001092E8004F
+:100520001092ED008091EB008E7F8093EB009F5F37
+:10053000953081F708958091270288238CF403C0B9
+:100540008EB38823B1F08091E80082FFF9CF8091CB
+:10055000E8008B778093E80008958EB3882349F0F4
+:100560008091E80080FFF9CF8091E8008E7780933A
+:10057000E800089594E68091EC0080FF05C080912A
+:10058000E80080FF05C023C08091E80082FD1FC005
+:100590008EB3882311F482E008958EB3853011F470
+:1005A00083E008958091EB0085FF02C081E008950B
+:1005B0008091E10082FFDFCF8091E1008B7F80930B
+:1005C000E100992311F484E008959150D4CF80E0A4
+:1005D00008959C0140912D0250912E024617570715
+:1005E00018F4F90120E038C06115710511F0AB0174
+:1005F000F8CF8091E8008E778093E80040E050E0EB
+:10060000F0CF8091E80083FF02C081E008958091DF
+:10061000E80082FD2DC08EB3882381F18EB3853032
+:1006200079F18091E80080FF17C09091F20006C038
+:1006300081918093F100415050409F5F41155105D9
+:1006400011F09830A8F320E0983009F421E080916F
+:10065000E8008E778093E8004115510591F622233A
+:1006600081F606C08EB3882349F08EB3853041F001
+:100670008091E80082FFF6CF80E0089582E008953F
+:1006800083E008959C0140912D0250912E0246175F
+:10069000570710F490E03BC06115710511F0AB01F4
+:1006A000F9CF8091E8008E778093E80040E050E039
+:1006B000F1CF8091E80083FF02C081E0089580912E
+:1006C000E80082FD30C08EB3882399F18EB3853067
+:1006D00091F18091E80080FF1AC08091F20009C07A
+:1006E000F9012F5F3F4FE491E093F10041505040FA
+:1006F0008F5F4115510511F0883090F390E08830FC
+:1007000009F491E08091E8008E778093E80041152C
+:10071000510579F6992369F606C08EB3882349F00E
+:100720008EB3853041F08091E80082FFF6CF80E003
+:10073000089582E0089583E008959C016115710594
+:1007400029F48091E8008B778093E800F90120C0BC
+:100750008091E80083FF02C081E008958EB3882372
+:1007600039F18EB3853031F18091E80082FFF0CF0E
+:1007700006C08091F10081936150704021F080911A
+:10078000F2008823B1F78091E8008B778093E8002E
+:1007900061157105E9F606C08EB3882349F08EB362
+:1007A000853041F08091E80080FFF6CF80E0089529
+:1007B00082E0089583E0089542D044D01EBA10929A
+:1007C0002502109224021092230284E089BD89B58B
+:1007D000826089BD09B400FEFDCF8091D800982FBA
+:1007E0009F779093D80080688093D80080916300B1
+:1007F0008E7F809363008091D8008F7D8093D80096
+:100800008091E0008E7F8093E0008091E1008E7FF8
+:100810008093E1008091E20081608093E20080910A
+:10082000E100877F8093E1008091E20088608093FF
+:10083000E2000895C1DF81E08093260208951092BE
+:10084000E20008951092E10008951F920F920FB6F2
+:100850000F9211241F932F933F934F935F936F93A6
+:100860007F938F939F93AF93BF93EF93FF93E9EEA3
+:10087000F0E0108117701082E0EFF0E08081877F58
+:1008800080837894C3D0F894A9EEB0E01C92E0EF96
+:10089000F0E08081886080831C93FF91EF91BF918D
+:1008A000AF919F918F917F916F915F914F913F9108
+:1008B0002F911F910F900FBE0F901F9018951F92B0
+:1008C0000F920FB60F9211242F933F934F935F9384
+:1008D0006F937F938F939F93AF93BF93EF93FF9308
+:1008E0008091E10080FF1BC08091E20080FF17C073
+:1008F0008091E1008E7F8093E1008091E2008E7F05
+:100900008093E2008091E20080618093E200809118
+:10091000D80080628093D80019BC1EBAD1D18091D2
+:10092000E10084FF29C08091E20084FF25C084E0BB
+:1009300089BD89B5826089BD09B400FEFDCF809173
+:10094000D8008F7D8093D8008091E1008F7E8093C6
+:10095000E1008091E2008F7E8093E2008091E200CE
+:1009600081608093E20080912502882311F481E068
+:1009700001C084E08EBBA4D18091E10083FF27C039
+:100980008091E20083FF23C08091E100877F809304
+:10099000E10082E08EBB109225028091E1008E7F03
+:1009A0008093E1008091E2008E7F8093E20080914D
+:1009B000E20080618093E200AADD80E060E042E036
+:1009C00093DD8091F00088608093F00079D1809170
+:1009D000E10082FF0AC08091E20082FF06C08091A0
+:1009E000E1008B7F8093E1006BD1FF91EF91BF918C
+:1009F000AF919F918F917F916F915F914F913F91B7
+:100A00002F910F900FBE0F901F9018951F93DF939B
+:100A1000CF93CDB7DEB7AC970FB6F894DEBF0FBE5D
+:100A2000CDBFE7E2F2E08091F100819322E0EF3266
+:100A3000F207C9F78091270230912802353009F476
+:100A400087C0363040F43130C9F1313070F0333086
+:100A500009F01DC133C0383009F4EFC0393009F452
+:100A6000FEC0363009F013C192C0803821F08238C0
+:100A700009F00DC108C090912302809124028823BF
+:100A800099F0926011C080912B0287708093E900E9
+:100A90008091EB0090E025E0969587952A95E1F707
+:100AA000982F91701092E9008091E800877F8093E1
+:100AB000E8009093F1001092F100CAC0882319F069
+:100AC000823009F0E4C090E08F719070009721F0BF
+:100AD000029709F0DDC00CC080912902813009F035
+:100AE000D7C010922402333069F5809324022AC0C3
+:100AF00080912902882331F520912B02277009F477
+:100B0000C7C02093E9008091EB0080FFC1C0333063
+:100B100021F48091EB00806213C08091EB00806132
+:100B20008093EB0081E090E002C0880F991F2A9526
+:100B3000E2F78093EA001092EA008091EB0088606F
+:100B40008093EB001092E9008091E800877F83C0DA
+:100B5000882309F09CC0109129028091E800877FCA
+:100B60008093E800E8DC04C08EB3882309F490C0C9
+:100B70008091E80080FFF8CF812F8F7711F492E009
+:100B800001C093E09EBB80688093E30081C08058E1
+:100B9000823008F07CC08091290290912A0223E0E3
+:100BA0008C3D920799F55FB7F894DE0115964EE0FB
+:100BB00020E030E061E2E42FF0E0609357008491A0
+:100BC00020FF03C082958F704F5F982F9F70892FF1
+:100BD000805D8A3308F0895F8C9311961C9211977F
+:100BE0002F5F3F4F12962431310529F75FBF8AE20C
+:100BF0008B8383E08C838091E800877F8093E8007B
+:100C0000CE0103966AE270E0E4DC11C060912B0231
+:100C1000AE014F5F5F4F2CDCBC010097C9F18091A2
+:100C2000E800877F8093E80089819A812BDD80919D
+:100C3000E8008B778093E8002BC0803841F58091E5
+:100C4000E800877F8093E800809125028093F1007F
+:100C50008091E8008E778093E8006DDC19C08823CE
+:100C6000B1F490912902923098F48091E800877F46
+:100C70008093E800909325025EDC80912502882312
+:100C800011F483E001C084E08EBB2DDB01C028DBC2
+:100C90008091E80083FF0AC08091EB00806280931E
+:100CA000EB008091E800877F8093E800AC960FB658
+:100CB000F894DEBF0FBECDBFCF91DF911F91089595
+:100CC00008951F938EB3882361F01091E90010926C
+:100CD000E9008091E80083FF01C098DE177010934F
+:100CE000E9001F9108950895FC018EB3843021F529
+:100CF00087859089A189B2890097A105B105E1F0A6
+:100D000085818093E9008091E80082FF15C0809181
+:100D1000F200882319F42FEF3FEF04C08091F10017
+:100D2000282F30E08091F200882341F48091E80080
+:100D30008B778093E80002C02FEF3FEFC901089541
+:100D4000FC018EB3843011F587859089A189B28921
+:100D50000097A105B105D1F081818093E9008091D0
+:100D6000F2008823A9F09091E8008091E8008E7746
+:100D70008093E80095FD0CC0FDDB982F882349F493
+:100D80008091E8008E778093E80003C092E001C074
+:100D900090E0892F0895FC018EB3843051F487854B
+:100DA0009089A189B2890097A105B10511F0CF0101
+:100DB000C7CF08951F93FC01162F8EB38430D9F44A
+:100DC00087859089A189B2890097A105B10599F01D
+:100DD00081818093E9008091E80085FD08C08091C1
+:100DE000E8008E778093E800C5DB882329F4109310
+:100DF000F10080E001C082E01F9108950F931F93DE
+:100E0000CF93DF93EC010D96FC0189E0DF011D9289
+:100E10008A95E9F72A813B8109818C81882311F425
+:100E200010E001C014E0C90151DB182B1260802FC3
+:100E300061E8412F59DB882329F12E813F810D8103
+:100E40008885882311F410E001C014E0C9013EDB5D
+:100E5000182B1260802F60E8412F46DB882391F029
+:100E60002A853B8509858C85882311F410E001C013
+:100E700014E0C9012BDB182B1260802F61EC412F8D
+:100E800033DB01C080E0DF91CF911F910F91089576
+:100E9000CF93DF93EC018091E80083FF60C08881ED
+:100EA00090E020912B0230912C022817390709F08D
+:100EB00056C080912802813261F0823220F4803263
+:100EC00009F04DC019C0823269F1833209F047C080
+:100ED00038C080912702813A09F041C08091E80032
+:100EE000877F8093E800CE010F9667E070E071DBAA
+:100EF0008091E8008B7713C080912702813279F5C9
+:100F00008091E800877F8093E800CE010F9667E02C
+:100F100070E013DCCE013ED98091E8008E7780939B
+:100F2000E8001DC0809127028132C9F48091E80059
+:100F3000877F8093E800809129028D87CE01C8D9F0
+:100F40000DC080912702813251F48091E800877FA3
+:100F50008093E800CE0160912902C5DEECDADF91D2
+:100F6000CF910895A1E21A2EAA1BBB1BFD010DC053
+:100F7000AA1FBB1FEE1FFF1FA217B307E407F50749
+:100F800020F0A21BB30BE40BF50B661F771F881F25
+:100F9000991F1A9469F760957095809590959B01BB
+:0C0FA000AC01BD01CF010895F894FFCF13
+:100FAC0000034000000440000002080000000000A4
+:060FBC000000000000002F
+:00000001FF
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-MegaADK-Rev3.hex b/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-MegaADK-Rev3.hex
new file mode 100644
index 0000000..3af6a24
--- /dev/null
+++ b/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-MegaADK-Rev3.hex
@@ -0,0 +1,254 @@
+:1000000090C00000A9C00000A7C00000A5C000006B
+:10001000A3C00000A1C000009FC000009DC0000060
+:100020009BC0000099C0000097C0000048C40000B9
+:100030000CC4000091C000008FC000008DC0000003
+:100040008BC0000089C0000087C0000085C0000090
+:1000500083C0000081C000007FC0000002C100001A
+:100060007BC0000079C0000077C0000075C00000B0
+:1000700073C0000071C000006FC000006DC00000C0
+:100080006BC0000069C0000067C0000065C00000D0
+:1000900063C0000061C000001201100102000008EE
+:1000A0004123440001000102DC0109023E0002017B
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:10012000000011241FBECFEFD2E0DEBFCDBF11E033
+:10013000A0E0B1E0ECEAFFE002C005900D92A6312C
+:10014000B107D9F712E0A6E1B1E001C01D92AF32CC
+:10015000B107E1F7F1D028C753CF9C01DC01AE57BE
+:10016000BF4FED91FC91119741911196FC93EE9345
+:1001700080589F4FE817F90711F42D933C939FB7D0
+:10018000F894F901EC57FF4F8081815080839FBF25
+:10019000842F0895DF92EF92FF920F931F93FC013B
+:1001A0008489813019F0823021F405C040E3D42ED7
+:1001B00004C0DD2402C030E2D32E8389823011F4E2
+:1001C00088E0D82A8589873031F0883031F0863050
+:1001D00031F482E003C084E001C086E0D82A1092A6
+:1001E000C9001092C8001092CA00E784F088018903
+:1001F000128980E0E81681EEF80680E0080780E0CA
+:10020000180719F420E130E00FC0C801B701969536
+:1002100087957795679560587B47814E9F4FA801DA
+:100220009701A0D6215030403093CD002093CC00D0
+:10023000D092CA0080E0E81681EEF80680E0080758
+:1002400080E0180711F082E001C080E08093C800D0
+:1002500088E98093C9001F910F91FF90EF90DF9084
+:1002600008951F920F920FB60F9211242F938F9320
+:100270009F93EF93FF939091CE008EB38430F1F46F
+:10028000E0919901F0919A019083E0919901F091A8
+:100290009A01CF01019690939A018093990189590F
+:1002A000914021F489E191E0928381839FB7F89492
+:1002B00080919D018F5F80939D019FBFFF91EF9182
+:1002C0009F918F912F910F900FBE0F901F901895B7
+:1002D000FC01858580FF02C05F9808955F9A0895AC
+:1002E00080E091E0D5C580E091E088C584B7877F44
+:1002F00084BF28E10FB6F89420936000109260004C
+:100300000FBE87E690E09093CD008093CC0086E00E
+:100310008093CA001092C8002093C900539A5A9A39
+:100320008AB180638AB98BB180638BB983D284E050
+:1003300085BD5F9A579A08950F931F93CF93DF93CC
+:10034000D5DF2FB7F8948EE991E090931F02809348
+:100350001E0290932102809320022FBF2FB7F894A2
+:1003600089E191E090939A018093990190939C0187
+:1003700080939B012FBF7894CEE9D1E003E08FB743
+:10038000F894909122028FBF903809F180E091E0BB
+:10039000ABD497FD1CC0E0911E02F0911F02808338
+:1003A000E0911E02F0911F02CF01019690931F026F
+:1003B00080931E028E51924011F4D283C1839FB765
+:1003C000F894809122028F5F809322029FBF8FB7A3
+:1003D000F89410919D018FBFA89902C0113678F151
+:1003E000A89A80919D01882361F05D980093160181
+:1003F00008C089E191E0B1DE682F80E091E0DAD4B5
+:1004000011501123B1F780911601882351F080918A
+:10041000160181508093160180911601882309F4FA
+:100420005D9A80911701882351F0809117018150C6
+:100430008093170180911701882309F45C9A8FB784
+:10044000F894909122028FBF992369F08EE991E090
+:1004500084DE982F8091C80085FFFCCF9093CE005A
+:100460005C980093170180E091E095D42AD487CF5F
+:10047000DA01923049F0933061F09130F9F4E8E913
+:10048000F0E022E130E01EC0EAEAF0E02EE330E0E6
+:1004900019C0813049F0813018F0823079F408C0F9
+:1004A000E8EEF0E0849107C0ECEEF0E0849103C048
+:1004B000E0E2F1E08491282F30E004C0E0E0F0E0D9
+:1004C00020E030E0ED93FC93C901089528E030E08E
+:1004D00040E003C04F5F220F331F28173907D0F3C6
+:1004E000842F8295807F08958093E9008091EB00AE
+:1004F00081608093EB001092ED006093EC004093DC
+:10050000ED008091EE00881F8827881F08951092C3
+:10051000F40090E09093E9001092F0001092E8004F
+:100520001092ED008091EB008E7F8093EB009F5F37
+:10053000953081F708958091270288238CF403C0B9
+:100540008EB38823B1F08091E80082FFF9CF8091CB
+:10055000E8008B778093E80008958EB3882349F0F4
+:100560008091E80080FFF9CF8091E8008E7780933A
+:10057000E800089594E68091EC0080FF05C080912A
+:10058000E80080FF05C023C08091E80082FD1FC005
+:100590008EB3882311F482E008958EB3853011F470
+:1005A00083E008958091EB0085FF02C081E008950B
+:1005B0008091E10082FFDFCF8091E1008B7F80930B
+:1005C000E100992311F484E008959150D4CF80E0A4
+:1005D00008959C0140912D0250912E024617570715
+:1005E00018F4F90120E038C06115710511F0AB0174
+:1005F000F8CF8091E8008E778093E80040E050E0EB
+:10060000F0CF8091E80083FF02C081E008958091DF
+:10061000E80082FD2DC08EB3882381F18EB3853032
+:1006200079F18091E80080FF17C09091F20006C038
+:1006300081918093F100415050409F5F41155105D9
+:1006400011F09830A8F320E0983009F421E080916F
+:10065000E8008E778093E8004115510591F622233A
+:1006600081F606C08EB3882349F08EB3853041F001
+:100670008091E80082FFF6CF80E0089582E008953F
+:1006800083E008959C0140912D0250912E0246175F
+:10069000570710F490E03BC06115710511F0AB01F4
+:1006A000F9CF8091E8008E778093E80040E050E039
+:1006B000F1CF8091E80083FF02C081E0089580912E
+:1006C000E80082FD30C08EB3882399F18EB3853067
+:1006D00091F18091E80080FF1AC08091F20009C07A
+:1006E000F9012F5F3F4FE491E093F10041505040FA
+:1006F0008F5F4115510511F0883090F390E08830FC
+:1007000009F491E08091E8008E778093E80041152C
+:10071000510579F6992369F606C08EB3882349F00E
+:100720008EB3853041F08091E80082FFF6CF80E003
+:10073000089582E0089583E008959C016115710594
+:1007400029F48091E8008B778093E800F90120C0BC
+:100750008091E80083FF02C081E008958EB3882372
+:1007600039F18EB3853031F18091E80082FFF0CF0E
+:1007700006C08091F10081936150704021F080911A
+:10078000F2008823B1F78091E8008B778093E8002E
+:1007900061157105E9F606C08EB3882349F08EB362
+:1007A000853041F08091E80080FFF6CF80E0089529
+:1007B00082E0089583E0089542D044D01EBA10929A
+:1007C0002502109224021092230284E089BD89B58B
+:1007D000826089BD09B400FEFDCF8091D800982FBA
+:1007E0009F779093D80080688093D80080916300B1
+:1007F0008E7F809363008091D8008F7D8093D80096
+:100800008091E0008E7F8093E0008091E1008E7FF8
+:100810008093E1008091E20081608093E20080910A
+:10082000E100877F8093E1008091E20088608093FF
+:10083000E2000895C1DF81E08093260208951092BE
+:10084000E20008951092E10008951F920F920FB6F2
+:100850000F9211241F932F933F934F935F936F93A6
+:100860007F938F939F93AF93BF93EF93FF93E9EEA3
+:10087000F0E0108117701082E0EFF0E08081877F58
+:1008800080837894C3D0F894A9EEB0E01C92E0EF96
+:10089000F0E08081886080831C93FF91EF91BF918D
+:1008A000AF919F918F917F916F915F914F913F9108
+:1008B0002F911F910F900FBE0F901F9018951F92B0
+:1008C0000F920FB60F9211242F933F934F935F9384
+:1008D0006F937F938F939F93AF93BF93EF93FF9308
+:1008E0008091E10080FF1BC08091E20080FF17C073
+:1008F0008091E1008E7F8093E1008091E2008E7F05
+:100900008093E2008091E20080618093E200809118
+:10091000D80080628093D80019BC1EBAD1D18091D2
+:10092000E10084FF29C08091E20084FF25C084E0BB
+:1009300089BD89B5826089BD09B400FEFDCF809173
+:10094000D8008F7D8093D8008091E1008F7E8093C6
+:10095000E1008091E2008F7E8093E2008091E200CE
+:1009600081608093E20080912502882311F481E068
+:1009700001C084E08EBBA4D18091E10083FF27C039
+:100980008091E20083FF23C08091E100877F809304
+:10099000E10082E08EBB109225028091E1008E7F03
+:1009A0008093E1008091E2008E7F8093E20080914D
+:1009B000E20080618093E200AADD80E060E042E036
+:1009C00093DD8091F00088608093F00079D1809170
+:1009D000E10082FF0AC08091E20082FF06C08091A0
+:1009E000E1008B7F8093E1006BD1FF91EF91BF918C
+:1009F000AF919F918F917F916F915F914F913F91B7
+:100A00002F910F900FBE0F901F9018951F93DF939B
+:100A1000CF93CDB7DEB7AC970FB6F894DEBF0FBE5D
+:100A2000CDBFE7E2F2E08091F100819322E0EF3266
+:100A3000F207C9F78091270230912802353009F476
+:100A400087C0363040F43130C9F1313070F0333086
+:100A500009F01DC133C0383009F4EFC0393009F452
+:100A6000FEC0363009F013C192C0803821F08238C0
+:100A700009F00DC108C090912302809124028823BF
+:100A800099F0926011C080912B0287708093E900E9
+:100A90008091EB0090E025E0969587952A95E1F707
+:100AA000982F91701092E9008091E800877F8093E1
+:100AB000E8009093F1001092F100CAC0882319F069
+:100AC000823009F0E4C090E08F719070009721F0BF
+:100AD000029709F0DDC00CC080912902813009F035
+:100AE000D7C010922402333069F5809324022AC0C3
+:100AF00080912902882331F520912B02277009F477
+:100B0000C7C02093E9008091EB0080FFC1C0333063
+:100B100021F48091EB00806213C08091EB00806132
+:100B20008093EB0081E090E002C0880F991F2A9526
+:100B3000E2F78093EA001092EA008091EB0088606F
+:100B40008093EB001092E9008091E800877F83C0DA
+:100B5000882309F09CC0109129028091E800877FCA
+:100B60008093E800E8DC04C08EB3882309F490C0C9
+:100B70008091E80080FFF8CF812F8F7711F492E009
+:100B800001C093E09EBB80688093E30081C08058E1
+:100B9000823008F07CC08091290290912A0223E0E3
+:100BA0008C3D920799F55FB7F894DE0115964EE0FB
+:100BB00020E030E061E2E42FF0E0609357008491A0
+:100BC00020FF03C082958F704F5F982F9F70892FF1
+:100BD000805D8A3308F0895F8C9311961C9211977F
+:100BE0002F5F3F4F12962431310529F75FBF8AE20C
+:100BF0008B8383E08C838091E800877F8093E8007B
+:100C0000CE0103966AE270E0E4DC11C060912B0231
+:100C1000AE014F5F5F4F2CDCBC010097C9F18091A2
+:100C2000E800877F8093E80089819A812BDD80919D
+:100C3000E8008B778093E8002BC0803841F58091E5
+:100C4000E800877F8093E800809125028093F1007F
+:100C50008091E8008E778093E8006DDC19C08823CE
+:100C6000B1F490912902923098F48091E800877F46
+:100C70008093E800909325025EDC80912502882312
+:100C800011F483E001C084E08EBB2DDB01C028DBC2
+:100C90008091E80083FF0AC08091EB00806280931E
+:100CA000EB008091E800877F8093E800AC960FB658
+:100CB000F894DEBF0FBECDBFCF91DF911F91089595
+:100CC00008951F938EB3882361F01091E90010926C
+:100CD000E9008091E80083FF01C098DE177010934F
+:100CE000E9001F9108950895FC018EB3843021F529
+:100CF00087859089A189B2890097A105B105E1F0A6
+:100D000085818093E9008091E80082FF15C0809181
+:100D1000F200882319F42FEF3FEF04C08091F10017
+:100D2000282F30E08091F200882341F48091E80080
+:100D30008B778093E80002C02FEF3FEFC901089541
+:100D4000FC018EB3843011F587859089A189B28921
+:100D50000097A105B105D1F081818093E9008091D0
+:100D6000F2008823A9F09091E8008091E8008E7746
+:100D70008093E80095FD0CC0FDDB982F882349F493
+:100D80008091E8008E778093E80003C092E001C074
+:100D900090E0892F0895FC018EB3843051F487854B
+:100DA0009089A189B2890097A105B10511F0CF0101
+:100DB000C7CF08951F93FC01162F8EB38430D9F44A
+:100DC00087859089A189B2890097A105B10599F01D
+:100DD00081818093E9008091E80085FD08C08091C1
+:100DE000E8008E778093E800C5DB882329F4109310
+:100DF000F10080E001C082E01F9108950F931F93DE
+:100E0000CF93DF93EC010D96FC0189E0DF011D9289
+:100E10008A95E9F72A813B8109818C81882311F425
+:100E200010E001C014E0C90151DB182B1260802FC3
+:100E300061E8412F59DB882329F12E813F810D8103
+:100E40008885882311F410E001C014E0C9013EDB5D
+:100E5000182B1260802F60E8412F46DB882391F029
+:100E60002A853B8509858C85882311F410E001C013
+:100E700014E0C9012BDB182B1260802F61EC412F8D
+:100E800033DB01C080E0DF91CF911F910F91089576
+:100E9000CF93DF93EC018091E80083FF60C08881ED
+:100EA00090E020912B0230912C022817390709F08D
+:100EB00056C080912802813261F0823220F4803263
+:100EC00009F04DC019C0823269F1833209F047C080
+:100ED00038C080912702813A09F041C08091E80032
+:100EE000877F8093E800CE010F9667E070E071DBAA
+:100EF0008091E8008B7713C080912702813279F5C9
+:100F00008091E800877F8093E800CE010F9667E02C
+:100F100070E013DCCE013ED98091E8008E7780939B
+:100F2000E8001DC0809127028132C9F48091E80059
+:100F3000877F8093E800809129028D87CE01C8D9F0
+:100F40000DC080912702813251F48091E800877FA3
+:100F50008093E800CE0160912902C5DEECDADF91D2
+:100F6000CF910895A1E21A2EAA1BBB1BFD010DC053
+:100F7000AA1FBB1FEE1FFF1FA217B307E407F50749
+:100F800020F0A21BB30BE40BF50B661F771F881F25
+:100F9000991F1A9469F760957095809590959B01BB
+:0C0FA000AC01BD01CF010895F894FFCF13
+:100FAC0000034000000440000002080000000000A4
+:060FBC000000000000002F
+:00000001FF
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Uno-Rev3.hex b/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Uno-Rev3.hex
new file mode 100644
index 0000000..d1404ee
--- /dev/null
+++ b/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Uno-Rev3.hex
@@ -0,0 +1,254 @@
+:1000000090C00000A9C00000A7C00000A5C000006B
+:10001000A3C00000A1C000009FC000009DC0000060
+:100020009BC0000099C0000097C0000048C40000B9
+:100030000CC4000091C000008FC000008DC0000003
+:100040008BC0000089C0000087C0000085C0000090
+:1000500083C0000081C000007FC0000002C100001A
+:100060007BC0000079C0000077C0000075C00000B0
+:1000700073C0000071C000006FC000006DC00000C0
+:100080006BC0000069C0000067C0000065C00000D0
+:1000900063C0000061C000001201100102000008EE
+:1000A0004123430001000102DC0109023E0002017C
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:10012000000011241FBECFEFD2E0DEBFCDBF11E033
+:10013000A0E0B1E0ECEAFFE002C005900D92A6312C
+:10014000B107D9F712E0A6E1B1E001C01D92AF32CC
+:10015000B107E1F7F1D028C753CF9C01DC01AE57BE
+:10016000BF4FED91FC91119741911196FC93EE9345
+:1001700080589F4FE817F90711F42D933C939FB7D0
+:10018000F894F901EC57FF4F8081815080839FBF25
+:10019000842F0895DF92EF92FF920F931F93FC013B
+:1001A0008489813019F0823021F405C040E3D42ED7
+:1001B00004C0DD2402C030E2D32E8389823011F4E2
+:1001C00088E0D82A8589873031F0883031F0863050
+:1001D00031F482E003C084E001C086E0D82A1092A6
+:1001E000C9001092C8001092CA00E784F088018903
+:1001F000128980E0E81681EEF80680E0080780E0CA
+:10020000180719F420E130E00FC0C801B701969536
+:1002100087957795679560587B47814E9F4FA801DA
+:100220009701A0D6215030403093CD002093CC00D0
+:10023000D092CA0080E0E81681EEF80680E0080758
+:1002400080E0180711F082E001C080E08093C800D0
+:1002500088E98093C9001F910F91FF90EF90DF9084
+:1002600008951F920F920FB60F9211242F938F9320
+:100270009F93EF93FF939091CE008EB38430F1F46F
+:10028000E0919901F0919A019083E0919901F091A8
+:100290009A01CF01019690939A018093990189590F
+:1002A000914021F489E191E0928381839FB7F89492
+:1002B00080919D018F5F80939D019FBFFF91EF9182
+:1002C0009F918F912F910F900FBE0F901F901895B7
+:1002D000FC01858580FF02C05F9808955F9A0895AC
+:1002E00080E091E0D5C580E091E088C584B7877F44
+:1002F00084BF28E10FB6F89420936000109260004C
+:100300000FBE87E690E09093CD008093CC0086E00E
+:100310008093CA001092C8002093C900539A5A9A39
+:100320008AB180638AB98BB180638BB983D284E050
+:1003300085BD5F9A579A08950F931F93CF93DF93CC
+:10034000D5DF2FB7F8948EE991E090931F02809348
+:100350001E0290932102809320022FBF2FB7F894A2
+:1003600089E191E090939A018093990190939C0187
+:1003700080939B012FBF7894CEE9D1E003E08FB743
+:10038000F894909122028FBF903809F180E091E0BB
+:10039000ABD497FD1CC0E0911E02F0911F02808338
+:1003A000E0911E02F0911F02CF01019690931F026F
+:1003B00080931E028E51924011F4D283C1839FB765
+:1003C000F894809122028F5F809322029FBF8FB7A3
+:1003D000F89410919D018FBFA89902C0113678F151
+:1003E000A89A80919D01882361F05D980093160181
+:1003F00008C089E191E0B1DE682F80E091E0DAD4B5
+:1004000011501123B1F780911601882351F080918A
+:10041000160181508093160180911601882309F4FA
+:100420005D9A80911701882351F0809117018150C6
+:100430008093170180911701882309F45C9A8FB784
+:10044000F894909122028FBF992369F08EE991E090
+:1004500084DE982F8091C80085FFFCCF9093CE005A
+:100460005C980093170180E091E095D42AD487CF5F
+:10047000DA01923049F0933061F09130F9F4E8E913
+:10048000F0E022E130E01EC0EAEAF0E02EE330E0E6
+:1004900019C0813049F0813018F0823079F408C0F9
+:1004A000E8EEF0E0849107C0ECEEF0E0849103C048
+:1004B000E0E2F1E08491282F30E004C0E0E0F0E0D9
+:1004C00020E030E0ED93FC93C901089528E030E08E
+:1004D00040E003C04F5F220F331F28173907D0F3C6
+:1004E000842F8295807F08958093E9008091EB00AE
+:1004F00081608093EB001092ED006093EC004093DC
+:10050000ED008091EE00881F8827881F08951092C3
+:10051000F40090E09093E9001092F0001092E8004F
+:100520001092ED008091EB008E7F8093EB009F5F37
+:10053000953081F708958091270288238CF403C0B9
+:100540008EB38823B1F08091E80082FFF9CF8091CB
+:10055000E8008B778093E80008958EB3882349F0F4
+:100560008091E80080FFF9CF8091E8008E7780933A
+:10057000E800089594E68091EC0080FF05C080912A
+:10058000E80080FF05C023C08091E80082FD1FC005
+:100590008EB3882311F482E008958EB3853011F470
+:1005A00083E008958091EB0085FF02C081E008950B
+:1005B0008091E10082FFDFCF8091E1008B7F80930B
+:1005C000E100992311F484E008959150D4CF80E0A4
+:1005D00008959C0140912D0250912E024617570715
+:1005E00018F4F90120E038C06115710511F0AB0174
+:1005F000F8CF8091E8008E778093E80040E050E0EB
+:10060000F0CF8091E80083FF02C081E008958091DF
+:10061000E80082FD2DC08EB3882381F18EB3853032
+:1006200079F18091E80080FF17C09091F20006C038
+:1006300081918093F100415050409F5F41155105D9
+:1006400011F09830A8F320E0983009F421E080916F
+:10065000E8008E778093E8004115510591F622233A
+:1006600081F606C08EB3882349F08EB3853041F001
+:100670008091E80082FFF6CF80E0089582E008953F
+:1006800083E008959C0140912D0250912E0246175F
+:10069000570710F490E03BC06115710511F0AB01F4
+:1006A000F9CF8091E8008E778093E80040E050E039
+:1006B000F1CF8091E80083FF02C081E0089580912E
+:1006C000E80082FD30C08EB3882399F18EB3853067
+:1006D00091F18091E80080FF1AC08091F20009C07A
+:1006E000F9012F5F3F4FE491E093F10041505040FA
+:1006F0008F5F4115510511F0883090F390E08830FC
+:1007000009F491E08091E8008E778093E80041152C
+:10071000510579F6992369F606C08EB3882349F00E
+:100720008EB3853041F08091E80082FFF6CF80E003
+:10073000089582E0089583E008959C016115710594
+:1007400029F48091E8008B778093E800F90120C0BC
+:100750008091E80083FF02C081E008958EB3882372
+:1007600039F18EB3853031F18091E80082FFF0CF0E
+:1007700006C08091F10081936150704021F080911A
+:10078000F2008823B1F78091E8008B778093E8002E
+:1007900061157105E9F606C08EB3882349F08EB362
+:1007A000853041F08091E80080FFF6CF80E0089529
+:1007B00082E0089583E0089542D044D01EBA10929A
+:1007C0002502109224021092230284E089BD89B58B
+:1007D000826089BD09B400FEFDCF8091D800982FBA
+:1007E0009F779093D80080688093D80080916300B1
+:1007F0008E7F809363008091D8008F7D8093D80096
+:100800008091E0008E7F8093E0008091E1008E7FF8
+:100810008093E1008091E20081608093E20080910A
+:10082000E100877F8093E1008091E20088608093FF
+:10083000E2000895C1DF81E08093260208951092BE
+:10084000E20008951092E10008951F920F920FB6F2
+:100850000F9211241F932F933F934F935F936F93A6
+:100860007F938F939F93AF93BF93EF93FF93E9EEA3
+:10087000F0E0108117701082E0EFF0E08081877F58
+:1008800080837894C3D0F894A9EEB0E01C92E0EF96
+:10089000F0E08081886080831C93FF91EF91BF918D
+:1008A000AF919F918F917F916F915F914F913F9108
+:1008B0002F911F910F900FBE0F901F9018951F92B0
+:1008C0000F920FB60F9211242F933F934F935F9384
+:1008D0006F937F938F939F93AF93BF93EF93FF9308
+:1008E0008091E10080FF1BC08091E20080FF17C073
+:1008F0008091E1008E7F8093E1008091E2008E7F05
+:100900008093E2008091E20080618093E200809118
+:10091000D80080628093D80019BC1EBAD1D18091D2
+:10092000E10084FF29C08091E20084FF25C084E0BB
+:1009300089BD89B5826089BD09B400FEFDCF809173
+:10094000D8008F7D8093D8008091E1008F7E8093C6
+:10095000E1008091E2008F7E8093E2008091E200CE
+:1009600081608093E20080912502882311F481E068
+:1009700001C084E08EBBA4D18091E10083FF27C039
+:100980008091E20083FF23C08091E100877F809304
+:10099000E10082E08EBB109225028091E1008E7F03
+:1009A0008093E1008091E2008E7F8093E20080914D
+:1009B000E20080618093E200AADD80E060E042E036
+:1009C00093DD8091F00088608093F00079D1809170
+:1009D000E10082FF0AC08091E20082FF06C08091A0
+:1009E000E1008B7F8093E1006BD1FF91EF91BF918C
+:1009F000AF919F918F917F916F915F914F913F91B7
+:100A00002F910F900FBE0F901F9018951F93DF939B
+:100A1000CF93CDB7DEB7AC970FB6F894DEBF0FBE5D
+:100A2000CDBFE7E2F2E08091F100819322E0EF3266
+:100A3000F207C9F78091270230912802353009F476
+:100A400087C0363040F43130C9F1313070F0333086
+:100A500009F01DC133C0383009F4EFC0393009F452
+:100A6000FEC0363009F013C192C0803821F08238C0
+:100A700009F00DC108C090912302809124028823BF
+:100A800099F0926011C080912B0287708093E900E9
+:100A90008091EB0090E025E0969587952A95E1F707
+:100AA000982F91701092E9008091E800877F8093E1
+:100AB000E8009093F1001092F100CAC0882319F069
+:100AC000823009F0E4C090E08F719070009721F0BF
+:100AD000029709F0DDC00CC080912902813009F035
+:100AE000D7C010922402333069F5809324022AC0C3
+:100AF00080912902882331F520912B02277009F477
+:100B0000C7C02093E9008091EB0080FFC1C0333063
+:100B100021F48091EB00806213C08091EB00806132
+:100B20008093EB0081E090E002C0880F991F2A9526
+:100B3000E2F78093EA001092EA008091EB0088606F
+:100B40008093EB001092E9008091E800877F83C0DA
+:100B5000882309F09CC0109129028091E800877FCA
+:100B60008093E800E8DC04C08EB3882309F490C0C9
+:100B70008091E80080FFF8CF812F8F7711F492E009
+:100B800001C093E09EBB80688093E30081C08058E1
+:100B9000823008F07CC08091290290912A0223E0E3
+:100BA0008C3D920799F55FB7F894DE0115964EE0FB
+:100BB00020E030E061E2E42FF0E0609357008491A0
+:100BC00020FF03C082958F704F5F982F9F70892FF1
+:100BD000805D8A3308F0895F8C9311961C9211977F
+:100BE0002F5F3F4F12962431310529F75FBF8AE20C
+:100BF0008B8383E08C838091E800877F8093E8007B
+:100C0000CE0103966AE270E0E4DC11C060912B0231
+:100C1000AE014F5F5F4F2CDCBC010097C9F18091A2
+:100C2000E800877F8093E80089819A812BDD80919D
+:100C3000E8008B778093E8002BC0803841F58091E5
+:100C4000E800877F8093E800809125028093F1007F
+:100C50008091E8008E778093E8006DDC19C08823CE
+:100C6000B1F490912902923098F48091E800877F46
+:100C70008093E800909325025EDC80912502882312
+:100C800011F483E001C084E08EBB2DDB01C028DBC2
+:100C90008091E80083FF0AC08091EB00806280931E
+:100CA000EB008091E800877F8093E800AC960FB658
+:100CB000F894DEBF0FBECDBFCF91DF911F91089595
+:100CC00008951F938EB3882361F01091E90010926C
+:100CD000E9008091E80083FF01C098DE177010934F
+:100CE000E9001F9108950895FC018EB3843021F529
+:100CF00087859089A189B2890097A105B105E1F0A6
+:100D000085818093E9008091E80082FF15C0809181
+:100D1000F200882319F42FEF3FEF04C08091F10017
+:100D2000282F30E08091F200882341F48091E80080
+:100D30008B778093E80002C02FEF3FEFC901089541
+:100D4000FC018EB3843011F587859089A189B28921
+:100D50000097A105B105D1F081818093E9008091D0
+:100D6000F2008823A9F09091E8008091E8008E7746
+:100D70008093E80095FD0CC0FDDB982F882349F493
+:100D80008091E8008E778093E80003C092E001C074
+:100D900090E0892F0895FC018EB3843051F487854B
+:100DA0009089A189B2890097A105B10511F0CF0101
+:100DB000C7CF08951F93FC01162F8EB38430D9F44A
+:100DC00087859089A189B2890097A105B10599F01D
+:100DD00081818093E9008091E80085FD08C08091C1
+:100DE000E8008E778093E800C5DB882329F4109310
+:100DF000F10080E001C082E01F9108950F931F93DE
+:100E0000CF93DF93EC010D96FC0189E0DF011D9289
+:100E10008A95E9F72A813B8109818C81882311F425
+:100E200010E001C014E0C90151DB182B1260802FC3
+:100E300061E8412F59DB882329F12E813F810D8103
+:100E40008885882311F410E001C014E0C9013EDB5D
+:100E5000182B1260802F60E8412F46DB882391F029
+:100E60002A853B8509858C85882311F410E001C013
+:100E700014E0C9012BDB182B1260802F61EC412F8D
+:100E800033DB01C080E0DF91CF911F910F91089576
+:100E9000CF93DF93EC018091E80083FF60C08881ED
+:100EA00090E020912B0230912C022817390709F08D
+:100EB00056C080912802813261F0823220F4803263
+:100EC00009F04DC019C0823269F1833209F047C080
+:100ED00038C080912702813A09F041C08091E80032
+:100EE000877F8093E800CE010F9667E070E071DBAA
+:100EF0008091E8008B7713C080912702813279F5C9
+:100F00008091E800877F8093E800CE010F9667E02C
+:100F100070E013DCCE013ED98091E8008E7780939B
+:100F2000E8001DC0809127028132C9F48091E80059
+:100F3000877F8093E800809129028D87CE01C8D9F0
+:100F40000DC080912702813251F48091E800877FA3
+:100F50008093E800CE0160912902C5DEECDADF91D2
+:100F6000CF910895A1E21A2EAA1BBB1BFD010DC053
+:100F7000AA1FBB1FEE1FFF1FA217B307E407F50749
+:100F800020F0A21BB30BE40BF50B661F771F881F25
+:100F9000991F1A9469F760957095809590959B01BB
+:0C0FA000AC01BD01CF010895F894FFCF13
+:100FAC0000034000000440000002080000000000A4
+:060FBC000000000000002F
+:00000001FF
diff --git a/hardware/arduino/programmers.txt b/hardware/arduino/programmers.txt
index 466f602..c34b88c 100644
--- a/hardware/arduino/programmers.txt
+++ b/hardware/arduino/programmers.txt
@@ -1,3 +1,5 @@
+# See: http://code.google.com/p/arduino/wiki/Platforms
+
avrisp.name=AVR ISP
avrisp.communication=serial
avrisp.protocol=stk500v1
@@ -9,6 +11,10 @@ avrispmkii.protocol=stk500v2
usbtinyisp.name=USBtinyISP
usbtinyisp.protocol=usbtiny
+usbasp.name=USBasp
+usbasp.communication=usb
+usbasp.protocol=usbasp
+
parallel.name=Parallel Programmer
parallel.protocol=dapa
parallel.force=true
diff --git a/hardware/arduino/variants/eightanaloginputs/pins_arduino.h b/hardware/arduino/variants/eightanaloginputs/pins_arduino.h
new file mode 100644
index 0000000..52b37ef
--- /dev/null
+++ b/hardware/arduino/variants/eightanaloginputs/pins_arduino.h
@@ -0,0 +1,27 @@
+/*
+ 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 $
+*/
+
+#include "../standard/pins_arduino.h"
+#undef NUM_ANALOG_INPUTS
+#define NUM_ANALOG_INPUTS 8
diff --git a/hardware/arduino/variants/leonardo/pins_arduino.h b/hardware/arduino/variants/leonardo/pins_arduino.h
new file mode 100644
index 0000000..5a15146
--- /dev/null
+++ b/hardware/arduino/variants/leonardo/pins_arduino.h
@@ -0,0 +1,253 @@
+/*
+ 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 ARDUINO_MODEL_USB_PID 0x0034
+
+#define TX_RX_LED_INIT DDRD |= (1<<5), DDRB |= (1<<0)
+#define TXLED0 PORTD |= (1<<5)
+#define TXLED1 PORTD &= ~(1<<5)
+#define RXLED0 PORTB |= (1<<0)
+#define RXLED1 PORTB &= ~(1<<0)
+
+static const uint8_t SDA = 2;
+static const uint8_t SCL = 3;
+
+// Map SPI port to 'new' pins D14..D17
+static const uint8_t SS = 17;
+static const uint8_t MOSI = 16;
+static const uint8_t MISO = 14;
+static const uint8_t SCK = 15;
+
+// Mapping of analog pins as digital I/O
+// A6-A11 share with digital pins
+static const uint8_t A0 = 18;
+static const uint8_t A1 = 19;
+static const uint8_t A2 = 20;
+static const uint8_t A3 = 21;
+static const uint8_t A4 = 22;
+static const uint8_t A5 = 23;
+static const uint8_t A6 = 24; // D4
+static const uint8_t A7 = 25; // D6
+static const uint8_t A8 = 26; // D8
+static const uint8_t A9 = 27; // D9
+static const uint8_t A10 = 28; // D10
+static const uint8_t A11 = 29; // D12
+
+// __AVR_ATmega32U4__ has an unusual mapping of pins to channels
+extern const uint8_t PROGMEM analog_pin_to_channel_PGM[];
+#define analogPinToChannel(P) ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) )
+
+#ifdef ARDUINO_MAIN
+
+// On the Arduino board, digital pins are also used
+// for the analog output (software PWM). Analog input
+// pins are a separate set.
+
+// ATMEL ATMEGA32U4 / ARDUINO LEONARDO
+//
+// D0 PD2 RXD1/INT2
+// D1 PD3 TXD1/INT3
+// D2 PD1 SDA SDA/INT1
+// D3# PD0 PWM8/SCL OC0B/SCL/INT0
+// D4 A6 PD4 ADC8
+// D5# PC6 ??? OC3A/#OC4A
+// D6# A7 PD7 FastPWM #OC4D/ADC10
+// D7 PE6 INT6/AIN0
+//
+// D8 A8 PB4 ADC11/PCINT4
+// D9# A9 PB5 PWM16 OC1A/#OC4B/ADC12/PCINT5
+// D10# A10 PB6 PWM16 OC1B/0c4B/ADC13/PCINT6
+// D11# PB7 PWM8/16 0C0A/OC1C/#RTS/PCINT7
+// D12 A11 PD6 T1/#OC4D/ADC9
+// D13# PC7 PWM10 CLK0/OC4A
+//
+// A0 D18 PF7 ADC7
+// A1 D19 PF6 ADC6
+// A2 D20 PF5 ADC5
+// A3 D21 PF4 ADC4
+// A4 D22 PF1 ADC1
+// A5 D23 PF0 ADC0
+//
+// New pins D14..D17 to map SPI port to digital pins
+//
+// MISO D14 PB3 MISO,PCINT3
+// SCK D15 PB1 SCK,PCINT1
+// MOSI D16 PB2 MOSI,PCINT2
+// SS D17 PB0 RXLED,SS/PCINT0
+//
+// TXLED PD5
+// RXLED PB0
+// HWB PE2 HWB
+
+// 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,
+ (uint16_t) &DDRB,
+ (uint16_t) &DDRC,
+ (uint16_t) &DDRD,
+ (uint16_t) &DDRE,
+ (uint16_t) &DDRF,
+};
+
+const uint16_t PROGMEM port_to_output_PGM[] = {
+ NOT_A_PORT,
+ NOT_A_PORT,
+ (uint16_t) &PORTB,
+ (uint16_t) &PORTC,
+ (uint16_t) &PORTD,
+ (uint16_t) &PORTE,
+ (uint16_t) &PORTF,
+};
+
+const uint16_t PROGMEM port_to_input_PGM[] = {
+ NOT_A_PORT,
+ NOT_A_PORT,
+ (uint16_t) &PINB,
+ (uint16_t) &PINC,
+ (uint16_t) &PIND,
+ (uint16_t) &PINE,
+ (uint16_t) &PINF,
+};
+
+const uint8_t PROGMEM digital_pin_to_port_PGM[30] = {
+ PD, // D0 - PD2
+ PD, // D1 - PD3
+ PD, // D2 - PD1
+ PD, // D3 - PD0
+ PD, // D4 - PD4
+ PC, // D5 - PC6
+ PD, // D6 - PD7
+ PE, // D7 - PE6
+
+ PB, // D8 - PB4
+ PB, // D9 - PB5
+ PB, // D10 - PB6
+ PB, // D11 - PB7
+ PD, // D12 - PD6
+ PC, // D13 - PC7
+
+ PB, // D14 - MISO - PB3
+ PB, // D15 - SCK - PB1
+ PB, // D16 - MOSI - PB2
+ PB, // D17 - SS - PB0
+
+ PF, // D18 - A0 - PF7
+ PF, // D19 - A1 - PF6
+ PF, // D20 - A2 - PF5
+ PF, // D21 - A3 - PF4
+ PF, // D22 - A4 - PF1
+ PF, // D23 - A5 - PF0
+
+ PD, // D24 / D4 - A6 - PD4
+ PD, // D25 / D6 - A7 - PD7
+ PB, // D26 / D8 - A8 - PB4
+ PB, // D27 / D9 - A9 - PB5
+ PB, // D28 / D10 - A10 - PB6
+ PD, // D29 / D12 - A11 - PD6
+};
+
+const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[30] = {
+ _BV(2), // D0 - PD2
+ _BV(3), // D1 - PD3
+ _BV(1), // D2 - PD1
+ _BV(0), // D3 - PD0
+ _BV(4), // D4 - PD4
+ _BV(6), // D5 - PC6
+ _BV(7), // D6 - PD7
+ _BV(6), // D7 - PE6
+
+ _BV(4), // D8 - PB4
+ _BV(5), // D9 - PB5
+ _BV(6), // D10 - PB6
+ _BV(7), // D11 - PB7
+ _BV(6), // D12 - PD6
+ _BV(7), // D13 - PC7
+
+ _BV(3), // D14 - MISO - PB3
+ _BV(1), // D15 - SCK - PB1
+ _BV(2), // D16 - MOSI - PB2
+ _BV(0), // D17 - SS - PB0
+
+ _BV(7), // D18 - A0 - PF7
+ _BV(6), // D19 - A1 - PF6
+ _BV(5), // D20 - A2 - PF5
+ _BV(4), // D21 - A3 - PF4
+ _BV(1), // D22 - A4 - PF1
+ _BV(0), // D23 - A5 - PF0
+
+ _BV(4), // D24 / D4 - A6 - PD4
+ _BV(7), // D25 / D6 - A7 - PD7
+ _BV(4), // D26 / D8 - A8 - PB4
+ _BV(5), // D27 / D9 - A9 - PB5
+ _BV(6), // D28 / D10 - A10 - PB6
+ _BV(6), // D29 / D12 - A11 - PD6
+};
+
+const uint8_t PROGMEM digital_pin_to_timer_PGM[18] = {
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+ TIMER0B, /* 3 */
+ NOT_ON_TIMER,
+ TIMER3A, /* 5 */
+ TIMER4D, /* 6 */
+ NOT_ON_TIMER,
+
+ NOT_ON_TIMER,
+ TIMER1A, /* 9 */
+ TIMER1B, /* 10 */
+ TIMER0A, /* 11 */
+
+ NOT_ON_TIMER,
+ TIMER4A, /* 13 */
+
+ NOT_ON_TIMER,
+ NOT_ON_TIMER,
+};
+
+const uint8_t PROGMEM analog_pin_to_channel_PGM[12] = {
+ 7, // A0 PF7 ADC7
+ 6, // A1 PF6 ADC6
+ 5, // A2 PF5 ADC5
+ 4, // A3 PF4 ADC4
+ 1, // A4 PF1 ADC1
+ 0, // A5 PF0 ADC0
+ 8, // A6 D4 PD4 ADC8
+ 10, // A7 D6 PD7 ADC10
+ 11, // A8 D8 PB4 ADC11
+ 12, // A9 D9 PB5 ADC12
+ 13, // A10 D10 PB6 ADC13
+ 9 // A11 D12 PD6 ADC9
+};
+
+#endif /* ARDUINO_MAIN */
+#endif /* Pins_Arduino_h */
diff --git a/hardware/arduino/cores/arduino/pins_arduino.c b/hardware/arduino/variants/mega/pins_arduino.h
old mode 100755
new mode 100644
similarity index 73%
rename from hardware/arduino/cores/arduino/pins_arduino.c
rename to hardware/arduino/variants/mega/pins_arduino.h
index 62e10ad..5a9b4cb
--- a/hardware/arduino/cores/arduino/pins_arduino.c
+++ b/hardware/arduino/variants/mega/pins_arduino.h
@@ -1,8 +1,8 @@
/*
- pins_arduino.c - pin definitions for the Arduino board
- Part of Arduino / Wiring Lite
+ pins_arduino.h - Pin definition functions for Arduino
+ Part of Arduino - http://www.arduino.cc/
- Copyright (c) 2005 David A. Mellis
+ 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
@@ -19,66 +19,72 @@
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
- $Id$
+ $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
*/
-#include <avr/io.h>
-#include "wiring_private.h"
-#include "pins_arduino.h"
+#ifndef Pins_Arduino_h
+#define 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.
+#include <avr/pgmspace.h>
-// 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 NUM_DIGITAL_PINS 70
+#define NUM_ANALOG_INPUTS 16
+#define analogInputToDigitalPin(p) ((p < 16) ? (p) + 54 : -1)
+#define digitalPinHasPWM(p) (((p) >= 2 && (p) <= 13) || ((p) >= 44 && (p)<= 46))
-// 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
+static const uint8_t SS = 53;
+static const uint8_t MOSI = 51;
+static const uint8_t MISO = 50;
+static const uint8_t SCK = 52;
-#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
+static const uint8_t SDA = 20;
+static const uint8_t SCL = 21;
+static const uint8_t LED_BUILTIN = 13;
+static const uint8_t A0 = 54;
+static const uint8_t A1 = 55;
+static const uint8_t A2 = 56;
+static const uint8_t A3 = 57;
+static const uint8_t A4 = 58;
+static const uint8_t A5 = 59;
+static const uint8_t A6 = 60;
+static const uint8_t A7 = 61;
+static const uint8_t A8 = 62;
+static const uint8_t A9 = 63;
+static const uint8_t A10 = 64;
+static const uint8_t A11 = 65;
+static const uint8_t A12 = 66;
+static const uint8_t A13 = 67;
+static const uint8_t A14 = 68;
+static const uint8_t A15 = 69;
+
+// A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins)
+// Only pins available for RECEIVE (TRANSMIT can be on any pin):
+// (I've deliberately left out pin mapping to the Hardware USARTs - seems senseless to me)
+// Pins: 10, 11, 12, 13, 50, 51, 52, 53, 62, 63, 64, 65, 66, 67, 68, 69
+
+#define digitalPinToPCICR(p) ( (((p) >= 10) && ((p) <= 13)) || \
+ (((p) >= 50) && ((p) <= 53)) || \
+ (((p) >= 62) && ((p) <= 69)) ? (&PCICR) : ((uint8_t *)0) )
+
+#define digitalPinToPCICRbit(p) ( (((p) >= 10) && ((p) <= 13)) || (((p) >= 50) && ((p) <= 53)) ? 0 : \
+ ( (((p) >= 62) && ((p) <= 69)) ? 2 : \
+ 0 ) )
+
+#define digitalPinToPCMSK(p) ( (((p) >= 10) && ((p) <= 13)) || (((p) >= 50) && ((p) <= 53)) ? (&PCMSK0) : \
+ ( (((p) >= 62) && ((p) <= 69)) ? (&PCMSK2) : \
+ ((uint8_t *)0) ) )
+
+#define digitalPinToPCMSKbit(p) ( (((p) >= 10) && ((p) <= 13)) ? ((p) - 6) : \
+ ( ((p) == 50) ? 3 : \
+ ( ((p) == 51) ? 2 : \
+ ( ((p) == 52) ? 1 : \
+ ( ((p) == 53) ? 0 : \
+ ( (((p) >= 62) && ((p) <= 69)) ? ((p) - 62) : \
+ 0 ) ) ) ) ) )
+
+#ifdef ARDUINO_MAIN
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
const uint16_t PROGMEM port_to_mode_PGM[] = {
NOT_A_PORT,
(uint16_t) &DDRA,
@@ -351,115 +357,7 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
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,
- (uint16_t) &DDRB,
- (uint16_t) &DDRC,
- (uint16_t) &DDRD,
-};
-
-const uint16_t PROGMEM port_to_output_PGM[] = {
- NOT_A_PORT,
- NOT_A_PORT,
- (uint16_t) &PORTB,
- (uint16_t) &PORTC,
- (uint16_t) &PORTD,
-};
-const uint16_t PROGMEM port_to_input_PGM[] = {
- NOT_A_PORT,
- NOT_A_PORT,
- (uint16_t) &PINB,
- (uint16_t) &PINC,
- (uint16_t) &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
+
+#endif
\ No newline at end of file
diff --git a/hardware/arduino/variants/micro/pins_arduino.h b/hardware/arduino/variants/micro/pins_arduino.h
new file mode 100644
index 0000000..c9f25eb
--- /dev/null
+++ b/hardware/arduino/variants/micro/pins_arduino.h
@@ -0,0 +1,27 @@
+/*
+ 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 $
+*/
+
+#include "../leonardo/pins_arduino.h"
+#undef ARDUINO_MODEL_USB_PID
+#define ARDUINO_MODEL_USB_PID 0x0035
\ No newline at end of file
diff --git a/hardware/arduino/variants/standard/pins_arduino.h b/hardware/arduino/variants/standard/pins_arduino.h
new file mode 100644
index 0000000..30b4266
--- /dev/null
+++ b/hardware/arduino/variants/standard/pins_arduino.h
@@ -0,0 +1,218 @@
+/*
+ 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 NUM_DIGITAL_PINS 20
+#define NUM_ANALOG_INPUTS 6
+#define analogInputToDigitalPin(p) ((p < 6) ? (p) + 14 : -1)
+
+#if defined(__AVR_ATmega8__)
+#define digitalPinHasPWM(p) ((p) == 9 || (p) == 10 || (p) == 11)
+#else
+#define digitalPinHasPWM(p) ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11)
+#endif
+
+static const uint8_t SS = 10;
+static const uint8_t MOSI = 11;
+static const uint8_t MISO = 12;
+static const uint8_t SCK = 13;
+
+static const uint8_t SDA = 18;
+static const uint8_t SCL = 19;
+static const uint8_t LED_BUILTIN = 13;
+
+static const uint8_t A0 = 14;
+static const uint8_t A1 = 15;
+static const uint8_t A2 = 16;
+static const uint8_t A3 = 17;
+static const uint8_t A4 = 18;
+static const uint8_t A5 = 19;
+static const uint8_t A6 = 20;
+static const uint8_t A7 = 21;
+
+#define digitalPinToPCICR(p) (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)0))
+#define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1))
+#define digitalPinToPCMSK(p) (((p) <= 7) ? (&PCMSK2) : (((p) <= 13) ? (&PCMSK0) : (((p) <= 21) ? (&PCMSK1) : ((uint8_t *)0))))
+#define digitalPinToPCMSKbit(p) (((p) <= 7) ? (p) : (((p) <= 13) ? ((p) - 8) : ((p) - 14)))
+
+#ifdef ARDUINO_MAIN
+
+// 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
+
+
+// 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,
+ (uint16_t) &DDRB,
+ (uint16_t) &DDRC,
+ (uint16_t) &DDRD,
+};
+
+const uint16_t PROGMEM port_to_output_PGM[] = {
+ NOT_A_PORT,
+ NOT_A_PORT,
+ (uint16_t) &PORTB,
+ (uint16_t) &PORTC,
+ (uint16_t) &PORTD,
+};
+
+const uint16_t PROGMEM port_to_input_PGM[] = {
+ NOT_A_PORT,
+ NOT_A_PORT,
+ (uint16_t) &PINB,
+ (uint16_t) &PINC,
+ (uint16_t) &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
+
+#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
