1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-03 14:24:15 +01:00
Commit Graph

121 Commits

Author SHA1 Message Date
Zach Eveland
e806be8c2a uploading now completes using RC2 on Win7 2011-10-26 11:28:07 -04:00
Zach Eveland
9e72b06a75 closer still - now up to 4680 2011-10-25 19:04:31 -04:00
Zach Eveland
d50b95eac1 progress on bootloader bug - have implemented blocking USB_Recv. avrdude makes it to flash programming address 0400 or so before hanging 2011-10-25 18:56:10 -04:00
Zach Eveland
cca9401589 fixed logic bug in waiting for synch. stripped out all Serial stuff 2011-10-24 22:12:45 -04:00
Zach Eveland
55178d9b8d removed old comments 2011-10-24 21:36:06 -04:00
Zach Eveland
3e775af6d8 bootloader responds properly now. nearly there - still have an issue with it falling out of sync after completing most operations 2011-10-23 16:49:36 -04:00
Zach Eveland
fa26e288a5 more attempts to get parameter sending to work 2011-10-21 20:30:55 -04:00
Zach Eveland
44b90b9f6a some progress on responding to parameter requests 2011-10-21 20:06:17 -04:00
Zach Eveland
79dbae2eb7 avrdude communication starting to work - responds to sync, fails when trying to respond to STK_GET_PARAMETER 2011-10-21 19:36:53 -04:00
Zach Eveland
e12b578462 continuing to port programming code. temporarily changed PID to test on Windows (it works) 2011-10-21 18:21:04 -04:00
Zach Eveland
6ca5bf3acb starting to port bootloader programming code - testing as I go 2011-10-21 18:03:34 -04:00
Zach Eveland
2d8ced65d1 added and modified Program() routine 2011-10-21 17:51:04 -04:00
Zach Eveland
0dc5f19ea9 cleaning up code and comments in main - getting rid of leftover stuff from experiments 2011-10-21 17:25:59 -04:00
Zach Eveland
f59451b04d Enumerates! used inline ASM for operation which moves interrupts to boot section 2011-10-21 17:16:48 -04:00
Zach Eveland
2f46c2a6e6 can now enable interrupts but EORSTE or SOFE in USB_::attach() still cause bootloader to hang 2011-10-21 16:51:25 -04:00
Zach Eveland
bc669c14f8 added more USB source adapted from sketch core. still not enumerating. 2011-10-21 16:33:52 -04:00
Zach Eveland
b86ce43044 initial commit of new Diskloader-based bootloader experiment 2011-10-21 08:02:17 -04:00
WestfW
8efc3920f9 Explicitly set the SHELL variable when OS=windows, so that we'll use
the same shell regardless of whether other shells are installed
(different shells have different behavior WRT directory component
separators, so this matters.

http://code.google.com/p/arduino/issues/detail?id=667 )
(cherry picked from commit fc8cacb9a3)
2011-10-10 12:11:18 -04:00
WestfW
de4d73511d Oops. Add atmega8.lst/hex and atmega168.lst/hex to controlled files.
(cherry picked from commit c56a1293d7)
2011-10-10 12:11:18 -04:00
WestfW
b2c43c2e55 Allow the READ PARAMETER command to return our version number.
(significant size impact: 14 bytes!)

Initialized "address" to eliminate compiler warning (4 bytes!)

Add "atmega168" as a more accurate target name than "diecimila"
(keep diecimila as well for backward compatibility)

Reduce the .hex and .lst targets that are stored in source control
to the three basics: atmega8, atmega168, atmega328.  The other
targets remain in the makefile and makeall, but will need to be
built from source if wanted.  Which should be less of a problem
now that the source is buildable without installing crosspack.
(cherry picked from commit 7b1ee0f1b0)
2011-10-10 12:11:17 -04:00
WestfW
a57d315e4b 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 e81c1123b6)
2011-10-10 12:11:16 -04:00
WestfW
1bbded4f34 (make sure .hex and .lst are updated as well.)
(cherry picked from commit ece29c3805)
2011-10-10 12:11:16 -04:00
WestfW
091dc9a7f9 Fix errors in LDSECTIONS refactoring
(found during atmega8 testing.)
(cherry picked from commit 422398e08c)
2011-10-10 12:11:16 -04:00
WestfW
93f7515ecf Update version to reflect previous edit. Sigh.
(cherry picked from commit e28b716f88)
2011-10-10 12:11:15 -04:00
WestfW
07a88dc998 Shrink code by using registers for variables "length" and "address"
http://code.google.com/p/optiboot/issues/detail?id=33

Fix high-value watchdog timeouts on ATmega8
http://code.google.com/p/optiboot/issues/detail?id=38

Change "start app on bad commands" code to start the app via the
watchdog timer, so that the app is always started with the chip
in fully reset state.
http://code.google.com/p/optiboot/issues/detail?id=37
(cherry picked from commit 6f7687b0f9)
2011-10-10 12:11:15 -04:00
WestfW
10019bb0df Add a version number to the optiboot source and binary.
http://code.google.com/p/arduino/issues/detail?id=554

end of flash memory where they can be read (at least in theory) by
device programmers, hex-file examination, or application programs.
This is done by putting the version number in a separate section
(".version"), and using linker/objcopy magic to locate that section as
appropriate for the target chip.  (See
http://lists.gnu.org/archive/html/avr-gcc-list/2011-02/msg00016.html
for some discussion on the details.)

Start the version at 4.1 (the last "packaged" version of optiboot was
called version 3, so the "top of source" would be 4.0, and adding the
version number makes 4.1)

Refactor LDSECTION in the Makefile to LDSECTIONS so that multiple
section start addresses can be defined.

Change the _isp makefile definitions to make the bootloader section
readable (but not writable) by the application section.  (This would
need to be done elsewhere as well to handle all bootloader programming
techniques.  Notably Arduino's boards.txt

Note that this change does not change the "code" portion of optiboot
at all.  The only diffs in the .hex files are the added version word
at the end of flash memory.
(cherry picked from commit 00706284de)
2011-10-10 12:11:15 -04:00
WestfW
287aae6b42 Update shell script makeall
(cherry picked from commit d4632cb095)
2011-10-10 12:11:14 -04:00
WestfW
92e746d0a5 This is a relatively significant edit that brings the Arduino copy of
optiboot up-to-date with the optiboot source repository as of Jun-2011
(the last changes made in the optiboot repository were in Oct-2010)

This adds support for several plaforms, fixes the "30k bug", and
refactors the source to have separate stk500.h, boot.h, and pin_defs.h

These are the arduino opticode issues fixed:
http://code.google.com/p/arduino/issues/detail?id=380
    optiboot has problems upload sketches bigger than 30 KB
http://code.google.com/p/arduino/issues/detail?id=556
    update optiboot to the point of the latest optiboot project sources.

These are issues that had been solved in the optiboot source aready:
http://code.google.com/p/arduino/issues/detail?id=364
   optiboot leaves timer1 configured when starting app, breaks PWM on
   pin 9 and 10.  (fixed with a workaround in arduino core.)
   aka http://code.google.com/p/optiboot/source/detail?r=c778fbe72df6ac13ef730c25283358c3c970f73e
   Support for ATmega8 and mega88.
   Fix fuse settings for mega168 _ISP targets
   Additional new platforms (mega, sanguino)

http://code.google.com/p/optiboot/issues/detail?id=26
   Set R1 to 0  (already in arduino code)
http://code.google.com/p/optiboot/issues/detail?id=36&can=1
   Fails to build correctly for mega88

After this commit, the only differences between the Arduino optiboot.c
and the optiboot repository optiboot.c are cosmetic.
(cherry picked from commit e2812ef91c)
2011-10-10 12:11:14 -04:00
WestfW
72e425a41d http://code.google.com/p/arduino/issues/detail?id=517
Remove the trailing comments when setting fuse values for the various
*_isp targets, so that they won't cause avrdude errors.

This was done the same way as in the optiboot source tree:
http://code.google.com/p/optiboot/issues/detail?id=17
http://code.google.com/p/optiboot/source/detail?r=005fb033fc08c551b2f86f7c90c5db21549b3f20
(cherry picked from commit 6840b77643)
2011-10-10 12:11:14 -04:00
WestfW
11b2d86ff1 Makefile modification to allow building optiboot in more environments.
Allows building within the Arduino Source tree, and within the Arduino
IDE tree, as well as using CrossPack on Mac.

Adds README.TXT to track arduino-specific changes (and documents the
new build options.)

This addresses Arduino issue:

  http://code.google.com/p/arduino/issues/detail?id=487

And optiboot issue

  http://code.google.com/p/optiboot/issues/detail?id=1

(which can be thought of as a subset of the Arduno issue.)

Note that the binaries produced after these Makefile changes (using any
of the compile environments) are identical to those produced by the
crosspack-20100115 environment on a Mac.
(cherry picked from commit 2d2ed324b4)
2011-10-10 12:11:13 -04:00
David A. Mellis
f093cc6970 Merge pull request #30 from WestfW/master
Significant optiboot upgrade.
2011-10-10 09:01:56 -07:00
WestfW
fc8cacb9a3 Explicitly set the SHELL variable when OS=windows, so that we'll use
the same shell regardless of whether other shells are installed
(different shells have different behavior WRT directory component
separators, so this matters.

http://code.google.com/p/arduino/issues/detail?id=667 )
2011-10-05 01:41:03 -07:00
David A. Mellis
de22990133 Updating bootloader comments. 2011-09-16 20:31:41 -04:00
David A. Mellis
19d7d4b066 Updating Micro bootloader (previous one was identical to Leonardo). 2011-09-16 18:25:59 -04:00
Zach Eveland
b898a35f76 new bootloader binaries for Micro and Leonardo - uses new assignment for TXLED pin 2011-09-16 16:24:21 -04:00
Zach Eveland
23d0d05844 updated pin mappings for bootloader and pins_arduino.h in anticipation of final hardware. 2011-09-16 15:46:51 -04:00
Zach Eveland
75cfefcd0a restored Micro entry in boards.txt, made separate bootloader images for Leonardo and Micro. 2011-09-16 14:47:42 -04:00
Zach Eveland
4452de6eaa bootloader iProduct definition changed to "Arduino Leonardo Bootloader" or "Arduino Micro Bootloader". selection depends on PID passed in at compile time 2011-09-16 12:09:51 -04:00
Zach Eveland
66b484e53e added to the bootloader iProduct and iManufacturer strings identifying board as an "Arduino Leonardo" manufactured by "Arduino LLC" 2011-09-16 11:56:33 -04:00
Zach Eveland
6bbc7b2db7 faster LED breathing animation in bootloader 2011-09-16 11:18:39 -04:00
Zach Eveland
6f65578b99 updated Leonardo INF with correct PID and created new Micro INF. 2011-09-08 20:45:10 -04:00
Zach Eveland
b1c8d0be34 in bootloader reduced delay between receiving stk500 'Q' and jumping to application 2011-09-08 20:38:23 -04:00
Zach Eveland
c0b45364b8 disabling watchdog in bootloader 2011-09-08 18:12:11 -04:00
Zach Eveland
11e3921c81 misc. bootloader fixes: increased wait time after receiving avrdude 'Q', increased bootloader timeout, and fixed LED one-shot timing 2011-09-08 16:23:29 -04:00
Zach Eveland
301f1b8552 Revert "added Micro section to boards.txt. specified different bootloader hex files for Leonardo and Micro (differ only by PID). added PID entries to boards.txt"
This reverts commit 3b5122e138.
2011-09-08 15:40:41 -04:00
Zach Eveland
3b5122e138 added Micro section to boards.txt. specified different bootloader hex files for Leonardo and Micro (differ only by PID). added PID entries to boards.txt 2011-09-08 11:00:40 -04:00
Zach Eveland
48212b11fd changed PIDs for Leonardo and Micro. PIDs are now defined in the Makefile 2011-09-08 09:47:17 -04:00
Zach Eveland
4db174e67b removed all bootloader mass storage and MSC references 2011-09-08 09:12:30 -04:00
Zach Eveland
bef7d736d2 bootloader ends as soon as sketch upload finishes. restored pulsing of LED while bootloader running. 2011-08-27 07:00:07 -04:00
Zach Eveland
e254d2989d LEDs for D13, TX, and RX are more in line with Uno-like behavior during sketch uploading.
D13 flashes on reboot, TX and RX flash with USB data transfer.
2011-08-14 16:02:16 -04:00
Zach Eveland
c149be22f7 rebuilt Diskloader, added LED control macros for Leonardo, removed Microtouch defines 2011-08-14 15:11:23 -04:00
Zach Eveland
13a269df2e increased bootloader delay to approx. 3.5 s 2011-08-14 14:29:44 -04:00
Zach Eveland
0ecdd723cf diskloader source and binary for 32u4 2011-08-11 10:31:39 -04:00
David A. Mellis
c93fd746c4 Disabling terminal / monitor. 2011-06-29 22:48:07 -04:00
WestfW
c56a1293d7 Oops. Add atmega8.lst/hex and atmega168.lst/hex to controlled files. 2011-06-14 23:57:41 -07:00
WestfW
7b1ee0f1b0 Allow the READ PARAMETER command to return our version number.
(significant size impact: 14 bytes!)

Initialized "address" to eliminate compiler warning (4 bytes!)

Add "atmega168" as a more accurate target name than "diecimila"
(keep diecimila as well for backward compatibility)

Reduce the .hex and .lst targets that are stored in source control
to the three basics: atmega8, atmega168, atmega328.  The other
targets remain in the makefile and makeall, but will need to be
built from source if wanted.  Which should be less of a problem
now that the source is buildable without installing crosspack.
2011-06-14 10:24:27 -07:00
WestfW
e81c1123b6 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.))
2011-06-13 19:07:07 -07:00
WestfW
ece29c3805 (make sure .hex and .lst are updated as well.) 2011-06-11 03:17:38 -07:00
WestfW
422398e08c Fix errors in LDSECTIONS refactoring
(found during atmega8 testing.)
2011-06-11 03:15:33 -07:00
WestfW
e28b716f88 Update version to reflect previous edit. Sigh. 2011-06-10 23:16:21 -07:00
WestfW
6f7687b0f9 Shrink code by using registers for variables "length" and "address"
http://code.google.com/p/optiboot/issues/detail?id=33

Fix high-value watchdog timeouts on ATmega8
http://code.google.com/p/optiboot/issues/detail?id=38

Change "start app on bad commands" code to start the app via the
watchdog timer, so that the app is always started with the chip
in fully reset state.
http://code.google.com/p/optiboot/issues/detail?id=37
2011-06-10 23:02:25 -07:00
WestfW
00706284de Add a version number to the optiboot source and binary.
http://code.google.com/p/arduino/issues/detail?id=554

end of flash memory where they can be read (at least in theory) by
device programmers, hex-file examination, or application programs.
This is done by putting the version number in a separate section
(".version"), and using linker/objcopy magic to locate that section as
appropriate for the target chip.  (See
http://lists.gnu.org/archive/html/avr-gcc-list/2011-02/msg00016.html
for some discussion on the details.)

Start the version at 4.1 (the last "packaged" version of optiboot was
called version 3, so the "top of source" would be 4.0, and adding the
version number makes 4.1)

Refactor LDSECTION in the Makefile to LDSECTIONS so that multiple
section start addresses can be defined.

Change the _isp makefile definitions to make the bootloader section
readable (but not writable) by the application section.  (This would
need to be done elsewhere as well to handle all bootloader programming
techniques.  Notably Arduino's boards.txt

Note that this change does not change the "code" portion of optiboot
at all.  The only diffs in the .hex files are the added version word
at the end of flash memory.
2011-06-10 17:47:47 -07:00
WestfW
d4632cb095 Update shell script makeall 2011-06-10 16:29:34 -07:00
WestfW
e2812ef91c This is a relatively significant edit that brings the Arduino copy of
optiboot up-to-date with the optiboot source repository as of Jun-2011
(the last changes made in the optiboot repository were in Oct-2010)

This adds support for several plaforms, fixes the "30k bug", and
refactors the source to have separate stk500.h, boot.h, and pin_defs.h

These are the arduino opticode issues fixed:
http://code.google.com/p/arduino/issues/detail?id=380
    optiboot has problems upload sketches bigger than 30 KB
http://code.google.com/p/arduino/issues/detail?id=556
    update optiboot to the point of the latest optiboot project sources.

These are issues that had been solved in the optiboot source aready:
http://code.google.com/p/arduino/issues/detail?id=364
   optiboot leaves timer1 configured when starting app, breaks PWM on
   pin 9 and 10.  (fixed with a workaround in arduino core.)
   aka http://code.google.com/p/optiboot/source/detail?r=c778fbe72df6ac13ef730c25283358c3c970f73e
   Support for ATmega8 and mega88.
   Fix fuse settings for mega168 _ISP targets
   Additional new platforms (mega, sanguino)

http://code.google.com/p/optiboot/issues/detail?id=26
   Set R1 to 0  (already in arduino code)
http://code.google.com/p/optiboot/issues/detail?id=36&can=1
   Fails to build correctly for mega88

After this commit, the only differences between the Arduino optiboot.c
and the optiboot repository optiboot.c are cosmetic.
2011-06-10 16:17:13 -07:00
WestfW
6840b77643 http://code.google.com/p/arduino/issues/detail?id=517
Remove the trailing comments when setting fuse values for the various
*_isp targets, so that they won't cause avrdude errors.

This was done the same way as in the optiboot source tree:
http://code.google.com/p/optiboot/issues/detail?id=17
http://code.google.com/p/optiboot/source/detail?r=005fb033fc08c551b2f86f7c90c5db21549b3f20
2011-06-09 22:57:27 -07:00
WestfW
2d2ed324b4 Makefile modification to allow building optiboot in more environments.
Allows building within the Arduino Source tree, and within the Arduino
IDE tree, as well as using CrossPack on Mac.

Adds README.TXT to track arduino-specific changes (and documents the
new build options.)

This addresses Arduino issue:

  http://code.google.com/p/arduino/issues/detail?id=487

And optiboot issue

  http://code.google.com/p/optiboot/issues/detail?id=1

(which can be thought of as a subset of the Arduno issue.)

Note that the binaries produced after these Makefile changes (using any
of the compile environments) are identical to those produced by the
crosspack-20100115 environment on a Mac.
2011-06-09 22:36:05 -07:00
David A. Mellis
94168bd0f4 Fix to optiboot infinite loop problem.
Explicitly setting R1 to 0 so that the watchdog timer is properly initializing, preventing it from timing out and resetting the processor.

http://code.google.com/p/optiboot/issues/detail?id=26
http://code.google.com/p/arduino/issues/detail?id=446
2011-01-15 13:29:08 +00:00
David A. Mellis
27109e3b1a Adding the Mega 2560 bootloader and boards.txt / boards menu entry. 2010-09-24 10:10:57 -04:00
David A. Mellis
7087bcf5bd Adding optiboot and Arduino Uno boards menu entry. 2010-09-22 09:04:33 -04:00
David A. Mellis
3524387e70 Adding ATmega328 version of the Arduino BT bootloader, along with a Makefile for building it. 2010-08-07 19:48:59 +00:00
David A. Mellis
ab1eb4aaa0 Moving things around. 2009-11-07 17:05:21 +00:00