Merge branch 'feature/circuits' into develop

Arduino/Arduino.ino

@@ -1,11 +1,15 @@
 #include <SoftwareSerial.h>
+#include <Wire.h>
 #include "SIM800L.h"
+#include <BME280I2C.h>
 
 #define SIM800_RX_PIN 10
 #define SIM800_TX_PIN 11
 #define SIM800_RST_PIN 7
 
 SIM800L* sim800l;
+BME280I2C bme;
+
 
 const char APN[] = "TM";
 String BASE_URL = "http://2.238.194.8/index.php?";
@@ -23,24 +27,28 @@ unsigned long startime = 0;
 unsigned long timer = 0;
 int windSpeed = 0;
 
+float temperature = 0;
+float humidity = 0;
+float pressure = 0;
+
 int northPin = 4;
 int eastPin = 5;
 int southPin = 2;
 int westPin = 3;
 
-int timerLimit = 3000;//300000; // 5 minutes
-
-bool printSensorsData = true;
-
+int timerLimit = 10000;//300000; // 5 minutes
 String windDirection = "";
-
+bool printSensorsData = true;
 
 
 void setup() {
   // Initialize Serial Monitor for debugging
-  Serial.begin(115200);
+  Serial.begin(9600);
   while(!Serial);
 
+ pinMode(13, OUTPUT);
+ digitalWrite(13, HIGH);
+
   // Initialize a SoftwareSerial
   SoftwareSerial* serial = new SoftwareSerial(SIM800_RX_PIN, SIM800_TX_PIN);
   serial->begin(9600);
@@ -49,47 +57,14 @@ void setup() {
   // Initialize SIM800L driver with an internal buffer of 200 bytes and a reception buffer of 512 bytes, debug disabled
   sim800l = new SIM800L((Stream *)serial, SIM800_RST_PIN, 200, 512);
 
-  // Setup module for GPRS communication
-  setupModule();
+  // Setup modules
+  setupSIM800L();
+  setupBME280();
+  timer = millis() + timerLimit;
 }
 
 void loop() {
  
-  windDirection = "";
-  anemometerVal = digitalRead(anemometerPin);
-  
-  if ((anemometerState == 1) && (anemometerVal == 0)) {
-    anemometerDuration = millis() - startime;
-    startime = millis();
-    windSpeed = 2500.0/anemometerDuration;
-  }
-  
-  anemometerState = anemometerVal;
-
-  if(millis() >= timer) {
-    
-    Serial.println("--------------------------");
-    Serial.println("Sending...");
-    
-    timer = millis() + timerLimit;
-    
-    if(digitalRead(northPin)) {windDirection = windDirection + "N";}
-    if(digitalRead(southPin)) {windDirection = windDirection + "S";}
-    if(digitalRead(eastPin)) {windDirection = windDirection + "E";}
-    if(digitalRead(westPin)) {windDirection = windDirection + "W";}
-
-    if(printSensorsData) {
-      Serial.print("Wind speed:\t");
-      Serial.print(windSpeed);
-      Serial.println("Km/h");
-    
-      Serial.print("Wind direction:\t");
-      Serial.println(windDirection);
-
-    }
-
-    sendRequest();
-    
-  }
+  getWind();
 
 }

Arduino/GetData.ino

@@ -4,8 +4,6 @@ void getWind() {
   windDirection = "";
   anemometerVal = digitalRead(anemometerPin);
 
-  //Serial.println(anemometerVal);
-  
   if ((anemometerState == 1) && (anemometerVal == 0)) {
     anemometerDuration = millis() - startime;
     startime = millis();
@@ -17,7 +15,6 @@ void getWind() {
   if(millis() >= timer) {
 
     Serial.println("--------------------------");
-    
     timer = millis() + timerLimit;
 
     if(digitalRead(northPin)) {windDirection = windDirection + "N";}
@@ -34,10 +31,6 @@ void getWind() {
       Serial.println(windDirection);
 
     }
-
-    sendRequest();
-    //delay(5000);
-    
+    //sendRequest();
   }
-
 }

Arduino/GetSensor.ino

@@ -0,0 +1,14 @@
+void getBME280Data() {
+
+   float temp(NAN), hum(NAN), pres(NAN);
+
+   BME280::TempUnit tempUnit(BME280::TempUnit_Celsius);
+   BME280::PresUnit presUnit(BME280::PresUnit_Pa);
+
+   bme.read(pres, temp, hum, tempUnit, presUnit);
+
+   temperature = temp;
+   humidity = hum;
+   pressure = pres;
+
+}

Arduino/Request.ino

@@ -1,11 +1,19 @@
 
 void sendRequest() {
 
+  getBME280Data();
+    
   s = BASE_URL;
-  s.concat("windSpeed=");
+  s.concat("windS=");
   s.concat(windSpeed);
-  s.concat("&windDirection=");
+  s.concat("&windD=");
   s.concat(windDirection);
+  s.concat("&temp=");
+  s.concat(temperature);
+  s.concat("&pres=");
+  s.concat(pressure);
+  s.concat("&hum=");
+  s.concat(humidity);
   s.toCharArray(URL, 100);
 
   Serial.println(URL);
@@ -24,7 +32,7 @@ void sendRequest() {
     Serial.println(F("GPRS not connected !"));
     Serial.println(F("Reset the module."));
     sim800l->reset();
-    setupModule();
+    setupSIM800L();
     return;
   }
 
@@ -67,6 +75,6 @@ void sendRequest() {
     Serial.println(F("Failed to switch module to low power mode"));
   }
 
-  
+  timer = millis() + timerLimit;
   windSpeed = 0;
 }

Arduino/Setup.ino

@@ -1,6 +1,6 @@
 
-void setupModule() {
-    // Wait until the module is ready to accept AT commands
+void setupSIM800L() {
+  // Wait until the module is ready to accept AT commands
   while(!sim800l->isReady()) {
     Serial.println(F("Problem to initialize AT command, retry in 1 sec"));
     delay(1000);
@@ -35,3 +35,24 @@ void setupModule() {
   }
   Serial.println(F("GPRS config OK"));
 }
+
+
+void setupBME280() {
+  Wire.begin();
+
+  while(!bme.begin()) {
+    Serial.println("Could not find BME280 sensor!");
+    delay(1000);
+  }
+
+  switch(bme.chipModel()) {
+     case BME280::ChipModel_BME280:
+       Serial.println("Found BME280 sensor! Success.");
+       break;
+     case BME280::ChipModel_BMP280:
+       Serial.println("Found BMP280 sensor! No Humidity available.");
+       break;
+     default:
+       Serial.println("Found UNKNOWN sensor! Error!");
+  }
+}