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

Author: zeveland

examples/PachubeClient/PachubeClient.ino

@@ -23,28 +23,32 @@
 #include <Ethernet.h>
 
 // assign a MAC address for the ethernet controller.
-// Newer Ethernet shields have a MAC address printed on a sticker on the shield
 // fill in your address here:
 byte mac[] = { 
   0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
+// assign an IP address for the controller:
+byte ip[] = { 
+  192,168,1,20 };
+byte gateway[] = {
+  192,168,1,1};	
+byte subnet[] = { 
+  255, 255, 255, 0 };
+
+//  The address of the server you want to connect to (pachube.com):
+byte server[] = { 
+  173,203,98,29 }; 
 
 // initialize the library instance:
-EthernetClient client;
+Client client(server, 80);
 
 long lastConnectionTime = 0;        // last time you connected to the server, in milliseconds
 boolean lastConnected = false;      // state of the connection last time through the main loop
 const int postingInterval = 10000;  //delay between updates to Pachube.com
 
 void setup() {
-  // start serial port:
+  // start the ethernet connection and serial port:
+  Ethernet.begin(mac, ip);
   Serial.begin(9600);
-  // start the Ethernet connection:
-  if (Ethernet.begin(mac) == 0) {
-    Serial.println("Failed to configure Ethernet using DHCP");
-    // no point in carrying on, so do nothing forevermore:
-    for(;;)
-      ;
-  }
   // give the ethernet module time to boot up:
   delay(1000);
 }
@@ -82,7 +86,7 @@ void loop() {
 // this method makes a HTTP connection to the server:
 void sendData(int thisData) {
   // if there's a successful connection:
-  if (client.connect("www.pachube.com", 80)) {
+  if (client.connect()) {
     Serial.println("connecting...");
     // send the HTTP PUT request. 
     // fill in your feed address here:

examples/PachubeClientString/PachubeClientString.ino

@@ -28,23 +28,29 @@
 // fill in your address here:
 byte mac[] = { 
   0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
+// assign an IP address for the controller:
+byte ip[] = { 
+  192,168,1,20 };
+byte gateway[] = {
+  192,168,1,1};	
+byte subnet[] = { 
+  255, 255, 255, 0 };
+
+//  The address of the server you want to connect to (pachube.com):
+byte server[] = { 
+  173,203,98,29 }; 
 
 // initialize the library instance:
-EthernetClient client;
+Client client(server, 80);
 
 long lastConnectionTime = 0;        // last time you connected to the server, in milliseconds
 boolean lastConnected = false;      // state of the connection last time through the main loop
 const int postingInterval = 10000;  //delay between updates to Pachube.com
 
 void setup() {
   // start the ethernet connection and serial port:
+  Ethernet.begin(mac, ip);
   Serial.begin(9600);
-  if (Ethernet.begin(mac) == 0) {
-    Serial.println("Failed to configure Ethernet using DHCP");
-    // no point in carrying on, so do nothing forevermore:
-    for(;;)
-      ;
-  }
   // give the ethernet module time to boot up:
   delay(1000);
 }
@@ -90,7 +96,7 @@ void loop() {
 // this method makes a HTTP connection to the server:
 void sendData(String thisData) {
   // if there's a successful connection:
-  if (client.connect("www.pachube.com", 80)) {
+  if (client.connect()) {
     Serial.println("connecting...");
     // send the HTTP PUT request. 
     // fill in your feed address here: