Commit Graph

404 Commits

Author SHA1 Message Date
amcewen 528e95b14d Final changes to integrate latest core updates to WiFly branch 2011-08-28 22:26:07 +01:00
amcewen 8ce77304f7 Merge branch 'master' into wifly_integration 2011-08-28 20:28:53 +01:00
Zach Eveland 39e0796aad auto-upload-and-reset works now at 300 bps. patched avrdude for Mac to support 300 bps connection, changed core and boards.txt to match 2011-08-27 20:32:34 -04:00
amcewen f9d50a7930 Merge branch 'new-extension' of https://github.com/arduino/Arduino 2011-08-27 23:53:42 +01: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
David A. Mellis 5130a13294 Moving write errors out of return value into separate API methods.
write(), print(), println() now return size_t (and don't use negative values to signal errors).
Print adds writeError() for checking for write errors, clearWriteError() to reset the flag to false, and a protected setWriteError() for signalling errors.

http://code.google.com/p/arduino/issues/detail?id=598
2011-08-26 16:08:14 -04:00
David A. Mellis 0635790dd1 Changing from long to ssize_t (int) for write(), print(), println() return. 2011-08-26 14:20:41 -04:00
Zach Eveland f0ac64d2db bugfix - Serial.write() would try to send even if no CDC connection was open. 2011-08-24 21:04:30 -04:00
Zach Eveland 160bf890e0 changed auto-reset method for upload: now triggered by opening port at 1200 bps 2011-08-24 17:12:28 -04:00
David A. Mellis f282cbaf96 write(), print(), and println() now return number of bytes written.
The type is long, and negative values indicate errors.  Needs more testing.
http://code.google.com/p/arduino/issues/detail?id=551
2011-08-23 19:12:03 -04:00
David A. Mellis f5a15cb62f Distinguishing those boards with eight analog inputs (Fio, BT, Nano, Mini).
http://code.google.com/p/arduino/issues/detail?id=499
2011-08-23 17:29:20 -04:00
David A. Mellis 69d1826e45 Renaming pins/ directory to the more generic variants/
http://code.google.com/p/arduino/issues/detail?id=588
2011-08-23 17:07:39 -04:00
Zach Eveland 0d592a5fea USB microcontrollers will call USB.attach() after init(), before setup() 2011-08-18 19:59:35 -04:00
Zach Eveland 7d575222af HW Serial on pins 0 and 1 works. Accessed by Serial1.* methods 2011-08-18 19:40:04 -04:00
David A. Mellis 9bc7be0d9a Stream.readBytesUntil() now writes null terminator within length. 2011-08-18 15:13:47 -04:00
David A. Mellis 8dd6a40334 A few API changes to new Stream parsing functions.
Renamed readChars() -> readBytes(), readCharsUntil() -> readBytesUntil().
Changed timeouts to milliseconds from seconds; default from 5 to 1 seconds.
Removed readCharsBetween().
2011-08-17 14:16:47 -04:00
David A. Mellis 31ff05504f Integrating Stream searching & parsing (Michael Margolis)
This from Michael's TextFinder library, incorporated into the Stream class: find(), findUntil(), parseInt(), parseFloat(), readChars(), readCharsUntil(), readCharsBetween(), setTimeout().
2011-08-17 13:53:49 -04:00
Zach Eveland 84c0d2cff8 Temporary fix for auto-reset from IDE. Will reset chip when DTR is asserted, no matter what CDC baud rate is selected. 2011-08-16 13:43:55 -04:00
Zach Eveland ddd3418a4f Serial via USB works
Integrated rest of Peter's USB implementation
2011-08-14 16:59:34 -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
David A. Mellis 39573e5cf7 Adding basic macros for analog + digital pin information.
http://code.google.com/p/arduino/issues/detail?id=495
2011-08-12 18:27:00 -04:00
David A. Mellis cafbc48008 Adding pin-change interrupt pin mapping macros to pins_arduino.h.
http://code.google.com/p/arduino/issues/detail?id=490
2011-08-12 17:31:22 -04:00
David A. Mellis ca1f64682a Adding SCL, SDA, and LED #defines. 2011-08-12 16:59:24 -04:00
Zach Eveland be087d96dc cleaned up types. set D5 as not a PWM pin for now. 2011-08-11 14:16:13 -04:00
Zach Eveland 4c537c1b6d committed USB API, initial HardwareSerial-USBSerial integration 2011-08-11 14:08:38 -04:00
Zach Eveland 3e3e4be2a3 diskloader source and binary for 32u4 2011-08-11 10:31:39 -04:00
Zach Eveland d59bda6ac6 support for 32u4 and Leonardo pins, uploading, and bootloader programming 2011-08-10 23:36:36 -04:00
David A. Mellis 84285ab780 Disabling terminal / monitor. 2011-06-29 22:48:07 -04:00
WestfW 8628479d70 Oops. Add atmega8.lst/hex and atmega168.lst/hex to controlled files. 2011-06-14 23:57:41 -07:00
WestfW 1f01799bbf 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.
2011-06-14 10:24:27 -07:00
WestfW e302384d43 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
2011-06-14 01:13:41 -07:00
WestfW a0d00b4d86 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.))
2011-06-13 19:07:07 -07:00
amcewen 58aaa903f8 Merge remote branch 'upstream/new-extension'
Moved my fork to the Arduino 1.0 codebase
2011-06-11 21:27:18 +01:00
WestfW 5c27dd97a0 (make sure .hex and .lst are updated as well.) 2011-06-11 03:17:38 -07:00
WestfW 738e5ca709 Fix errors in LDSECTIONS refactoring
(found during atmega8 testing.)
2011-06-11 03:15:33 -07:00
WestfW 6a466797f7 Update version to reflect previous edit. Sigh. 2011-06-10 23:16:21 -07:00
WestfW a78553bd13 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
2011-06-10 23:02:25 -07:00
WestfW 2a83ee55b3 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.
2011-06-10 17:47:47 -07:00
WestfW 64be388f3e Update shell script makeall 2011-06-10 16:29:34 -07:00
WestfW 4f44d2893a 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.
2011-06-10 16:17:13 -07:00
WestfW e115bd8643 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
2011-06-09 22:57:27 -07:00
WestfW bac72096b3 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.
2011-06-09 22:36:05 -07:00
David A. Mellis a239d2c541 Added Printable interface class to allow printing of classes such as IPAddress 2011-06-04 09:19:17 -04:00
David A. Mellis 664e9af2cd Fixing 300 baud communication for serial.
Because UBBR is only 12 bits, we were overflowing it at 300 baud because of the use of the U2X bit.  Now we turn off U2X if it would yield a UBBR value that would overflow.

Note that this breaks 300 baud communication with the computer on the Uno and Mega 2560 because the 8U2 USB-serial firmware has this same bug (and previously they cancelled each other out).  Since, however, it seems more likely that people will need to use 300 baud to communicate with other (legacy) hardware than with the computer, I'm making this change.  Issue for 8U2 firmware bug: http://code.google.com/p/arduino/issues/detail?id=542

http://code.google.com/p/arduino/issues/detail?id=522
2011-05-20 13:29:13 -04:00
David A. Mellis f25e71c3c1 Fixing 300 baud communication for serial.
Because UBBR is only 12 bits, we were overflowing it at 300 baud because of the use of the U2X bit.  Now we turn off U2X if it would yield a UBBR value that would overflow.

Note that this breaks 300 baud communication with the computer on the Uno and Mega 2560 because the 8U2 USB-serial firmware has this same bug (and previously they cancelled each other out).  Since, however, it seems more likely that people will need to use 300 baud to communicate with other (legacy) hardware than with the computer, I'm making this change.  Issue for 8U2 firmware bug: http://code.google.com/p/arduino/issues/detail?id=542

http://code.google.com/p/arduino/issues/detail?id=522
2011-05-14 12:25:39 -04:00
David A. Mellis 90c487402c Small optimization in HardwareSerial.
begin(long) -> begin(unsigned long)

Conflicts:

	hardware/arduino/cores/arduino/HardwareSerial.h
2011-05-12 16:58:56 -04:00
David A. Mellis 5e5cce8124 Optimizing printing of numbers (writing a single buffer).
Fix from Bill Greiman via Limor.
2011-05-07 18:17:32 -04:00
David A. Mellis ac5defcea6 Adding serialEvent(), serialEvent1(), etc.
Called from within the serial receive interrupt.  These are implemented as an empty weak function in the core that be overridden by the user's sketch.

http://code.google.com/p/arduino/issues/detail?id=263
2011-05-07 13:04:13 -04:00