Skip to content

Commit

Permalink
fix using NUMOP_MUL50 on webUI emsesp#2064, dev41
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelDvP committed Sep 29, 2024
1 parent 77768f9 commit 505aa1f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 26 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG_LATEST.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ For more details go to [www.emsesp.org](https://www.emsesp.org/).
- log shows data for F7/F9 requests
- Detection of LittleFS for factory setting wasn't working
- 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

Expand All @@ -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
- 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)
- 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 changes: 6 additions & 25 deletions src/helpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 val;

switch (numeric_operator) {
case DeviceValueNumOp::DV_NUMOP_DIV2:
val = (value * 100 / 2 + 0.5);
break;
case DeviceValueNumOp::DV_NUMOP_DIV10:
val = (value * 10 + 0.5);
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 (numeric_operator == 0) { // DV_NUMOP_NONE
val = value * 100 + 0.5;
} else if (numeric_operator > 0) { // DV_NUMOP_DIVxx
val = value * 100 / numeric_operator + 0.5;
} else { // DV_NUMOP_MULxx
val = value * -100 * numeric_operator;
}

if (value < 0) { // negative rounding
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.7.0-dev.40"
#define EMSESP_APP_VERSION "3.7.0-dev.41"

0 comments on commit 505aa1f

Please sign in to comment.