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
b00713e8
Commit
b00713e8
authored
Oct 05, 2015
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(ModbusServer): добавил вспомонательную функцию для удобства работы
с одним адресом..
parent
a405f36f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
libuniset2.spec
conf/libuniset2.spec
+4
-1
ModbusTCPServer.h
include/modbus/ModbusTCPServer.h
+2
-0
ModbusTCPServer.cc
src/Communications/Modbus/ModbusTCPServer.cc
+7
-0
No files found.
conf/libuniset2.spec
View file @
b00713e8
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
Name: libuniset2
Name: libuniset2
Version: 2.2
Version: 2.2
Release: alt
5
Release: alt
6
Summary: UniSet - library for building distributed industrial control systems
Summary: UniSet - library for building distributed industrial control systems
...
@@ -456,6 +456,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
...
@@ -456,6 +456,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# ..
# ..
%changelog
%changelog
* Mon Oct 05 2015 Pavel Vainerman <pv@altlinux.ru> 2.2-alt6
- (ModbusServer): add helper function addr2vaddr()
* Fri Oct 02 2015 Pavel Vainerman <pv@altlinux.ru> 2.2-alt5
* Fri Oct 02 2015 Pavel Vainerman <pv@altlinux.ru> 2.2-alt5
- (ModbusSlave): added support for multiple addresses for MBSlave
- (ModbusSlave): added support for multiple addresses for MBSlave
...
...
include/modbus/ModbusTCPServer.h
View file @
b00713e8
...
@@ -23,6 +23,8 @@ class ModbusTCPServer:
...
@@ -23,6 +23,8 @@ class ModbusTCPServer:
ModbusTCPServer
(
ost
::
InetAddress
&
ia
,
int
port
=
502
);
ModbusTCPServer
(
ost
::
InetAddress
&
ia
,
int
port
=
502
);
virtual
~
ModbusTCPServer
();
virtual
~
ModbusTCPServer
();
std
::
unordered_set
<
ModbusRTU
::
ModbusAddr
>
addr2vaddr
(
ModbusRTU
::
ModbusAddr
&
mbaddr
);
/*! Однопоточная обработка (каждый запрос последовательно), с разрывом соединения в конце */
/*! Однопоточная обработка (каждый запрос последовательно), с разрывом соединения в конце */
virtual
ModbusRTU
::
mbErrCode
receive
(
const
std
::
unordered_set
<
ModbusRTU
::
ModbusAddr
>&
vmbaddr
,
timeout_t
msecTimeout
)
override
;
virtual
ModbusRTU
::
mbErrCode
receive
(
const
std
::
unordered_set
<
ModbusRTU
::
ModbusAddr
>&
vmbaddr
,
timeout_t
msecTimeout
)
override
;
...
...
src/Communications/Modbus/ModbusTCPServer.cc
View file @
b00713e8
...
@@ -26,6 +26,13 @@ ModbusTCPServer::~ModbusTCPServer()
...
@@ -26,6 +26,13 @@ ModbusTCPServer::~ModbusTCPServer()
terminate
();
terminate
();
}
}
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
std
::
unordered_set
<
ModbusAddr
>
ModbusTCPServer
::
addr2vaddr
(
ModbusAddr
&
mbaddr
)
{
std
::
unordered_set
<
ModbusRTU
::
ModbusAddr
>
v
;
v
.
emplace
(
mbaddr
);
return
std
::
move
(
v
);
}
// -------------------------------------------------------------------------
void
ModbusTCPServer
::
setMaxSessions
(
unsigned
int
num
)
void
ModbusTCPServer
::
setMaxSessions
(
unsigned
int
num
)
{
{
if
(
num
<
sessCount
)
if
(
num
<
sessCount
)
...
...
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