Commit Graph

667 Commits

Author SHA1 Message Date
Zach Eveland b7d91b3bbc renamed bootloader file 2011-10-27 11:52:10 -04:00
Zach Eveland 3524f2ff0b Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"
This reverts commit df9835efafd13685251749bc210c0b96a18a96a5, reversing
changes made to ec45af8bfa9222a807c075dd1db4b5aa798bba03.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
2011-10-27 11:45:13 -04:00
Zach Eveland ec93cd74a1 Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot
Conflicts:
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
2011-10-27 11:41:02 -04:00
Zach Eveland 415a5e119d changes in core and boards.txt to support new bootloader
old bootloader could fit in only 2 kB of flash.  new version has to have a 4 kB block - jump-to address and boards.txt must reflect this.
2011-10-27 11:36:10 -04:00
Zach Eveland 2b13fd3b40 bootloader runs sketch after timeout, added bootloader LED breathing 2011-10-27 11:27:24 -04:00
Zach Eveland 71879e53fe cosmetic changes - remove old comments, unused code 2011-10-27 10:54:21 -04:00
Zach Eveland 5d976f8b1d removed conditional compilation checks for CDC_ENABLED
bootloader must always have CDC enabled
2011-10-27 10:48:26 -04:00
Zach Eveland 0ab2cb1c69 removed old comments and unused USB core code 2011-10-27 10:45:13 -04:00
Zach Eveland da03595c32 brought nuevo_diskloader changes over to diskloader
Moved nuevo_diskloader files into diskloader directory.  Changed back to real PID for Leonardo
2011-10-27 10:23:06 -04:00
Zach Eveland 29cfd9e9fe Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot
Conflicts:
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde
	build/shared/lib/theme/theme.txt
	hardware/arduino/cores/arduino/HardwareSerial.h
	hardware/arduino/cores/arduino/Print.cpp
	hardware/arduino/cores/arduino/WString.h
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
	libraries/Firmata/examples/EchoString/EchoString.ino
	libraries/SD/File.cpp
	libraries/SoftwareSerial/SoftwareSerial.cpp
	libraries/SoftwareSerial/SoftwareSerial.h
	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	libraries/SoftwareSerial/keywords.txt
2011-10-27 09:32:27 -04:00
Zach Eveland c0a9e827c1 working bootloader. had to move interrupts back to application section. NOTE: need to have sketch CDC jump to appropriate place for bootloader - 4k from end instead of 2k 2011-10-26 16:51:42 -04:00
Zach Eveland a52fb29860 working (?!?!?!) bootloader. doesn't yet restart chip after upload completes. 2011-10-26 12:53:57 -04:00
Zach Eveland bdfae9f7b7 uploading now completes using RC2 on Win7 2011-10-26 11:28:07 -04:00
Zach Eveland 6bf6a20d26 closer still - now up to 4680 2011-10-25 19:04:31 -04:00
Zach Eveland 89108dd2b9 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
David A. Mellis 5c9d10ad94 Bug fix in replace().
http://code.google.com/p/arduino/issues/detail?id=694
2011-10-25 11:15:14 -04:00
Zach Eveland 9a5c50d586 fixed logic bug in waiting for synch. stripped out all Serial stuff 2011-10-24 22:12:45 -04:00
Zach Eveland b6f5fae14f removed old comments 2011-10-24 21:36:06 -04:00
David A. Mellis 8d48010edf Moving ARDUINO_MAIN from main.cpp to wiring_digital.c and hiding PA, PB, etc.
http://code.google.com/p/arduino/issues/detail?id=677
http://code.google.com/p/arduino/issues/detail?id=691
2011-10-24 16:50:15 -04:00
David A. Mellis 85d70c4314 Renaming LED to LED_BUILTIN.
http://code.google.com/p/arduino/issues/detail?id=651
2011-10-24 16:45:44 -04:00
David A. Mellis 85f10a7150 Correcting analogReference() constants for ATtiny24/44/84 and 25/45/85.
DEFAULT, EXTERNAL, and INTERNAL have different values on those processors.
2011-10-24 15:44:01 -04:00
Zach Eveland 4f19d9bc8e 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 8d5361044e more attempts to get parameter sending to work 2011-10-21 20:30:55 -04:00
Zach Eveland b9eece6584 some progress on responding to parameter requests 2011-10-21 20:06:17 -04:00
Zach Eveland c83d85b87a 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 d28a82d037 continuing to port programming code. temporarily changed PID to test on Windows (it works) 2011-10-21 18:21:04 -04:00
Zach Eveland 4498bc7ca7 starting to port bootloader programming code - testing as I go 2011-10-21 18:03:34 -04:00
Zach Eveland 146922e211 added and modified Program() routine 2011-10-21 17:51:04 -04:00
Zach Eveland 629788e47c cleaning up code and comments in main - getting rid of leftover stuff from experiments 2011-10-21 17:25:59 -04:00
Zach Eveland ad95bc05f4 Enumerates! used inline ASM for operation which moves interrupts to boot section 2011-10-21 17:16:48 -04:00
Zach Eveland 13c5eccbe3 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 0f6498ae1d added more USB source adapted from sketch core. still not enumerating. 2011-10-21 16:33:52 -04:00
David A. Mellis d3fa070d10 Lowering timer 1 prescale factor (to 8 from 64) for F_CPU less than 8 MHz.
Otherwise, you can see flicker on an LED.
2011-10-21 11:54:11 -04:00
Zach Eveland 37c1c455ee initial commit of new Diskloader-based bootloader experiment 2011-10-21 08:02:17 -04:00
David A. Mellis 4387ea1990 Putting the Uno lock bits back. 2011-10-10 12:28:09 -04:00
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 3b4fbd0960 Modify Uno "lock" bits in boards.txt to make bootloader readable by
sketches.  Part of http://code.google.com/p/arduino/issues/detail?id=554
(cherry picked from commit 39a496616f241a3908d7821dcb15520f16ecd871)
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 f9ed282a16 Merge pull request #30 from WestfW/master
Significant optiboot upgrade.
2011-10-10 09:01:56 -07:00