andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix using NUMOP_MUL50 on webUI #2064, dev41

Browse Source
This commit is contained in:
MichaelDvP
2024-09-29 09:00:05 +02:00
parent 77768f9bdc
commit 505aa1f945
3 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG_LATEST.md
View File

@@ -49,6 +49,8 @@ For more details go to [www.emsesp.org](https://www.emsesp.org/).
- log shows data for F7/F9 requests - log shows data for F7/F9 requests
- Detection of LittleFS for factory setting wasn't working - Detection of LittleFS for factory setting wasn't working
- Check for bad GPIOs with Ethernet before the ethernet is initialized - Check for bad GPIOs with Ethernet before the ethernet is initialized
- Show values with factor 50 on webUI [#2064](https://github.com/emsesp/EMS-ESP32/issues/2064)
- Rendering of values between -1 and 0
## Changed ## Changed
@@ -70,3 +72,6 @@ For more details go to [www.emsesp.org](https://www.emsesp.org/).
- WebLog UI matches color schema of the terminal console correctly - WebLog UI matches color schema of the terminal console correctly
- Updated Web libraries, ArduinoJson - Updated Web libraries, ArduinoJson
- Help page doesn't show detailed tech info if the user is not 'admin' role [#2054](https://github.com/emsesp/EMS-ESP32/issues/2054) - Help page doesn't show detailed tech info if the user is not 'admin' role [#2054](https://github.com/emsesp/EMS-ESP32/issues/2054)
- Show ems-esp internal devices in device list of system/info
- Scheduler and mqtt run async on systems with psram
- Show IPv6 address type (local/global/ula) in log

31
src/helpers.cpp
View File

@@ -460,31 +460,12 @@ int Helpers::atoint(const char * value) {
float Helpers::transformNumFloat(float value, const int8_t numeric_operator, const uint8_t fahrenheit) { float Helpers::transformNumFloat(float value, const int8_t numeric_operator, const uint8_t fahrenheit) {
float val; float val;
switch (numeric_operator) { if (numeric_operator == 0) { // DV_NUMOP_NONE
case DeviceValueNumOp::DV_NUMOP_DIV2: val = value * 100 + 0.5;
val = (value * 100 / 2 + 0.5); } else if (numeric_operator > 0) { // DV_NUMOP_DIVxx
break; val = value * 100 / numeric_operator + 0.5;
case DeviceValueNumOp::DV_NUMOP_DIV10: } else { // DV_NUMOP_MULxx
val = (value * 10 + 0.5); val = value * -100 * numeric_operator;
break;
case DeviceValueNumOp::DV_NUMOP_DIV60:
val = (value * 10 / 6 + 0.5);
break;
case DeviceValueNumOp::DV_NUMOP_DIV100:
val = (value + 0.5);
break;
case DeviceValueNumOp::DV_NUMOP_MUL5:
val = value * 100 * 5;
break;
case DeviceValueNumOp::DV_NUMOP_MUL10:
val = value * 100 * 10;
break;
case DeviceValueNumOp::DV_NUMOP_MUL15:
val = value * 100 * 15;
break;
default:
val = (value * 100 + 0.5); // no ops
break;
} }
if (value < 0) { // negative rounding if (value < 0) { // negative rounding

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.7.0-dev.40" #define EMSESP_APP_VERSION "3.7.0-dev.41"