Commit cae1b942 authored by Vitaly Lipatov's avatar Vitaly Lipatov

use unsigned instead signed

parent d50d65ef
...@@ -690,7 +690,7 @@ bool MBExchange::preInitRead( InitList::iterator& p ) ...@@ -690,7 +690,7 @@ bool MBExchange::preInitRead( InitList::iterator& p )
return true; return true;
auto dev = p->dev; auto dev = p->dev;
int q_count = p->p.rnum; unsigned int q_count = p->p.rnum;
if( mblog->is_level3() ) if( mblog->is_level3() )
{ {
...@@ -730,13 +730,13 @@ bool MBExchange::preInitRead( InitList::iterator& p ) ...@@ -730,13 +730,13 @@ bool MBExchange::preInitRead( InitList::iterator& p )
{ {
ModbusRTU::ReadInputStatusRetMessage ret = mb->read02(dev->mbaddr, p->mbreg, q_count); ModbusRTU::ReadInputStatusRetMessage ret = mb->read02(dev->mbaddr, p->mbreg, q_count);
ModbusRTU::ModbusData* dat = new ModbusRTU::ModbusData[q_count]; ModbusRTU::ModbusData* dat = new ModbusRTU::ModbusData[q_count];
int m = 0; unsigned int m = 0;
for( unsigned int i = 0; i < ret.bcnt; i++ ) for( unsigned int i = 0; i < ret.bcnt; i++ )
{ {
ModbusRTU::DataBits b(ret.data[i]); ModbusRTU::DataBits b(ret.data[i]);
for( int k = 0; k < ModbusRTU::BitsPerByte && m < q_count; k++, m++ ) for( unsigned int k = 0; k < ModbusRTU::BitsPerByte && m < q_count; k++, m++ )
dat[m] = b[k]; dat[m] = b[k];
} }
...@@ -749,13 +749,13 @@ bool MBExchange::preInitRead( InitList::iterator& p ) ...@@ -749,13 +749,13 @@ bool MBExchange::preInitRead( InitList::iterator& p )
{ {
ModbusRTU::ReadCoilRetMessage ret = mb->read01(dev->mbaddr, p->mbreg, q_count); ModbusRTU::ReadCoilRetMessage ret = mb->read01(dev->mbaddr, p->mbreg, q_count);
ModbusRTU::ModbusData* dat = new ModbusRTU::ModbusData[q_count]; ModbusRTU::ModbusData* dat = new ModbusRTU::ModbusData[q_count];
int m = 0; unsigned int m = 0;
for( unsigned int i = 0; i < ret.bcnt; i++ ) for( unsigned int i = 0; i < ret.bcnt; i++ )
{ {
ModbusRTU::DataBits b(ret.data[i]); ModbusRTU::DataBits b(ret.data[i]);
for( int k = 0; k < ModbusRTU::BitsPerByte && m < q_count; k++, m++ ) for( unsigned int k = 0; k < ModbusRTU::BitsPerByte && m < q_count; k++, m++ )
dat[m] = b[k]; dat[m] = b[k];
} }
...@@ -998,9 +998,9 @@ bool MBExchange::pollRTU( std::shared_ptr<RTUDevice>& dev, RegMap::iterator& it ...@@ -998,9 +998,9 @@ bool MBExchange::pollRTU( std::shared_ptr<RTUDevice>& dev, RegMap::iterator& it
case ModbusRTU::fnReadInputStatus: case ModbusRTU::fnReadInputStatus:
{ {
ModbusRTU::ReadInputStatusRetMessage ret = mb->read02(dev->mbaddr, p->mbreg, p->q_count); ModbusRTU::ReadInputStatusRetMessage ret = mb->read02(dev->mbaddr, p->mbreg, p->q_count);
int m = 0; unsigned int m = 0;
for( auto i = 0; i < ret.bcnt; i++ ) for( uint i = 0; i < ret.bcnt; i++ )
{ {
ModbusRTU::DataBits b(ret.data[i]); ModbusRTU::DataBits b(ret.data[i]);
...@@ -1018,7 +1018,7 @@ bool MBExchange::pollRTU( std::shared_ptr<RTUDevice>& dev, RegMap::iterator& it ...@@ -1018,7 +1018,7 @@ bool MBExchange::pollRTU( std::shared_ptr<RTUDevice>& dev, RegMap::iterator& it
case ModbusRTU::fnReadCoilStatus: case ModbusRTU::fnReadCoilStatus:
{ {
ModbusRTU::ReadCoilRetMessage ret = mb->read01(dev->mbaddr, p->mbreg, p->q_count); ModbusRTU::ReadCoilRetMessage ret = mb->read01(dev->mbaddr, p->mbreg, p->q_count);
int m = 0; unsigned int m = 0;
for( auto i = 0; i < ret.bcnt; i++ ) for( auto i = 0; i < ret.bcnt; i++ )
{ {
......
...@@ -325,7 +325,7 @@ class MBExchange: ...@@ -325,7 +325,7 @@ class MBExchange:
bool mbregFromID; bool mbregFromID;
int polltime; /*!< переодичность обновления данных, [мсек] */ int polltime; /*!< переодичность обновления данных, [мсек] */
timeout_t sleepPause_usec; timeout_t sleepPause_usec;
int maxQueryCount; /*!< максимальное количество регистров для одного запроса */ unsigned int maxQueryCount; /*!< максимальное количество регистров для одного запроса */
PassiveTimer ptHeartBeat; PassiveTimer ptHeartBeat;
UniSetTypes::ObjectId sidHeartBeat; UniSetTypes::ObjectId sidHeartBeat;
......
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