Commit 2c2319d4 authored by Pavel Vainerman's avatar Pavel Vainerman

1) rename rtustate --> uniset-rtu188-state

2) add (rtu188-state) '-y' - use 485 interface for Fastwel
parent ddbe9637
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Name: libuniset Name: libuniset
Version: 0.99 Version: 0.99
Release: eter18 Release: eter20
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++
...@@ -146,7 +146,7 @@ rm -f %buildroot%_libdir/*.la ...@@ -146,7 +146,7 @@ rm -f %buildroot%_libdir/*.la
%_bindir/mtr-conv %_bindir/mtr-conv
%_bindir/mtr-setup %_bindir/mtr-setup
%_bindir/vtconv %_bindir/vtconv
%_bindir/rtustate %_bindir/%oname-rtu188-state
%_bindir/%oname-rtuexchange %_bindir/%oname-rtuexchange
%_bindir/%oname-smemory %_bindir/%oname-smemory
%_bindir/%oname-smviewer %_bindir/%oname-smviewer
......
bin_PROGRAMS = @PACKAGE@-rtuexchange mtr-conv rtustate vtconv mtr-setup bin_PROGRAMS = @PACKAGE@-rtuexchange mtr-conv uniset-rtu188-state vtconv mtr-setup
lib_LTLIBRARIES = libUniSetRTU.la lib_LTLIBRARIES = libUniSetRTU.la
libUniSetRTU_la_LIBADD = $(top_builddir)/lib/libUniSet.la \ libUniSetRTU_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
...@@ -27,9 +27,9 @@ vtconv_SOURCES = vtconv.cc ...@@ -27,9 +27,9 @@ vtconv_SOURCES = vtconv.cc
vtconv_LDADD = $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la vtconv_LDADD = $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
vtconv_CXXFLAGS = -I$(top_builddir)/extensions/include vtconv_CXXFLAGS = -I$(top_builddir)/extensions/include
rtustate_LDADD = libUniSetRTU.la $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la uniset_rtu188_state_LDADD = libUniSetRTU.la $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
rtustate__CXXFLAGS = -I$(top_builddir)/extensions/include uniset_rtu188_state__CXXFLAGS = -I$(top_builddir)/extensions/include
rtustate_SOURCES = rtustate.cc uniset_rtu188_state_SOURCES = rtustate.cc
# install # install
devel_include_HEADERS = *.h devel_include_HEADERS = *.h
......
...@@ -13,6 +13,7 @@ static struct option longopts[] = { ...@@ -13,6 +13,7 @@ static struct option longopts[] = {
{ "device", required_argument, 0, 'd' }, { "device", required_argument, 0, 'd' },
{ "verbose", no_argument, 0, 'v' }, { "verbose", no_argument, 0, 'v' },
{ "speed", required_argument, 0, 's' }, { "speed", required_argument, 0, 's' },
{ "use485F", no_argument, 0, 'y' },
{ NULL, 0, 0, 0 } { NULL, 0, 0, 0 }
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
...@@ -25,6 +26,7 @@ static void print_help() ...@@ -25,6 +26,7 @@ static void print_help()
printf("[-s|--speed] speed - 9600,14400,19200,38400,57600,115200. Default: 38400.\n"); printf("[-s|--speed] speed - 9600,14400,19200,38400,57600,115200. Default: 38400.\n");
printf("[-t|--timeout] msec - Timeout. Default: 2000.\n"); printf("[-t|--timeout] msec - Timeout. Default: 2000.\n");
printf("[-v|--verbose] - Print all messages to stdout\n"); printf("[-v|--verbose] - Print all messages to stdout\n");
printf("[-y|--use485F] - use RS485 Fastwel.\n");
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
int main( int argc, char **argv ) int main( int argc, char **argv )
...@@ -37,6 +39,7 @@ int main( int argc, char **argv ) ...@@ -37,6 +39,7 @@ int main( int argc, char **argv )
ModbusRTU::ModbusAddr slaveaddr = 0x01; ModbusRTU::ModbusAddr slaveaddr = 0x01;
int tout = 2000; int tout = 2000;
DebugStream dlog; DebugStream dlog;
int use485 = 0;
try try
{ {
...@@ -68,6 +71,10 @@ int main( int argc, char **argv ) ...@@ -68,6 +71,10 @@ int main( int argc, char **argv )
verb = 1; verb = 1;
break; break;
case 'y':
use485 = 1;
break;
case '?': case '?':
default: default:
printf("? argumnet\n"); printf("? argumnet\n");
...@@ -83,7 +90,7 @@ int main( int argc, char **argv ) ...@@ -83,7 +90,7 @@ int main( int argc, char **argv )
<< endl; << endl;
} }
ModbusRTUMaster mb(dev); ModbusRTUMaster mb(dev,use485);
if( verb ) if( verb )
dlog.addLevel( Debug::type(Debug::CRIT | Debug::WARN | Debug::INFO) ); dlog.addLevel( Debug::type(Debug::CRIT | Debug::WARN | Debug::INFO) );
......
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