mirror of https://github.com/noisymime/Arduino.git
Merge branch 'master' of github.com:arduino/Arduino
This commit is contained in:
commit
33883abd9c
|
@ -1,159 +0,0 @@
|
||||||
/*
|
|
||||||
Cosm sensor client
|
|
||||||
|
|
||||||
This sketch connects an analog sensor to Cosm (http://www.cosm.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.
|
|
||||||
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 14 May 2012
|
|
||||||
by Tom Igoe with input from Usman Haque and Joe Saavedra
|
|
||||||
|
|
||||||
http://arduino.cc/en/Tutorial/CosmClient
|
|
||||||
This code is in the public domain.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <SPI.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
|
|
||||||
#define APIKEY "YOUR API KEY GOES HERE" // replace your Cosm 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:
|
|
||||||
byte mac[] = {
|
|
||||||
0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
|
|
||||||
|
|
||||||
// fill in an available IP address on your network here,
|
|
||||||
// for manual configuration:
|
|
||||||
IPAddress ip(10,0,1,20);
|
|
||||||
|
|
||||||
// initialize the library instance:
|
|
||||||
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
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
// start serial port:
|
|
||||||
Serial.begin(9600);
|
|
||||||
// start the Ethernet connection:
|
|
||||||
if (Ethernet.begin(mac) == 0) {
|
|
||||||
Serial.println("Failed to configure Ethernet using DHCP");
|
|
||||||
// DHCP failed, so use a fixed IP address:
|
|
||||||
Ethernet.begin(mac, ip);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
// read the analog sensor:
|
|
||||||
int sensorReading = analogRead(A0);
|
|
||||||
|
|
||||||
// if there's incoming data from the net connection.
|
|
||||||
// send it out the serial port. This is for debugging
|
|
||||||
// purposes only:
|
|
||||||
if (client.available()) {
|
|
||||||
char c = client.read();
|
|
||||||
Serial.print(c);
|
|
||||||
}
|
|
||||||
|
|
||||||
// if there's no net connection, but there was one last time
|
|
||||||
// through the loop, then stop the client:
|
|
||||||
if (!client.connected() && lastConnected) {
|
|
||||||
Serial.println();
|
|
||||||
Serial.println("disconnecting.");
|
|
||||||
client.stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
// if you're not connected, and ten seconds have passed since
|
|
||||||
// your last connection, then connect again and send data:
|
|
||||||
if(!client.connected() && (millis() - lastConnectionTime > postingInterval)) {
|
|
||||||
sendData(sensorReading);
|
|
||||||
}
|
|
||||||
// store the state of the connection for next time through
|
|
||||||
// the loop:
|
|
||||||
lastConnected = client.connected();
|
|
||||||
}
|
|
||||||
|
|
||||||
// this method makes a HTTP connection to the server:
|
|
||||||
void sendData(int thisData) {
|
|
||||||
// if there's a successful connection:
|
|
||||||
if (client.connect(server, 80)) {
|
|
||||||
Serial.println("connecting...");
|
|
||||||
// send the HTTP PUT request:
|
|
||||||
client.print("PUT /v2/feeds/");
|
|
||||||
client.print(FEEDID);
|
|
||||||
client.println(".csv HTTP/1.1");
|
|
||||||
client.println("Host: api.cosm.com");
|
|
||||||
client.print("X-ApiKey: ");
|
|
||||||
client.println(APIKEY);
|
|
||||||
client.print("User-Agent: ");
|
|
||||||
client.println(USERAGENT);
|
|
||||||
client.print("Content-Length: ");
|
|
||||||
|
|
||||||
// calculate the length of the sensor reading in bytes:
|
|
||||||
// 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.println("Content-Type: text/csv");
|
|
||||||
client.println("Connection: close");
|
|
||||||
client.println();
|
|
||||||
|
|
||||||
// here's the actual content of the PUT request:
|
|
||||||
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();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// This method calculates the number of digits in the
|
|
||||||
// sensor reading. Since each digit of the ASCII decimal
|
|
||||||
// representation is a byte, the number of digits equals
|
|
||||||
// the number of bytes:
|
|
||||||
|
|
||||||
int getLength(int someValue) {
|
|
||||||
// there's at least one byte:
|
|
||||||
int digits = 1;
|
|
||||||
// continually divide the value by ten,
|
|
||||||
// adding one to the digit count for each
|
|
||||||
// time you divide, until you're at 0:
|
|
||||||
int dividend = someValue /10;
|
|
||||||
while (dividend > 0) {
|
|
||||||
dividend = dividend /10;
|
|
||||||
digits++;
|
|
||||||
}
|
|
||||||
// return the number of digits:
|
|
||||||
return digits;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,146 +0,0 @@
|
||||||
/*
|
|
||||||
Cosm sensor client with Strings
|
|
||||||
|
|
||||||
This sketch connects an analog sensor to Cosm (http://www.cosm.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.
|
|
||||||
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.
|
|
||||||
|
|
||||||
Circuit:
|
|
||||||
* Analog sensor attached to analog in 0
|
|
||||||
* Ethernet shield attached to pins 10, 11, 12, 13
|
|
||||||
|
|
||||||
created 15 March 2010
|
|
||||||
updated 14 May 2012
|
|
||||||
by Tom Igoe with input from Usman Haque and Joe Saavedra
|
|
||||||
|
|
||||||
http://arduino.cc/en/Tutorial/CosmClientString
|
|
||||||
This code is in the public domain.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <SPI.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define APIKEY "YOUR API KEY GOES HERE" // replace your Cosm 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[] = {
|
|
||||||
0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
|
|
||||||
|
|
||||||
// fill in an available IP address on your network here,
|
|
||||||
// for manual configuration:
|
|
||||||
IPAddress ip(10,0,1,20);
|
|
||||||
|
|
||||||
// initialize the library instance:
|
|
||||||
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
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
// start serial port:
|
|
||||||
Serial.begin(9600);
|
|
||||||
// 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");
|
|
||||||
// DHCP failed, so use a fixed IP address:
|
|
||||||
Ethernet.begin(mac, ip);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
// read the analog sensor:
|
|
||||||
int sensorReading = analogRead(A0);
|
|
||||||
// convert the data to a String to send it:
|
|
||||||
|
|
||||||
String dataString = "sensor1,";
|
|
||||||
dataString += sensorReading;
|
|
||||||
|
|
||||||
// you can append multiple readings to this String if your
|
|
||||||
// Cosm feed is set up to handle multiple values:
|
|
||||||
int otherSensorReading = analogRead(A1);
|
|
||||||
dataString += "\nsensor2,";
|
|
||||||
dataString += otherSensorReading;
|
|
||||||
|
|
||||||
// if there's incoming data from the net connection.
|
|
||||||
// send it out the serial port. This is for debugging
|
|
||||||
// purposes only:
|
|
||||||
if (client.available()) {
|
|
||||||
char c = client.read();
|
|
||||||
Serial.print(c);
|
|
||||||
}
|
|
||||||
|
|
||||||
// if there's no net connection, but there was one last time
|
|
||||||
// through the loop, then stop the client:
|
|
||||||
if (!client.connected() && lastConnected) {
|
|
||||||
Serial.println();
|
|
||||||
Serial.println("disconnecting.");
|
|
||||||
client.stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
// if you're not connected, and ten seconds have passed since
|
|
||||||
// your last connection, then connect again and send data:
|
|
||||||
if(!client.connected() && (millis() - lastConnectionTime > postingInterval)) {
|
|
||||||
sendData(dataString);
|
|
||||||
}
|
|
||||||
// store the state of the connection for next time through
|
|
||||||
// the loop:
|
|
||||||
lastConnected = client.connected();
|
|
||||||
}
|
|
||||||
|
|
||||||
// this method makes a HTTP connection to the server:
|
|
||||||
void sendData(String thisData) {
|
|
||||||
// if there's a successful connection:
|
|
||||||
if (client.connect(server, 80)) {
|
|
||||||
Serial.println("connecting...");
|
|
||||||
// send the HTTP PUT request:
|
|
||||||
client.print("PUT /v2/feeds/");
|
|
||||||
client.print(FEEDID);
|
|
||||||
client.println(".csv HTTP/1.1");
|
|
||||||
client.println("Host: api.cosm.com");
|
|
||||||
client.print("X-ApiKey: ");
|
|
||||||
client.println(APIKEY);
|
|
||||||
client.print("User-Agent: ");
|
|
||||||
client.println(USERAGENT);
|
|
||||||
client.print("Content-Length: ");
|
|
||||||
client.println(thisData.length());
|
|
||||||
|
|
||||||
// last pieces of the HTTP PUT request:
|
|
||||||
client.println("Content-Type: text/csv");
|
|
||||||
client.println("Connection: close");
|
|
||||||
client.println();
|
|
||||||
|
|
||||||
// here's the actual content of the PUT request:
|
|
||||||
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();
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
/*
|
/*
|
||||||
Cosm sensor client with Strings
|
Pachube sensor client with Strings
|
||||||
|
|
||||||
This sketch connects an analog sensor to Cosm (http://www.cosm.com)
|
This sketch connects an analog sensor to Pachube (http://www.pachube.com)
|
||||||
using a Wiznet Ethernet shield. You can use the Arduino Ethernet shield, or
|
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
|
the Adafruit Ethernet shield, either one will work, as long as it's got
|
||||||
a Wiznet Ethernet module on board.
|
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 pachube.com API.
|
||||||
To make it work, create a feed with two datastreams, and give them the IDs
|
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.
|
sensor1 and sensor2. Or change the code below to match your feed.
|
||||||
|
|
||||||
|
@ -20,8 +20,10 @@
|
||||||
created 15 March 2010
|
created 15 March 2010
|
||||||
modified 9 Apr 2012
|
modified 9 Apr 2012
|
||||||
by Tom Igoe with input from Usman Haque and Joe Saavedra
|
by Tom Igoe with input from Usman Haque and Joe Saavedra
|
||||||
|
modified 8 September 2012
|
||||||
|
by Scott Fitzgerald
|
||||||
|
|
||||||
http://arduino.cc/en/Tutorial/CosmClientString
|
http://arduino.cc/en/Tutorial/PachubeClientString
|
||||||
This code is in the public domain.
|
This code is in the public domain.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@ -30,7 +32,7 @@
|
||||||
#include <Ethernet.h>
|
#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 Pachube api key here
|
||||||
#define FEEDID 00000 // replace your feed ID
|
#define FEEDID 00000 // replace your feed ID
|
||||||
#define USERAGENT "My Project" // user agent is the project name
|
#define USERAGENT "My Project" // user agent is the project name
|
||||||
|
|
||||||
|
@ -49,12 +51,12 @@ EthernetClient client;
|
||||||
|
|
||||||
// if you don't want to use DNS (and reduce your sketch size)
|
// if you don't want to use DNS (and reduce your sketch size)
|
||||||
// use the numeric IP instead of the name for the server:
|
// use the numeric IP instead of the name for the server:
|
||||||
IPAddress server(216,52,233,121); // numeric IP for api.cosm.com
|
IPAddress server(216,52,233,121); // numeric IP for api.pachube.com
|
||||||
//char server[] = "api.cosm.com"; // name address for Cosm API
|
//char server[] = "api.pachube.com"; // name address for pachube API
|
||||||
|
|
||||||
unsigned long lastConnectionTime = 0; // last time you connected to the server, in milliseconds
|
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
|
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 pachube.com
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
// Open serial communications and wait for port to open:
|
// Open serial communications and wait for port to open:
|
||||||
|
@ -83,7 +85,7 @@ void loop() {
|
||||||
dataString += sensorReading;
|
dataString += sensorReading;
|
||||||
|
|
||||||
// you can append multiple readings to this String if your
|
// you can append multiple readings to this String if your
|
||||||
// Cosm feed is set up to handle multiple values:
|
// pachube feed is set up to handle multiple values:
|
||||||
int otherSensorReading = analogRead(A1);
|
int otherSensorReading = analogRead(A1);
|
||||||
dataString += "\nsensor2,";
|
dataString += "\nsensor2,";
|
||||||
dataString += otherSensorReading;
|
dataString += otherSensorReading;
|
||||||
|
@ -123,8 +125,8 @@ void sendData(String thisData) {
|
||||||
client.print("PUT /v2/feeds/");
|
client.print("PUT /v2/feeds/");
|
||||||
client.print(FEEDID);
|
client.print(FEEDID);
|
||||||
client.println(".csv HTTP/1.1");
|
client.println(".csv HTTP/1.1");
|
||||||
client.println("Host: api.cosm.com");
|
client.println("Host: api.pachube.com");
|
||||||
client.print("X-CosmApiKey: ");
|
client.print("X-pachubeApiKey: ");
|
||||||
client.println(APIKEY);
|
client.println(APIKEY);
|
||||||
client.print("User-Agent: ");
|
client.print("User-Agent: ");
|
||||||
client.println(USERAGENT);
|
client.println(USERAGENT);
|
||||||
|
|
Loading…
Reference in New Issue