Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
2c2319d4
Commit
2c2319d4
authored
Nov 23, 2010
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1) rename rtustate --> uniset-rtu188-state
2) add (rtu188-state) '-y' - use 485 interface for Fastwel
parent
ddbe9637
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
libuniset.spec
conf/libuniset.spec
+2
-2
Makefile.am
extensions/RTUExchange/Makefile.am
+4
-4
rtustate.cc
extensions/RTUExchange/rtustate.cc
+8
-1
No files found.
conf/libuniset.spec
View file @
2c2319d4
...
...
@@ -3,7 +3,7 @@
Name: libuniset
Version: 0.99
Release: eter
18
Release: eter
20
Summary: UniSet - library for building distributed industrial control systems
License: GPL
Group: Development/C++
...
...
@@ -146,7 +146,7 @@ rm -f %buildroot%_libdir/*.la
%_bindir/mtr-conv
%_bindir/mtr-setup
%_bindir/vtconv
%_bindir/
rtu
state
%_bindir/
%oname-rtu188-
state
%_bindir/%oname-rtuexchange
%_bindir/%oname-smemory
%_bindir/%oname-smviewer
...
...
extensions/RTUExchange/Makefile.am
View file @
2c2319d4
bin_PROGRAMS
=
@PACKAGE@-rtuexchange mtr-conv
rtu
state vtconv mtr-setup
bin_PROGRAMS
=
@PACKAGE@-rtuexchange mtr-conv
uniset-rtu188-
state vtconv mtr-setup
lib_LTLIBRARIES
=
libUniSetRTU.la
libUniSetRTU_la_LIBADD
=
$(top_builddir)
/lib/libUniSet.la
\
...
...
@@ -27,9 +27,9 @@ vtconv_SOURCES = vtconv.cc
vtconv_LDADD
=
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
vtconv_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
rtu
state_LDADD
=
libUniSetRTU.la
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
rtu
state__CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
rtustate_SOURCES
=
rtustate.cc
uniset_rtu188_
state_LDADD
=
libUniSetRTU.la
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
uniset_rtu188_
state__CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
uniset_rtu188_state_SOURCES
=
rtustate.cc
# install
devel_include_HEADERS
=
*
.h
...
...
extensions/RTUExchange/rtustate.cc
View file @
2c2319d4
...
...
@@ -13,6 +13,7 @@ static struct option longopts[] = {
{
"device"
,
required_argument
,
0
,
'd'
},
{
"verbose"
,
no_argument
,
0
,
'v'
},
{
"speed"
,
required_argument
,
0
,
's'
},
{
"use485F"
,
no_argument
,
0
,
'y'
},
{
NULL
,
0
,
0
,
0
}
};
// --------------------------------------------------------------------------
...
...
@@ -25,6 +26,7 @@ static void print_help()
printf
(
"[-s|--speed] speed - 9600,14400,19200,38400,57600,115200. Default: 38400.
\n
"
);
printf
(
"[-t|--timeout] msec - Timeout. Default: 2000.
\n
"
);
printf
(
"[-v|--verbose] - Print all messages to stdout
\n
"
);
printf
(
"[-y|--use485F] - use RS485 Fastwel.
\n
"
);
}
// --------------------------------------------------------------------------
int
main
(
int
argc
,
char
**
argv
)
...
...
@@ -37,6 +39,7 @@ int main( int argc, char **argv )
ModbusRTU
::
ModbusAddr
slaveaddr
=
0x01
;
int
tout
=
2000
;
DebugStream
dlog
;
int
use485
=
0
;
try
{
...
...
@@ -68,6 +71,10 @@ int main( int argc, char **argv )
verb
=
1
;
break
;
case
'y'
:
use485
=
1
;
break
;
case
'?'
:
default:
printf
(
"? argumnet
\n
"
);
...
...
@@ -83,7 +90,7 @@ int main( int argc, char **argv )
<<
endl
;
}
ModbusRTUMaster
mb
(
dev
);
ModbusRTUMaster
mb
(
dev
,
use485
);
if
(
verb
)
dlog
.
addLevel
(
Debug
::
type
(
Debug
::
CRIT
|
Debug
::
WARN
|
Debug
::
INFO
)
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment