From c58fcf5554827113680ee16559c36ed21e0ec0e0 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Sun, 11 Dec 2011 19:56:50 -0500 Subject: 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. --- boards.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 018a7fa..ded7572 100644 --- a/boards.txt +++ b/boards.txt @@ -144,21 +144,21 @@ mega.build.variant=mega ############################################################## -#leonardo.name=Arduino Leonardo -#leonardo.upload.protocol=arduino -#leonardo.upload.maximum_size=28672 -#leonardo.upload.speed=1200 -#leonardo.bootloader.low_fuses=0xde -#leonardo.bootloader.high_fuses=0xd8 -#leonardo.bootloader.extended_fuses=0xcb -#leonardo.bootloader.path=diskloader -#leonardo.bootloader.file=DiskLoader-Leonardo.hex -#leonardo.bootloader.unlock_bits=0x3F -#leonardo.bootloader.lock_bits=0x2F -#leonardo.build.mcu=atmega32u4 -#leonardo.build.f_cpu=16000000L -#leonardo.build.core=arduino -#leonardo.build.variant=leonardo +leonardo.name=Arduino Leonardo +leonardo.upload.protocol=arduino +leonardo.upload.maximum_size=28672 +leonardo.upload.speed=1200 +leonardo.bootloader.low_fuses=0xde +leonardo.bootloader.high_fuses=0xd8 +leonardo.bootloader.extended_fuses=0xcb +leonardo.bootloader.path=diskloader +leonardo.bootloader.file=DiskLoader-Leonardo.hex +leonardo.bootloader.unlock_bits=0x3F +leonardo.bootloader.lock_bits=0x2F +leonardo.build.mcu=atmega32u4 +leonardo.build.f_cpu=16000000L +leonardo.build.core=arduino +leonardo.build.variant=leonardo ############################################################## -- cgit v1.2.3-18-g5258 From 9bd7761e3a77e939b54dc05241a57c64f1c55b74 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Sun, 18 Dec 2011 12:52:30 -0500 Subject: fix bootloader size in boards.txt - 2 kB instead of 4 kB --- boards.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index ded7572..efd0766 100644 --- a/boards.txt +++ b/boards.txt @@ -146,10 +146,10 @@ mega.build.variant=mega leonardo.name=Arduino Leonardo leonardo.upload.protocol=arduino -leonardo.upload.maximum_size=28672 +leonardo.upload.maximum_size=30720 leonardo.upload.speed=1200 leonardo.bootloader.low_fuses=0xde -leonardo.bootloader.high_fuses=0xd8 +leonardo.bootloader.high_fuses=0xda leonardo.bootloader.extended_fuses=0xcb leonardo.bootloader.path=diskloader leonardo.bootloader.file=DiskLoader-Leonardo.hex -- cgit v1.2.3-18-g5258 From dd5bae59df6f1ba63083361ba284f364bc62b401 Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Wed, 4 Jan 2012 16:01:52 -0500 Subject: Adding links to documentation of boards.txt and programmers.txt files. --- boards.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 018a7fa..7b719de 100644 --- a/boards.txt +++ b/boards.txt @@ -1,3 +1,5 @@ +# See: http://code.google.com/p/arduino/wiki/Platforms + ############################################################## uno.name=Arduino Uno -- cgit v1.2.3-18-g5258 From 0ed2d3c95309ecf5905ec06624fc68955fdbd2d0 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Tue, 10 Jan 2012 16:29:47 -0500 Subject: renamed DiskLoader to Caterina (after Leonardo's mom) --- boards.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 9c155c1..834db54 100644 --- a/boards.txt +++ b/boards.txt @@ -153,8 +153,8 @@ leonardo.upload.speed=1200 leonardo.bootloader.low_fuses=0xde leonardo.bootloader.high_fuses=0xda leonardo.bootloader.extended_fuses=0xcb -leonardo.bootloader.path=diskloader -leonardo.bootloader.file=DiskLoader-Leonardo.hex +leonardo.bootloader.path=caterina +leonardo.bootloader.file=Caterina-Leonardo.hex leonardo.bootloader.unlock_bits=0x3F leonardo.bootloader.lock_bits=0x2F leonardo.build.mcu=atmega32u4 @@ -171,8 +171,8 @@ leonardo.build.variant=leonardo #micro.bootloader.low_fuses=0xde #micro.bootloader.high_fuses=0xda #micro.bootloader.extended_fuses=0xcb -#micro.bootloader.path=diskloader -#micro.bootloader.file=DiskLoader-Micro.hex +#micro.bootloader.path=caterina +#micro.bootloader.file=Caterina-Micro.hex #micro.bootloader.unlock_bits=0x3F #micro.bootloader.lock_bits=0x2F #micro.build.mcu=atmega32u4 -- cgit v1.2.3-18-g5258 From e650b85ca58eeb795ba851227e2474576e0f18a1 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Thu, 19 Jan 2012 21:18:07 -0500 Subject: changed fuses to select 4k bootloader for LUFA-based Caterina --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 834db54..fed59eb 100644 --- a/boards.txt +++ b/boards.txt @@ -151,7 +151,7 @@ leonardo.upload.protocol=arduino leonardo.upload.maximum_size=30720 leonardo.upload.speed=1200 leonardo.bootloader.low_fuses=0xde -leonardo.bootloader.high_fuses=0xda +leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.extended_fuses=0xcb leonardo.bootloader.path=caterina leonardo.bootloader.file=Caterina-Leonardo.hex -- cgit v1.2.3-18-g5258 From c7df908cec4a3fc36b009cfdb4a8f45bd1e7d91a Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Fri, 3 Feb 2012 20:24:24 -0500 Subject: modify boards.txt with new settings for Caterina_LUFA --- boards.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index fed59eb..89035e6 100644 --- a/boards.txt +++ b/boards.txt @@ -147,14 +147,14 @@ mega.build.variant=mega ############################################################## leonardo.name=Arduino Leonardo -leonardo.upload.protocol=arduino -leonardo.upload.maximum_size=30720 +leonardo.upload.protocol=avr109 +leonardo.upload.maximum_size=28672 leonardo.upload.speed=1200 leonardo.bootloader.low_fuses=0xde leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.extended_fuses=0xcb -leonardo.bootloader.path=caterina -leonardo.bootloader.file=Caterina-Leonardo.hex +leonardo.bootloader.path=caterina_LUFA +leonardo.bootloader.file=Caterina.hex leonardo.bootloader.unlock_bits=0x3F leonardo.bootloader.lock_bits=0x2F leonardo.build.mcu=atmega32u4 -- cgit v1.2.3-18-g5258 From 924e5a48465cf8a9ba3af38e6cf4c2e1a2c0733c Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Mon, 13 Feb 2012 00:56:06 -0500 Subject: 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. --- boards.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 89035e6..7d25ab8 100644 --- a/boards.txt +++ b/boards.txt @@ -149,7 +149,8 @@ mega.build.variant=mega leonardo.name=Arduino Leonardo leonardo.upload.protocol=avr109 leonardo.upload.maximum_size=28672 -leonardo.upload.speed=1200 +leonardo.upload.speed=57600 +leonardo.upload.disable_flushing=true leonardo.bootloader.low_fuses=0xde leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.extended_fuses=0xcb -- cgit v1.2.3-18-g5258 From 19c44dd5fd671823610f6b6277874c956cced90e Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Tue, 14 Feb 2012 10:00:55 -0500 Subject: Changed Leonardo fuses to select longer clock startup time. Done with the aim of discriminating more reliably between reset sources. --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 7d25ab8..740671c 100644 --- a/boards.txt +++ b/boards.txt @@ -151,7 +151,7 @@ leonardo.upload.protocol=avr109 leonardo.upload.maximum_size=28672 leonardo.upload.speed=57600 leonardo.upload.disable_flushing=true -leonardo.bootloader.low_fuses=0xde +leonardo.bootloader.low_fuses=0xff leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.extended_fuses=0xcb leonardo.bootloader.path=caterina_LUFA -- cgit v1.2.3-18-g5258 From 0c00db7809760aae21678615b153d4a09709d018 Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Wed, 29 Feb 2012 17:25:46 -0500 Subject: Switching Mini w/ ATmega328 upload protocol from stk500 to arduino. --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 7b719de..8ce7cc9 100644 --- a/boards.txt +++ b/boards.txt @@ -184,7 +184,7 @@ mega.build.variant=mega mini328.name=Arduino Mini w/ ATmega328 -mini328.upload.protocol=stk500 +mini328.upload.protocol=arduino mini328.upload.maximum_size=28672 mini328.upload.speed=115200 -- cgit v1.2.3-18-g5258 From 53e51de832189a30a2a6e9fae77d0f58a3616ccc Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Thu, 8 Mar 2012 13:47:42 -0500 Subject: removed old version of Leonardo's caterina bootloader, replaced with LUFA-based caterina --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index cb603cd..710ae27 100644 --- a/boards.txt +++ b/boards.txt @@ -154,7 +154,7 @@ leonardo.upload.disable_flushing=true leonardo.bootloader.low_fuses=0xff leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.extended_fuses=0xcb -leonardo.bootloader.path=caterina_LUFA +leonardo.bootloader.path=caterina leonardo.bootloader.file=Caterina.hex leonardo.bootloader.unlock_bits=0x3F leonardo.bootloader.lock_bits=0x2F -- cgit v1.2.3-18-g5258 From ec83f55b626f3b9b5da4a0782b8fa81ca72a8933 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Mon, 9 Apr 2012 08:06:35 -0400 Subject: 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 --- boards.txt | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 710ae27..3a94d26 100644 --- a/boards.txt +++ b/boards.txt @@ -155,31 +155,36 @@ leonardo.bootloader.low_fuses=0xff leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.extended_fuses=0xcb leonardo.bootloader.path=caterina -leonardo.bootloader.file=Caterina.hex +leonardo.bootloader.file=Caterina-Leonardo.hex leonardo.bootloader.unlock_bits=0x3F leonardo.bootloader.lock_bits=0x2F leonardo.build.mcu=atmega32u4 leonardo.build.f_cpu=16000000L +leonardo.build.vid=0x2341 +leonardo.build.pid=0x8034 leonardo.build.core=arduino leonardo.build.variant=leonardo ############################################################## -#micro.name=Arduino Micro -#micro.upload.protocol=arduino -#micro.upload.maximum_size=30720 -#micro.upload.speed=1200 -#micro.bootloader.low_fuses=0xde -#micro.bootloader.high_fuses=0xda -#micro.bootloader.extended_fuses=0xcb -#micro.bootloader.path=caterina -#micro.bootloader.file=Caterina-Micro.hex -#micro.bootloader.unlock_bits=0x3F -#micro.bootloader.lock_bits=0x2F -#micro.build.mcu=atmega32u4 -#micro.build.f_cpu=16000000L -#micro.build.core=arduino -#micro.build.variant=micro +micro.name=Arduino Micro +micro.upload.protocol=avr109 +micro.upload.maximum_size=28672 +micro.upload.speed=57600 +micro.upload.disable_flushing=true +micro.bootloader.low_fuses=0xff +micro.bootloader.high_fuses=0xd8 +micro.bootloader.extended_fuses=0xcb +micro.bootloader.path=caterina +micro.bootloader.file=Caterina-Micro.hex +micro.bootloader.unlock_bits=0x3F +micro.bootloader.lock_bits=0x2F +micro.build.mcu=atmega32u4 +micro.build.f_cpu=16000000L +micro.build.vid=0x2341 +micro.build.pid=0x8035 +micro.build.core=arduino +micro.build.variant=micro ############################################################## -- cgit v1.2.3-18-g5258 From e2e0260094c762fddf4669b7a957914405ae9f19 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Mon, 9 Apr 2012 10:12:14 -0400 Subject: Micro I hardly knew ye --- boards.txt | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 3a94d26..26c9477 100644 --- a/boards.txt +++ b/boards.txt @@ -167,27 +167,6 @@ leonardo.build.variant=leonardo ############################################################## -micro.name=Arduino Micro -micro.upload.protocol=avr109 -micro.upload.maximum_size=28672 -micro.upload.speed=57600 -micro.upload.disable_flushing=true -micro.bootloader.low_fuses=0xff -micro.bootloader.high_fuses=0xd8 -micro.bootloader.extended_fuses=0xcb -micro.bootloader.path=caterina -micro.bootloader.file=Caterina-Micro.hex -micro.bootloader.unlock_bits=0x3F -micro.bootloader.lock_bits=0x2F -micro.build.mcu=atmega32u4 -micro.build.f_cpu=16000000L -micro.build.vid=0x2341 -micro.build.pid=0x8035 -micro.build.core=arduino -micro.build.variant=micro - -############################################################## - mini328.name=Arduino Mini w/ ATmega328 mini328.upload.protocol=arduino -- cgit v1.2.3-18-g5258 From d755d0035d4e3a816c127fd8207722bfe6629eee Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Wed, 25 Apr 2012 15:56:18 -0400 Subject: changed PID values for Leonardo bootloader and sketch done to avoid driver problems for users who installed the pre-release bootloader and driver --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 26c9477..638eb4a 100644 --- a/boards.txt +++ b/boards.txt @@ -161,7 +161,7 @@ leonardo.bootloader.lock_bits=0x2F leonardo.build.mcu=atmega32u4 leonardo.build.f_cpu=16000000L leonardo.build.vid=0x2341 -leonardo.build.pid=0x8034 +leonardo.build.pid=0x8036 leonardo.build.core=arduino leonardo.build.variant=leonardo -- cgit v1.2.3-18-g5258 From 825a890430698896eb213771ab2818fca8aa3c80 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Fri, 25 May 2012 17:31:55 +0200 Subject: Simplified boards.txt file --- boards.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index c6124e0..b6d7425 100644 --- a/boards.txt +++ b/boards.txt @@ -14,9 +14,7 @@ uno.bootloader.high_fuses=0xDE uno.bootloader.extended_fuses=0x05 uno.bootloader.unlock_bits=0x3F uno.bootloader.lock_bits=0x0F -uno.bootloader.erase.params=-e -Ulock:w:{bootloader.unlock_bits}:m -Uefuse:w:{bootloader.extended_fuses}:m -Uhfuse:w:{bootloader.high_fuses}:m -Ulfuse:w:{bootloader.low_fuses}:m -uno.bootloader.write.params=-Uflash:w:{bootloader.file}:i -Ulock:w:{bootloader.lock_bits}:m -uno.bootloader.file={runtime.ide.path}/hardware/arduino/avr/optiboot/optiboot_atmega328.hex +uno.bootloader.file=optiboot/optiboot_atmega328.hex uno.build.mcu=atmega328p uno.build.f_cpu=16000000L @@ -153,24 +151,28 @@ mega.build.variant=mega ############################################################## leonardo.name=Arduino Leonardo +leonardo.upload.tool=avrdude leonardo.upload.protocol=avr109 leonardo.upload.maximum_size=28672 leonardo.upload.speed=57600 leonardo.upload.disable_flushing=true +leonardo.upload.use_1200bps_touch=true + +leonardo.bootloader.tool=avrdude leonardo.bootloader.low_fuses=0xff leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.extended_fuses=0xcb -leonardo.bootloader.path=caterina -leonardo.bootloader.file=Caterina-Leonardo.hex +leonardo.bootloader.file=caterina/Caterina-Leonardo.hex leonardo.bootloader.unlock_bits=0x3F leonardo.bootloader.lock_bits=0x2F + leonardo.build.mcu=atmega32u4 leonardo.build.f_cpu=16000000L leonardo.build.vid=0x2341 leonardo.build.pid=0x8036 leonardo.build.core=arduino leonardo.build.variant=leonardo -leonardo.build.extra_flags=-DUSB_VID={build.vid} -DDUSB_PID={build.pid} +leonardo.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} ############################################################## -- cgit v1.2.3-18-g5258 From 31c24577835b0a9c7a1291ffbda1b61d96818511 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 26 Jun 2012 00:52:05 +0200 Subject: Added default extra_flags parameter to allow build on all boards --- boards.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index b6d7425..85a9bf3 100644 --- a/boards.txt +++ b/boards.txt @@ -20,7 +20,6 @@ uno.build.mcu=atmega328p uno.build.f_cpu=16000000L uno.build.core=arduino uno.build.variant=standard -uno.build.extra_flags= ############################################################## -- cgit v1.2.3-18-g5258