okoyono/weatherstation
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Broken newline removed."

Browse source 
This reverts commit 2fefed97e5.
This commit is contained in:
klaute 2017-12-09 18:33:43 +01:00
parent 2fefed97e5
commit f7c1d4dee9
2 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
firmware/config.h Executable file → Normal file
View file

@ -18,4 +18,3 @@ const char *INFLUXDB_USER = "oko";
const char *INFLUXDB_PASS = "de1873a0d2f8f21f17cf4d8db4f65c59"; const char *INFLUXDB_PASS = "de1873a0d2f8f21f17cf4d8db4f65c59";
String DEVICE_NAME = "aaron"; String DEVICE_NAME = "aaron";

36
firmware/firmware.ino Executable file → Normal file
View file

@ -3,7 +3,7 @@
#include <DNSServer.h> #include <DNSServer.h>
#include <ESP8266WebServer.h> #include <ESP8266WebServer.h>
#include <WiFiManager.h> #include <WiFiManager.h>
#include <ESP8266Influxdb.h> // https://github.com/hwwong/ESP8266Influxdb auchecken und code+header in das firmware verzeichnis kopieren #include <ESP8266Influxdb.h>
#include <Adafruit_Sensor.h> // Adafruit Unified Sensor #include <Adafruit_Sensor.h> // Adafruit Unified Sensor
#include <Adafruit_APDS9960.h> // https://github.com/adafruit/Adafruit_APDS9960 #include <Adafruit_APDS9960.h> // https://github.com/adafruit/Adafruit_APDS9960
#include <Adafruit_BME280.h> // https://github.com/adafruit/Adafruit_BME280_Library #include <Adafruit_BME280.h> // https://github.com/adafruit/Adafruit_BME280_Library
@ -62,14 +62,9 @@ void setup() {
delay(2000); delay(2000);
// Initialize and configure the sensors // Initialize and configure the sensors
apds.begin(); //apds.begin();
apds.enableColor(true); //apds.enableColor(true);
//bme.begin();
bool status = bme.begin(0x76);
if (!status) {
Serial.println("Could not find a valid BME280 sensor, check wiring!");
while (1);
}
delay(100); delay(100);
} }
@ -77,29 +72,20 @@ void setup() {
void loop() { void loop() {
digitalWrite(STATUS_LED_PIN, LOW); digitalWrite(STATUS_LED_PIN, LOW);
#ifdef DEBUG
Serial.println("---");
digitalWrite(STATUS_LED_PIN, HIGH);
#endif
currentSensorData[SENSOR_TEMPERATURE] = fetchTemperature(); currentSensorData[SENSOR_TEMPERATURE] = fetchTemperature();
Serial.print("*"); //currentSensorData[SENSOR_HUMIDITY] = fetchHumidity();
currentSensorData[SENSOR_HUMIDITY] = fetchHumidity();
Serial.print("*");
//currentSensorData[SENSOR_LIGHT] = fetchLight(); //currentSensorData[SENSOR_LIGHT] = fetchLight();
Serial.print("*"); //currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed();
currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed(); //currentSensorData[SENSOR_PRESSURE] = fetchPressure();
Serial.print("*");
currentSensorData[SENSOR_PRESSURE] = fetchPressure();
Serial.println("*");
#ifdef DEBUG #ifdef DEBUG
Serial.println(""); Serial.println("");
Serial.println("Current readings:"); Serial.println("Current readings:");
Serial.println("Temperature: " + String(currentSensorData[SENSOR_TEMPERATURE]) + " °C"); Serial.println("Temperature: " + String(currentSensorData[SENSOR_TEMPERATURE]) + " °C");
Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + " %"); //Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + "%");
Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen"); //Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen");
Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h"); //Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h");
Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa"); //Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa");
#endif #endif
pushToInfluxDB(DEVICE_NAME, currentSensorData); pushToInfluxDB(DEVICE_NAME, currentSensorData);