rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-30 11:24:12 +01:00
Code Issues Releases Activity
2,294 Commits 7 Branches 93 Tags 2.9 GiB
b9b0fcdadc
Commit Graph

539 Commits

Author SHA1 Message Date
Zach Eveland
bb9a4f89cc merged Caterina with Blink 2012-04-11 23:24:04 -04:00
Zach Eveland
7e235dbff8 fixed logic bug in Caterina that could stop the bootloader from entering self-programming mode 2012-04-11 23:19:05 -04:00
Zach Eveland
d3a8e450ee Micro I hardly knew ye 2012-04-09 10:12:14 -04:00
Zach Eveland
3f6342e9bb Micro and Leonardo bootloaders for distribution are now merged with Blink sketch 2012-04-09 08:08:34 -04:00
Zach Eveland
caeaa4571c sketch USB VID and PID values are passed in from boards.txt at compile time now. changed sketch PIDs to final values. also uncommented Micro section in boards.txt 2012-04-09 08:06:35 -04:00
Zach Eveland
d02e4481d3 PID and VID are no longer hard-coded in bootloader. instead they are passed in at compile-time from makefile. also added and renamed built bootloader images for Micro and Leonardo 2012-04-09 08:03:56 -04:00
Zach Eveland
437025c6ee Revert "Revert "added a short delay and comment to boolean operator in CDC"" 
This reverts commit 200eefb4e2.
 2012-04-06 21:23:17 -04:00
Federico Vanzati
200eefb4e2 Revert "added a short delay and comment to boolean operator in CDC" 
This reverts commit ade4893f58.
 2012-04-06 17:36:09 +02:00
Zach Eveland
ade4893f58 added a short delay and comment to boolean operator in CDC 
Delay fixes problem where the port has been configured but not quite opened.  Federico found that 10 ms was the minimum time needed to avoid problems.
 2012-04-03 10:52:38 -04:00
Zach Eveland
b685aef6ec added Boolean operators to HardwareSerial and CDC to test whether the port is ready to send data. 
Mostly useful for Leonardo - simple way to test whether the port is actually opened by an application and ready to receive data.  For Serial objects attached to real UARTs always returns true.
 2012-04-01 12:54:35 -04:00
Zach Eveland
97d9ce93ca fixed logic error in Keyboard.release() - now removes every occurrence of a key if it's present more than once 2012-03-28 19:46:32 -04:00
Zach Eveland
b86ec2723a removed horrible multi-key Keyboard.press() and Keyboard.release() methods 
Saves 924 bytes of Flash
 2012-03-28 18:46:10 -04:00
Zach Eveland
3d15f3781a eliminated Keyboard.type() - unnecessary duplication of Keyboard.write() (David Mellis). Also edit KeyboardReprogram example which was the only example using type() 2012-03-28 18:35:26 -04:00
Zach Eveland
259a2f18b3 added methods to Keyboard to handle multiple simultaneous key presses or releases (up to six each) 2012-03-26 17:28:02 -04:00
Zach Eveland
63fdb8ef7a Keyboard.type() now just presses and releases the key indicated - doesn't releaseAll() 2012-03-26 17:00:16 -04:00
Zach Eveland
2e140e4950 added stub methods for begin() and end() to Mouse and Keyboard 2012-03-26 16:02:40 -04:00
Zach Eveland
a0f1f1a930 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-03-24 09:30:17 -04:00
David A. Mellis
13e0b9335c Putting ArduinoISP back to 19200 baud. 
From 9600.  And lowering the delay in the heartbeat from 40 to 20,
which seems to fix things again.
 2012-03-15 19:02:08 -04:00
Zach Eveland
067cca7baa reduced delay before starting the Leonardo bootloader 
Since we use a magic RAM flag to signal to the bootloader there's a risk of the sketch overwriting the magic RAM location before the bootloader starts.  By reducing the watchdog timeout we reduce the chance of this happening.
 2012-03-14 18:17:22 -04:00
Zach Eveland
a05a0d531b bugfix for Caterina not starting sketch if "verify upload" turned off in IDE. 
Previously, if avrdude skipped the upload step the read while write memory might never be reenabled.  This would prevent the bootloader from ending and the sketch from starting - the bootloader just continued to run even after a successful upload.  Now enable RWW when we receive the AVR109 "Exit bootloader" 'E' command.  Had to disable lock bit changing support in the bootloader to free up flash for the change - will anyone miss it?
 2012-03-14 17:48:11 -04:00
Zach Eveland
2a19c327bb changed Caterina timeout after self-programming to 500 ms (from 250 ms) 
attempt to fix bug reported by Dave Mellis:
"avrdude: ser_close(): can’t reset attributes for device: Invalid argument"
is thrown after attempting an upload in the IDE (though the upload seems to be successful)
 2012-03-14 17:07:14 -04:00
Zach Eveland
30421143f9 give Leonardo bootloader 250 ms to finish housekeeping before leaving self-programming mode 
Earlier approach had bootloader end as soon as it was told to.  On Linux this caused problems with avrdude because the microcontroller never had a chance to send an acknowledgement.
 2012-03-08 14:20:12 -05:00
Zach Eveland
33116711b0 removed old version of Leonardo's caterina bootloader, replaced with LUFA-based caterina 2012-03-08 13:47:42 -05:00
Cristian Maglie
177746aa7f Fix for some strange behaviours during board reset 2012-03-07 16:21:04 +01:00
Zach Eveland
18f08bc7d4 Added Keyboard support for all modifier and all common non-printing keys. 2012-03-03 23:37:39 -05:00
Zach Eveland
aec3752e52 Removed support for key mapping in Keyboard. 
Was no longer being used and would be damn near impossible to support with the new scheme for handling modifiers and non-printing keyboard characters.
 2012-03-03 23:06:44 -05:00
Zach Eveland
db82ab90eb added Keyboard methods press(), release(), and releaseAll() 
Changes mean that a single, persistent key report must be used so keys can be added or removed.  Also reimplemented type() using the new methods.
 2012-03-03 22:54:45 -05:00
Zach Eveland
8a35793794 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 
Conflicts:
	.gitignore
 2012-03-03 13:28:39 -05:00
Zach Eveland
7387db0673 fixed minor compilation warnings for Leonardo 2012-03-03 13:26:57 -05:00
David A. Mellis
f4f62f9a12 Small changes for the ATmega1284. 
http://code.google.com/p/arduino/issues/detail?id=736
 2012-03-02 18:58:53 -05:00
Zach Eveland
09aa8bd678 reduced Caterina timeout to 8 seconds from 16 2012-03-01 08:51:47 -05:00
Zach Eveland
93a47f884d changed auto-reset logic for Leonardo. only do WDT manipulation if the port is opened at 1200 bps. (Dave Mellis) 2012-03-01 08:51:16 -05:00
Zach Eveland
f505a3da4c Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-03-01 08:32:21 -05:00
David A. Mellis
7ab140700b Switching Mini w/ ATmega328 upload protocol from stk500 to arduino. 2012-02-29 17:25:46 -05:00
Cristian Maglie
5eef4ca79c Autoreset 1200 bps fix. 2012-02-27 17:41:38 +01:00
Zach Eveland
ae23ed0570 shortened the watchdog period for resetting Leonardo from 2 s to 250 ms. Reset into bootloader is much snappier. 2012-02-22 22:33:44 -05:00
Zach Eveland
65ddc6c43b Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-02-22 15:19:32 -05:00
Zach Eveland
4c3aa52258 Leonardo now checks whether bootloader should be run after a WDT event. 
Before the sketch initiates an auto-reset for upload it pokes a magic word into a specific RAM address.  On starting the bootloader checks this address.  If it finds the magic word it knows the bootloader code should run. If not it jumps straight back to sketch.

Test in a sketch by adding to setup():
wdt_enable(WDTO_2S);

Sketch should upload, start, run for two seconds, WDT, and sketch should restart (not bootloader).

Had to cut out unused descriptor code to make the bootloader still fit in 4k.
 2012-02-14 12:17:30 -05:00
Zach Eveland
94c09c2618 Changed Leonardo fuses to select longer clock startup time. 
Done with the aim of discriminating more reliably between reset sources.
 2012-02-14 10:00:55 -05:00
Zach Eveland
52b0c7214b Leonardo bootloader jumps straight to sketch for a power-on reset. 
Disconnect programmer after burning bootloader to get the full effect.  ICSP and JTAG programmers do a hardware reset after any reset condition, confusing the firmware a little.
 2012-02-14 09:59:48 -05:00
Zach Eveland
bab3c5eade Leonardo auto-reset-and-upload changes for Windows (explanation below) 
On Windows COM port changes when board switched between bootloader and sketch.  No way to prevent this so now Windows users have to select the upload port separate from the comm port.  Also, handling of reset into bootloader was broken on Windows.  Would occasionally leave the original COM port completely unusable.  Changed the way this reset is initiated.
Finally, had to add upload.disable.flushing=true flag to boards.txt so IDE wouldn't try to flush the original COM port after it disappeared.
 2012-02-13 00:56:06 -05:00
Zach Eveland
25a4fe8607 changed Leonardo bootloader and sketch PID values again (now 0x0701 for bootloader, 0x0801 for sketch) 2012-02-13 00:10:16 -05:00
David A. Mellis
0acebeeff4 prog_char -> char PROGMEM in Print.cpp 
http://code.google.com/p/arduino/issues/detail?id=795
 2012-02-12 19:52:03 -05:00
Zach Eveland
c39793001c adjusting descriptors - trying to prevent sketch and bootloader from grabbing different COM numbers on Windows 2012-02-08 01:16:56 -05:00
Zach Eveland
4ee57f12e9 changed Caterina descriptors - Arduino LLC VID, new PID, manufacturer string, and serial number 2012-02-07 23:52:55 -05:00
Zach Eveland
5d53eed01a fixed bug in Caterina which caused some programming instructions to fail 
Timer 1 interrupts were trashing self-programming timing.  Now disable Timer 1 compare match before doing Flash tasks and reenable afterward.
 2012-02-07 23:46:31 -05:00
Zach Eveland
f2d5ea87ad increased Leonardo bootloader timeout to 16 seconds 2012-02-06 15:23:41 -05:00
Zach Eveland
5483adf8fe proper bootloader timeout and LED control in Leonardo bootloader 2012-02-03 23:15:04 -05:00
Zach Eveland
1e0700b536 fixed starting Leonardo bootloader from sketch 
AvrdudeUploader class opens and closes Leonardo port at the magic baudrate before starting avrdude; reduced reset timeout from 250 ms to 15 ms
 2012-02-03 21:42:46 -05:00
Zach Eveland
086ed6382c modify boards.txt with new settings for Caterina_LUFA 2012-02-03 20:24:24 -05:00
Zach Eveland
5eb7ad154b Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-02-03 19:54:33 -05:00
David A. Mellis
915e4889e4 Making head and tail unsigned to avoid division in serial ISR. 
http://code.google.com/p/arduino/issues/detail?id=776
 2012-02-03 17:24:29 -05:00
Zach Eveland
1303b6fbba Caterina now cleanly hands off operation to the sketch 
had to remove TIMER1 operation from bootloader - was interfering with normal sketch operation
 2012-01-24 18:04:10 -05:00
Zach Eveland
6498b66059 move interrupt vector table to application section before jumping to it after upload finished. 2012-01-21 16:51:55 -05:00
Zach Eveland
73f6f2edd5 Leonardo bootloader checks reason for reset and jumps immediately to sketch if reset was caused by WDT 2012-01-21 16:39:06 -05:00
Zach Eveland
371b72c681 stripped all LUFA LED control. from LUFA-based Caterina 2012-01-19 21:31:51 -05:00
Zach Eveland
83c9f21667 changed fuses to select 4k bootloader for LUFA-based Caterina 2012-01-19 21:18:07 -05:00
Zach Eveland
db397d5b35 added Board/LEDs.h to LUFA-based Caterina 2012-01-19 21:17:12 -05:00
Zach Eveland
98b0491fbd superficial changes to stock LUFA CDC bootloader - renamed project, removed unnecessary files 2012-01-19 20:31:35 -05:00
Zach Eveland
9c0352b22a initial checkin of LUFA 111009 CDC bootloader 2012-01-19 20:04:55 -05:00
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
2622ad5580 Merge branch 'master' of github.com:arduino/Arduino into new-extension 2012-01-10 12:02:27 -05:00
David A. Mellis
11281ec77e Adding links to documentation of boards.txt and programmers.txt files. 2012-01-04 16:01:52 -05:00
David A. Mellis
76c964d32b Adding INPUT_PULLUP option pinMode(). (Paul Stoffregen). 
This also changes pinMode(pin, INPUT); to explicitly disable the pull-up resistor, even if it was previously set.

http://code.google.com/p/arduino/issues/detail?id=246
 2012-01-02 14:20:28 -05:00
David A. Mellis
5088b09f2d Fixing findUntil() problem with repeated initial characters. (Jeffery.zksun) 
http://code.google.com/p/arduino/issues/detail?id=768
 2012-01-02 13:49:59 -05:00
David A. Mellis
cce4ef7c69 Fixing warnings (unsigned comparisons to 0). (maniacbug) 2012-01-02 12:57:23 -05:00
David A. Mellis
c441bc1a0d Fixing static is not at beginning of declaration warnings (maniacbug). 2012-01-02 12:38:23 -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
8f9ec88f57 Merge branch 'master' of github.com:arduino/Arduino into new-extension 2011-12-31 11:21:44 -05:00
David A. Mellis
f520bb5051 Simplifying microseconds <-> clock cycles conversions. (Rob Tillaart) 
This should fix problems with overflows in pulseIn().  It may make millis() slightly less precise for clock speeds that aren't multiple of 1 million, but we don't really support those anyway.

http://code.google.com/p/arduino/issues/detail?id=675
 2011-12-30 18:05:12 -05:00
David A. Mellis
80a2154279 Fixing ArduinoISP sketch by lowering baud rate to 9600 (from 19200). 
http://code.google.com/p/arduino/issues/detail?id=661
 2011-12-28 18:43:36 -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
Zach Eveland
20e7f2d354 changed Keyboard write() method to type(). Made write() an alias for type() to allow subclassing by Stream. 2011-12-20 17:09:44 -05:00
Zach Eveland
20564fb1d0 Revert "changed Keyboard write() method to type(). Made write() an alias for type() to allow subclassing by Stream." 
This reverts commit de1d5fc0cb.
 2011-12-20 17:08:07 -05:00
Zach Eveland
de1d5fc0cb changed Keyboard write() method to type(). Made write() an alias for type() to allow subclassing by Stream. 2011-12-20 17:00:19 -05:00
Zach Eveland
d874bc9832 fixed attachInterrupt() on Leonardo 
had to define a separate block for the 32U4 since it looks like a Mega-series board based on a simple register trick.  Only two useable HW interrupts though, compared to the Megas' 8, and numbering differs.
 2011-12-19 15:40:12 -05:00
Zach Eveland
fd28193336 added asynchronous buffering of received CDC characters 
This fixes the issue Federico reported where bytes written by host but not read by sketch would cause serial connection to lock up.  Ring buffer implementation is based on HardwareSerial.cpp.

Adds public accept() method to CDC.
 2011-12-18 17:52:35 -05:00
Zach Eveland
6a44faedbb fixed digitalWrite on timer 4 pins (D6 and D13) 2011-12-18 14:18:38 -05:00
Zach Eveland
4b358f21d9 fix bootloader size in boards.txt - 2 kB instead of 4 kB 2011-12-18 12:52:30 -05:00
Zach Eveland
699315c359 fixed TIMER4 use on Leonardo 
ATMEGA32U4 has major differences in TIMER4 registers compared to ATMEGA1280 and 2560.  turnOffPWM, analogWrite, and initialize routines had wrong registers, bit names, etc.
 2011-12-11 19:56:50 -05:00
David A. Mellis
eb380de972 Updated reference voltage defines for ATmega1284P. 
http://code.google.com/p/arduino/issues/detail?id=728
 2011-12-02 17:18:15 -05:00
David A. Mellis
d7d0e304d5 Support 3rd external interrupt on ATmega1284P (maniacbug) 
http://code.google.com/p/arduino/issues/detail?id=728
 2011-12-02 17:17:27 -05:00
David A. Mellis
0d70c7272e Fixing delayMicroseconds() timing for 20 MHz clocks. (Erdem U. Altinyurt) 
http://code.google.com/p/arduino/issues/detail?id=306
 2011-12-02 17:04:20 -05:00
David A. Mellis
dca1dc429a Removing Leonardo (and Mouse/Keyboard examples) for Arduino 1.0 release. 
These will return, but the code isn't finished yet so I don't want to include it.
 2011-11-28 18:47:45 -05:00
David A. Mellis
3df132aea9 Correcting Arduino Mini w/ ATmega328 bootloader file and fuses (untested). 2011-11-25 19:26:01 -06:00
David A. Mellis
ed48d17e20 readBytes() and readBytesUntil() handle zero bytes and return # of bytes read. 
http://code.google.com/p/arduino/issues/detail?id=586
 2011-11-19 16:23:19 -05:00
David A. Mellis
4119b9089b Adding Arduino Mini w/ ATmega328. 
http://code.google.com/p/arduino/issues/detail?id=710
 2011-11-19 16:22:46 -05: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
9b58072423 Fixed size of const array mapping digital pin number to bit mask. 2011-11-16 12:15:57 -05:00
Zach Eveland
21ee685489 Updated digital pin and port mapping constants in pins_arduino.h for Leonardo. 
Changed digital_pin_to_port_PGM[] and digital_pin_to_bit_mask_PGM[] to reflect changes to constants for SPI and analog pins
 2011-11-16 11:20:38 -05:00
Zach Eveland
5f574b3634 Swapped Dx assignment for MISO and SS to make numbering more sane (Dave Mellis). Also updated comments on pin numbers. 2011-11-16 11:00:21 -05:00
Zach Eveland
ba5d66c26f Fixed handling of Ax constants on Leonardo 
Fixed mistake in assignment and handling of A6-A11 constants.  Renumbered constants for all Ax channels.
 2011-11-16 10:49:41 -05:00
Zach Eveland
3ee847c8e2 updated pins_arduino.h for Leonardo to reflect final mapping of A6-A11 2011-11-15 09:48:09 -05:00
Zach Eveland
56d06e15ed Merge branch 'new-extension' of github.com:arduino/Arduino into new-extension 2011-11-15 09:33:11 -05:00
Cristian Maglie
6ceb9a19de Added latest firmware for usbserial (not combined with DFU) 2011-11-12 12:57:30 +01:00
Cristian Maglie
17adbbcfc5 Added latest firmware for atmega16u2 on R3 boards 2011-11-11 11:38:04 -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
f0801e61e6 updated analog pin assignments and declared TWI/I2C pins 
Fixed analog pin to ADC channel mapping to match new scheme.  Changed mapping of analog pins to digital channels so that A6-A11 point back to the correct digital pins.  Declared SDA and SCL pins.
(All from Federico Vanzati's comments)
 2011-11-08 22:06:15 -05:00
Zach Eveland
42fadb6f6d added 12th ADC channel for Leonardo. cleaned up and corrected comments for pin functions. 2011-11-02 07:37:39 -04: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
76ed870de8 Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot 2011-10-31 21:42:09 -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
David A. Mellis
10001866e6 Protecting the version of parseInt() and parseFloat(). (Paul Stoffregen) 
This should allow us more flexibility in determining how to handle these functions later.  For example, in specifying that initial characters shouldn't be skipped.

http://code.google.com/p/arduino/issues/detail?id=698
 2011-10-29 17:40:23 -04:00
Zach Eveland
a6381bb564 renamed bootloader file 2011-10-27 11:52:10 -04:00
Zach Eveland
a6a59f1783 Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot" 
This reverts commit df9835efaf, reversing
changes made to ec45af8bfa.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
 2011-10-27 11:45:13 -04:00
Zach Eveland
f2bd8a5394 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
03e1515a51 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
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
David A. Mellis
d9f9676d23 Bug fix in replace(). 
http://code.google.com/p/arduino/issues/detail?id=694
 2011-10-25 11:15:14 -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
David A. Mellis
f729e0321b 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
18838fb44a 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
8336c88211 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
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
David A. Mellis
ec09ead6ac 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
b86ce43044 initial commit of new Diskloader-based bootloader experiment 2011-10-21 08:02:17 -04:00
David A. Mellis
e7ff928762 Putting the Uno lock bits back. 2011-10-10 12:28:09 -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
61e4d16675 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 39a496616f)
 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
David A. Mellis
a08657b350 Moving USBasp in programmers menu. 2011-10-10 11:58:38 -04:00
David A. Mellis
2ffad50619 Merge pull request #41 from chiva/patch-1 
Added USBasp to programmers list
 2011-10-10 08:56:15 -07:00
David A. Mellis
ca671fdc05 Fixing more warnings (Paul Stoffregen). 2011-10-10 11:28:44 -04: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
85c109f255 Fixing warnings in Stream (Paul Stoffregen) 
http://code.google.com/p/arduino/issues/detail?id=208
 2011-10-02 09:44:21 -04:00
David A. Mellis
6554ae653c Using alternate timer 0 overflow interrupt signal name for ATtiny24/44/84. 2011-09-30 11:24:44 -04:00
David A. Mellis
bd823bf201 Changing Ethernet upload protocol from stk500 to arduino. 
http://code.google.com/p/arduino/issues/detail?id=649
 2011-09-28 23:26:37 -04:00
David A. Mellis
de22990133 Updating bootloader comments. 2011-09-16 20:31:41 -04:00
David A. Mellis
df2270d4d5 Commenting out micro board for now since it's not being released yet. 2011-09-16 20:26:43 -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
d532d85059 added Mouse.isPressed() method 2011-09-16 16:59:14 -04:00
Zach Eveland
00c3631467 made some Keyboard methods private 2011-09-16 16:43:07 -04:00
Zach Eveland
30fc9919e1 added support for TIMER4D used for PWM on Leonardo and Micro D6 2011-09-16 16:36:42 -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
a4ccf47ec7 updated pin assignment again based on design files for Leonardo 2011-09-16 16:12:39 -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
8638d5b4e9 restored accidentally-deleted Leonardo type in boards.txt 2011-09-16 14:54:42 -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
cd5ecfff1c Merge https://github.com/arduino/32U4 into new-extension 2011-09-16 14:34:55 -04:00
Zach Eveland
667da698d7 added automatic one-shot TX and RX LED control for sketch USB 2011-09-16 14:32:25 -04:00
David A. Mellis
5ec35fc68c Moving Leonardo after Uno. 2011-09-16 14:24:11 -04:00
Zach Eveland
6b7d24edb0 added to sketch iProduct and iManufacturer strings identifying board as either an "Arduino Leonardo" or "Arduino Micro" manufactured by "Arduino LLC" 2011-09-16 12:29:47 -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
ab8fc5aab7 Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension 2011-09-16 10:27:11 -04:00
Santiago Reig
90f285ae9c Added USBasp to programmers list 2011-09-16 01:56:22 +03:00
Zach Eveland
d4e9db463b fixed analog pin mapping for 32u4 2011-09-13 23:52:26 -04:00
Zach Eveland
18d76057fe fixed Mouse button assignments 2011-09-13 21:37:46 -04:00
Zach Eveland
e3fa1ed039 made Mouse.buttons() private. removed MOUSE_ALL macro 2011-09-12 08:14:13 -04:00
David A. Mellis
f3d8628c5e Don't consume trailing char in parseInt() and parseFloat (Paul Stoffregen). 
http://code.google.com/p/arduino/issues/detail?id=624
 2011-09-09 16:24:47 -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
94879d3ac6 Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension 
Conflicts:
	build/linux/dist/tools/avrdude.conf
 2011-09-08 20:26:47 -04:00
Zach Eveland
db7013f95c fixed bug where sketches over 28k caused subsequent auto-reset-and-upload attempts to fail. fixed bug in reboot routine, changed fuses to select 1024-word bootloader size, disabled hardware boot enable. 2011-09-08 19:31:18 -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
e870f070db added compile-time definition of sketch PID. PID is pulled from variants/leonardo or the new variants/micro as appropriate. 2011-09-08 15:52:05 -04:00