From 927272824cb901d9dafea64d7f45143512395d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=BB=D0=B8=D0=BC=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9=20=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5?= =?UTF-8?q?=D0=B2=D0=B8=D1=87?= Date: Mon, 10 Apr 2023 00:01:20 +0300 Subject: [PATCH] counter fix --- lighthub/modules/out_counter.cpp | 11 +++++++---- lighthub/modules/out_counter.h | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lighthub/modules/out_counter.cpp b/lighthub/modules/out_counter.cpp index 32f246b..f9286b9 100644 --- a/lighthub/modules/out_counter.cpp +++ b/lighthub/modules/out_counter.cpp @@ -13,7 +13,8 @@ static int driverStatus = CST_UNKNOWN; void out_counter::getConfig() { if (!item) return; - impulse = item->getFloatArg(0); + impulse = item->getFloatArg(0)*TENS_BASE; + period = item->getFloatArg(1)*1000.0; //debugSerial<<"CTR: imp:"<getExt(); itemCmd st; st.loadItem(item,FLAG_PARAMETERS|FLAG_COMMAND); - float val = st.getFloat(); + //float val = st.getFloat(); + uint32_t val = st.getTens_raw(); //short cmd = st.getCmd(); - debugSerial<<"CTR: tick val:"<SendStatus(FLAG_PARAMETERS); diff --git a/lighthub/modules/out_counter.h b/lighthub/modules/out_counter.h index d76c030..3171a3d 100644 --- a/lighthub/modules/out_counter.h +++ b/lighthub/modules/out_counter.h @@ -20,7 +20,8 @@ public: int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true) override; protected: - float impulse; + //float impulse; + uint32_t impulse; uint32_t period; }; #endif