Commit Graph

49 Commits

Author SHA1 Message Date
WestfW d3bed622e8 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 fc8cacb9a3b7c1d9cf96ae9891c7c3cd21f3c181)
2011-10-10 12:11:18 -04:00
WestfW 915ea3be2a Oops. Add atmega8.lst/hex and atmega168.lst/hex to controlled files.
(cherry picked from commit c56a1293d70d27531b7351edc3aa4c11b4a6996b)
2011-10-10 12:11:18 -04:00
WestfW 07dfd77554 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 7b1ee0f1b0192143fffbbed66dc046b6568f4386)
2011-10-10 12:11:17 -04:00
WestfW 0d9377c729 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)
2011-10-10 12:11:16 -04:00
WestfW e74e76ce14 (make sure .hex and .lst are updated as well.)
(cherry picked from commit ece29c380556878ba8efebce8801a7f076c61ada)
2011-10-10 12:11:16 -04:00
WestfW a8f7e73ce8 Fix errors in LDSECTIONS refactoring
(found during atmega8 testing.)
(cherry picked from commit 422398e08c8e011bf490b54af88271c54e56ddb9)
2011-10-10 12:11:16 -04:00
WestfW 0ad7a6df62 Update version to reflect previous edit. Sigh.
(cherry picked from commit e28b716f88968477fa0f42dbd88c539573e91886)
2011-10-10 12:11:15 -04:00
WestfW c7af506852 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 6f7687b0f925cb07447cbbcc692766c51c02f700)
2011-10-10 12:11:15 -04:00
WestfW b4952051f6 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 00706284dec3171646419839bd4a9e3f1c2d7088)
2011-10-10 12:11:15 -04:00
WestfW 64cbe56ab5 Update shell script makeall
(cherry picked from commit d4632cb09593e44bc8624c6b9a432c672fe4ad45)
2011-10-10 12:11:14 -04:00
WestfW 67f1e949e1 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 e2812ef91cc1489527827dcd14c843f3b3244f36)
2011-10-10 12:11:14 -04:00
WestfW 8caed55a69 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 6840b77643a75b850d48bed80c578da484e6559f)
2011-10-10 12:11:14 -04:00
WestfW 6f7731bb6d 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 2d2ed324b48e709f59a002cb274ed60bb0ebc911)
2011-10-10 12:11:13 -04:00
David A. Mellis dd74a97fb6 Updating bootloader comments. 2011-09-16 20:31:41 -04:00
David A. Mellis 2da3428b37 Updating Micro bootloader (previous one was identical to Leonardo). 2011-09-16 18:25:59 -04:00
Zach Eveland d3a8346007 new bootloader binaries for Micro and Leonardo - uses new assignment for TXLED pin 2011-09-16 16:24:21 -04:00
Zach Eveland 29a707a06b updated pin mappings for bootloader and pins_arduino.h in anticipation of final hardware. 2011-09-16 15:46:51 -04:00
Zach Eveland 18b5d20428 restored Micro entry in boards.txt, made separate bootloader images for Leonardo and Micro. 2011-09-16 14:47:42 -04:00
Zach Eveland 24cb818be8 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 81bfed93e5 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 bc096344f5 faster LED breathing animation in bootloader 2011-09-16 11:18:39 -04:00
Zach Eveland 620254196e updated Leonardo INF with correct PID and created new Micro INF. 2011-09-08 20:45:10 -04:00
Zach Eveland 022874df4d in bootloader reduced delay between receiving stk500 'Q' and jumping to application 2011-09-08 20:38:23 -04:00
Zach Eveland 3b72c2343a disabling watchdog in bootloader 2011-09-08 18:12:11 -04:00
Zach Eveland 874cacf143 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 07e58f22c0 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 3b5122e13837eede7c10acf484efdee4d03e802d.
2011-09-08 15:40:41 -04:00
Zach Eveland 0862493202 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 cb5b07ae94 changed PIDs for Leonardo and Micro. PIDs are now defined in the Makefile 2011-09-08 09:47:17 -04:00
Zach Eveland 384f8e80fa removed all bootloader mass storage and MSC references 2011-09-08 09:12:30 -04:00
Zach Eveland e8b2adc36a 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 b8a2daf8bc 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 5b453fd606 rebuilt Diskloader, added LED control macros for Leonardo, removed Microtouch defines 2011-08-14 15:11:23 -04:00
Zach Eveland f63015fa2a increased bootloader delay to approx. 3.5 s 2011-08-14 14:29:44 -04:00
Zach Eveland 3e3e4be2a3 diskloader source and binary for 32u4 2011-08-11 10:31:39 -04:00
David A. Mellis 7a66c18e70 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 e511065c6a Adding the Mega 2560 bootloader and boards.txt / boards menu entry. 2010-09-24 10:10:57 -04:00
David A. Mellis 8980259e0d Adding optiboot and Arduino Uno boards menu entry. 2010-09-22 09:04:33 -04:00
David A. Mellis 8a2387e805 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 9858f5294b Adding ATmega328 bootloader for the Pro and Pro Mini running at 8 MHz (3.3V). Uses the USART0 double speed mode, which according to Nathan from Sparkfun, is necessary to achieve reliable communication at 57600 baud. 2009-05-08 11:05:41 +00:00
David A. Mellis a42326aba2 Adding support for the Arduino Mega (ATmega1280) to the core and bootloader. 2009-03-25 10:50:00 +00:00
David A. Mellis b89ee8da48 Renaming atmega168 bootloader directory to atmega since it's no longer atmega168 specific. Updating boards.txt accordingly. 2009-03-24 10:41:46 +00:00
David A. Mellis 1e421dd393 Setting atmega328 bootloader baud rate to 57600 (for now) and adding isp targets to makefile (e.g. diecimila_isp, atmega328_isp). 2008-11-26 14:34:24 +00:00
David A. Mellis bcbd3a6ef4 Adding ATmega328 support. 2008-11-09 21:02:20 +00:00
David A. Mellis b7ec38e61a * Updating version number to 0013.
* Updating ATmega168 bootloader to work with standard distributions of avrdude
  (responding to signature requests made with the universal SPI command) and
  correctly store EEPROM data.  Thanks to ladyada.
* Changing compilation process to generate .eep file and allow for use of
  EEMEM directive (although not yet uploading EEPROM data).
2008-10-11 19:27:10 +00:00
David A. Mellis 3898f82e7d Reindenting the ATmega168 bootloader file. It was a mess (and still is somewhat of one). 2008-10-11 15:20:39 +00:00
David A. Mellis 080d18c6d2 Incorporating ladyada's watchdog timer changes into the bootloader source, but only compiling them in for the Pro and Pro Mini (since Nathan includes them in the bootloader he burns to the board). Added a WATCHDOG_MODS flag to the Makefile to specify that they should be included. Recompiled the pro .hex file to include them. 2008-09-06 22:17:58 +00:00
David A. Mellis 3460189d09 Adding Nano and Pro (8 MHz) to boards.txt file; updating Makefile for atmega168 bootloader based on Nathan's changes to allow for customizing of more parameters per-board; including Pro 8 MHz .hex compiled bootloader file; not updating the Diecimila or NG .hex files. 2008-08-16 01:56:41 +00:00
David A. Mellis 658d3beeba Adding LilyPad bootloader and adding LilyPad to board definition file. 2007-10-09 22:46:09 +00:00
David A. Mellis b9d55056c0 Moving bootloaders into the hardware/bootloaders directory. 2007-10-06 13:28:43 +00:00