From cf188070d5b3c16f7a4f412ca3305464fbf3e6da Mon Sep 17 00:00:00 2001 From: biver Date: Tue, 1 Mar 2022 20:56:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B5=D0=BB=D0=B0=D0=B5=D0=BC=20=D0=BE?= =?UTF-8?q?=D0=BA=D1=80=D1=83=D0=B3=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=BD=D0=BE=D0=BC?= =?UTF-8?q?=D1=83=20=D0=BA=D0=BE=D0=BB=D0=B8=D1=87=D0=B5=D1=81=D1=82=D0=B2?= =?UTF-8?q?=D1=83=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B7=D0=B0=D0=BF=D1=8F=D1=82?= =?UTF-8?q?=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/classes/IoTItem.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp index 1fdb4481..322bc42c 100644 --- a/src/classes/IoTItem.cpp +++ b/src/classes/IoTItem.cpp @@ -78,17 +78,9 @@ void IoTItem::regEvent(String value, String consoleInfo = "") { void IoTItem::regEvent(float regvalue, String consoleInfo = "") { if (_multiply) regvalue = regvalue * _multiply; if (_plus) regvalue = regvalue + _multiply; - if (_round != 0) { - if (regvalue > 0) { - regvalue = (int)(regvalue * _round + 0.5F); - regvalue = regvalue / _round; - } - if (regvalue < 0) { - regvalue = (int)(regvalue * _round - 0.5F); - regvalue = regvalue / _round; - } - - // regvalue = (float)regvalue / (_round ? pow(10, (int)_round) : 1); // TODO: решить как указывать округление, количество знаков после запятой или десятые сотые ... + if (_round >= 0 && _round < 6) { + int sot = _round ? pow(10, (int)_round) : 1; + regvalue = round(regvalue*sot)/sot; } if (_map1 != _map2) regvalue = map(regvalue, _map1, _map2, _map3, _map4);