Merge branch 'develop' of https://git.it.hs-heilbronn.de/auribest/smart_garden into mseyfrie_dev

src/common.h

@@ -14,10 +14,6 @@
 // DHT11
 #define PIN_DHT11 14
 
-// MQ-135
-#define PIN_MQ135_A 12
-#define PIN_MQ135_D 13
-
 // MOISTURE SENSOR // A7
 #define PIN_MS 35
 #define VALUE_WATER 1650

src/connections.cpp

@@ -6,6 +6,7 @@
 #include <common.h>
 #include <store.h>
 #include <valve.h>
+#include <ntpManager.h>
 
 extern "C" {
   #include "freertos/FreeRTOS.h"
@@ -205,7 +206,7 @@ void setupConnections() {
   connectMQTT();
 
   mqttClient.setCallback(onMqttMessage);
-
+  setupNTP();
 }
 
 void publishMessage(const char *topic, const char *msg) {

src/sensors.cpp

@@ -18,7 +18,6 @@ void setupSensors() {
   setupPWM();
   setupTemperatureSensor();
   setupCapacitiveSoilMoistureSensor();
-  setupNTP();
 
   strcpy(MQTT_SENSOR_DATA_TOPIC, MQTT_TOPIC_BASE_PUB "/");
   strcat(MQTT_SENSOR_DATA_TOPIC, getDeviceIDcharArr());

src/store.cpp

@@ -13,8 +13,8 @@ int soilSaturation = 69;
 // Minimum light value before light turns on
 int minimumLightValueLX = 50;
 // Switches for automatic light and irrigation control
-bool automaticLight = true;
-bool automaticIrrigation = true;
+bool automaticLight = false;
+bool automaticIrrigation = false;
 // Make sure device irrigates until fieldcapacity is reached
 bool irrigateUntilFC = false;
 

src/store.h

@@ -1,10 +1,10 @@
-// Feldkapazität des Bodens in Prozent: Standard ist Humus
+// Fieldcapacity of the Ground in Percentage: Standard is Humus
 extern int fieldCapacity;
-// PWP des Bodens in Prozent: Standard ist Humus
+// PWP of the Ground in Percentage: Standard is Humus
 extern int permanentWiltingPoint;
-// Boden vollständig gesättigt bei (Prozent): Standard ist Humus
+// Ground completely saturated by (Percentage): Standard is Humus
 extern int soilSaturation;
-// Helligkeitswert der mindestens vorhanden sein muss
+// Minimum light value before light turns on
 extern int minimumLightValueLX;
 // switches for automatic light and irrigation control
 extern bool automaticLight;

src/temperatureSensor.cpp

@@ -2,25 +2,23 @@
 #include <DHT_U.h>
 #include <common.h>
 
-
 #define DHTPIN PIN_DHT11
 #define DHTTYPE DHT11
 
-
+// set pin and type
 DHT_Unified dht(DHTPIN, DHTTYPE);
 
+// initialize temperature sensor
 void setupTemperatureSensor() {
   // Serial.begin(9600);
   dht.begin();
   Serial.println(F("DHT11 Unified Sensor Ready"));
   sensor_t sensor;
   dht.temperature().getSensor(&sensor);
-  
 }
 
 // Get humidity event and its value.
 float readHumidity(){
-    
     sensors_event_t event;
     dht.humidity().getEvent(&event);
     return event.relative_humidity;