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

22
libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino → libraries/WiFi/examples/WiFiXivelyClient/WiFiXivelyClient.ino
View File

@ -1,13 +1,13 @@
/*
Wifi Pachube sensor client
This sketch connects an analog sensor to Pachube (http://www.pachube.com)
Wifi Xively sensor client
This sketch connects an analog sensor to Xively (http://www.xively.com)
using an Arduino Wifi shield.
This example is written for a network using WPA encryption. For
WEP or WPA, change the Wifi.begin() call accordingly.
This example has been updated to use version 2.0 of the Pachube API.
This example has been updated to use version 2.0 of the Xively 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,7 +18,7 @@
created 13 Mar 2012
modified 31 May 2012
by Tom Igoe
modified 8 Sept 2012
modified 8 Nov 2013
by Scott Fitzgerald
This code is in the public domain.
@ -27,7 +27,7 @@
#include <SPI.h>
#include <WiFi.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 Arduino Project" // user agent is the project name
@ -40,12 +40,12 @@ int status = WL_IDLE_STATUS;
WiFiClient 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() {
//Initialize serial and wait for port to open:
@ -119,7 +119,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: ");

22
libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino → libraries/WiFi/examples/WiFiXivelyClientString/WiFiXivelyClientString.ino
View File

@ -1,13 +1,13 @@
/*
Wifi Pachube sensor client with Strings
This sketch connects an analog sensor to Pachube (http://www.pachube.com)
Wifi Xively sensor client with Strings
This sketch connects an analog sensor to Xively (http://www.xively.com)
using a Arduino Wifi shield.
This example is written for a network using WPA encryption. For
WEP or WPA, change the Wifi.begin() call accordingly.
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.
@ -31,7 +31,7 @@
#include <SPI.h>
#include <WiFi.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 Arduino Project" // user agent is the project name
@ -45,12 +45,12 @@ WiFiClient 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() {
//Initialize serial and wait for port to open:
@ -93,7 +93,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;
@ -133,7 +133,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: ");