arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
Cristian Maglie
2013-11-11 12:40:59 +01:00
parent 77635aacca cb9686dc33
commit 853be57648
8 changed files with 125 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/GSM/examples/GSMPachubeClient/GSMPachubeClient.ino → libraries/GSM/examples/GSMXivelyClient/GSMXivelyClient.ino
View File

@ -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: ");

26
libraries/GSM/examples/GSMPachubeClientString/GSMPachubeClientString.ino → libraries/GSM/examples/GSMXivelyClientString/GSMXivelyClientString.ino
View File

@ -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: ");