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
79cdbd5c
Commit
79cdbd5c
authored
Nov 27, 2011
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(mtr-read): Добавил утилиту чтения регистров с устройств MTR (DEIF)
parent
75b79377
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
385 additions
and
3 deletions
+385
-3
libuniset.spec
conf/libuniset.spec
+4
-1
Makefile.am
extensions/ModbusMaster/Makefile.am
+6
-2
mtr-conv.cc
extensions/ModbusMaster/mtr-conv.cc
+0
-0
mtr-read.cc
extensions/ModbusMaster/mtr-read.cc
+375
-0
No files found.
conf/libuniset.spec
View file @
79cdbd5c
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
Name: libuniset
Name: libuniset
Version: 1.0
Version: 1.0
Release: alt5
6
Release: alt5
7
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++
...
@@ -212,6 +212,9 @@ rm -f %buildroot%_libdir/*.la
...
@@ -212,6 +212,9 @@ rm -f %buildroot%_libdir/*.la
%changelog
%changelog
* Sun Nov 27 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt57
- add uniset-mtr-read utility
* Sat Nov 26 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt56
* Sat Nov 26 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt56
- (modbus): fixed bug (again) in ModbusSlave::readInputStatus(0x02)
- (modbus): fixed bug (again) in ModbusSlave::readInputStatus(0x02)
...
...
extensions/ModbusMaster/Makefile.am
View file @
79cdbd5c
...
@@ -6,7 +6,7 @@ libMBMaster_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
...
@@ -6,7 +6,7 @@ libMBMaster_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
libMBMaster_la_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
libMBMaster_la_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
libMBMaster_la_SOURCES
=
MBExchange.cc RTUStorage.cc
libMBMaster_la_SOURCES
=
MBExchange.cc RTUStorage.cc
bin_PROGRAMS
=
@PACKAGE@-mbtcpmaster @PACKAGE@-rtuexchange @PACKAGE@-mtr-conv @PACKAGE@-rtu188-state @PACKAGE@-vtconv @PACKAGE@-mtr-setup
bin_PROGRAMS
=
@PACKAGE@-mbtcpmaster @PACKAGE@-rtuexchange @PACKAGE@-mtr-conv @PACKAGE@-rtu188-state @PACKAGE@-vtconv @PACKAGE@-mtr-setup
@PACKAGE@-mtr-read
lib_LTLIBRARIES
=
libUniSetMBTCPMaster.la libUniSetRTU.la
lib_LTLIBRARIES
=
libUniSetMBTCPMaster.la libUniSetRTU.la
# -------------------- Mobus TCP -------------------
# -------------------- Mobus TCP -------------------
...
@@ -48,7 +48,7 @@ libUniSetRTU_la_SOURCES = RTUExchange.cc
...
@@ -48,7 +48,7 @@ libUniSetRTU_la_SOURCES = RTUExchange.cc
$(SIGC_LIBS)
$(SIGC_LIBS)
@PACKAGE@
_rtuexchange_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
@PACKAGE@
_rtuexchange_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
@PACKAGE@
_mtr_conv_SOURCES
=
mtrconv.cc
@PACKAGE@
_mtr_conv_SOURCES
=
mtr
-
conv.cc
@PACKAGE@
_mtr_conv_LDADD
=
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
@PACKAGE@
_mtr_conv_LDADD
=
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
@PACKAGE@
_mtr_conv_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
@PACKAGE@
_mtr_conv_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
...
@@ -56,6 +56,10 @@ libUniSetRTU_la_SOURCES = RTUExchange.cc
...
@@ -56,6 +56,10 @@ libUniSetRTU_la_SOURCES = RTUExchange.cc
@PACKAGE@
_mtr_setup_LDADD
=
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
@PACKAGE@
_mtr_setup_LDADD
=
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
@PACKAGE@
_mtr_setup_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
@PACKAGE@
_mtr_setup_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
@PACKAGE@
_mtr_read_SOURCES
=
mtr-read.cc
@PACKAGE@
_mtr_read_LDADD
=
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
@PACKAGE@
_mtr_read_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
@PACKAGE@
_vtconv_SOURCES
=
vtconv.cc
@PACKAGE@
_vtconv_SOURCES
=
vtconv.cc
@PACKAGE@
_vtconv_LDADD
=
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
@PACKAGE@
_vtconv_LDADD
=
$(top_builddir)
/extensions/lib/libUniSetExtensions.la
$(top_builddir)
/lib/libUniSet.la
@PACKAGE@
_vtconv_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
@PACKAGE@
_vtconv_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
...
...
extensions/ModbusMaster/mtrconv.cc
→
extensions/ModbusMaster/mtr
-
conv.cc
View file @
79cdbd5c
File moved
extensions/ModbusMaster/mtr-read.cc
0 → 100644
View file @
79cdbd5c
// --------------------------------------------------------------------------
#include <string>
#include <sstream>
#include <iomanip>
#include <getopt.h>
#include "Debug.h"
#include "modbus/ModbusRTUMaster.h"
#include "modbus/ModbusHelpers.h"
#include "MTR.h"
// --------------------------------------------------------------------------
using
namespace
UniSetTypes
;
using
namespace
std
;
// --------------------------------------------------------------------------
static
struct
option
longopts
[]
=
{
{
"help"
,
no_argument
,
0
,
'h'
},
{
"read03"
,
required_argument
,
0
,
'r'
},
{
"read04"
,
required_argument
,
0
,
'x'
},
{
"device"
,
required_argument
,
0
,
'd'
},
{
"verbose"
,
no_argument
,
0
,
'v'
},
{
"speed"
,
required_argument
,
0
,
's'
},
{
"use485F"
,
no_argument
,
0
,
'y'
},
{
"num-cycles"
,
required_argument
,
0
,
'l'
},
{
"timeout"
,
required_argument
,
0
,
't'
},
{
NULL
,
0
,
0
,
0
}
};
// --------------------------------------------------------------------------
static
void
print_help
()
{
printf
(
"-h|--help - this message
\n
"
);
printf
(
"[--read03] slaveaddr reg mtrtype - read from MTR (mtrtype: T1...T10,T16,T17,F1)
\n
"
);
printf
(
"[--read04] slaveaddr reg mtrtype - read from MTR (mtrtype: T1...T10,T16,T17,F1)
\n
"
);
printf
(
"[-y|--use485F] - use RS485 Fastwel.
\n
"
);
printf
(
"[-d|--device] dev - use device dev. Default: /dev/ttyS0
\n
"
);
printf
(
"[-s|--speed] speed - 9600,14400,19200,38400,57600,115200. Default: 38400.
\n
"
);
printf
(
"[-t|--timeout] msec - Timeout. Default: 2000.
\n
"
);
printf
(
"[-l|--num-cycles] num - Number of cycles of exchange. Default: -1 infinitely.
\n
"
);
printf
(
"[-v|--verbose] - Print all messages to stdout
\n
"
);
}
// --------------------------------------------------------------------------
enum
Command
{
cmdNOP
,
cmdRead03
,
cmdRead04
};
// --------------------------------------------------------------------------
static
char
*
checkArg
(
int
ind
,
int
argc
,
char
*
argv
[]
);
static
void
readMTR
(
ModbusRTUMaster
*
mb
,
ModbusRTU
::
ModbusAddr
addr
,
ModbusRTU
::
ModbusData
reg
,
MTR
::
MTRType
t
,
Command
cmd
);
// --------------------------------------------------------------------------
int
main
(
int
argc
,
char
**
argv
)
{
Command
cmd
=
cmdNOP
;
int
optindex
=
0
;
int
opt
=
0
;
int
verb
=
0
;
string
dev
(
"/dev/ttyS0"
);
string
speed
(
"38400"
);
ModbusRTU
::
ModbusData
reg
=
0
;
ModbusRTU
::
ModbusAddr
slaveaddr
=
0x00
;
int
tout
=
2000
;
DebugStream
dlog
;
string
tofile
(
""
);
int
use485
=
0
;
int
ncycles
=
-
1
;
MTR
::
MTRType
mtrtype
=
MTR
::
mtUnknown
;
try
{
while
(
(
opt
=
getopt_long
(
argc
,
argv
,
"hvyq:r:d:s:t:x:"
,
longopts
,
&
optindex
))
!=
-
1
)
{
switch
(
opt
)
{
case
'h'
:
print_help
();
return
0
;
case
'r'
:
case
'x'
:
{
if
(
opt
==
'r'
)
cmd
=
cmdRead03
;
else
cmd
=
cmdRead04
;
slaveaddr
=
ModbusRTU
::
str2mbAddr
(
optarg
);
if
(
!
checkArg
(
optind
,
argc
,
argv
)
)
{
cerr
<<
"no argument is given: 'reg'.."
<<
endl
;
return
1
;
}
reg
=
ModbusRTU
::
str2mbData
(
argv
[
optind
]);
if
(
!
checkArg
(
optind
+
1
,
argc
,
argv
)
)
{
cerr
<<
"no argument is given: 'mtrtype'.."
<<
endl
;
return
1
;
}
mtrtype
=
MTR
::
str2type
(
argv
[
optind
+
1
]);
if
(
mtrtype
==
MTR
::
mtUnknown
)
{
cerr
<<
"command error: Unknown mtr type: '"
<<
string
(
argv
[
optind
+
1
])
<<
"'"
<<
endl
;
return
1
;
}
}
break
;
case
'y'
:
use485
=
1
;
break
;
case
'd'
:
dev
=
string
(
optarg
);
break
;
case
's'
:
speed
=
string
(
optarg
);
break
;
case
't'
:
tout
=
uni_atoi
(
optarg
);
break
;
case
'v'
:
verb
=
1
;
break
;
case
'l'
:
ncycles
=
uni_atoi
(
optarg
);
break
;
case
'?'
:
default:
printf
(
"? argumnet
\n
"
);
return
0
;
}
}
if
(
verb
)
{
cout
<<
"(init): dev="
<<
dev
<<
" speed="
<<
speed
<<
" timeout="
<<
tout
<<
" msec "
<<
endl
;
}
ModbusRTUMaster
mb
(
dev
,
use485
);
if
(
verb
)
dlog
.
addLevel
(
Debug
::
ANY
);
mb
.
setTimeout
(
tout
);
mb
.
setSpeed
(
speed
);
mb
.
setLog
(
dlog
);
int
nc
=
1
;
if
(
ncycles
>
0
)
nc
=
ncycles
;
while
(
nc
)
{
try
{
switch
(
cmd
)
{
case
cmdRead03
:
case
cmdRead04
:
{
if
(
verb
)
{
cout
<<
" slaveaddr="
<<
ModbusRTU
::
addr2str
(
slaveaddr
)
<<
" reg="
<<
ModbusRTU
::
dat2str
(
reg
)
<<
"("
<<
(
int
)
reg
<<
")"
<<
" mtrType="
<<
MTR
::
type2str
(
mtrtype
)
<<
endl
;
}
readMTR
(
&
mb
,
slaveaddr
,
reg
,
mtrtype
,
cmd
);
}
break
;
case
cmdNOP
:
default:
cerr
<<
"No command. Use -h for help."
<<
endl
;
return
1
;
}
}
catch
(
ModbusRTU
::
mbException
&
ex
)
{
if
(
ex
.
err
!=
ModbusRTU
::
erTimeOut
)
throw
ex
;
cout
<<
"timeout..."
<<
endl
;
}
if
(
ncycles
>
0
)
{
nc
--
;
if
(
nc
<=
0
)
break
;
}
msleep
(
500
);
}
}
catch
(
ModbusRTU
::
mbException
&
ex
)
{
cerr
<<
"(mtr-read): "
<<
ex
<<
endl
;
}
catch
(
SystemError
&
err
)
{
cerr
<<
"(mtr-read): "
<<
err
<<
endl
;
}
catch
(
Exception
&
ex
)
{
cerr
<<
"(mtr-read): "
<<
ex
<<
endl
;
}
catch
(...)
{
cerr
<<
"(mtr-read): catch(...)"
<<
endl
;
}
return
0
;
}
// --------------------------------------------------------------------------
char
*
checkArg
(
int
i
,
int
argc
,
char
*
argv
[]
)
{
if
(
i
<
argc
&&
(
argv
[
i
])[
0
]
!=
'-'
)
return
argv
[
i
];
return
0
;
}
// --------------------------------------------------------------------------
void
readMTR
(
ModbusRTUMaster
*
mb
,
ModbusRTU
::
ModbusAddr
addr
,
ModbusRTU
::
ModbusData
reg
,
MTR
::
MTRType
mtrType
,
Command
cmd
)
{
int
count
=
MTR
::
wsize
(
mtrType
);
ModbusRTU
::
ModbusData
dat
[
ModbusRTU
::
MAXLENPACKET
/
sizeof
(
ModbusRTU
::
ModbusData
)];
memset
(
dat
,
0
,
sizeof
(
dat
));
if
(
cmd
==
cmdRead03
)
{
ModbusRTU
::
ReadOutputRetMessage
ret
=
mb
->
read03
(
addr
,
reg
,
count
);
memcpy
(
dat
,
ret
.
data
,
ret
.
count
);
}
else
if
(
cmd
==
cmdRead04
)
{
ModbusRTU
::
ReadInputRetMessage
ret
=
mb
->
read04
(
addr
,
reg
,
count
);
memcpy
(
dat
,
ret
.
data
,
ret
.
count
);
}
else
{
cerr
<<
"Unknown command..."
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT1
)
{
MTR
::
T1
t
(
dat
[
0
]);
cout
<<
"(T1): v1="
<<
dat
[
0
]
<<
" --> (unsigned) "
<<
t
.
val
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT2
)
{
MTR
::
T2
t
(
dat
[
0
]);
cout
<<
"(T2): v1="
<<
dat
[
0
]
<<
" --> (signed) "
<<
t
.
val
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT3
)
{
MTR
::
T3
t
(
dat
,
MTR
::
T3
::
wsize
());
cout
<<
"(T3): v1="
<<
t
.
raw
.
v
[
0
]
<<
" v2="
<<
t
.
raw
.
v
[
1
]
<<
" --> "
<<
(
long
)
t
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT4
)
{
MTR
::
T4
t
(
dat
[
0
]);
cout
<<
"(T4): v1="
<<
t
.
raw
<<
" --> "
<<
t
.
sval
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT5
)
{
MTR
::
T5
t
(
dat
,
MTR
::
T5
::
wsize
());
cout
<<
"(T5): v1="
<<
t
.
raw
.
v
[
0
]
<<
" v2="
<<
t
.
raw
.
v
[
1
]
<<
" --> "
<<
t
.
raw
.
u2
.
val
<<
" * 10^"
<<
(
int
)
t
.
raw
.
u2
.
exp
<<
" ===> "
<<
t
.
val
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT6
)
{
MTR
::
T6
t
(
dat
,
MTR
::
T6
::
wsize
());
cout
<<
"(T6): v1="
<<
t
.
raw
.
v
[
0
]
<<
" v2="
<<
t
.
raw
.
v
[
1
]
<<
" --> "
<<
t
.
raw
.
u2
.
val
<<
" * 10^"
<<
(
int
)
t
.
raw
.
u2
.
exp
<<
" ===> "
<<
t
.
val
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT7
)
{
MTR
::
T7
t
(
dat
,
MTR
::
T7
::
wsize
());
cout
<<
"(T7): v1="
<<
t
.
raw
.
v
[
0
]
<<
" v2="
<<
t
.
raw
.
v
[
1
]
<<
" ===> "
<<
t
.
val
<<
" ["
<<
(
t
.
raw
.
u2
.
ic
==
0xFF
?
"CAP"
:
"IND"
)
<<
"|"
<<
(
t
.
raw
.
u2
.
ie
==
0xFF
?
"EXP"
:
"IMP"
)
<<
"]"
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT16
)
{
MTR
::
T16
t
(
dat
[
0
]);
cout
<<
"(T16): v1="
<<
t
.
val
<<
" float="
<<
t
.
fval
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT17
)
{
MTR
::
T17
t
(
dat
[
0
]);
cout
<<
"(T17): v1="
<<
t
.
val
<<
" float="
<<
t
.
fval
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtF1
)
{
MTR
::
F1
f
(
dat
,
MTR
::
F1
::
wsize
());
cout
<<
"(F1): v1="
<<
f
.
raw
.
v
[
0
]
<<
" v2="
<<
f
.
raw
.
v
[
1
]
<<
" ===> "
<<
f
.
raw
.
val
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT8
)
{
MTR
::
T8
t
(
dat
[
0
],
dat
[
1
]);
cout
<<
"(T8): v1="
<<
t
.
raw
.
v
[
0
]
<<
" v2="
<<
t
.
raw
.
v
[
1
]
<<
" ===> "
<<
setfill
(
'0'
)
<<
hex
<<
setw
(
2
)
<<
t
.
hour
()
<<
":"
<<
setw
(
2
)
<<
t
.
min
()
<<
" "
<<
setw
(
2
)
<<
t
.
day
()
<<
"/"
<<
setw
(
2
)
<<
t
.
mon
()
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT9
)
{
MTR
::
T9
t
(
dat
[
0
],
dat
[
1
]);
cout
<<
"(T9): v1="
<<
t
.
raw
.
v
[
0
]
<<
" v2="
<<
t
.
raw
.
v
[
1
]
<<
" ===> "
<<
setfill
(
'0'
)
<<
hex
<<
setw
(
2
)
<<
t
.
hour
()
<<
":"
<<
setw
(
2
)
<<
t
.
min
()
<<
":"
<<
setw
(
2
)
<<
t
.
sec
()
<<
"."
<<
setw
(
2
)
<<
t
.
ssec
()
<<
endl
;
return
;
}
if
(
mtrType
==
MTR
::
mtT10
)
{
MTR
::
T10
t
(
dat
[
0
],
dat
[
1
]);
cout
<<
"(T10): v1="
<<
t
.
raw
.
v
[
0
]
<<
" v2="
<<
t
.
raw
.
v
[
1
]
<<
" ===> "
<<
setfill
(
'0'
)
<<
dec
<<
setw
(
4
)
<<
t
.
year
()
<<
"/"
<<
setw
(
2
)
<<
t
.
mon
()
<<
"/"
<<
setw
(
2
)
<<
t
.
day
()
<<
endl
;
return
;
}
cerr
<<
"Unsupported mtrtype='"
<<
MTR
::
type2str
(
mtrType
)
<<
"'"
<<
endl
;
}
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