Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	libraries/Ethernet/examples/XivelyClient/XivelyClient.ino
	libraries/Ethernet/examples/XivelyClientString/XivelyClientString.ino
	libraries/GSM/examples/GSMXivelyClient/GSMXivelyClient.ino
	libraries/GSM/examples/GSMXivelyClientString/GSMXivelyClientString.ino
	libraries/Servo/examples/Knob/Knob.ino
	libraries/Servo/examples/Sweep/Sweep.ino
	libraries/WiFi/examples/WiFiXivelyClient/WiFiXivelyClient.ino
	libraries/WiFi/examples/WiFiXivelyClientString/WiFiXivelyClientString.ino

Author: cmaglie

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

@@ -1,12 +1,12 @@
 /*
-  Pachube sensor client
-
- This sketch connects an analog sensor to Pachube (http://www.pachube.com)
+  Xively sensor client
+ 
+ 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.
 
@@ -18,16 +18,16 @@
  created 15 March 2010
  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
 
@@ -46,12 +46,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:
@@ -108,8 +108,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/PachubeClientString/PachubeClientString.ino renamed to libraries/Ethernet/examples/XivelyClientString/XivelyClientString.ino

@@ -1,12 +1,12 @@
 /*
-  Cosm sensor client with Strings
-
- This sketch connects an analog sensor to Cosm (http://www.cosm.com)
+  Xively sensor client with Strings
+ 
+ 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 Cosm.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.
 
@@ -20,8 +20,10 @@
  created 15 March 2010
  modified 9 Apr 2012
  by Tom Igoe with input from Usman Haque and Joe Saavedra
-
- http://arduino.cc/en/Tutorial/CosmClientString
+ modified 8 September 2012
+ by Scott Fitzgerald
+ 
+ http://arduino.cc/en/Tutorial/XivelyClientString
  This code is in the public domain.
 
  */
@@ -30,7 +32,7 @@
 #include <Ethernet.h>
 
 
-#define APIKEY         "YOUR API KEY GOES HERE" // replace your Cosm 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
 
@@ -50,12 +52,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.cosm.com
-//char server[] = "api.cosm.com";   // name address for Cosm 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 Cosm.com
+const unsigned long postingInterval = 10*1000;  //delay between updates to xively.com
 
 void setup() {
   // Open serial communications and wait for port to open:
@@ -84,7 +86,7 @@ void loop() {
   dataString += sensorReading;
 
   // you can append multiple readings to this String if your
-  // Cosm 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;
@@ -124,8 +126,8 @@ void sendData(String thisData) {
     client.print("PUT /v2/feeds/");
     client.print(FEEDID);
     client.println(".csv HTTP/1.1");
-    client.println("Host: api.cosm.com");
-    client.print("X-CosmApiKey: ");
+    client.println("Host: api.xively.com");
+    client.print("X-xivelyApiKey: ");
     client.println(APIKEY);
     client.print("User-Agent: ");
     client.println(USERAGENT);

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

@@ -1,10 +1,10 @@
 /*
- GSM Pachube client
-
- This sketch connects an analog sensor to Pachube (http://www.pachube.com)
+ GSM Xively client
+ 
+ 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.
 
@@ -18,16 +18,16 @@
  and adapted for GSM shield by David Del Peral
 
  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/GSMPachubeClientString/GSMPachubeClientString.ino renamed to libraries/GSM/examples/GSMXivelyClientString/GSMXivelyClientString.ino

@@ -1,10 +1,10 @@
 /*
- Pachube client with Strings
-
- This sketch connects two analog sensors to Pachube (http://www.pachube.com)
+ Xively client with Strings
+ 
+ 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()
 {
@@ -91,8 +91,8 @@ void loop()
   String dataString = "sensor1,";
   dataString += sensorReading;
 
-  // you can append multiple readings to this String to
-  // send the pachube feed multiple values
+  // you can append multiple readings to this String to 
+  // 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: ");

libraries/Servo/examples/Knob/Knob.ino

@@ -1,5 +1,11 @@
-// Controlling a servo position using a potentiometer (variable resistor)
-// by Michal Rinott <http://people.interaction-ivrea.it/m.rinott>
+/* 
+ Controlling a servo position using a potentiometer (variable resistor) 
+ by Michal Rinott <http://people.interaction-ivrea.it/m.rinott> 
+
+ modified on 8 Nov 2013
+ by Scott Fitzgerald
+ http://arduino.cc/en/Tutorial/Knob
+*/
 
 #include <Servo.h>
 
@@ -13,10 +19,11 @@ void setup()
   myservo.attach(9);  // attaches the servo on pin 9 to the servo object
 }
 
-void loop()
-{
-  val = analogRead(potpin);            // reads the value of the potentiometer (value between 0 and 1023)
-  val = map(val, 0, 1023, 0, 179);     // scale it to use it with the servo (value between 0 and 180)
-  myservo.write(val);                  // sets the servo position according to the scaled value
-  delay(15);                           // waits for the servo to get there
-}
+void loop() 
+{ 
+  val = analogRead(potpin);            // reads the value of the potentiometer (value between 0 and 1023) 
+  val = map(val, 0, 1023, 0, 180);     // scale it to use it with the servo (value between 0 and 180) 
+  myservo.write(val);                  // sets the servo position according to the scaled value 
+  delay(15);                           // waits for the servo to get there 
+} 
+

libraries/Servo/examples/Sweep/Sweep.ino

@@ -1,31 +1,35 @@
-// Sweep
-// by BARRAGAN <http://barraganstudio.com>
-// This example code is in the public domain.
+/* Sweep
+ by BARRAGAN <http://barraganstudio.com> 
+ This example code is in the public domain.
 
+ modified 8 Nov 2013
+ by Scott Fitzgerald
+ http://arduino.cc/en/Tutorial/Sweep
+*/ 
 
-#include <Servo.h>
+#include <Servo.h> 
+ 
+Servo myservo;  // create servo object to control a servo 
+                // twelve servo objects can be created on most boards
+ 
+int pos = 0;    // variable to store the servo position 
+ 
+void setup() 
+{ 
+  myservo.attach(9);  // attaches the servo on pin 9 to the servo object 
+} 
+ 
+void loop() 
+{ 
+  for(pos = 0; pos <= 180; pos += 1) // goes from 0 degrees to 180 degrees 
+  {                                  // in steps of 1 degree 
+    myservo.write(pos);              // tell servo to go to position in variable 'pos' 
+    delay(15);                       // waits 15ms for the servo to reach the position 
+  } 
+  for(pos = 180; pos>=0; pos-=1)     // goes from 180 degrees to 0 degrees 
+  {                                
+    myservo.write(pos);              // tell servo to go to position in variable 'pos' 
+    delay(15);                       // waits 15ms for the servo to reach the position 
+  } 
+} 
 
-Servo myservo;  // create servo object to control a servo
-// a maximum of eight servo objects can be created
-
-int pos = 0;    // variable to store the servo position
-
-void setup()
-{
-  myservo.attach(9);  // attaches the servo on pin 9 to the servo object
-}
-
-
-void loop()
-{
-  for (pos = 0; pos < 180; pos += 1) // goes from 0 degrees to 180 degrees
-  { // in steps of 1 degree
-    myservo.write(pos);              // tell servo to go to position in variable 'pos'
-    delay(15);                       // waits 15ms for the servo to reach the position
-  }
-  for (pos = 180; pos >= 1; pos -= 1) // goes from 180 degrees to 0 degrees
-  {
-    myservo.write(pos);              // tell servo to go to position in variable 'pos'
-    delay(15);                       // waits 15ms for the servo to reach the position
-  }
-}