Commit 94c9da47 authored by Pavel Vainerman's avatar Pavel Vainerman

(MBExchange): minor fixes

parent 5bfe3264
...@@ -2390,7 +2390,7 @@ namespace uniset ...@@ -2390,7 +2390,7 @@ namespace uniset
/*! приоритет опроса: /*! приоритет опроса:
* 1...n - задаёт "часоту" опроса. Т.е. каждые 1...n циклов * 1...n - задаёт "часоту" опроса. Т.е. каждые 1...n циклов
*/ */
unsigned int pollfactor = IOBase::initIntProp(it, "pollfactor", prop_prefix, false, 0); size_t pollfactor = IOBase::initIntProp(it, "pollfactor", prop_prefix, false, 0);
std::shared_ptr<RegMap> rmap; std::shared_ptr<RegMap> rmap;
......
...@@ -95,10 +95,10 @@ namespace uniset ...@@ -95,10 +95,10 @@ namespace uniset
public IOBase public IOBase
{ {
// only for RTU // only for RTU
int16_t nbit; /*!< bit number (-1 - not used) */ int8_t nbit; /*!< bit number (-1 - not used) */
VTypes::VType vType; /*!< type of value */ VTypes::VType vType; /*!< type of value */
uint16_t rnum; /*!< count of registers */ uint16_t rnum; /*!< count of registers */
uint16_t nbyte; /*!< byte number (1-2) */ uint8_t nbyte; /*!< byte number (1-2) */
RSProperty(): RSProperty():
nbit(-1), vType(VTypes::vtUnknown), nbit(-1), vType(VTypes::vtUnknown),
...@@ -194,7 +194,7 @@ namespace uniset ...@@ -194,7 +194,7 @@ namespace uniset
} }
ModbusRTU::ModbusAddr mbaddr; /*!< адрес устройства */ ModbusRTU::ModbusAddr mbaddr; /*!< адрес устройства */
std::unordered_map<unsigned int, std::shared_ptr<RegMap>> pollmap; std::unordered_map<size_t, std::shared_ptr<RegMap>> pollmap;
DeviceType dtype; /*!< тип устройства */ DeviceType dtype; /*!< тип устройства */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment