1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-11 22:24:13 +01:00
Commit Graph

344 Commits

Author SHA1 Message Date
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
Zach Eveland
508eb9b72f removed leftover pins/ directory 2011-09-08 15:43:16 -04:00
Zach Eveland
301f1b8552 Revert "added Micro section to boards.txt. specified different bootloader hex files for Leonardo and Micro (differ only by PID). added PID entries to boards.txt"
This reverts commit 3b5122e138.
2011-09-08 15:40:41 -04:00
Zach Eveland
c295917fad Revert "support compile-time passing of PID to Leonardo/Micro sketches. PID comes from boards.txt - different for Micro and Leonardo"
This reverts commit 3e0d195492.
2011-09-08 15:39:17 -04:00
Zach Eveland
3e0d195492 support compile-time passing of PID to Leonardo/Micro sketches. PID comes from boards.txt - different for Micro and Leonardo 2011-09-08 11:23:55 -04:00
Zach Eveland
3b5122e138 added Micro section to boards.txt. specified different bootloader hex files for Leonardo and Micro (differ only by PID). added PID entries to boards.txt 2011-09-08 11:00:40 -04:00
Zach Eveland
48212b11fd changed PIDs for Leonardo and Micro. PIDs are now defined in the Makefile 2011-09-08 09:47:17 -04:00
Zach Eveland
4db174e67b removed all bootloader mass storage and MSC references 2011-09-08 09:12:30 -04:00
David A. Mellis
7d8d20894c Making Print::write(char *) non-virtual.
http://code.google.com/p/arduino/issues/detail?id=607
2011-09-07 18:41:05 -04:00
David A. Mellis
ab36bd5dbb Changing to a simpler mental model for serialEvent (Paul Stoffregen).
http://code.google.com/p/arduino/issues/detail?id=626
2011-09-07 17:47:17 -04:00
Zach Eveland
fa901e2ba4 changed auto-reset trigger condition to fix auto-reset-and-upload for Windows. now reboots when a port, opened at 1200 bps, is closed. 2011-09-06 20:58:00 -04:00
Zach Eveland
5e058a8aa3 changed baudrate for auto-reset-and-upload back to 1200 bps. specified arduino protocol for Leonardo avrdude upload. 2011-09-05 13:08:05 -04:00
Zach Eveland
e24e9499cf Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension
Conflicts:
	build/macosx/dist/tools-universal.zip
	build/windows/avr_tools.zip
	hardware/arduino/cores/arduino/HardwareSerial.cpp
2011-09-05 12:53:45 -04:00
David Mellis
83da177280 Merge branch 'new-extension' of github.com:arduino/Arduino into new-extension 2011-09-02 19:58:39 -04:00
David Mellis
85bf4252f0 Updating to avrdude 5.11 (Windows). stk500 -> arduino in boards.txt.
http://code.google.com/p/arduino/issues/detail?id=606
2011-09-02 19:57:29 -04:00
David A. Mellis
bf5e928e4c Adding Arduino Ethernet and Arduino Mega ADK (joint w/ Mega 2560) to boards menu.
http://code.google.com/p/arduino/issues/detail?id=594
2011-08-31 16:48:06 -04:00
David A. Mellis
1278144d50 Moving serialEvent() calls from RX interrupts to main for() loop (after loop()).
http://code.google.com/p/arduino/issues/detail?id=584
2011-08-31 15:52:56 -04:00
David A. Mellis
61b33f11ce Renaming writeError() to getWriteError() in Print (and Stream and friends).
http://code.google.com/p/arduino/issues/detail?id=608
2011-08-31 15:39:20 -04:00
Zach Eveland
3389d28e20 added Mouse press() and release() 2011-08-30 20:23:06 -04:00
Zach Eveland
7d26163b16 on a CDC or HID write() error, call setWriteError(). better handling of USB_Send errors in CDC. 2011-08-30 17:25:35 -04:00
amcewen
a6093a8d91 Created an abstract base class UDP to match the Client and Server classes, and reworked the Ethernet library to use it and derive EthernetUDP. 2011-08-30 21:27:31 +01:00
Zach Eveland
6049e4455a support for non-Leonardo boards is back! 2011-08-30 11:50:08 -04:00
Zach Eveland
0b3acaea21 CDC and HID write() routines now return non-void - brought in line with new write behavior 2011-08-30 11:04:34 -04:00
Zach Eveland
0a34c0f35e brought leonardo folder in line with new variants scheme 2011-08-30 10:45:41 -04:00
Zach Eveland
91f89da73a Merge branch 'mainline' into new-extension 2011-08-30 08:38:06 -04:00
amcewen
ad5dead85a Changed names of the Ethernet classes: Client -> EthernetClient, NetClient -> Client, and basic testing performed 2011-08-29 22:36:28 +01:00
amcewen
b7533c1839 Final changes to integrate latest core updates to WiFly branch 2011-08-28 22:26:07 +01:00
amcewen
e1748e79d7 Merge branch 'master' into wifly_integration 2011-08-28 20:28:53 +01:00
Zach Eveland
6345e2942a 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
4588120106 Merge branch 'new-extension' of https://github.com/arduino/Arduino 2011-08-27 23:53:42 +01:00
Zach Eveland
bef7d736d2 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
b73cf39d94 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
929597375b Changing from long to ssize_t (int) for write(), print(), println() return. 2011-08-26 14:20:41 -04:00
Zach Eveland
eebe997dce bugfix - Serial.write() would try to send even if no CDC connection was open. 2011-08-24 21:04:30 -04:00
Zach Eveland
ff5fe87864 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
8059abe581 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
b788ad593f 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
d00f0949ed 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
dd539bacf8 USB microcontrollers will call USB.attach() after init(), before setup() 2011-08-18 19:59:35 -04:00
Zach Eveland
5b989d13b3 HW Serial on pins 0 and 1 works. Accessed by Serial1.* methods 2011-08-18 19:40:04 -04:00