okoyono/weatherstation
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: okoyono:ba1cc54d2e1e5083b145726fc260c1de04abbd0c
Branches Tags
okoyono:master
okoyono:feature/http_call_send_json
okoyono:feature/main_loop_to_fsm
okoyono:feature/InfluxDB-Connection-Update
..
compare: okoyono:0a08e8d97495607f7bcd2fc33b82e35832244c5d
Branches Tags
okoyono:master
okoyono:feature/http_call_send_json
okoyono:feature/main_loop_to_fsm
okoyono:feature/InfluxDB-Connection-Update

No commits in common. "ba1cc54d2e1e5083b145726fc260c1de04abbd0c" and "0a08e8d97495607f7bcd2fc33b82e35832244c5d" have entirely different histories.
ba1cc54d2e ... 0a08e8d974

1 changed files with 8 additions and 12 deletions
Show stats Expand all files Collapse all files

20
firmware/firmware.ino
View file

@ -1,6 +1,10 @@
// Standard ESP8266 libs from project folder // Standard ESP8266 libs from project folder
#include <ESP8266mDNS.h> #include <ESP8266mDNS.h>
#include <ESP8266HTTPUpdateServer.h>
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#include <DNSServer.h>
#include <ESP8266WebServer.h>
#include <ESP8266HTTPClient.h>
#include <WiFiClient.h> // WiFiClient #include <WiFiClient.h> // WiFiClient
@ -13,14 +17,6 @@
#include <WiFiManager.h> // WiFiManager from bib manager #include <WiFiManager.h> // WiFiManager from bib manager
#endif #endif
#ifdef HTTP_CALL_ON_WINDSPEED_EXCEED
#include <ESP8266HTTPClient.h>
#endif
#ifdef HTTP_CALL_SEND_JSON_DATA
#include <ESP8266HTTPClient.h>
#endif
//*************************************************************************// //*************************************************************************//
// check if some settings are correct // check if some settings are correct
@ -88,7 +84,7 @@ void setup()
pinMode(ANEMOMETER_PIN, INPUT_PULLUP); pinMode(ANEMOMETER_PIN, INPUT_PULLUP);
pinMode(A0, INPUT); pinMode(A0, INPUT);
digitalWrite(STATUS_LED_PIN, HIGH); digitalWrite(STATUS_LED_PIN, LOW);
#ifndef BAT_PINS_D34 #ifndef BAT_PINS_D34
debug("D5 D6 used as battery pins"); debug("D5 D6 used as battery pins");
@ -115,7 +111,7 @@ void setup()
_battery_mode_main(); _battery_mode_main();
digitalWrite(STATUS_LED_PIN, HIGH); digitalWrite(STATUS_LED_PIN, LOW);
criticalBatCheck(); criticalBatCheck();
@ -611,7 +607,7 @@ void _fsm_loop()
if (currentSensorData[SENSOR_WINDSPEED] >= HTTP_CALL_ON_WINDSPEED_EXCEED_MPS) if (currentSensorData[SENSOR_WINDSPEED] >= HTTP_CALL_ON_WINDSPEED_EXCEED_MPS)
{ {
// windspeed exceeded send http call // windspeed exceeded send http call
digitalWrite(STATUS_LED_PIN, LOW); digitalWrite(STATUS_LED_PIN, HIGH);
// call the url HTTP_CALL_ON_WINDSPEED_URL // call the url HTTP_CALL_ON_WINDSPEED_URL
WiFiClient client; WiFiClient client;
@ -630,7 +626,7 @@ void _fsm_loop()
http.end(); http.end();
debug("Called windspeed exceed callout"); debug("Called windspeed exceed callout");
digitalWrite(STATUS_LED_PIN, HIGH); digitalWrite(STATUS_LED_PIN, LOW);
} }
#ifdef WEBUPDATER_FEATURE #ifdef WEBUPDATER_FEATURE