Commit f00a04d3 authored by Pavel Vainerman's avatar Pavel Vainerman

1) Исправил баг в uniset-mbtcptest (игнорировалось заданное значение в функциях

writeXX) 2) Теперь можно задать отрицательное значение при помощи префикса 'm'. Раньше было нельзя, т.е. '-' - воспринимался getopt-ом как аргумент (несущетвующий).
parent 05de7184
...@@ -94,7 +94,7 @@ int main( int argc, char **argv ) ...@@ -94,7 +94,7 @@ int main( int argc, char **argv )
string dev("/dev/ttyS0"); string dev("/dev/ttyS0");
string speed("38400"); string speed("38400");
ModbusRTU::ModbusData reg = 0; ModbusRTU::ModbusData reg = 0;
ModbusRTU::ModbusData val = 0; int val = 0;
ModbusRTU::ModbusData count = 1; ModbusRTU::ModbusData count = 1;
ModbusRTU::ModbusAddr myaddr = 0x01; ModbusRTU::ModbusAddr myaddr = 0x01;
ModbusRTU::ModbusAddr slaveaddr = 0x00; ModbusRTU::ModbusAddr slaveaddr = 0x00;
...@@ -175,6 +175,12 @@ int main( int argc, char **argv ) ...@@ -175,6 +175,12 @@ int main( int argc, char **argv )
ModbusRTU::DataBits d(sb); ModbusRTU::DataBits d(sb);
val = d.mbyte(); val = d.mbyte();
} }
else if( (argv[optind+1])[0] == 'm' )
{
string v(argv[optind+1]);
string sb(v,1);
val = -1*ModbusRTU::str2mbData(sb);
}
else else
val = ModbusRTU::str2mbData(argv[optind+1]); val = ModbusRTU::str2mbData(argv[optind+1]);
} }
......
...@@ -71,7 +71,7 @@ int main( int argc, char **argv ) ...@@ -71,7 +71,7 @@ int main( int argc, char **argv )
string iaddr("127.0.0.1"); string iaddr("127.0.0.1");
int port=502; int port=502;
ModbusRTU::ModbusData reg = 0; ModbusRTU::ModbusData reg = 0;
ModbusRTU::ModbusData val = 0; int val = 0;
ModbusRTU::ModbusData count = 1; ModbusRTU::ModbusData count = 1;
ModbusRTU::ModbusAddr myaddr = 0x01; ModbusRTU::ModbusAddr myaddr = 0x01;
ModbusRTU::ModbusAddr slaveaddr = 0x00; ModbusRTU::ModbusAddr slaveaddr = 0x00;
...@@ -135,7 +135,7 @@ int main( int argc, char **argv ) ...@@ -135,7 +135,7 @@ int main( int argc, char **argv )
} }
reg = ModbusRTU::str2mbData(argv[optind]); reg = ModbusRTU::str2mbData(argv[optind]);
if( !checkArg(optind+1,argc,argv) ) if( checkArg(optind+1,argc,argv) )
{ {
if( (argv[optind+1])[0] == 'b' ) if( (argv[optind+1])[0] == 'b' )
{ {
...@@ -144,6 +144,12 @@ int main( int argc, char **argv ) ...@@ -144,6 +144,12 @@ int main( int argc, char **argv )
ModbusRTU::DataBits d(sb); ModbusRTU::DataBits d(sb);
val = d.mbyte(); val = d.mbyte();
} }
else if( (argv[optind+1])[0] == 'm' )
{
string v(argv[optind+1]);
string sb(v,1);
val = -1 * ModbusRTU::str2mbData(sb);
}
else else
val = ModbusRTU::str2mbData(argv[optind+1]); val = ModbusRTU::str2mbData(argv[optind+1]);
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Name: libuniset Name: libuniset
Version: 0.99 Version: 0.99
Release: eter24 Release: eter25
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
License: GPL License: GPL
Group: Development/C++ Group: Development/C++
...@@ -184,6 +184,10 @@ rm -f %buildroot%_libdir/*.la ...@@ -184,6 +184,10 @@ rm -f %buildroot%_libdir/*.la
%exclude %_pkgconfigdir/libUniSet.pc %exclude %_pkgconfigdir/libUniSet.pc
%changelog %changelog
* Sat Dec 04 2010 Pavel Vainerman <pv@altlinux.ru> 0.99-eter25
- fixed bug in uniset-mbtcptest (writexx)
- minor fixes ( add 'm'-parametes for set value < 0 )
* Tue Nov 30 2010 Pavel Vainerman <pv@altlinux.ru> 0.99-eter24 * Tue Nov 30 2010 Pavel Vainerman <pv@altlinux.ru> 0.99-eter24
- ModbusRTU::mbException: public Exception - ModbusRTU::mbException: public Exception
......
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