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 +69 -103
1 changed files with 69 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit af2189a78a - Show all commits

126
firmware/webUpdater.ino
View file

@ -36,8 +36,7 @@ uint32_t _wifi_reconnect_cnt = 0;
//*************************************************************************// //*************************************************************************//
void setupWebUpdater(String device, String ip) void setupWebUpdater(String device, String ip) {
{
debug("Starting WebUpdater... " + ip); debug("Starting WebUpdater... " + ip);
_webUpdater_ip = ip; _webUpdater_ip = ip;
_webUpdater_dev = device; _webUpdater_dev = device;
@ -67,41 +66,33 @@ void setupWebUpdater(String device, String ip)
//*************************************************************************// //*************************************************************************//
void doWebUpdater(void) void doWebUpdater(void) {
{
digitalWrite(D0, HIGH); digitalWrite(D0, HIGH);
httpServer.handleClient(); httpServer.handleClient();
} }
//*************************************************************************// //*************************************************************************//
#ifdef SHOW_SENSOR_DATA_ON_WEBUPDATER_MAIN_PAGE #ifdef SHOW_SENSOR_DATA_ON_WEBUPDATER_MAIN_PAGE
void sentWindspeed(float ws) void sentWindspeed(float ws) {
{
_webUpdater_sensValues[SENSOR_WINDSPEED] = ws; _webUpdater_sensValues[SENSOR_WINDSPEED] = ws;
} }
#endif #endif
void setWifiReconnectCnt(uint32_t wrc) void setWifiReconnectCnt(uint32_t wrc) {
{
_wifi_reconnect_cnt = wrc; _wifi_reconnect_cnt = wrc;
} }
#ifdef SHOW_SENSOR_DATA_ON_WEBUPDATER_MAIN_PAGE #ifdef SHOW_SENSOR_DATA_ON_WEBUPDATER_MAIN_PAGE
void setSensorData(float sensorValues[]) void setSensorData(float sensorValues[]) {
{
for (uint8_t i = 0; i < 5 and wuValidData == false; i++) for (uint8_t i = 0; i < 5 and wuValidData == false; i++) {
{ if (sensorValues[i] != 0 and sensorValues[i] != nanf("no value") and (not isnan(sensorValues[i]))) {
if (sensorValues[i] != 0 and sensorValues[i] != nanf("no value") and (not isnan(sensorValues[i])))
{
wuValidData = true; // at least one value is not zero, the data wuValidData = true; // at least one value is not zero, the data
} }
} }
for (uint8_t i = 0; i < VALUES; i++) for (uint8_t i = 0; i < VALUES; i++) {
{ if (sensorValues[i] != nanf("no value") and (not isnan(sensorValues[i]))) {
if (sensorValues[i] != nanf("no value") and (not isnan(sensorValues[i])))
{
// only copy real float values // only copy real float values
//debug(String(i) + "=" + String(sensorValues[i])); //debug(String(i) + "=" + String(sensorValues[i]));
_webUpdater_sensValues[i] = sensorValues[i]; _webUpdater_sensValues[i] = sensorValues[i];
@ -112,41 +103,36 @@ void setSensorData(float sensorValues[])
//*************************************************************************// //*************************************************************************//
void showHTMLMain(void) void showHTMLMain(void) {
{
String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + "</title>" String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + "</title>"
"<meta http-equiv=\"refresh\" content=\"20\">" "<meta http-equiv=\"refresh\" content=\"20\">"
"</head><body>" "</head><body>"
"<br><a href=\"http://" + _webUpdater_ip + ":8080/update\">firmware update</a><br><br>" "<br><a href=\"http://"
+ _webUpdater_ip + ":8080/update\">firmware update</a><br><br>"
#ifdef USE_LOGGER #ifdef USE_LOGGER
"<br><a href=\"http://" + _webUpdater_ip + ":8080/showlog\">logfile</a><br>" "<br><a href=\"http://"
+ _webUpdater_ip + ":8080/showlog\">logfile</a><br>"
#endif #endif
#ifdef DEBUG_WINDSPEED_MEASUREMENT #ifdef DEBUG_WINDSPEED_MEASUREMENT
"<br><a href=\"http://" + _webUpdater_ip + ":8080/measWind\">manual wind measurement</a><br>" "<br><a href=\"http://"
+ _webUpdater_ip + ":8080/measWind\">manual wind measurement</a><br>"
#endif #endif
#ifdef HOMEBRIDGE_WEBSTAT #ifdef HOMEBRIDGE_WEBSTAT
"<br><a href=\"http://" + _webUpdater_ip + ":8080/hbWebstat\">homebridge websatt</a><br>" "<br><a href=\"http://"
+ _webUpdater_ip + ":8080/hbWebstat\">homebridge websatt</a><br>"
#endif #endif
#ifdef WEB_RESET #ifdef WEB_RESET
"<br><a href=\"http://" + _webUpdater_ip + ":8080/resetESP\">reset ESP</a><br>" "<br><a href=\"http://"
+ _webUpdater_ip + ":8080/resetESP\">reset ESP</a><br>"
#endif #endif
#ifdef SHOW_SENSOR_DATA_ON_WEBUPDATER_MAIN_PAGE #ifdef SHOW_SENSOR_DATA_ON_WEBUPDATER_MAIN_PAGE
"<br><br><table>" "<br><br><table>" TR_TD_START_STR
TR_TD_START_STR + "temperature" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_TEMPERATURE]) + TR_TD_END_STR + "temperature" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_TEMPERATURE]) + TR_TD_END_STR TR_TD_START_STR + "humidity" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_HUMIDITY]) + TR_TD_END_STR TR_TD_START_STR + "light" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_LIGHT]) + TR_TD_END_STR TR_TD_START_STR + "windspeed" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_WINDSPEED]) + TR_TD_END_STR TR_TD_START_STR + "pressure" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_PRESSURE]) + TR_TD_END_STR TR_TD_START_STR + "batvoltage" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_BAT_VOLTAGE]) + TR_TD_END_STR TR_TD_START_STR + "millis" + TD_TD_MID_STR + String(millis()) + TR_TD_END_STR TR_TD_START_STR + "valid" + TD_TD_MID_STR + String(wuValidData) + TR_TD_END_STR TR_TD_START_STR + "wifi rssi" + TD_TD_MID_STR + WiFi.RSSI() + TR_TD_END_STR TR_TD_START_STR + "wifi rec cnt" + TD_TD_MID_STR + String(_wifi_reconnect_cnt) + TR_TD_END_STR "</table>"
TR_TD_START_STR + "humidity" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_HUMIDITY]) + TR_TD_END_STR
TR_TD_START_STR + "light" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_LIGHT]) + TR_TD_END_STR
TR_TD_START_STR + "windspeed" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_WINDSPEED]) + TR_TD_END_STR
TR_TD_START_STR + "pressure" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_PRESSURE]) + TR_TD_END_STR
TR_TD_START_STR + "batvoltage" + TD_TD_MID_STR + String(_webUpdater_sensValues[SENSOR_BAT_VOLTAGE]) + TR_TD_END_STR
TR_TD_START_STR + "millis" + TD_TD_MID_STR + String(millis()) + TR_TD_END_STR
TR_TD_START_STR + "valid" + TD_TD_MID_STR + String(wuValidData) + TR_TD_END_STR
TR_TD_START_STR + "wifi rssi" + TD_TD_MID_STR + WiFi.RSSI() + TR_TD_END_STR
TR_TD_START_STR + "wifi rec cnt" + TD_TD_MID_STR + String(_wifi_reconnect_cnt) + TR_TD_END_STR
"</table>"
#endif #endif
#ifndef DISABLE_WIFIMANAGER #ifndef DISABLE_WIFIMANAGER
"<br><br><br><br><br><a href=\"http://" + _webUpdater_ip + ":8080/resetWifiManager\">reset WiFi Manager</a><br>" "<br><br><br><br><br><a href=\"http://"
+ _webUpdater_ip + ":8080/resetWifiManager\">reset WiFi Manager</a><br>"
#endif #endif
"</body></html>"; "</body></html>";
@ -156,31 +142,10 @@ void showHTMLMain(void)
//*************************************************************************// //*************************************************************************//
#ifdef HOMEBRIDGE_WEBSTAT #ifdef HOMEBRIDGE_WEBSTAT
void hb_webstat_send(void) void hb_webstat_send(void) {
{
String msg = hb_ws_msg_start + String msg = hb_ws_msg_start + hb_ws_msg_temp + String(_webUpdater_sensValues[SENSOR_TEMPERATURE], 2) + ", " + hb_ws_msg_humi + String(_webUpdater_sensValues[SENSOR_HUMIDITY], 2) + ", " + hb_ws_msg_light + String(_webUpdater_sensValues[SENSOR_LIGHT], 0) + // The light level for the homebridge-http-lux2 plugin is only able to parse integer values
hb_ws_msg_temp + ", " + hb_ws_msg_windspeed + String(_webUpdater_sensValues[SENSOR_WINDSPEED], 2) + ", " + hb_ws_msg_pressure + String(_webUpdater_sensValues[SENSOR_PRESSURE], 2) + ", " + hb_ws_msg_timestamp + String(millis()) + ", " + hb_ws_msg_valid + String(wuValidData) + hb_ws_msg_end;
String(_webUpdater_sensValues[SENSOR_TEMPERATURE], 2) +
", " +
hb_ws_msg_humi +
String(_webUpdater_sensValues[SENSOR_HUMIDITY], 2) +
", " +
hb_ws_msg_light +
String(_webUpdater_sensValues[SENSOR_LIGHT], 0) + // The light level for the homebridge-http-lux2 plugin is only able to parse integer values
", " +
hb_ws_msg_windspeed +
String(_webUpdater_sensValues[SENSOR_WINDSPEED], 2) +
", " +
hb_ws_msg_pressure +
String(_webUpdater_sensValues[SENSOR_PRESSURE], 2) +
", " +
hb_ws_msg_timestamp +
String(millis()) +
", " +
hb_ws_msg_valid +
String(wuValidData) +
hb_ws_msg_end;
httpServer.send(200, "text/html", msg); httpServer.send(200, "text/html", msg);
} }
@ -190,8 +155,7 @@ void hb_webstat_send(void)
#ifdef WEB_RESET #ifdef WEB_RESET
void resetESP() void resetESP() {
{
String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - reset WiFi manager</title>" String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - reset WiFi manager</title>"
"<meta http-equiv=\"refresh\" content=\"20\">" "<meta http-equiv=\"refresh\" content=\"20\">"
@ -203,6 +167,11 @@ void resetESP()
delay(5000); delay(5000);
#ifdef ENABLE_WATCHDOG
// loop endless, watchdog will reset the device
while (1 == 1) {}
#endif
// manual reset after restart is required // manual reset after restart is required
ESP.restart(); ESP.restart();
} }
@ -211,8 +180,7 @@ void resetESP()
#ifndef DISABLE_WIFIMANAGER #ifndef DISABLE_WIFIMANAGER
void resetWifiManager() void resetWifiManager() {
{
String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - reset WiFi manager</title>" String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - reset WiFi manager</title>"
"<meta http-equiv=\"refresh\" content=\"20\">" "<meta http-equiv=\"refresh\" content=\"20\">"
@ -229,6 +197,10 @@ void resetWifiManager()
delay(5000); delay(5000);
#ifdef ENABLE_WATCHDOG
// loop endless, watchdog will reset the device
while (1 == 1) {}
#endif
// manual reset after restart is required // manual reset after restart is required
ESP.restart(); ESP.restart();
} }
@ -239,8 +211,7 @@ void resetWifiManager()
#ifdef DEBUG_WINDSPEED_MEASUREMENT #ifdef DEBUG_WINDSPEED_MEASUREMENT
#ifdef SENSOR_WIND #ifdef SENSOR_WIND
void measureWindspeed() void measureWindspeed() {
{
// read from windspeed sensorSTATUS_LED_PIN // read from windspeed sensorSTATUS_LED_PIN
digitalWrite(STATUS_LED_PIN, HIGH); digitalWrite(STATUS_LED_PIN, HIGH);
@ -250,11 +221,11 @@ void measureWindspeed()
String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - manual wind measurement</title>" String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - manual wind measurement</title>"
"</head><body>" "</head><body>"
"Windsensor measurement result: " + String(tmp_windspeed) + "<br>" "Windsensor measurement result: "
+ String(tmp_windspeed) + "<br>"
"</body></html>"; "</body></html>";
httpServer.send(200, "text/html", message); httpServer.send(200, "text/html", message);
} }
#endif #endif
#endif #endif
@ -269,30 +240,25 @@ String logfile[LOGFILE_SIZE];
uint16_t logger_pos = 0; uint16_t logger_pos = 0;
void logdata(String s) void logdata(String s) {
{
logfile[logger_pos] = s; logfile[logger_pos] = s;
logger_pos++; logger_pos++;
if (logger_pos > LOGFILE_SIZE -1) if (logger_pos > LOGFILE_SIZE - 1) {
{ for (uint16_t i = 1; i < LOGFILE_SIZE; i++) {
for (uint16_t i = 1; i < LOGFILE_SIZE; i++)
{
logfile[i - 1] = logfile[i]; // overwrite previous element with current element logfile[i - 1] = logfile[i]; // overwrite previous element with current element
} }
logger_pos--; // reduce the position in the log logger_pos--; // reduce the position in the log
} }
} }
void showLog() void showLog() {
{
String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - logfile</title>" String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - logfile</title>"
"<meta http-equiv=\"refresh\" content=\"5\">" "<meta http-equiv=\"refresh\" content=\"5\">"
"</head><body>" "</head><body>"
"Logfile data:<br>"; "Logfile data:<br>";
for (uint16_t lp = 0; lp < logger_pos; lp++) for (uint16_t lp = 0; lp < logger_pos; lp++) {
{
message = message + logfile[lp] + "<br>"; message = message + logfile[lp] + "<br>";
} }