Skip to content

U
uniset2
Commit c16ac65e authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(mbtcptester): подправил формат вывода

parent d69cf177
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
Utilities/MBTester/mbtcptester.cc
View file @ c16ac65e
...@@ -377,14 +377,14 @@ int main( int argc, char** argv ) ...@@ -377,14 +377,14 @@ int main( int argc, char** argv )
cout << "(reply): count=" << (int)ret.bcnt cout << "(reply): count=" << (int)ret.bcnt
<< "(" << ModbusRTU::dat2str(ret.bcnt) << ")" << "(" << ModbusRTU::dat2str(ret.bcnt) << ")"
<< " time: " << elapsed_usec << " usec" << " usec: " << elapsed_usec
<< endl; << endl;
for( int i = 0; i < ret.bcnt; i++ ) for( int i = 0; i < ret.bcnt; i++ )
{ {
ModbusRTU::DataBits b(ret.data[i]); ModbusRTU::DataBits b(ret.data[i]);
cout << i << ": " cout << setw(3) << i << ": "
<< setw(6) << (reg + 8 * i) << setw(6) << (reg + 8 * i)
<< "(" << setw(6) << ModbusRTU::dat2str( reg + 8 * i ) << ") = " << "(" << setw(6) << ModbusRTU::dat2str( reg + 8 * i ) << ") = "
<< setw(5) << (int)(ret.data[i]) << setw(5) << (int)(ret.data[i])
...@@ -413,14 +413,14 @@ int main( int argc, char** argv ) ...@@ -413,14 +413,14 @@ int main( int argc, char** argv )
cout << "(reply): count=" << (int)ret.bcnt cout << "(reply): count=" << (int)ret.bcnt
<< "(" << ModbusRTU::dat2str(ret.bcnt) << ")" << "(" << ModbusRTU::dat2str(ret.bcnt) << ")"
<< " time: " << elapsed_usec << " usec" << " usec: " << elapsed_usec
<< endl; << endl;
for( int i = 0; i < ret.bcnt; i++ ) for( int i = 0; i < ret.bcnt; i++ )
{ {
ModbusRTU::DataBits b(ret.data[i]); ModbusRTU::DataBits b(ret.data[i]);
cout << i << ": " cout << setw(3) << i << ": "
<< setw(6) << (reg + 8 * i) << setw(6) << (reg + 8 * i)
<< "(" << setw(6) << ModbusRTU::dat2str( reg + 8 * i ) << ") = " << "(" << setw(6) << ModbusRTU::dat2str( reg + 8 * i ) << ") = "
<< setw(5) << (int)(ret.data[i]) << setw(5) << (int)(ret.data[i])
...@@ -449,14 +449,14 @@ int main( int argc, char** argv ) ...@@ -449,14 +449,14 @@ int main( int argc, char** argv )
cout << "(reply): count=" << (int)ret.count cout << "(reply): count=" << (int)ret.count
<< "(" << ModbusRTU::dat2str(ret.count) << ")" << "(" << ModbusRTU::dat2str(ret.count) << ")"
<< " time: " << elapsed_usec << " usec" << " usec: " << elapsed_usec
<< endl; << endl;
for( size_t i = 0; i < ret.count; i++ ) for( size_t i = 0; i < ret.count; i++ )
{ {
ModbusRTU::DataBits16 b(ret.data[i]); ModbusRTU::DataBits16 b(ret.data[i]);
cout << i << ": " cout << setw(3) << i << ": "
<< setw(6) << ( reg + i ) << setw(6) << ( reg + i )
<< "(" << setw(6) << ModbusRTU::dat2str( reg + i ) << ") = " << "(" << setw(6) << ModbusRTU::dat2str( reg + i ) << ") = "
<< setw(5) << (int)(ret.data[i]) << setw(5) << (int)(ret.data[i])
...@@ -490,14 +490,14 @@ int main( int argc, char** argv ) ...@@ -490,14 +490,14 @@ int main( int argc, char** argv )
cout << "(reply): count=" << (int)ret.count cout << "(reply): count=" << (int)ret.count
<< "(" << ModbusRTU::dat2str(ret.count) << ")" << "(" << ModbusRTU::dat2str(ret.count) << ")"
<< " time: " << elapsed_usec << " usec" << " usec: " << elapsed_usec
<< endl; << endl;
for( size_t i = 0; i < ret.count; i++ ) for( size_t i = 0; i < ret.count; i++ )
{ {
ModbusRTU::DataBits16 b(ret.data[i]); ModbusRTU::DataBits16 b(ret.data[i]);
cout << i << ": " cout << setw(3) << i << ": "
<< setw(6) << ( reg + i ) << setw(6) << ( reg + i )
<< "(" << setw(6) << ModbusRTU::dat2str( reg + i ) << ") = " << "(" << setw(6) << ModbusRTU::dat2str( reg + i ) << ") = "
<< setw(5) << (int)(ret.data[i]) << setw(5) << (int)(ret.data[i])
...@@ -547,7 +547,7 @@ int main( int argc, char** argv ) ...@@ -547,7 +547,7 @@ int main( int argc, char** argv )
if( verb ) if( verb )
cout << "(reply): " << ret cout << "(reply): " << ret
<< " time: " << elapsed_usec << " usec" << " usec: " << elapsed_usec
<< endl; << endl;
} }
break; break;
...@@ -569,7 +569,7 @@ int main( int argc, char** argv ) ...@@ -569,7 +569,7 @@ int main( int argc, char** argv )
if( verb ) if( verb )
cout << "(reply): " << ret cout << "(reply): " << ret
<< " time: " << elapsed_usec << " usec" << " usec: " << elapsed_usec
<< endl; << endl;
} }
...@@ -640,7 +640,7 @@ int main( int argc, char** argv ) ...@@ -640,7 +640,7 @@ int main( int argc, char** argv )
if( verb ) if( verb )
cout << "(reply): " << ret cout << "(reply): " << ret
<< " time: " << elapsed_usec << " usec" << " usec: " << elapsed_usec
<< 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