N4th4/TM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some cosmetics

Browse Source
This commit is contained in:
Nathanaël Restori 2012-09-12 21:29:43 +02:00
parent 3f0796e617
commit d88d174658
2 changed files with 51 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arduino/WeatherStationLogger/WeatherStationLogger.ino
View File

@ -1,9 +1,9 @@
#include <SD.h> #include <SD.h>
#include <Wire.h> #include <Wire.h>
#include "BMP085.h" #include "BMP085.h"
#include "Chronodot.h"
#include "DHT.h" #include "DHT.h"
#include "TSL2561.h" #include "TSL2561.h"
#include "Chronodot.h"
#define TIMING 1000 // milliseconds #define TIMING 1000 // milliseconds
#define DHTPIN 2 #define DHTPIN 2
@ -18,7 +18,6 @@ File file;
void setup() { void setup() {
Serial.begin(9600); Serial.begin(9600);
pinMode(5, OUTPUT);
//----- SD Card //----- SD Card
Serial.println("INIT SD Card"); Serial.println("INIT SD Card");
@ -33,9 +32,9 @@ void setup() {
Serial.println("INIT Sensors"); Serial.println("INIT Sensors");
bmp.begin(); bmp.begin();
chronodot.begin();
dht.begin(); dht.begin();
tsl.begin(); tsl.begin();
chronodot.begin();
// You can change the gain on the fly, to adapt to brighter/dimmer light situations // You can change the gain on the fly, to adapt to brighter/dimmer light situations
//tsl.setGain(TSL2561_GAIN_0X); // set no gain (for bright situtations) //tsl.setGain(TSL2561_GAIN_0X); // set no gain (for bright situtations)

11
arduino/WeatherStationWeb/WeatherStationWeb.ino
View File

@ -1,11 +1,11 @@
#include <Wire.h> #include <Wire.h>
#include <SPI.h> #include <SPI.h>
#include <Ethernet.h> #include <Ethernet.h>
#include "WebServer.h"
#include "BMP085.h" #include "BMP085.h"
#include "Chronodot.h"
#include "DHT.h" #include "DHT.h"
#include "TSL2561.h" #include "TSL2561.h"
#include "Chronodot.h" #include "WebServer.h"
#define TIMEZONE 7200 // 2 hours #define TIMEZONE 7200 // 2 hours
#define DHTPIN 2 #define DHTPIN 2
@ -34,9 +34,9 @@ inline Print &operator <<(Print &obj, T arg)
{ obj.print(arg); return obj; } { obj.print(arg); return obj; }
BMP085 bmp; BMP085 bmp;
Chronodot chronodot;
DHT dht(DHTPIN, DHTTYPE); DHT dht(DHTPIN, DHTTYPE);
TSL2561 tsl(TSL2561_ADDR_FLOAT); TSL2561 tsl(TSL2561_ADDR_FLOAT);
Chronodot chronodot;
WebServer webserver(PREFIX, 80); WebServer webserver(PREFIX, 80);
byte packetBuffer[ NTP_PACKET_SIZE]; byte packetBuffer[ NTP_PACKET_SIZE];
@ -52,8 +52,6 @@ void sensorsJsonCmd(WebServer &server, WebServer::ConnectionType type, char *url
int32_t pressure = bmp.readPressure(); int32_t pressure = bmp.readPressure();
float altitude = bmp.readAltitude(); float altitude = bmp.readAltitude();
float humidity = dht.readHumidity();
uint32_t lum = tsl.getFullLuminosity(); uint32_t lum = tsl.getFullLuminosity();
uint16_t lightIr = lum >> 16; uint16_t lightIr = lum >> 16;
uint16_t lightFull = lum & 0xFFFF; uint16_t lightFull = lum & 0xFFFF;
@ -72,6 +70,7 @@ void sensorsJsonCmd(WebServer &server, WebServer::ConnectionType type, char *url
<< "] }"; << "] }";
} }
// Taken from http://arduino.cc/en/Tutorial/UdpNtpClient .
void sendNTPpacket() { void sendNTPpacket() {
// set all bytes in the buffer to 0 // set all bytes in the buffer to 0
memset(packetBuffer, 0, NTP_PACKET_SIZE); memset(packetBuffer, 0, NTP_PACKET_SIZE);
@ -119,8 +118,6 @@ void sendNTPpacket() {
void setup() { void setup() {
Serial.begin(9600); Serial.begin(9600);
pinMode(5, OUTPUT);
SPI.begin();
//----- Ethernet/WebServer //----- Ethernet/WebServer
Serial.println("INIT Ethernet"); Serial.println("INIT Ethernet");