diff options
| author | WestfW <westfw@gmail.com> | 2011-06-13 19:07:07 -0700 |
|---|---|---|
| committer | David A. Mellis <d.mellis@arduino.cc> | 2011-10-10 12:11:16 -0400 |
| commit | 0d9377c729d3dfe4719bab1631587bfc5d444b60 (patch) | |
| tree | fdf18f6c101c39d58d9936e38a415fe28053d7d9 /bootloaders/optiboot/optiboot_pro_20mhz.hex | |
| parent | e74e76ce14724fc3ea0a49e291de9b707825a576 (diff) | |
http://code.google.com/p/arduino/issues/detail?id=368
Optiboot does not support ArduinoasISP programmer.
When avrdude runs and talks to an arduino running ArduinoISP,
it needs the optiboot (entered due to auto-reset) to abort and
start the ArduinoISP "application" when it sees communications
at the wrong serial speed. Unfortunately, optiboot treats all
unrecognized command characters as "no-ops" and responds/loops
for more commands, leading to a nice loop that never gets to
the sketch. This patch causes characters received with Framing
errors (the most likely error for speed mis-matches) to NOT
reset the watchdog timer (normally done in getch()), which will
cause the application to start if it continues for "a while."
(tested. Works! Running ArduinoISP at speeds as high as 57600
still causes the bootloader to start the sketch (although it fails
later on for other reasons.))
(cherry picked from commit e81c1123b624b6cac7da018c9c786700f3152bc9)
Diffstat (limited to 'bootloaders/optiboot/optiboot_pro_20mhz.hex')
| -rw-r--r-- | bootloaders/optiboot/optiboot_pro_20mhz.hex | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/bootloaders/optiboot/optiboot_pro_20mhz.hex b/bootloaders/optiboot/optiboot_pro_20mhz.hex index dbd29c1..451a99c 100644 --- a/bootloaders/optiboot/optiboot_pro_20mhz.hex +++ b/bootloaders/optiboot/optiboot_pro_20mhz.hex @@ -1,33 +1,34 @@ -:103E0000112484B714BE81FFE3D085E08093810044
+:103E0000112484B714BE81FFE7D085E08093810040
:103E100082E08093C00088E18093C10086E08093B7
-:103E2000C20085E18093C4008EE0BCD0259A86E074
+:103E2000C20085E18093C4008EE0C0D0259A86E070
:103E30002CE33BEF91E0309385002093840096BB08
:103E4000B09BFECF1D9AA8958150A9F79924939411
:103E5000A5E0AA2EF1E1BF2E9DD0813421F481E0AE
-:103E6000AFD083E01FC0823411F484E103C08534F5
-:103E700019F485E0A5D083C0853579F48BD0E82E80
+:103E6000B3D083E01FC0823411F484E103C08534F1
+:103E700019F485E0A9D083C0853579F48BD0E82E7C
:103E8000FF2488D0082F10E0102F00270E291F29AB
-:103E9000000F111F8DD0680172C0863529F484E0AF
-:103EA0008FD080E06FD06BC0843609F042C072D0F2
+:103E9000000F111F91D0680172C0863529F484E0AB
+:103EA00093D080E06FD06BC0843609F042C072D0EE
:103EB00071D0082F6FD080E0C81688E3D80620F4B0
:103EC00083E0F60187BFE895C0E0D1E063D0899335
:103ED0000C17E1F7F0E0CF16F8E3DF0620F083E0FF
-:103EE000F60187BFE89564D007B600FCFDCFA601B8
+:103EE000F60187BFE89568D007B600FCFDCFA601B4
:103EF000A0E0B1E02C9130E011968C91119790E008
:103F0000982F8827822B932B1296FA010C0197BECB
:103F1000E89511244E5F5F4FF1E0A038BF0751F7DD
:103F2000F601A7BEE89507B600FCFDCFB7BEE89541
-:103F300026C08437B1F42ED02DD0F82E2BD038D017
+:103F300026C08437B1F42ED02DD0F82E2BD03CD013
:103F4000F601EF2C8F010F5F1F4F84911BD0EA9475
:103F5000F801C1F70894C11CD11CFA94CF0CD11CF4
-:103F60000EC0853739F424D08EE10CD084E90AD014
-:103F700086E098CF813511F488E014D019D080E123
+:103F60000EC0853739F428D08EE10CD084E90AD010
+:103F700086E098CF813511F488E018D01DD080E11B
:103F800001D06ACF982F8091C00085FFFCCF90931D
-:103F9000C6000895A8958091C00087FFFCCF80914E
-:103FA000C6000895E0E6F0E098E1908380830895EC
-:103FB000F1DF803219F088E0F5DFFFCF84E1E2CF56
-:103FC0001F93182FE7DF1150E9F7F2DF1F910895D3
-:0A3FD00080E0E8DFEE27FF270994E8
-:023FFE000204BB
+:103F9000C60008958091C00087FFFCCF8091C000CB
+:103FA00084FD01C0A8958091C6000895E0E6F0E088
+:103FB00098E1908380830895EDDF803219F088E0E6
+:103FC000F5DFFFCF84E1DECF1F93182FE3DF115021
+:103FD000E9F7F2DF1F91089580E0E8DFEE27FF2781
+:023FE000099442
+:023FFE000304BA
:0400000300003E00BB
:00000001FF
|