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
fff7e4bc
Commit
fff7e4bc
authored
Sep 01, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
..мелкие правки..
parent
4b86c607
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
RTUStorage.cc
extensions/ModbusMaster/RTUStorage.cc
+1
-1
RTUStorage.h
extensions/ModbusMaster/RTUStorage.h
+1
-1
ModbusTCPTypes.cc
src/Communications/Modbus/ModbusTCPTypes.cc
+3
-3
ModbusTypes.cc
src/Communications/Modbus/ModbusTypes.cc
+1
-1
No files found.
extensions/ModbusMaster/RTUStorage.cc
View file @
fff7e4bc
...
...
@@ -33,7 +33,7 @@ RTUStorage::~RTUStorage()
}
// -----------------------------------------------------------------------------
void
RTUStorage
::
poll
(
const
std
::
shared_ptr
<
ModbusRTUMaster
>
mb
)
throw
(
ModbusRTU
::
mbException
)
void
RTUStorage
::
poll
(
const
std
::
shared_ptr
<
ModbusRTUMaster
>
&
mb
)
throw
(
ModbusRTU
::
mbException
)
{
try
{
...
...
extensions/ModbusMaster/RTUStorage.h
View file @
fff7e4bc
...
...
@@ -16,7 +16,7 @@ class RTUStorage
RTUStorage
(
ModbusRTU
::
ModbusAddr
addr
);
~
RTUStorage
();
void
poll
(
const
std
::
shared_ptr
<
ModbusRTUMaster
>
mb
)
void
poll
(
const
std
::
shared_ptr
<
ModbusRTUMaster
>
&
mb
)
throw
(
ModbusRTU
::
mbException
);
inline
ModbusRTU
::
ModbusAddr
getAddress
(){
return
addr
;
}
...
...
src/Communications/Modbus/ModbusTCPTypes.cc
View file @
fff7e4bc
...
...
@@ -369,14 +369,14 @@ const DataBits& DataBits::operator=( const ModbusByte& r )
{
for
(
unsigned
int
i
=
0
;
i
<
b
.
size
();
i
++
)
b
[
i
]
=
r
&
(
1
<<
i
);
return
(
*
this
);
}
// -------------------------------------------------------------------------
std
::
ostream
&
ModbusRTU
::
operator
<<
(
std
::
ostream
&
os
,
DataBits
&
d
)
{
os
<<
"["
;
for
(
unsigned
int
i
=
d
.
b
.
size
()
-
1
;
i
>
=
0
;
i
--
)
for
(
unsigned
int
i
=
d
.
b
.
size
()
-
1
;
i
!
=
0
;
i
--
)
os
<<
d
.
b
[
i
];
os
<<
"]"
;
...
...
@@ -432,7 +432,7 @@ const DataBits16& DataBits16::operator=( const ModbusData& r )
std
::
ostream
&
ModbusRTU
::
operator
<<
(
std
::
ostream
&
os
,
DataBits16
&
d
)
{
os
<<
"["
;
for
(
unsigned
int
i
=
d
.
b
.
size
()
-
1
;
i
>
=
0
;
i
--
)
for
(
unsigned
int
i
=
d
.
b
.
size
()
-
1
;
i
!
=
0
;
i
--
)
os
<<
d
.
b
[
i
];
os
<<
"]"
;
...
...
src/Communications/Modbus/ModbusTypes.cc
View file @
fff7e4bc
...
...
@@ -2257,7 +2257,7 @@ ModbusMessage DiagnosticMessage::transport_msg()
ModbusData
crc
=
checkCRC
(
(
ModbusByte
*
)(
&
mm
),
szModbusHeader
+
sizeof
(
subf
)
+
sizeof
(
ModbusData
)
*
count
);
// копируем CRC (последний элемент). Без переворачивания...
memcpy
(
&
(
mm
.
data
[
ind
]),
&
crc
,
szCRC
);
memcpy
(
&
(
mm
.
data
[
ind
]),
&
crc
,
szCRC
);
ind
+=
szCRC
;
// длина сообщения...
...
...
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