andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 17:29:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
Proddy
2024-09-29 12:01:40 +02:00
committed by GitHub
parent ab040e120e 596872f5aa
commit 2d011a899e
2 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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