diff --git a/firmware/sensor_wind.ino b/firmware/sensor_wind.ino index bdb50c3..5462a63 100644 --- a/firmware/sensor_wind.ino +++ b/firmware/sensor_wind.ino @@ -25,11 +25,9 @@ float wind_speed() void start_measure_wind() { - start_meas_wind_time = millis(); anemometerRotations = 0; interruptNumber = digitalPinToInterrupt(ANEMOMETER_PIN); - } boolean check_measure_wind_done() diff --git a/firmware/webUpdater.ino b/firmware/webUpdater.ino index 2a0961f..85726f9 100644 --- a/firmware/webUpdater.ino +++ b/firmware/webUpdater.ino @@ -117,32 +117,32 @@ void showHTMLMain(void) { String message = "OKO Weatherstation - " + String(_webUpdater_dev) + "" -"" -"" -"
firmware update

" + "" + "" + "
firmware update

" #ifdef USE_LOGGER -"
logfile
" + "
logfile
" #endif #ifdef DEBUG_WINDSPEED_MEASUREMENT -"
manual wind measurement
" + "
manual wind measurement
" #endif #ifdef HOMEBRIDGE_WEBSTAT -"
homebridge websatt
" + "
homebridge websatt
" #endif -"

" -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 -"
" -"




reset WiFi Manager
" -""; + "

" + 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 + "
" + "




reset WiFi Manager
" + ""; httpServer.send(200, "text/html", message); } @@ -185,11 +185,11 @@ void resetWifiManager() { String message = "OKO Weatherstation - " + String(_webUpdater_dev) + " - reset WiFi manager" -"" -"" -"Reset WifiManager config.
" -"Rebooting...
" -""; + "" + "" + "Reset WifiManager config.
" + "Rebooting...
" + ""; httpServer.send(200, "text/html", message); @@ -217,9 +217,9 @@ void measureWindspeed() digitalWrite(STATUS_LED_PIN, LOW); String message = "OKO Weatherstation - " + String(_webUpdater_dev) + " - manual wind measurement" -"" -"Windsensor measurement result: " + String(tmp_windspeed) + "
" -""; + "" + "Windsensor measurement result: " + String(tmp_windspeed) + "
" + ""; httpServer.send(200, "text/html", message); @@ -255,9 +255,9 @@ void logdata(String s) void showLog() { String message = "OKO Weatherstation - " + String(_webUpdater_dev) + " - logfile" -"" -"" -"Logfile data:
"; + "" + "" + "Logfile data:
"; for (uint16_t lp = 0; lp < logger_pos; lp++) {