From 7423f10928d7014bf8ab10d05b0af3be17f96491 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 13 Sep 2020 11:29:53 +0200 Subject: [PATCH 1/4] ready for 2.0.2 --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index cbb73a5f9..3758dc6af 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "2.0.1b5" +#define EMSESP_APP_VERSION "2.0.2b0" From 476b42542fff07d300f5ae34770bf66a1a88cadb Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 14 Sep 2020 00:06:57 +0200 Subject: [PATCH 2/4] format LittleFS on erased ESP8266 - #492 --- src/system.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/system.cpp b/src/system.cpp index ba5709e33..3400df0d9 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -633,7 +633,6 @@ bool System::check_upgrade() { #if defined(EMSESP_DEBUG) Serial.begin(115200); Serial.println(F("FS is Littlefs")); - Serial.flush(); Serial.end(); #endif return false; @@ -649,9 +648,11 @@ bool System::check_upgrade() { #if defined(EMSESP_DEBUG) Serial.begin(115200); Serial.println(F("No old SPIFFS found!")); - Serial.flush(); Serial.end(); #endif + // if there is neither SPIFFS or LittleFS we can assume the ESP8266 has been erased + l_cfg.setAutoFormat(true); // reset to normal behaviour + LittleFS.setConfig(l_cfg); return false; } From 48b0a4dc7d29afbb64b88b986a58c3e8368462c3 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 14 Sep 2020 08:38:45 +0200 Subject: [PATCH 3/4] allow empty syslog host --- interface/src/project/EMSESPSettingsController.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/project/EMSESPSettingsController.tsx b/interface/src/project/EMSESPSettingsController.tsx index e728a8356..010d0dd7b 100644 --- a/interface/src/project/EMSESPSettingsController.tsx +++ b/interface/src/project/EMSESPSettingsController.tsx @@ -8,7 +8,7 @@ import MenuItem from '@material-ui/core/MenuItem'; import { ENDPOINT_ROOT } from '../api'; import { restController, RestControllerProps, RestFormLoader, RestFormProps, FormActions, FormButton, BlockFormControlLabel, SectionContent } from '../components'; -import { isIP, isHostname, or } from '../validators'; +import { isIP, isHostname, or, optional } from '../validators'; import { EMSESPSettings } from './EMSESPtypes'; @@ -19,7 +19,7 @@ type EMSESPSettingsControllerProps = RestControllerProps; class EMSESPSettingsController extends Component { componentDidMount() { - ValidatorForm.addValidationRule('isIPOrHostname', or(isIP, isHostname)); + ValidatorForm.addValidationRule('isIPOrHostname', optional(or(isIP, isHostname))); this.props.loadData(); } From 35537826938fac541b85dbb42650d5f3bb836e10 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 14 Sep 2020 08:40:20 +0200 Subject: [PATCH 4/4] only update sensor values if valid and in range --- src/sensors.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/sensors.cpp b/src/sensors.cpp index 79ae8de9c..c03af10a2 100644 --- a/src/sensors.cpp +++ b/src/sensors.cpp @@ -106,8 +106,12 @@ void Sensors::loop() { case TYPE_DS18S20: case TYPE_DS1822: case TYPE_DS1825: - found_.emplace_back(addr); - found_.back().temperature_c = get_temperature_c(addr); + float f; + f = get_temperature_c(addr); + if ((f != NAN) && (f >= -55) && (f <= 125)) { + found_.emplace_back(addr); + found_.back().temperature_c = f; + } /* // comment out for debugging @@ -220,7 +224,7 @@ float Sensors::get_temperature_c(const uint8_t addr[]) { break; } } - uint32_t raw = (raw_value * 625 + 500) / 1000; // round to 0.1 + uint32_t raw = ((uint32_t)raw_value * 625 + 500) / 1000; // round to 0.1 return (float)raw / 10; #else return NAN;