Commit 44727dd3 authored by Pavel Vainerman's avatar Pavel Vainerman

(MBTCPMaster): исправлена ошибка в функции genRegID, а также добавлен ряд сообщений об ошибках..

parent 89ea12d6
......@@ -314,6 +314,9 @@ class MBTCPMaster:
friend std::ostream& operator<<( std::ostream& os, RTUDeviceMap& d );
void printMap(RTUDeviceMap& d);
// ----------------------------------
static RegID genRegID( const ModbusRTU::ModbusData r, const int fn );
protected:
struct InitRegInfo
{
......@@ -381,7 +384,6 @@ class MBTCPMaster:
void initDeviceList();
void initOffsetList();
static RegID genRegID( const ModbusRTU::ModbusData r, const int fn );
RTUDevice* addDev( RTUDeviceMap& dmap, ModbusRTU::ModbusAddr a, UniXML_iterator& it );
RegInfo* addReg( RegMap& rmap, RegID id, ModbusRTU::ModbusData r, UniXML_iterator& it,
RTUDevice* dev, RegInfo* rcopy=0 );
......
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