[gnoduino: 101/237] Merge branch 'new-extension' of github.com:arduino/Arduino into new-extension
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnoduino: 101/237] Merge branch 'new-extension' of github.com:arduino/Arduino into new-extension
- Date: Sat, 31 Mar 2012 20:23:19 +0000 (UTC)
commit db1e2fc6f29a4a735462b08fe8fa3cbd3602b145
Merge: 402d33e 4466184
Author: David Mellis <d mellis arduino cc>
Date: Fri Sep 2 19:58:39 2011 -0400
Merge branch 'new-extension' of github.com:arduino/Arduino into new-extension
arduino/boards.txt | 23 +++++++-
arduino/cores/arduino/Client.h | 27 +++++++++
arduino/cores/arduino/HardwareSerial.cpp | 53 ++++++++++++++++-
arduino/cores/arduino/HardwareSerial.h | 2 +
arduino/cores/arduino/IPAddress.cpp | 56 ++++++++++++++++++
arduino/cores/arduino/IPAddress.h | 76 +++++++++++++++++++++++++
arduino/cores/arduino/Print.h | 2 +-
arduino/cores/arduino/Printable.h | 3 +
arduino/cores/arduino/Server.h | 9 +++
arduino/cores/arduino/Udp.h | 90 ++++++++++++++++++++++++++++++
arduino/cores/arduino/main.cpp | 4 +-
arduino/cores/arduino/new.cpp | 18 ++++++
arduino/cores/arduino/new.h | 22 +++++++
13 files changed, 378 insertions(+), 7 deletions(-)
---
diff --cc arduino/boards.txt
index 1b2037f,48a0cf9..fb2a1cd
--- a/arduino/boards.txt
+++ b/arduino/boards.txt
@@@ -165,9 -165,30 +165,30 @@@ mini.build.variant=eightanaloginput
##############################################################
+ ethernet.name=Arduino Ethernet
+
+ ethernet.upload.protocol=stk500
+ ethernet.upload.maximum_size=32256
+ ethernet.upload.speed=115200
+
+ ethernet.bootloader.low_fuses=0xff
+ ethernet.bootloader.high_fuses=0xde
+ ethernet.bootloader.extended_fuses=0x05
+ ethernet.bootloader.path=optiboot
+ ethernet.bootloader.file=optiboot_atmega328.hex
+ ethernet.bootloader.unlock_bits=0x3F
+ ethernet.bootloader.lock_bits=0x0F
+
+ ethernet.build.variant=standard
+ ethernet.build.mcu=atmega328p
+ ethernet.build.f_cpu=16000000L
+ ethernet.build.core=arduino
+
+ ##############################################################
+
fio.name=Arduino Fio
-fio.upload.protocol=stk500
+fio.upload.protocol=arduino
fio.upload.maximum_size=30720
fio.upload.speed=57600
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]