Updates to a number of Examples

removed pachube examples, added xively examples. changes to the Servo
examples

Author: shfitz

libraries/Ethernet/examples/TwitterClient/TwitterClient.ino

@@ -1,12 +1,12 @@
 /*
-  Pachube sensor client
+  Xively sensor client
  
- This sketch connects an analog sensor to Pachube (http://www.pachube.com)
+ This sketch connects an analog sensor to Xively (http://www.xively.com)
  using a Wiznet Ethernet shield. You can use the Arduino Ethernet shield, or
  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. 
+ This example has been updated to use version 2.0 of the Xively.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.
  
@@ -19,15 +19,15 @@
  modified 9 Apr 2012
  by Tom Igoe with input from Usman Haque and Joe Saavedra
  
-http://arduino.cc/en/Tutorial/PachubeClient
+http://arduino.cc/en/Tutorial/XivelyClient
  This code is in the public domain.
  
  */
 
 #include <SPI.h>
 #include <Ethernet.h>
 
-#define APIKEY         "YOUR API KEY GOES HERE" // replace your pachube api key here
+#define APIKEY         "YOUR API KEY GOES HERE" // replace your xively api key here
 #define FEEDID         00000 // replace your feed ID
 #define USERAGENT      "My Project" // user agent is the project name
 
@@ -45,12 +45,12 @@ EthernetClient client;
 
 // 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
+IPAddress server(216,52,233,122);      // numeric IP for api.xively.com
+//char server[] = "api.xively.com";   // name address for xively 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
+const unsigned long postingInterval = 10*1000; //delay between updates to Xively.com
 
 void setup() {
  // Open serial communications and wait for port to open:
@@ -107,8 +107,8 @@ void sendData(int thisData) {
     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("Host: api.xively.com");
+    client.print("X-XivelyApiKey: ");
     client.println(APIKEY);
     client.print("User-Agent: ");
     client.println(USERAGENT);

libraries/Ethernet/examples/PachubeClient/PachubeClient.ino renamed to libraries/Ethernet/examples/XivelyClient/XivelyClient.ino

@@ -1,12 +1,12 @@
 /*
-  Pachube sensor client with Strings
+  Xively sensor client with Strings
  
- This sketch connects an analog sensor to Pachube (http://www.pachube.com)
+ This sketch connects an analog sensor to Xively (http://www.xively.com)
  using a Wiznet Ethernet shield. You can use the Arduino Ethernet shield, or
  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. 
+ This example has been updated to use version 2.0 of the xively.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.
  
@@ -23,7 +23,7 @@
  modified 8 September 2012
  by Scott Fitzgerald
  
- http://arduino.cc/en/Tutorial/PachubeClientString
+ http://arduino.cc/en/Tutorial/XivelyClientString
  This code is in the public domain.
  
  */
@@ -32,7 +32,7 @@
 #include <Ethernet.h>
 
 
-#define APIKEY         "YOUR API KEY GOES HERE" // replace your Pachube api key here
+#define APIKEY         "YOUR API KEY GOES HERE" // replace your Xively api key here
 #define FEEDID         00000 // replace your feed ID
 #define USERAGENT      "My Project" // user agent is the project name
 
@@ -51,12 +51,12 @@ EthernetClient client;
 
 // 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,121);      // numeric IP for api.pachube.com
-//char server[] = "api.pachube.com";   // name address for pachube API
+IPAddress server(216,52,233,121);      // numeric IP for api.xively.com
+//char server[] = "api.xively.com";   // name address for xively 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
+const unsigned long postingInterval = 10*1000;  //delay between updates to xively.com
 
 void setup() {
  // Open serial communications and wait for port to open:
@@ -85,7 +85,7 @@ void loop() {
   dataString += sensorReading;
 
   // you can append multiple readings to this String if your
-  // pachube feed is set up to handle multiple values:
+  // xively feed is set up to handle multiple values:
   int otherSensorReading = analogRead(A1);
   dataString += "\nsensor2,";
   dataString += otherSensorReading;
@@ -125,8 +125,8 @@ void sendData(String thisData) {
     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("Host: api.xively.com");
+    client.print("X-xivelyApiKey: ");
     client.println(APIKEY);
     client.print("User-Agent: ");
     client.println(USERAGENT);

libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino renamed to libraries/Ethernet/examples/XivelyClientString/XivelyClientString.ino

@@ -1,10 +1,10 @@
 /*
- GSM Pachube client
+ GSM Xively client
  
- This sketch connects an analog sensor to Pachube (http://www.pachube.com)
+ This sketch connects an analog sensor to Xively (http://www.xively.com)
  using a Telefonica GSM/GPRS shield.
 
- This example has been updated to use version 2.0 of the Pachube.com API. 
+ This example has been updated to use version 2.0 of the Xively.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.
  
@@ -19,15 +19,15 @@
  
  This code is in the public domain.
  
- http://arduino.cc/en/Tutorial/GSMExamplesPachubeClient
+ http://arduino.cc/en/Tutorial/GSMExamplesXivelyClient
  
  */
 
 // libraries
 #include <GSM.h>
 
-// Pachube Client data
-#define APIKEY         "YOUR API KEY GOES HERE"  // replace your pachube api key here
+// Xively Client data
+#define APIKEY         "YOUR API KEY GOES HERE"  // replace your xively api key here
 #define FEEDID         00000                     // replace your feed ID
 #define USERAGENT      "My Project"              // user agent is the project name
 
@@ -46,12 +46,12 @@ GSM gsmAccess;
 
 // 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,121);    // numeric IP for api.pachube.com
-char server[] = "api.pachube.com";      // name address for pachube API
+// IPAddress server(216,52,233,121);    // numeric IP for api.xively.com
+char server[] = "api.xively.com";      // name address for xively 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
+const unsigned long postingInterval = 10*1000;  //delay between updates to Xively.com
 
 void setup()
 {
@@ -126,7 +126,7 @@ void sendData(int thisData)
     client.print("PUT /v2/feeds/");
     client.print(FEEDID);
     client.println(".csv HTTP/1.1");
-    client.println("Host: api.pachube.com");
+    client.println("Host: api.xively.com");
     client.print("X-ApiKey: ");
     client.println(APIKEY);
     client.print("User-Agent: ");

libraries/GSM/examples/GSMPachubeClient/GSMPachubeClient.ino renamed to libraries/GSM/examples/GSMXivelyClient/GSMXivelyClient.ino

@@ -1,10 +1,10 @@
 /*
- Pachube client with Strings
+ Xively client with Strings
  
- This sketch connects two analog sensors to Pachube (http://www.pachube.com)
+ This sketch connects two analog sensors to Xively (http://www.xively.com)
  through a Telefonica GSM/GPRS shield.
  
- This example has been updated to use version 2.0 of the Pachube.com API. 
+ This example has been updated to use version 2.0 of the Xively.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.
  
@@ -27,8 +27,8 @@
 // Include the GSM library
 #include <GSM.h>
 
-// Pachube login information
-#define APIKEY         "YOUR API KEY GOES HERE"  // replace your pachube api key here
+// Xively login information
+#define APIKEY         "YOUR API KEY GOES HERE"  // replace your xively api key here
 #define FEEDID         00000                     // replace your feed ID
 #define USERAGENT      "My Project"              // user agent is the project name
 
@@ -47,12 +47,12 @@ GSM gsmAccess;
 
 // 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,121);     // numeric IP for api.pachube.com
-char server[] = "api.pachube.com";       // name address for Pachube API
+// IPAddress server(216,52,233,121);     // numeric IP for api.xively.com
+char server[] = "api.xively.com";       // name address for Xively 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
+const unsigned long postingInterval = 10*1000;  // delay between updates to Xively.com
 
 void setup()
 {
@@ -92,7 +92,7 @@ void loop()
   dataString += sensorReading;
 
   // you can append multiple readings to this String to 
-  // send the pachube feed multiple values
+  // send the xively feed multiple values
   int otherSensorReading = analogRead(A1);
   dataString += "\nsensor2,";
   dataString += otherSensorReading;
@@ -138,7 +138,7 @@ void sendData(String thisData)
     client.print("PUT /v2/feeds/");
     client.print(FEEDID);
     client.println(".csv HTTP/1.1");
-    client.println("Host: api.pachube.com");
+    client.println("Host: api.xively.com");
     client.print("X-ApiKey: ");
     client.println(APIKEY);
     client.print("User-Agent: ");