Pre-merge upstream Arduino

5 files changed, 150 insertions, 83 deletions

diff --git a/libraries/Ethernet/examples/ChatServer/ChatServer.ino b/libraries/Ethernet/examples/ChatServer/ChatServer.ino
index 9f819fd..de75257 100644
--- a/libraries/Ethernet/examples/ChatServer/ChatServer.ino
+++ b/libraries/Ethernet/examples/ChatServer/ChatServer.ino
@@ -12,7 +12,7 @@
  
  created 18 Dec 2009
  by David A. Mellis
- modified 10 August 2010
+ modified 12 March 2012
  by Tom Igoe
  
  */
@@ -23,14 +23,16 @@
 // Enter a MAC address and IP address for your controller below.
 // The IP address will be dependent on your local network.
 // gateway and subnet are optional:
-byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
+byte mac[] = { 
+  0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
 IPAddress ip(192,168,1, 177);
 IPAddress gateway(192,168,1, 1);
 IPAddress subnet(255, 255, 0, 0);
 
+
 // telnet defaults to port 23
 EthernetServer server(23);
-boolean gotAMessage = false; // whether or not you got a message from the client yet
+boolean alreadyConnected = false; // whether or not the client was connected previously
 
 void setup() {
   // initialize the ethernet device
@@ -39,25 +41,34 @@ void setup() {
   server.begin();
   // open the serial port
   Serial.begin(9600);
+  Serial.print("Chat server address:");
+  Serial.println(Ethernet.localIP());
 }
 
 void loop() {
   // wait for a new client:
   EthernetClient client = server.available();
-  
+
   // when the client sends the first byte, say hello:
   if (client) {
-    if (!gotAMessage) {
+    if (!alreadyConnected) {
+      // clead out the input buffer:
+      client.flush();    
       Serial.println("We have a new client");
       client.println("Hello, client!"); 
-      gotAMessage = true;
+      alreadyConnected = true;
+    } 
+
+    if (client.available() > 0) {
+      // read the bytes incoming from the client:
+      char thisChar = client.read();
+      // echo the bytes back to the client:
+      server.write(thisChar);
+      // echo the bytes to the server as well:
+      Serial.write(thisChar);
     }
-    
-    // read the bytes incoming from the client:
-    char thisChar = client.read();
-    // echo the bytes back to the client:
-    server.write(thisChar);
-    // echo the bytes to the server as well:
-    Serial.print(thisChar);
   }
 }
+
+
+
diff --git a/libraries/Ethernet/examples/PachubeClient/PachubeClient.ino b/libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
index a169443..4d4290d 100644
--- a/libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
+++ b/libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
@@ -6,15 +6,20 @@
  the Adafruit Ethernet shield, either one will work, as long as it's got
  a Wiznet Ethernet module on board.
  
+ This example has been updated to use version 2.0 of the Pachube.com API. 
+ To make it work, create a feed with a datastream, and give it the ID
+ sensor1. Or change the code below to match your feed.
+ 
+ 
  Circuit:
  * Analog sensor attached to analog in 0
  * Ethernet shield attached to pins 10, 11, 12, 13
  
  created 15 March 2010
- updated 26 Oct 2011
- by Tom Igoe
+ updated 16 Mar 2012
+ by Tom Igoe with input from Usman Haque and Joe Saavedra
  
- http://www.tigoe.net/pcomp/code/category/arduinowiring/873
+http://arduino.cc/en/Tutorial/PachubeClient
  This code is in the public domain.
  
  */
@@ -22,6 +27,10 @@
 #include <SPI.h>
 #include <Ethernet.h>
 
+#define APIKEY         "YOUR API KEY GOES HERE" // replace your pachube api key here
+#define FEEDID         00000 // replace your feed ID
+#define USERAGENT      "My Project" // user agent is the project name
+
 // 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:
@@ -34,26 +43,22 @@ IPAddress ip(10,0,1,20);
 // initialize the library instance:
 EthernetClient client;
 
-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
+// if you don't want to use DNS (and reduce your sketch size)
+// use the numeric IP instead of the name for the server:
+IPAddress server(216,52,233,122);      // numeric IP for api.pachube.com
+//char server[] = "api.pachube.com";   // name address for pachube API
+
+unsigned 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 unsigned long postingInterval = 10*1000; //delay between updates to Pachube.com
 
 void setup() {
   // start serial port:
   Serial.begin(9600);
-  // start the Ethernet connection:
+ // 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);
-  // start the Ethernet connection:
-  if (Ethernet.begin(mac) == 0) {
-    Serial.println("Failed to configure Ethernet using DHCP");
-    // Configure manually:
+    // DHCP failed, so use a fixed IP address:
     Ethernet.begin(mac, ip);
   }
 }
@@ -91,34 +96,43 @@ 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(server, 80)) {
     Serial.println("connecting...");
-    // send the HTTP PUT request. 
-    // fill in your feed address here:
-    client.print("PUT /api/YOUR_FEED_HERE.csv HTTP/1.1\n");
-    client.print("Host: www.pachube.com\n");
-    // fill in your Pachube API key here:
-    client.print("X-PachubeApiKey: YOUR_KEY_HERE\n");
+    // send the HTTP PUT request:
+    client.print("PUT /v2/feeds/");
+    client.print(FEEDID);
+    client.println(".csv HTTP/1.1");
+    client.println("Host: api.pachube.com");
+    client.print("X-PachubeApiKey: ");
+    client.println(APIKEY);
+    client.print("User-Agent: ");
+    client.println(USERAGENT);
     client.print("Content-Length: ");
 
     // calculate the length of the sensor reading in bytes:
-    int thisLength = getLength(thisData);
-    client.println(thisLength, DEC);
+    // 8 bytes for "sensor1," + number of digits of the data:
+    int thisLength = 8 + getLength(thisData);
+    client.println(thisLength);
 
     // last pieces of the HTTP PUT request:
-    client.print("Content-Type: text/csv\n");
-    client.println("Connection: close\n");
+    client.println("Content-Type: text/csv");
+    client.println("Connection: close");
+    client.println();
 
     // here's the actual content of the PUT request:
-    client.println(thisData, DEC);
-
-    // note the time that the connection was made:
-    lastConnectionTime = millis();
+    client.print("sensor1,");
+    client.println(thisData);
+  
   } 
   else {
     // if you couldn't make a connection:
     Serial.println("connection failed");
+    Serial.println();
+    Serial.println("disconnecting.");
+    client.stop();
   }
+   // note the time that the connection was made or attempted:
+  lastConnectionTime = millis();
 }
 
 
diff --git a/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino b/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
index 4a03100..3535287 100644
--- a/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
+++ b/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
@@ -6,6 +6,10 @@
  the Adafruit Ethernet shield, either one will work, as long as it's got
  a Wiznet Ethernet module on board.
  
+ This example has been updated to use version 2.0 of the Pachube.com API. 
+ To make it work, create a feed with two datastreams, and give them the IDs
+ sensor1 and sensor2. Or change the code below to match your feed.
+ 
  This example uses the String library, which is part of the Arduino core from
  version 0019.  
  
@@ -14,9 +18,10 @@
  * Ethernet shield attached to pins 10, 11, 12, 13
  
  created 15 March 2010
- updated 26 Oct 2011
- by Tom Igoe
+ updated 16 Mar 2012
+ by Tom Igoe with input from Usman Haque and Joe Saavedra
  
+ http://arduino.cc/en/Tutorial/PachubeClientString
  This code is in the public domain.
  
  */
@@ -24,9 +29,14 @@
 #include <SPI.h>
 #include <Ethernet.h>
 
+
+#define APIKEY         "YOUR API KEY GOES HERE" // replace your pachube api key here
+#define FEEDID         00000 // replace your feed ID
+#define USERAGENT      "My Project" // user agent is the project name
+
 // assign a MAC address for the ethernet controller.
 // fill in your address here:
-byte mac[] = { 
+  byte mac[] = { 
   0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
 // fill in an available IP address on your network here,
 // for manual configuration:
@@ -35,9 +45,14 @@ IPAddress ip(10,0,1,20);
 // initialize the library instance:
 EthernetClient client;
 
-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
+// if you don't want to use DNS (and reduce your sketch size)
+// use the numeric IP instead of the name for the server:
+//IPAddress server(216,52,233,122);      // numeric IP for api.pachube.com
+char server[] = "api.pachube.com";   // name address for pachube API
+
+unsigned 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 unsigned long postingInterval = 10*1000;  //delay between updates to Pachube.com
 
 void setup() {
   // start serial port:
@@ -47,7 +62,7 @@ void setup() {
   // start the Ethernet connection:
   if (Ethernet.begin(mac) == 0) {
     Serial.println("Failed to configure Ethernet using DHCP");
-    // Configure manually:
+    // DHCP failed, so use a fixed IP address:
     Ethernet.begin(mac, ip);
   }
 }
@@ -56,13 +71,15 @@ void loop() {
   // read the analog sensor:
   int sensorReading = analogRead(A0);   
   // convert the data to a String to send it:
-  String dataString = String(sensorReading);
+
+  String dataString = "sensor1,";
+  dataString += sensorReading;
 
   // you can append multiple readings to this String if your
   // pachube feed is set up to handle multiple values:
   int otherSensorReading = analogRead(A1);
-  dataString += ",";
-  dataString += String(otherSensorReading);
+  dataString += "\nsensor2,";
+  dataString += otherSensorReading;
 
   // if there's incoming data from the net connection.
   // send it out the serial port.  This is for debugging
@@ -81,7 +98,7 @@ void loop() {
   }
 
   // if you're not connected, and ten seconds have passed since
-  // your last connection, then connect again and send data:
+  // your last connection, then connect again and send data: 
   if(!client.connected() && (millis() - lastConnectionTime > postingInterval)) {
     sendData(dataString);
   }
@@ -93,29 +110,36 @@ 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(server, 80)) {
     Serial.println("connecting...");
-    // send the HTTP PUT request. 
-    // fill in your feed address here:
-    client.print("PUT /api/YOUR_FEED_HERE.csv HTTP/1.1\n");
-    client.print("Host: www.pachube.com\n");
-    // fill in your Pachube API key here:
-    client.print("X-PachubeApiKey: YOUR_KEY_HERE\n");
+    // send the HTTP PUT request:
+    client.print("PUT /v2/feeds/");
+    client.print(FEEDID);
+    client.println(".csv HTTP/1.1");
+    client.println("Host: api.pachube.com");
+    client.print("X-PachubeApiKey: ");
+    client.println(APIKEY);
+    client.print("User-Agent: ");
+    client.println(USERAGENT);
     client.print("Content-Length: ");
-    client.println(thisData.length(), DEC);
+    client.println(thisData.length());
 
     // last pieces of the HTTP PUT request:
-    client.print("Content-Type: text/csv\n");
-    client.println("Connection: close\n");
+    client.println("Content-Type: text/csv");
+    client.println("Connection: close");
+    client.println();
 
     // here's the actual content of the PUT request:
     client.println(thisData);
-
-    // note the time that the connection was made:
-    lastConnectionTime = millis();
   } 
   else {
     // if you couldn't make a connection:
     Serial.println("connection failed");
+    Serial.println();
+    Serial.println("disconnecting.");
+    client.stop();
   }
+  // note the time that the connection was made or attempted:
+  lastConnectionTime = millis();
 }
+
diff --git a/libraries/Ethernet/examples/TwitterClient/TwitterClient.ino b/libraries/Ethernet/examples/TwitterClient/TwitterClient.ino
index f113e17..a3b397d 100644
--- a/libraries/Ethernet/examples/TwitterClient/TwitterClient.ino
+++ b/libraries/Ethernet/examples/TwitterClient/TwitterClient.ino
@@ -14,7 +14,7 @@
  version 0019.  
  
  Circuit:
-  * Ethernet shield attached to pins 10, 11, 12, 13
+ * Ethernet shield attached to pins 10, 11, 12, 13
  
  created 21 May 2011
  by Tom Igoe
@@ -35,12 +35,12 @@ IPAddress ip(192,168,1,20);
 // initialize the library instance:
 EthernetClient client;
 
-const int requestInterval = 60000;  // delay between requests
+const unsigned long requestInterval = 60000;  // delay between requests
 
 char serverName[] = "api.twitter.com";  // twitter URL
 
 boolean requested;                   // whether you've made a request since connecting
-long lastAttemptTime = 0;            // last time you connected to the server, in milliseconds
+unsigned long lastAttemptTime = 0;            // last time you connected to the server, in milliseconds
 
 String currentLine = "";            // string to hold the text from server
 String tweet = "";                  // string to hold the tweet
@@ -51,13 +51,17 @@ void setup() {
   currentLine.reserve(256);
   tweet.reserve(150);
 
-// initialize serial:
+  // initialize serial:
   Serial.begin(9600);
   // attempt a DHCP connection:
+  Serial.println("Attempting to get an IP address using DHCP:");
   if (!Ethernet.begin(mac)) {
     // if DHCP fails, start with a hard-coded address:
+    Serial.println("failed to get an IP address using DHCP, trying manually");
     Ethernet.begin(mac, ip);
   }
+  Serial.print("My address:");
+  Serial.println(Ethernet.localIP());
   // connect to Twitter:
   connectToServer();
 }
@@ -114,7 +118,7 @@ void connectToServer() {
   Serial.println("connecting to server...");
   if (client.connect(serverName, 80)) {
     Serial.println("making HTTP request...");
-  // make HTTP GET request to twitter:
+    // make HTTP GET request to twitter:
     client.println("GET /1/statuses/user_timeline.xml?screen_name=arduino&count=1 HTTP/1.1");
     client.println("HOST: api.twitter.com");
     client.println();
@@ -122,3 +126,4 @@ void connectToServer() {
   // note the time of this connect attempt:
   lastAttemptTime = millis();
 }   
+
diff --git a/libraries/Ethernet/examples/WebServer/WebServer.ino b/libraries/Ethernet/examples/WebServer/WebServer.ino
index 6837f83..7cf2c53 100644
--- a/libraries/Ethernet/examples/WebServer/WebServer.ino
+++ b/libraries/Ethernet/examples/WebServer/WebServer.ino
@@ -10,7 +10,7 @@
  
  created 18 Dec 2009
  by David A. Mellis
- modified 4 Sep 2010
+ modified 20 Mar 2012
  by Tom Igoe
  
  */
@@ -20,7 +20,8 @@
 
 // Enter a MAC address and IP address for your controller below.
 // The IP address will be dependent on your local network:
-byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
+byte mac[] = { 
+  0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
 IPAddress ip(192,168,1, 177);
 
 // Initialize the Ethernet server library
@@ -28,23 +29,27 @@ IPAddress ip(192,168,1, 177);
 // (port 80 is default for HTTP):
 EthernetServer server(80);
 
-void setup()
-{
+void setup() {
+  Serial.begin(9600);
   // start the Ethernet connection and the server:
   Ethernet.begin(mac, ip);
   server.begin();
+  Serial.print("server is at ");
+  Serial.println(Ethernet.localIP());
 }
 
-void loop()
-{
+
+void loop() {
   // listen for incoming clients
   EthernetClient client = server.available();
   if (client) {
+    Serial.println("new client");
     // an http request ends with a blank line
     boolean currentLineIsBlank = true;
     while (client.connected()) {
       if (client.available()) {
         char c = client.read();
+        Serial.write(c);
         // if you've gotten to the end of the line (received a newline
         // character) and the line is blank, the http request has ended,
         // so you can send a reply
@@ -52,16 +57,22 @@ void loop()
           // send a standard http response header
           client.println("HTTP/1.1 200 OK");
           client.println("Content-Type: text/html");
+          client.println("Connnection: close");
           client.println();
-
+          client.println("<!DOCTYPE HTML>");
+          client.println("<html>");
+                    // add a meta refresh tag, so the browser pulls again every 5 seconds:
+          client.println("<meta http-equiv=\"refresh\" content=\"5\">");
           // output the value of each analog input pin
           for (int analogChannel = 0; analogChannel < 6; analogChannel++) {
+            int sensorReading = analogRead(analogChannel);
             client.print("analog input ");
             client.print(analogChannel);
             client.print(" is ");
-            client.print(analogRead(analogChannel));
-            client.println("<br />");
+            client.print(sensorReading);
+            client.println("<br />");       
           }
+          client.println("</html>");
           break;
         }
         if (c == '\n') {
@@ -78,5 +89,7 @@ void loop()
     delay(1);
     // close the connection:
     client.stop();
+    Serial.println("client disonnected");
   }
 }
+