Zach Eveland
0fc76a6b87
made Leonardo and Micro bootloader PIDs same as sketch PIDs
2012-01-10 21:23:01 -05:00
Zach Eveland
2dfb0dce2c
restored composite and non-composite device descriptors (removed in 4b05c3fc75)
...
Windows wants to see both types of device descriptors.
2012-01-10 20:52:57 -05:00
Zach Eveland
77b40e6bba
reenabled HID to force Leonardo bootloader to enumerate as a composite device
2012-01-10 17:04:32 -05:00
Zach Eveland
932afb8428
renamed DiskLoader to Caterina (after Leonardo's mom)
2012-01-10 16:29:47 -05:00
Zach Eveland
99fea13f84
changed USB PID for Leonardo and Micro bootloaders
...
sketch and bootloader will use different PIDs to distinguish one from the other.
2012-01-10 16:09:56 -05:00
Zach Eveland
48ed974834
fixed warning when comparing pgm_read_word(0) to -1 (thanks, Limor Fried and Phillip Torrone)
2012-01-10 16:00:46 -05:00
Zach Eveland
e3b89d178d
got rid of u8, u16, u32 typedefs in Diskloader
...
done to bring types in line with others in Arduino core
2012-01-10 15:51:44 -05:00
Zach Eveland
f403b001a2
made the bootloader's LED control macro names less offensive
...
TX_LED_OFF() instead of TXLED0, etc.
2012-01-10 15:38:26 -05:00
Zach Eveland
4b05c3fc75
added conditional compilation for HID, removed conditional compilation for CDC (is always used). disabled HID by default. also always enumerates as composite now.
...
the bootloader must always have a CDC interface. HID is optional and not even complete to reduce size.
2012-01-10 15:31:56 -05:00
Zach Eveland
015044add5
fix bug in handling of long descriptors for bootloader USB (thank you, Todd Krein, Limor Fried, and Phillip Torrone)
...
descriptors longer than 255 bytes were being shortened, causing problems with enumeration under Windows
2012-01-10 14:25:40 -05:00
Zach Eveland
f39ec37722
reset the Leonardo board when leaving the bootloader, before starting the sketch
...
Done so all IO and other registers are properly reinitialized when a new sketch is uploaded or when an existing sketch is started. Uses a watchdog timeout with a 15 ms period to accomplish the reset. Bootloader checks the reason for reset and only enumerates as bootloader and enters the programming loop if reset was NOT caused by WDT.
2011-12-31 12:19:08 -05:00
Zach Eveland
bdf7107507
bootloader merged with blink sketch
...
full set of descriptors in sketch fixes driver installation issue on Win7.
2011-12-26 17:19:48 -05:00
David A. Mellis
3df132aea9
Correcting Arduino Mini w/ ATmega328 bootloader file and fuses (untested).
2011-11-25 19:26:01 -06:00
Zach Eveland
75eb722759
Leonardo bootloader now sends iSerial string during enumeration. Seems to satisfy Windows' composite device requirements.
2011-11-16 16:38:22 -05:00
Zach Eveland
cd6aa2b1f3
restored original non-interrupt-driven DiskLoader
...
Interrupt-driven version was a dead-end - too many bugs with that approach.
2011-11-09 14:04:59 -05:00
Zach Eveland
c8f495ba7f
changed Leonardo PID to 0x0032 for Diskloader testing. updated .inf to match.
2011-10-31 23:44:32 -04:00
Zach Eveland
4a77aea4e5
check to see if a sketch has been loaded before jumping out of bootloader
2011-10-31 21:36:29 -04:00
Zach Eveland
a6a59f1783
Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"
...
This reverts commit df9835efafec45af8bfa
2011-10-27 11:45:13 -04:00
Zach Eveland
be51da6b0d
bootloader runs sketch after timeout, added bootloader LED breathing
2011-10-27 11:27:24 -04:00
Zach Eveland
b70f79ea2c
cosmetic changes - remove old comments, unused code
2011-10-27 10:54:21 -04:00
Zach Eveland
040a469f79
removed conditional compilation checks for CDC_ENABLED
...
bootloader must always have CDC enabled
2011-10-27 10:48:26 -04:00
Zach Eveland
9dc9e60704
removed old comments and unused USB core code
2011-10-27 10:45:13 -04:00
Zach Eveland
3d848a5b9a
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
df9835efaf
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
ec45af8bfa
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
32614bf841
working (?!?!?!) bootloader. doesn't yet restart chip after upload completes.
2011-10-26 12:53:57 -04:00
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
