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

Big wheaterstation update #2

Closed
klaute wants to merge 19 commits from master into feature/http_call_send_json
pull from: master
merge into: okoyono:feature/http_call_send_json
Conversation 1 Commits 19 Files changed 728 +21 -2
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 36b0c72f9b - Show all commits

22
firmware/firmware.ino
View file

@ -12,6 +12,10 @@
#include "config.h" #include "config.h"
#include "config_user.h" #include "config_user.h"
#ifdef ENABLE_PING_HOST_TEST
#include <ESP8266Ping.h>
#endif
#ifndef DISABLE_WIFIMANAGER #ifndef DISABLE_WIFIMANAGER
#include <WiFiManager.h> // WiFiManager from bib manager #include <WiFiManager.h> // WiFiManager from bib manager
#endif #endif
@ -266,6 +270,8 @@ float readSensors(uint8_t s) {
void wifiConnectionCheck() { void wifiConnectionCheck() {
bool success = false;
if ((wifi_check_interval_counter + WIFI_CHECK_INTERVAL_MS) > millis()) { if ((wifi_check_interval_counter + WIFI_CHECK_INTERVAL_MS) > millis()) {
// if check interval is not exceeded abort check // if check interval is not exceeded abort check
return; return;
@ -273,11 +279,23 @@ void wifiConnectionCheck() {
wifi_check_interval_counter = millis(); wifi_check_interval_counter = millis();
if (WiFi.status() == WL_CONNECTED) { /*if (WiFi.status() == WL_CONNECTED) {
// if we are connected // if we are connected
return; return;
} }*/
#ifdef ENABLE_PING_HOST_TEST
debug("Ping 192.168.0.85");
success = Ping.ping(PING_HOST_IP, 3);
if (success)
{
debug("Ping success");
return;
}
#endif // ENABLE_PING_HOST_TEST
debug("Connection problem, resetting ESP");
#ifdef ENABLE_WATCHDOG #ifdef ENABLE_WATCHDOG
// loop endless, watchdog will reset the device // loop endless, watchdog will reset the device
while (1 == 1) {} while (1 == 1) {}

1
firmware/libraries/ESP8266Ping Submodule

@ -0,0 +1 @@
Subproject commit 934e701dcee743fe1ec564d0c2d64bd99e8d7bf3