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
316d7772
Commit
316d7772
authored
Oct 16, 2022
by
Pavel Vainerman
Committed by
Pavel Vainerman
Oct 16, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(modbus): make style
parent
08cccaf0
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
15 additions
and
6 deletions
+15
-6
ModbusClient.cc
src/Communications/Modbus/ModbusClient.cc
+0
-0
ModbusHelpers.cc
src/Communications/Modbus/ModbusHelpers.cc
+0
-0
ModbusRTUMaster.cc
src/Communications/Modbus/ModbusRTUMaster.cc
+0
-0
ModbusRTUSlave.cc
src/Communications/Modbus/ModbusRTUSlave.cc
+0
-0
ModbusRTUSlaveSlot.cc
src/Communications/Modbus/ModbusRTUSlaveSlot.cc
+0
-0
ModbusServer.cc
src/Communications/Modbus/ModbusServer.cc
+0
-0
ModbusServerSlot.cc
src/Communications/Modbus/ModbusServerSlot.cc
+0
-0
ModbusTCPCore.cc
src/Communications/Modbus/ModbusTCPCore.cc
+1
-1
ModbusTCPMaster.cc
src/Communications/Modbus/ModbusTCPMaster.cc
+0
-0
ModbusTCPServer.cc
src/Communications/Modbus/ModbusTCPServer.cc
+9
-0
ModbusTCPServerSlot.cc
src/Communications/Modbus/ModbusTCPServerSlot.cc
+0
-0
ModbusTCPSession.cc
src/Communications/Modbus/ModbusTCPSession.cc
+2
-2
ModbusTypes.cc
src/Communications/Modbus/ModbusTypes.cc
+3
-3
No files found.
src/Communications/Modbus/ModbusClient.cc
View file @
316d7772
src/Communications/Modbus/ModbusHelpers.cc
View file @
316d7772
src/Communications/Modbus/ModbusRTUMaster.cc
View file @
316d7772
src/Communications/Modbus/ModbusRTUSlave.cc
View file @
316d7772
src/Communications/Modbus/ModbusRTUSlaveSlot.cc
View file @
316d7772
src/Communications/Modbus/ModbusServer.cc
View file @
316d7772
src/Communications/Modbus/ModbusServerSlot.cc
View file @
316d7772
src/Communications/Modbus/ModbusTCPCore.cc
View file @
316d7772
...
...
@@ -139,7 +139,7 @@ namespace uniset
return
i
;
}
// -------------------------------------------------------------------------
size_t
ModbusTCPCore
::
readDataFD
(
int
fd
,
std
::
queue
<
unsigned
char
>&
qrecv
,
size_t
max
,
size_t
attempts
)
size_t
ModbusTCPCore
::
readDataFD
(
int
fd
,
std
::
queue
<
unsigned
char
>&
qrecv
,
size_t
max
,
size_t
attempts
)
{
bool
commfail
=
false
;
...
...
src/Communications/Modbus/ModbusTCPMaster.cc
View file @
316d7772
src/Communications/Modbus/ModbusTCPServer.cc
View file @
316d7772
...
...
@@ -115,6 +115,7 @@ namespace uniset
try
{
auto
tmpSock
=
make_shared
<
UTCPSocket
>
(
iaddr
,
port
);
if
(
sock
)
sock
.
reset
();
...
...
@@ -148,10 +149,12 @@ namespace uniset
asyncResetSockTimeout
.
start
();
ioTimer
.
set
(
loop
);
if
(
tmTime_msec
!=
UniSetTimer
::
WaitUpTime
)
ioTimer
.
start
(
0
,
tmTime
);
sockTimeout
.
set
(
loop
);
if
(
socketTimeout_msec
>
0
&&
socketTimeout_msec
!=
UniSetTimer
::
WaitUpTime
)
sockTimeout
.
start
(
0
,
tmSockTimeout
);
}
...
...
@@ -263,15 +266,18 @@ namespace uniset
void
ModbusTCPServer
::
setSocketTimeout
(
timeout_t
msec
)
{
socketTimeout_msec
=
msec
;
if
(
msec
==
UniSetTimer
::
WaitUpTime
||
msec
==
0
)
{
socketTimeout_msec
=
0
;
if
(
sockTimeout
.
is_active
()
)
sockTimeout
.
stop
();
}
else
{
tmSockTimeout
=
(
double
)
msec
/
1000.
;
if
(
sockTimeout
.
is_active
()
)
sockTimeout
.
start
(
0
,
tmSockTimeout
);
}
...
...
@@ -417,11 +423,13 @@ namespace uniset
{
if
(
dlog
->
is_crit
()
)
dlog
->
crit
()
<<
myname
<<
"(ModbusTCPServer::onSocketTimeout): invalid event"
<<
endl
;
return
;
}
{
std
::
lock_guard
<
std
::
mutex
>
l
(
sMutex
);
if
(
!
slist
.
empty
())
{
if
(
dlog
->
is_info
()
)
...
...
@@ -438,6 +446,7 @@ namespace uniset
try
{
createSocket
();
if
(
io
.
is_active
()
)
io
.
stop
();
...
...
src/Communications/Modbus/ModbusTCPServerSlot.cc
View file @
316d7772
src/Communications/Modbus/ModbusTCPSession.cc
View file @
316d7772
...
...
@@ -315,7 +315,7 @@ namespace uniset
return
0
;
}
}
catch
(
const
uniset
::
CommFailed
&
ex
)
{}
catch
(
const
uniset
::
CommFailed
&
ex
)
{}
if
(
!
cancelled
&&
dlog
->
is_info
()
)
dlog
->
info
()
<<
peername
<<
"(getNextData): client disconnected"
<<
endl
;
...
...
@@ -384,7 +384,7 @@ namespace uniset
}
while
(
len
==
0
&&
!
pt
.
checkTime
()
);
}
catch
(
const
uniset
::
CommFailed
&
ex
)
{}
catch
(
const
uniset
::
CommFailed
&
ex
)
{}
if
(
len
<
mhead
.
len
)
{
...
...
src/Communications/Modbus/ModbusTypes.cc
View file @
316d7772
...
...
@@ -1617,7 +1617,7 @@ namespace uniset
{
addr
=
a
;
func
=
fnWriteOutputRegisters
;
memset
(
data
,
0
,
sizeof
(
data
));
memset
(
data
,
0
,
sizeof
(
data
));
}
// -------------------------------------------------------------------------
bool
WriteOutputMessage
::
addData
(
ModbusData
d
)
...
...
@@ -1869,7 +1869,7 @@ namespace uniset
return
os
<<
(
*
m
);
}
// -------------------------------------------------------------------------
ForceSingleCoilMessage
::
ForceSingleCoilMessage
(
ModbusAddr
a
,
ModbusData
r
,
bool
cmd
)
:
ForceSingleCoilMessage
::
ForceSingleCoilMessage
(
ModbusAddr
a
,
ModbusData
r
,
bool
cmd
)
:
start
(
r
)
{
addr
=
a
;
...
...
@@ -2040,7 +2040,7 @@ namespace uniset
}
// -------------------------------------------------------------------------
WriteSingleOutputMessage
::
WriteSingleOutputMessage
(
ModbusAddr
a
,
ModbusData
r
,
ModbusData
d
)
:
WriteSingleOutputMessage
::
WriteSingleOutputMessage
(
ModbusAddr
a
,
ModbusData
r
,
ModbusData
d
)
:
start
(
r
),
data
(
d
)
{
...
...
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