From 2fefed97e5f8dbb69a1842df4dca96822896a549 Mon Sep 17 00:00:00 2001
From: klaute <klaute@gmail.com>
Date: Sat, 9 Dec 2017 18:25:54 +0100
Subject: [PATCH] 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 <DNSServer.h>
 #include <ESP8266WebServer.h>
 #include <WiFiManager.h>
-#include <ESP8266Influxdb.h>
+#include <ESP8266Influxdb.h> // https://github.com/hwwong/ESP8266Influxdb auchecken und code+header in das firmware verzeichnis kopieren
 #include <Adafruit_Sensor.h>  // Adafruit Unified Sensor
 #include <Adafruit_APDS9960.h> // https://github.com/adafruit/Adafruit_APDS9960
 #include <Adafruit_BME280.h> // 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);
-}
+}