okoyono/weatherstation
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
weatherstation/firmware/webUpdater.ino

266 lines
8.4 KiB
Arduino
Raw Normal View History

Added the webbased OTA update mechanism.
2018-06-23 21:49:11 +02:00
/*
WebUpdater documentation updated.
2018-06-24 12:13:46 +02:00
* To upload through terminal you can use: curl -F "image=@firmware.bin" http://<ip>:8080/update
WebUpdater documentation updated.
2018-06-24 12:01:58 +02:00
*
*
WebUpdater documentation updated.
2018-06-24 12:03:05 +02:00
* bin file location on windows: C:\Users\<your username>\AppData\Local\Temp\arduino_build_<id>
WebUpdater documentation updated.
2018-06-24 12:01:58 +02:00
*/
Added the webbased OTA update mechanism.
2018-06-23 21:49:11 +02:00
#include <ESP8266WiFi.h>
#include <ESP8266WebServer.h>
#include <ESP8266mDNS.h>
#include <ESP8266HTTPUpdateServer.h>
Move all dependencies to the repository This step seems bold, but is saves us so much hassle. Even better, we have a reliable codebase, with all the dependencies (and their versions) we need in order to build the project. If a library got an update, we can replace it inplace if the code is still compatible.
2019-02-03 16:12:19 +01:00
#include <WiFiClient.h>
Added documentation about includes.
2022-11-11 11:11:10 +01:00
#include <WiFiManager.h> // WiFiManager from bib manager by tzapu
Move all dependencies to the repository This step seems bold, but is saves us so much hassle. Even better, we have a reliable codebase, with all the dependencies (and their versions) we need in order to build the project. If a library got an update, we can replace it inplace if the code is still compatible.
2019-02-03 16:12:19 +01:00
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
#include "config.h"
#include "config_user.h"
Improved sensor data read code.
2022-09-13 10:48:58 +02:00
//*************************************************************************//
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
ESP8266WebServer httpServer(WEB_UPDATER_HTTP_PORT);
Added the webbased OTA update mechanism.
2018-06-23 21:49:11 +02:00
ESP8266HTTPUpdateServer httpUpdater;
Refactor webUpdater to remove logic from firmware.ino
2019-08-04 12:46:42 +02:00
String _webUpdater_ip = "127.0.0.1";
String _webUpdater_dev = "unknown";
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
float _webUpdater_sensValues[VALUES];
Initial implementation of the FSM, also cleaned up webUpdater ino file.
2022-09-12 15:26:30 +02:00
#define TR_TD_START_STR "<tr><td>"
#define TR_TD_END_STR "</td></tr>"
#define TD_TD_MID_STR "</td><td>"
Frickelt in a sensor status page.
2018-07-11 11:49:58 +02:00
Added a data validation check. The webupdater will output the result of the check and also the hbWebstat json data contain the valid flag now. Also only valid data will logged into the influxDB.
2022-08-28 13:47:10 +02:00
boolean wuValidData = false;
Added reconnect info. Also added the info to the webupdater.
2022-09-14 20:05:50 +02:00
uint32_t _wifi_reconnect_cnt = 0;
Improved sensor data read code.
2022-09-13 10:48:58 +02:00
//*************************************************************************//
Refactor webUpdater to remove logic from firmware.ino
2019-08-04 12:46:42 +02:00
void setupWebUpdater(String device, String ip)
Added the webbased OTA update mechanism.
2018-06-23 21:49:11 +02:00
{
Refactor webUpdater to remove logic from firmware.ino
2019-08-04 12:46:42 +02:00
debug("Starting WebUpdater... " + ip);
_webUpdater_ip = ip;
_webUpdater_dev = device;
Added the webbased OTA update mechanism.
2018-06-23 21:49:11 +02:00
httpUpdater.setup(&httpServer);
Frickelt in a sensor status page.
2018-07-11 11:49:58 +02:00
WifiManager reset feature added to webUpdater.
2022-05-14 19:38:58 +02:00
httpServer.on("/", showHTMLMain);
httpServer.on("/resetWifiManager", resetWifiManager);
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
#ifdef HOMEBRIDGE_WEBSTAT
httpServer.on("/hbWebstat", hb_webstat_send);
#endif
Added windspeed measurement web functionality.
2022-05-24 11:03:52 +02:00
#ifdef DEBUG_WINDSPEED_MEASUREMENT
httpServer.on("/measWind", measureWindspeed);
#endif
Logging feature added.
2022-09-12 19:31:16 +02:00
#ifdef USE_LOGGER
httpServer.on("/showlog", showLog);
#endif
Added the webbased OTA update mechanism.
2018-06-23 21:49:11 +02:00
httpServer.begin();
Refactor webUpdater to remove logic from firmware.ino
2019-08-04 12:46:42 +02:00
debug("HTTPUpdateServer ready!");
Added the webbased OTA update mechanism.
2018-06-23 21:49:11 +02:00
}
Improved sensor data read code.
2022-09-13 10:48:58 +02:00
//*************************************************************************//
Added the webbased OTA update mechanism.
2018-06-23 21:49:11 +02:00
void doWebUpdater(void)
{
digitalWrite(D0, HIGH);
httpServer.handleClient();
}
Frickelt in a sensor status page.
2018-07-11 11:49:58 +02:00
Added reconnect info. Also added the info to the webupdater.
2022-09-14 20:05:50 +02:00
//*************************************************************************//
Added a separate function to set the windspeed to the webupdater.
2022-09-14 20:24:43 +02:00
void sentWindspeed(float ws)
{
_webUpdater_sensValues[SENSOR_WINDSPEED] = ws;
}
Added reconnect info. Also added the info to the webupdater.
2022-09-14 20:05:50 +02:00
void setWifiReconnectCnt(uint32_t wrc)
{
_wifi_reconnect_cnt = wrc;
}
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
void setSensorData(float sensorValues[])
{
Added a data validation check. The webupdater will output the result of the check and also the hbWebstat json data contain the valid flag now. Also only valid data will logged into the influxDB.
2022-08-28 13:47:10 +02:00
for (uint8_t i = 0; i < 5 and wuValidData == false; i++)
{
Fixed valid data checks and prevented to copy nan data to webUpdater.
2022-09-14 12:42:01 +02:00
if (sensorValues[i] != 0 and sensorValues[i] != nanf("no value") and (not isnan(sensorValues[i])))
Added a data validation check. The webupdater will output the result of the check and also the hbWebstat json data contain the valid flag now. Also only valid data will logged into the influxDB.
2022-08-28 13:47:10 +02:00
{
wuValidData = true; // at least one value is not zero, the data
}
}
Newline added
2022-09-14 11:56:53 +02:00
for (uint8_t i = 0; i < VALUES; i++)
{
Fixed valid data checks and prevented to copy nan data to webUpdater.
2022-09-14 12:42:01 +02:00
if (sensorValues[i] != nanf("no value") and (not isnan(sensorValues[i])))
{
// only copy real float values
Updated required libraries
2022-09-15 10:23:02 +02:00
//debug(String(i) + "=" + String(sensorValues[i]));
Fixed valid data checks and prevented to copy nan data to webUpdater.
2022-09-14 12:42:01 +02:00
_webUpdater_sensValues[i] = sensorValues[i];
}
Frickelt in a sensor status page.
2018-07-11 11:49:58 +02:00
}
}
Improved sensor data read code.
2022-09-13 10:48:58 +02:00
//*************************************************************************//
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
void showHTMLMain(void)
{
Added a data validation check. The webupdater will output the result of the check and also the hbWebstat json data contain the valid flag now. Also only valid data will logged into the influxDB.
2022-08-28 13:47:10 +02:00
Refactor webUpdater to remove logic from firmware.ino
2019-08-04 12:46:42 +02:00
String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + "</title>"
code formatting changed
2022-11-10 13:33:09 +01:00
"<meta http-equiv=\"refresh\" content=\"20\">"
"</head><body>"
"<br><a href=\"http://" + _webUpdater_ip + ":8080/update\">firmware update</a><br><br>"
Updated timing checks to use millis() function, added some links to web updater main page.
2022-09-12 20:27:42 +02:00
#ifdef USE_LOGGER
code formatting changed
2022-11-10 13:33:09 +01:00
"<br><a href=\"http://" + _webUpdater_ip + ":8080/showlog\">logfile</a><br>"
Updated timing checks to use millis() function, added some links to web updater main page.
2022-09-12 20:27:42 +02:00
#endif
#ifdef DEBUG_WINDSPEED_MEASUREMENT
code formatting changed
2022-11-10 13:33:09 +01:00
"<br><a href=\"http://" + _webUpdater_ip + ":8080/measWind\">manual wind measurement</a><br>"
Updated timing checks to use millis() function, added some links to web updater main page.
2022-09-12 20:27:42 +02:00
#endif
#ifdef HOMEBRIDGE_WEBSTAT
code formatting changed
2022-11-10 13:33:09 +01:00
"<br><a href=\"http://" + _webUpdater_ip + ":8080/hbWebstat\">homebridge websatt</a><br>"
Updated timing checks to use millis() function, added some links to web updater main page.
2022-09-12 20:27:42 +02:00
#endif
code formatting changed
2022-11-10 13:33:09 +01:00
"<br><br><table>"
TR_TD_START_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>"
"<br><br><br><br><br><a href=\"http://" + _webUpdater_ip + ":8080/resetWifiManager\">reset WiFi Manager</a><br>"
"</body></html>";
Frickelt in a sensor status page.
2018-07-11 11:49:58 +02:00
httpServer.send(200, "text/html", message);
}
WifiManager reset feature added to webUpdater.
2022-05-14 19:38:58 +02:00
Improved sensor data read code.
2022-09-13 10:48:58 +02:00
//*************************************************************************//
Initial implementation of the FSM, also cleaned up webUpdater ino file.
2022-09-12 15:26:30 +02:00
#ifdef HOMEBRIDGE_WEBSTAT
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
void hb_webstat_send(void)
{
Added http get call functionality and fixed spaces in code.
2022-11-11 10:49:42 +01:00
Fixed webserver update time and modified webstat website content.
2022-05-16 13:34:33 +02:00
String msg = hb_ws_msg_start +
Added http get call functionality and fixed spaces in code.
2022-11-11 10:49:42 +01:00
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_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;
Fixed webserver update time and modified webstat website content.
2022-05-16 13:34:33 +02:00
httpServer.send(200, "text/html", msg);
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
}
Initial implementation of the FSM, also cleaned up webUpdater ino file.
2022-09-12 15:26:30 +02:00
#endif
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
Improved sensor data read code.
2022-09-13 10:48:58 +02:00
//*************************************************************************//
WifiManager reset feature added to webUpdater.
2022-05-14 19:38:58 +02:00
void resetWifiManager()
{
Logging feature added.
2022-09-12 19:31:16 +02:00
String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - reset WiFi manager</title>"
code formatting changed
2022-11-10 13:33:09 +01:00
"<meta http-equiv=\"refresh\" content=\"20\">"
"</head><body>"
"Reset WifiManager config.<br>"
"Rebooting...<br>"
"</body></html>";
WifiManager reset feature added to webUpdater.
2022-05-14 19:38:58 +02:00
httpServer.send(200, "text/html", message);
// Erase WiFi Credentials, enable, compile, flash, disable and reflash.
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
WiFiManager wifiManager;
wifiManager.resetSettings();
WifiManager reset feature added to webUpdater.
2022-05-14 19:38:58 +02:00
delay(5000);
Added include of wifiManager to webUpdater
2022-05-14 19:54:51 +02:00
Moved Homebridge webstat to webUpdater logic. Fixed Windspeed calculation. Added a interval firmware reset functionality.
2022-05-15 22:34:36 +02:00
// manual reset after restart is required
WifiManager reset feature added to webUpdater.
2022-05-14 19:38:58 +02:00
ESP.restart();
}
Added windspeed measurement web functionality.
2022-05-24 11:03:52 +02:00
Improved sensor data read code.
2022-09-13 10:48:58 +02:00
//*************************************************************************//
Initial implementation of the FSM, also cleaned up webUpdater ino file.
2022-09-12 15:26:30 +02:00
#ifdef DEBUG_WINDSPEED_MEASUREMENT
#ifdef SENSOR_WIND
Added windspeed measurement web functionality.
2022-05-24 11:03:52 +02:00
void measureWindspeed()
{
// read from windspeed sensorSTATUS_LED_PIN
digitalWrite(STATUS_LED_PIN, HIGH);
debug("Starting windspeed measurement");
float tmp_windspeed = wind_speed();
digitalWrite(STATUS_LED_PIN, LOW);
Logging feature added.
2022-09-12 19:31:16 +02:00
String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - manual wind measurement</title>"
code formatting changed
2022-11-10 13:33:09 +01:00
"</head><body>"
"Windsensor measurement result: " + String(tmp_windspeed) + "<br>"
"</body></html>";
Added windspeed measurement web functionality.
2022-05-24 11:03:52 +02:00
httpServer.send(200, "text/html", message);
}
Initial implementation of the FSM, also cleaned up webUpdater ino file.
2022-09-12 15:26:30 +02:00
#endif
#endif
Logging feature added.
2022-09-12 19:31:16 +02:00
Improved sensor data read code.
2022-09-13 10:48:58 +02:00
//*************************************************************************//
Logging feature added.
2022-09-12 19:31:16 +02:00
#ifdef USE_LOGGER
Removed sensor_ids array, increased logger list length.
2022-09-13 13:17:38 +02:00
#define LOGFILE_SIZE 25
Logging feature added.
2022-09-12 19:31:16 +02:00
String logfile[LOGFILE_SIZE];
uint16_t logger_pos = 0;
void logdata(String s)
{
logfile[logger_pos] = s;
logger_pos++;
if (logger_pos > LOGFILE_SIZE -1)
{
for (uint16_t i = 1; i < LOGFILE_SIZE; i++)
{
logfile[i-1] = logfile[i]; // overwrite previous element with current element
}
logger_pos--; // reduce the position in the log
}
}
void showLog()
{
String message = "<html><head><title>OKO Weatherstation - " + String(_webUpdater_dev) + " - logfile</title>"
code formatting changed
2022-11-10 13:33:09 +01:00
"<meta http-equiv=\"refresh\" content=\"5\">"
"</head><body>"
"Logfile data:<br>";
Logging feature added.
2022-09-12 19:31:16 +02:00
for (uint16_t lp = 0; lp < logger_pos; lp++)
{
message = message + logfile[lp] + "<br>";
}
message = message + "</body></html>";
httpServer.send(200, "text/html", message);
}
#endif
Improved sensor data read code.
2022-09-13 10:48:58 +02:00
//*************************************************************************//
Reference in a new issue Copy permalink