rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-12 23:08:52 +01:00
Code Issues Releases Activity
1,744 Commits 7 Branches 93 Tags 2.9 GiB
36b5d52d4a
Commit Graph

405 Commits

Author SHA1 Message Date
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