From 7cb4c49294eb32d02ecea6fddb82768012d19f93 Mon Sep 17 00:00:00 2001 From: Dslak Date: Fri, 12 Feb 2021 12:31:18 +0100 Subject: [PATCH] sensor integration --- Arduino/Arduino.ino | 14 +++++++------- Arduino/GetData.ino | 14 +++++++------- Arduino/Request.ino | 6 +++--- Arduino/Setup.ino | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Arduino/Arduino.ino b/Arduino/Arduino.ino index 8a453f7..fc238e1 100644 --- a/Arduino/Arduino.ino +++ b/Arduino/Arduino.ino @@ -57,22 +57,22 @@ 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";} @@ -82,14 +82,14 @@ void loop() { Serial.print("Wind speed:\t"); Serial.print(windSpeed); Serial.println("Km/h"); - + Serial.print("Wind direction:\t"); Serial.println(windDirection); } sendRequest(); - + } } diff --git a/Arduino/GetData.ino b/Arduino/GetData.ino index cde465a..68343bf 100644 --- a/Arduino/GetData.ino +++ b/Arduino/GetData.ino @@ -5,21 +5,21 @@ void getWind() { anemometerVal = digitalRead(anemometerPin); //Serial.println(anemometerVal); - + if ((anemometerState == 1) && (anemometerVal == 0)) { anemometerDuration = millis() - startime; startime = millis(); windSpeed = 2500.0/anemometerDuration; } - + anemometerState = anemometerVal; if(millis() >= timer) { - + Serial.println("--------------------------"); - + timer = millis() + timerLimit; - + if(digitalRead(northPin)) {windDirection = windDirection + "N";} if(digitalRead(southPin)) {windDirection = windDirection + "S";} if(digitalRead(eastPin)) {windDirection = windDirection + "E";} @@ -29,7 +29,7 @@ void getWind() { Serial.print("Wind speed:\t"); Serial.print(windSpeed); Serial.println("Km/h"); - + Serial.print("Wind direction:\t"); Serial.println(windDirection); @@ -37,7 +37,7 @@ void getWind() { sendRequest(); //delay(5000); - + } } diff --git a/Arduino/Request.ino b/Arduino/Request.ino index 2ba4593..c18b7c4 100644 --- a/Arduino/Request.ino +++ b/Arduino/Request.ino @@ -9,7 +9,7 @@ void sendRequest() { s.toCharArray(URL, 100); Serial.println(URL); - + // Establish GPRS connectivity (5 trials) bool connected = false; for(uint8_t i = 0; i < 5 && !connected; i++) { @@ -33,7 +33,7 @@ void sendRequest() { // Do HTTP GET communication with 10s for the timeout (read) uint16_t rc = sim800l->doGet(URL, 10000); - if(rc == 200) { + if(rc == 200) { // Success, output the data received on the serial Serial.print(F("HTTP GET successful (")); Serial.print(sim800l->getDataSizeReceived()); @@ -67,6 +67,6 @@ void sendRequest() { Serial.println(F("Failed to switch module to low power mode")); } - + windSpeed = 0; } diff --git a/Arduino/Setup.ino b/Arduino/Setup.ino index 4903c25..bd8fa6a 100644 --- a/Arduino/Setup.ino +++ b/Arduino/Setup.ino @@ -1,6 +1,6 @@ void setupModule() { - // Wait until the module is ready to accept AT commands + // 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);