Commit c7510c28 authored by Pavel Vainerman's avatar Pavel Vainerman

Добавил в вывод mbtcptest значения в виде битов [xxxxxxxxxxxxx]

parent 832dcfae
...@@ -482,10 +482,12 @@ int main( int argc, char** argv ) ...@@ -482,10 +482,12 @@ int main( int argc, char** argv )
for( size_t i = 0; i < ret.count; i++ ) for( size_t i = 0; i < ret.count; i++ )
{ {
ModbusRTU::DataBits16 b(ret.data[i]);
cout << i << ": (" << ModbusRTU::dat2str( reg + i ) << ") = " << (int)(ret.data[i]) cout << i << ": (" << ModbusRTU::dat2str( reg + i ) << ") = " << (int)(ret.data[i])
<< " (" << " ("
<< ModbusRTU::dat2str(ret.data[i]) << ModbusRTU::dat2str(ret.data[i])
<< ")" << ")"
<< b
<< endl; << endl;
} }
} }
...@@ -510,10 +512,12 @@ int main( int argc, char** argv ) ...@@ -510,10 +512,12 @@ int main( int argc, char** argv )
for( size_t i = 0; i < ret.count; i++ ) for( size_t i = 0; i < ret.count; i++ )
{ {
ModbusRTU::DataBits16 b(ret.data[i]);
cout << i << ": (" << ModbusRTU::dat2str( reg + i ) << ") = " << (int)(ret.data[i]) cout << i << ": (" << ModbusRTU::dat2str( reg + i ) << ") = " << (int)(ret.data[i])
<< " (" << " ("
<< ModbusRTU::dat2str(ret.data[i]) << ModbusRTU::dat2str(ret.data[i])
<< ")" << ")"
<< b
<< endl; << endl;
} }
} }
......
...@@ -29,7 +29,6 @@ static struct option longopts[] = ...@@ -29,7 +29,6 @@ static struct option longopts[] =
{ "num-cycles", required_argument, 0, 'l' }, { "num-cycles", required_argument, 0, 'l' },
{ "sleep-msec", required_argument, 0, 's' }, { "sleep-msec", required_argument, 0, 's' },
{ "check", no_argument, 0, 'n' }, { "check", no_argument, 0, 'n' },
{ NULL, 0, 0, 0 } { NULL, 0, 0, 0 }
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
...@@ -142,7 +141,6 @@ int main( int argc, char** argv ) ...@@ -142,7 +141,6 @@ int main( int argc, char** argv )
if( cmd == cmdNOP ) if( cmd == cmdNOP )
cmd = cmdRead02; cmd = cmdRead02;
case 'r': case 'r':
if( cmd == cmdNOP ) if( cmd == cmdNOP )
cmd = cmdRead03; cmd = cmdRead03;
...@@ -428,10 +426,13 @@ int main( int argc, char** argv ) ...@@ -428,10 +426,13 @@ int main( int argc, char** argv )
for( size_t i = 0; i < ret.count; i++ ) for( size_t i = 0; i < ret.count; i++ )
{ {
ModbusRTU::DataBits16 b(ret.data[i]);
cout << i << ": (" << ModbusRTU::dat2str( reg + i ) << ") = " << (int)(ret.data[i]) cout << i << ": (" << ModbusRTU::dat2str( reg + i ) << ") = " << (int)(ret.data[i])
<< " (" << " ("
<< ModbusRTU::dat2str(ret.data[i]) << ModbusRTU::dat2str(ret.data[i])
<< ")" << ")"
<< b
<< endl; << endl;
} }
} }
...@@ -456,10 +457,12 @@ int main( int argc, char** argv ) ...@@ -456,10 +457,12 @@ int main( int argc, char** argv )
for( size_t i = 0; i < ret.count; i++ ) for( size_t i = 0; i < ret.count; i++ )
{ {
ModbusRTU::DataBits16 b(ret.data[i]);
cout << i << ": (" << ModbusRTU::dat2str( reg + i ) << ") = " << (int)(ret.data[i]) cout << i << ": (" << ModbusRTU::dat2str( reg + i ) << ") = " << (int)(ret.data[i])
<< " (" << " ("
<< ModbusRTU::dat2str(ret.data[i]) << ModbusRTU::dat2str(ret.data[i])
<< ")" << ")"
<< b
<< endl; << endl;
} }
} }
......
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