From 729d2b8650694b9260df10704ecb9f7925495fdc Mon Sep 17 00:00:00 2001 From: Aaron Fischer Date: Sat, 9 Dec 2017 18:07:46 +0100 Subject: [PATCH 1/4] Der stand geht --- firmware/config.h | 2 +- firmware/firmware.ino | 22 +++++++++++----------- firmware/influxdb.ino | 8 ++++---- firmware/sensors.ino | 8 +++++--- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/firmware/config.h b/firmware/config.h index 811da32..fc6e477 100644 --- a/firmware/config.h +++ b/firmware/config.h @@ -1,4 +1,4 @@ -#define DEBUG +#define DEBUG 1 #define SENSOR_TEMPERATURE 0 #define SENSOR_HUMIDITY 1 diff --git a/firmware/firmware.ino b/firmware/firmware.ino index ff439f2..5f76ec3 100644 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -62,9 +62,9 @@ void setup() { delay(2000); // Initialize and configure the sensors - apds.begin(); - apds.enableColor(true); - bme.begin(); + //apds.begin(); + //apds.enableColor(true); + //bme.begin(); delay(100); } @@ -73,19 +73,19 @@ void loop() { digitalWrite(STATUS_LED_PIN, LOW); currentSensorData[SENSOR_TEMPERATURE] = fetchTemperature(); - currentSensorData[SENSOR_HUMIDITY] = fetchHumidity(); - currentSensorData[SENSOR_LIGHT] = fetchLight(); - currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed(); - currentSensorData[SENSOR_PRESSURE] = fetchPressure(); + //currentSensorData[SENSOR_HUMIDITY] = fetchHumidity(); + //currentSensorData[SENSOR_LIGHT] = fetchLight(); + //currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed(); + //currentSensorData[SENSOR_PRESSURE] = fetchPressure(); #ifdef DEBUG Serial.println(""); Serial.println("Current readings:"); Serial.println("Temperature: " + String(currentSensorData[SENSOR_TEMPERATURE]) + " °C"); - Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + "%"); - Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen"); - Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h"); - Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa"); + //Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + "%"); + //Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen"); + //Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h"); + //Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa"); #endif pushToInfluxDB(DEVICE_NAME, currentSensorData); diff --git a/firmware/influxdb.ino b/firmware/influxdb.ino index 2756d63..d731789 100644 --- a/firmware/influxdb.ino +++ b/firmware/influxdb.ino @@ -1,7 +1,7 @@ void pushToInfluxDB(String device, float sensorValues[]) { influxdb.write("weather,device=" + device + " temperature=" + String(sensorValues[SENSOR_TEMPERATURE])); - influxdb.write("weather,device=" + device + " humidity=" + String(sensorValues[SENSOR_HUMIDITY])); - influxdb.write("weather,device=" + device + " light=" + String(sensorValues[SENSOR_LIGHT])); - influxdb.write("weather,device=" + device + " windspeed=" + String(sensorValues[SENSOR_WINDSPEED])); - influxdb.write("weather,device=" + device + " pressure=" + String(sensorValues[SENSOR_PRESSURE])); + //influxdb.write("weather,device=" + device + " humidity=" + String(sensorValues[SENSOR_HUMIDITY])); + //influxdb.write("weather,device=" + device + " light=" + String(sensorValues[SENSOR_LIGHT])); + //influxdb.write("weather,device=" + device + " windspeed=" + String(sensorValues[SENSOR_WINDSPEED])); + //influxdb.write("weather,device=" + device + " pressure=" + String(sensorValues[SENSOR_PRESSURE])); } diff --git a/firmware/sensors.ino b/firmware/sensors.ino index 3d5e93b..57e008a 100644 --- a/firmware/sensors.ino +++ b/firmware/sensors.ino @@ -2,15 +2,17 @@ int anemometerRotations = 0; unsigned long currentTime = 0; float fetchTemperature() { - return bme.readTemperature(); + return 10; + //return bme.readTemperature(); } float fetchPressure() { - return bme.readPressure() / 100.0F; + return 10; + //return bme.readPressure() / 100.0F; } float fetchHumidity() { - return bme.readHumidity(); + //return bme.readHumidity(); } float fetchLight() { From 2fefed97e5f8dbb69a1842df4dca96822896a549 Mon Sep 17 00:00:00 2001 From: klaute Date: Sat, 9 Dec 2017 18:25:54 +0100 Subject: [PATCH 2/4] Broken newline removed. --- firmware/config.h | 1 + firmware/firmware.ino | 40 +++++++++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 13 deletions(-) mode change 100644 => 100755 firmware/config.h mode change 100644 => 100755 firmware/firmware.ino diff --git a/firmware/config.h b/firmware/config.h old mode 100644 new mode 100755 index fc6e477..f65ed66 --- a/firmware/config.h +++ b/firmware/config.h @@ -18,3 +18,4 @@ const char *INFLUXDB_USER = "oko"; const char *INFLUXDB_PASS = "de1873a0d2f8f21f17cf4d8db4f65c59"; String DEVICE_NAME = "aaron"; + diff --git a/firmware/firmware.ino b/firmware/firmware.ino old mode 100644 new mode 100755 index 5f76ec3..1a4962f --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -3,7 +3,7 @@ #include #include #include -#include +#include // https://github.com/hwwong/ESP8266Influxdb auchecken und code+header in das firmware verzeichnis kopieren #include // Adafruit Unified Sensor #include // https://github.com/adafruit/Adafruit_APDS9960 #include // https://github.com/adafruit/Adafruit_BME280_Library @@ -62,33 +62,47 @@ void setup() { delay(2000); // Initialize and configure the sensors - //apds.begin(); - //apds.enableColor(true); - //bme.begin(); + apds.begin(); + apds.enableColor(true); + + bool status = bme.begin(0x76); + if (!status) { + Serial.println("Could not find a valid BME280 sensor, check wiring!"); + while (1); + } delay(100); } void loop() { digitalWrite(STATUS_LED_PIN, LOW); - + + #ifdef DEBUG + Serial.println("---"); + digitalWrite(STATUS_LED_PIN, HIGH); + #endif currentSensorData[SENSOR_TEMPERATURE] = fetchTemperature(); - //currentSensorData[SENSOR_HUMIDITY] = fetchHumidity(); + Serial.print("*"); + currentSensorData[SENSOR_HUMIDITY] = fetchHumidity(); + Serial.print("*"); //currentSensorData[SENSOR_LIGHT] = fetchLight(); - //currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed(); - //currentSensorData[SENSOR_PRESSURE] = fetchPressure(); + Serial.print("*"); + currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed(); + Serial.print("*"); + currentSensorData[SENSOR_PRESSURE] = fetchPressure(); + Serial.println("*"); #ifdef DEBUG Serial.println(""); Serial.println("Current readings:"); Serial.println("Temperature: " + String(currentSensorData[SENSOR_TEMPERATURE]) + " °C"); - //Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + "%"); - //Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen"); - //Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h"); - //Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa"); + Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + " %"); + Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen"); + Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h"); + Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa"); #endif pushToInfluxDB(DEVICE_NAME, currentSensorData); delay(UPDATE_INTERVAL*1000); -} +} From f7c1d4dee9cd41dd0305a14078490d42d51fbdb0 Mon Sep 17 00:00:00 2001 From: klaute Date: Sat, 9 Dec 2017 18:33:43 +0100 Subject: [PATCH 3/4] Revert "Broken newline removed." This reverts commit 2fefed97e5f8dbb69a1842df4dca96822896a549. --- firmware/config.h | 1 - firmware/firmware.ino | 40 +++++++++++++--------------------------- 2 files changed, 13 insertions(+), 28 deletions(-) mode change 100755 => 100644 firmware/config.h mode change 100755 => 100644 firmware/firmware.ino diff --git a/firmware/config.h b/firmware/config.h old mode 100755 new mode 100644 index f65ed66..fc6e477 --- a/firmware/config.h +++ b/firmware/config.h @@ -18,4 +18,3 @@ const char *INFLUXDB_USER = "oko"; const char *INFLUXDB_PASS = "de1873a0d2f8f21f17cf4d8db4f65c59"; String DEVICE_NAME = "aaron"; - diff --git a/firmware/firmware.ino b/firmware/firmware.ino old mode 100755 new mode 100644 index 1a4962f..5f76ec3 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -3,7 +3,7 @@ #include #include #include -#include // https://github.com/hwwong/ESP8266Influxdb auchecken und code+header in das firmware verzeichnis kopieren +#include #include // Adafruit Unified Sensor #include // https://github.com/adafruit/Adafruit_APDS9960 #include // https://github.com/adafruit/Adafruit_BME280_Library @@ -62,47 +62,33 @@ void setup() { delay(2000); // Initialize and configure the sensors - apds.begin(); - apds.enableColor(true); - - bool status = bme.begin(0x76); - if (!status) { - Serial.println("Could not find a valid BME280 sensor, check wiring!"); - while (1); - } + //apds.begin(); + //apds.enableColor(true); + //bme.begin(); delay(100); } void loop() { digitalWrite(STATUS_LED_PIN, LOW); - - #ifdef DEBUG - Serial.println("---"); - digitalWrite(STATUS_LED_PIN, HIGH); - #endif + currentSensorData[SENSOR_TEMPERATURE] = fetchTemperature(); - Serial.print("*"); - currentSensorData[SENSOR_HUMIDITY] = fetchHumidity(); - Serial.print("*"); + //currentSensorData[SENSOR_HUMIDITY] = fetchHumidity(); //currentSensorData[SENSOR_LIGHT] = fetchLight(); - Serial.print("*"); - currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed(); - Serial.print("*"); - currentSensorData[SENSOR_PRESSURE] = fetchPressure(); - Serial.println("*"); + //currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed(); + //currentSensorData[SENSOR_PRESSURE] = fetchPressure(); #ifdef DEBUG Serial.println(""); Serial.println("Current readings:"); Serial.println("Temperature: " + String(currentSensorData[SENSOR_TEMPERATURE]) + " °C"); - Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + " %"); - Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen"); - Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h"); - Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa"); + //Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + "%"); + //Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen"); + //Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h"); + //Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa"); #endif pushToInfluxDB(DEVICE_NAME, currentSensorData); delay(UPDATE_INTERVAL*1000); -} +} From 284e3940ea0d784fd62e82871ee519a55ba44bab Mon Sep 17 00:00:00 2001 From: klaute Date: Sat, 9 Dec 2017 19:10:31 +0100 Subject: [PATCH 4/4] Bugfix array size --- firmware/firmware.ino | 20 ++++++++++---------- firmware/influxdb.ino | 10 +++++----- firmware/sensors.ino | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) mode change 100644 => 100755 firmware/firmware.ino mode change 100644 => 100755 firmware/influxdb.ino mode change 100644 => 100755 firmware/sensors.ino diff --git a/firmware/firmware.ino b/firmware/firmware.ino old mode 100644 new mode 100755 index 5f76ec3..acd755b --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -26,7 +26,7 @@ * - https://github.com/marvinroger/homie-esp8266 */ -float currentSensorData[4] = {0.0, 0.0, 0.0, 0.0}; +float currentSensorData[5] = {0.0, 0.0, 0.0, 0.0, 0.0}; WiFiManager wifiManager; @@ -64,7 +64,7 @@ void setup() { // Initialize and configure the sensors //apds.begin(); //apds.enableColor(true); - //bme.begin(); + bme.begin(0x76); delay(100); } @@ -73,22 +73,22 @@ void loop() { digitalWrite(STATUS_LED_PIN, LOW); currentSensorData[SENSOR_TEMPERATURE] = fetchTemperature(); - //currentSensorData[SENSOR_HUMIDITY] = fetchHumidity(); + currentSensorData[SENSOR_HUMIDITY] = fetchHumidity(); //currentSensorData[SENSOR_LIGHT] = fetchLight(); - //currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed(); - //currentSensorData[SENSOR_PRESSURE] = fetchPressure(); + // currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed(); + currentSensorData[SENSOR_PRESSURE] = fetchPressure(); #ifdef DEBUG Serial.println(""); Serial.println("Current readings:"); Serial.println("Temperature: " + String(currentSensorData[SENSOR_TEMPERATURE]) + " °C"); - //Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + "%"); - //Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen"); - //Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h"); - //Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa"); + Serial.println("Humidity: " + String(currentSensorData[SENSOR_HUMIDITY]) + "%"); + Serial.println("Light: " + String(currentSensorData[SENSOR_LIGHT]) + " Lumen"); + Serial.println("Windspeed: " + String(currentSensorData[SENSOR_WINDSPEED]) + " Km/h"); + Serial.println("Pressure: " + String(currentSensorData[SENSOR_PRESSURE]) + " hPa"); #endif pushToInfluxDB(DEVICE_NAME, currentSensorData); delay(UPDATE_INTERVAL*1000); -} +} diff --git a/firmware/influxdb.ino b/firmware/influxdb.ino old mode 100644 new mode 100755 index d731789..c315b58 --- a/firmware/influxdb.ino +++ b/firmware/influxdb.ino @@ -1,7 +1,7 @@ void pushToInfluxDB(String device, float sensorValues[]) { influxdb.write("weather,device=" + device + " temperature=" + String(sensorValues[SENSOR_TEMPERATURE])); - //influxdb.write("weather,device=" + device + " humidity=" + String(sensorValues[SENSOR_HUMIDITY])); - //influxdb.write("weather,device=" + device + " light=" + String(sensorValues[SENSOR_LIGHT])); - //influxdb.write("weather,device=" + device + " windspeed=" + String(sensorValues[SENSOR_WINDSPEED])); - //influxdb.write("weather,device=" + device + " pressure=" + String(sensorValues[SENSOR_PRESSURE])); -} + influxdb.write("weather,device=" + device + " humidity=" + String(sensorValues[SENSOR_HUMIDITY])); + influxdb.write("weather,device=" + device + " light=" + String(sensorValues[SENSOR_LIGHT])); + influxdb.write("weather,device=" + device + " windspeed=" + String(sensorValues[SENSOR_WINDSPEED])); + influxdb.write("weather,device=" + device + " pressure=" + String(sensorValues[SENSOR_PRESSURE])); +} diff --git a/firmware/sensors.ino b/firmware/sensors.ino old mode 100644 new mode 100755 index 57e008a..e63ca84 --- a/firmware/sensors.ino +++ b/firmware/sensors.ino @@ -2,17 +2,17 @@ int anemometerRotations = 0; unsigned long currentTime = 0; float fetchTemperature() { - return 10; - //return bme.readTemperature(); + //return 10; + return bme.readTemperature(); } float fetchPressure() { - return 10; - //return bme.readPressure() / 100.0F; + //return 10; + return bme.readPressure() / 100.0F; } float fetchHumidity() { - //return bme.readHumidity(); + return bme.readHumidity(); } float fetchLight() { @@ -41,4 +41,4 @@ float fetchWindspeed() { return (float)anemometerRotations / 5.0 * 2.4; } - +