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
cae1b942
Commit
cae1b942
authored
Oct 24, 2015
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use unsigned instead signed
parent
d50d65ef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
MBExchange.cc
extensions/ModbusMaster/MBExchange.cc
+8
-8
MBExchange.h
extensions/ModbusMaster/MBExchange.h
+1
-1
No files found.
extensions/ModbusMaster/MBExchange.cc
View file @
cae1b942
...
@@ -690,7 +690,7 @@ bool MBExchange::preInitRead( InitList::iterator& p )
...
@@ -690,7 +690,7 @@ bool MBExchange::preInitRead( InitList::iterator& p )
return
true
;
return
true
;
auto
dev
=
p
->
dev
;
auto
dev
=
p
->
dev
;
int
q_count
=
p
->
p
.
rnum
;
unsigned
int
q_count
=
p
->
p
.
rnum
;
if
(
mblog
->
is_level3
()
)
if
(
mblog
->
is_level3
()
)
{
{
...
@@ -730,13 +730,13 @@ bool MBExchange::preInitRead( InitList::iterator& p )
...
@@ -730,13 +730,13 @@ bool MBExchange::preInitRead( InitList::iterator& p )
{
{
ModbusRTU
::
ReadInputStatusRetMessage
ret
=
mb
->
read02
(
dev
->
mbaddr
,
p
->
mbreg
,
q_count
);
ModbusRTU
::
ReadInputStatusRetMessage
ret
=
mb
->
read02
(
dev
->
mbaddr
,
p
->
mbreg
,
q_count
);
ModbusRTU
::
ModbusData
*
dat
=
new
ModbusRTU
::
ModbusData
[
q_count
];
ModbusRTU
::
ModbusData
*
dat
=
new
ModbusRTU
::
ModbusData
[
q_count
];
int
m
=
0
;
unsigned
int
m
=
0
;
for
(
unsigned
int
i
=
0
;
i
<
ret
.
bcnt
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
ret
.
bcnt
;
i
++
)
{
{
ModbusRTU
::
DataBits
b
(
ret
.
data
[
i
]);
ModbusRTU
::
DataBits
b
(
ret
.
data
[
i
]);
for
(
int
k
=
0
;
k
<
ModbusRTU
::
BitsPerByte
&&
m
<
q_count
;
k
++
,
m
++
)
for
(
unsigned
int
k
=
0
;
k
<
ModbusRTU
::
BitsPerByte
&&
m
<
q_count
;
k
++
,
m
++
)
dat
[
m
]
=
b
[
k
];
dat
[
m
]
=
b
[
k
];
}
}
...
@@ -749,13 +749,13 @@ bool MBExchange::preInitRead( InitList::iterator& p )
...
@@ -749,13 +749,13 @@ bool MBExchange::preInitRead( InitList::iterator& p )
{
{
ModbusRTU
::
ReadCoilRetMessage
ret
=
mb
->
read01
(
dev
->
mbaddr
,
p
->
mbreg
,
q_count
);
ModbusRTU
::
ReadCoilRetMessage
ret
=
mb
->
read01
(
dev
->
mbaddr
,
p
->
mbreg
,
q_count
);
ModbusRTU
::
ModbusData
*
dat
=
new
ModbusRTU
::
ModbusData
[
q_count
];
ModbusRTU
::
ModbusData
*
dat
=
new
ModbusRTU
::
ModbusData
[
q_count
];
int
m
=
0
;
unsigned
int
m
=
0
;
for
(
unsigned
int
i
=
0
;
i
<
ret
.
bcnt
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
ret
.
bcnt
;
i
++
)
{
{
ModbusRTU
::
DataBits
b
(
ret
.
data
[
i
]);
ModbusRTU
::
DataBits
b
(
ret
.
data
[
i
]);
for
(
int
k
=
0
;
k
<
ModbusRTU
::
BitsPerByte
&&
m
<
q_count
;
k
++
,
m
++
)
for
(
unsigned
int
k
=
0
;
k
<
ModbusRTU
::
BitsPerByte
&&
m
<
q_count
;
k
++
,
m
++
)
dat
[
m
]
=
b
[
k
];
dat
[
m
]
=
b
[
k
];
}
}
...
@@ -998,9 +998,9 @@ bool MBExchange::pollRTU( std::shared_ptr<RTUDevice>& dev, RegMap::iterator& it
...
@@ -998,9 +998,9 @@ bool MBExchange::pollRTU( std::shared_ptr<RTUDevice>& dev, RegMap::iterator& it
case
ModbusRTU
:
:
fnReadInputStatus
:
case
ModbusRTU
:
:
fnReadInputStatus
:
{
{
ModbusRTU
::
ReadInputStatusRetMessage
ret
=
mb
->
read02
(
dev
->
mbaddr
,
p
->
mbreg
,
p
->
q_count
);
ModbusRTU
::
ReadInputStatusRetMessage
ret
=
mb
->
read02
(
dev
->
mbaddr
,
p
->
mbreg
,
p
->
q_count
);
int
m
=
0
;
unsigned
int
m
=
0
;
for
(
auto
i
=
0
;
i
<
ret
.
bcnt
;
i
++
)
for
(
uint
i
=
0
;
i
<
ret
.
bcnt
;
i
++
)
{
{
ModbusRTU
::
DataBits
b
(
ret
.
data
[
i
]);
ModbusRTU
::
DataBits
b
(
ret
.
data
[
i
]);
...
@@ -1018,7 +1018,7 @@ bool MBExchange::pollRTU( std::shared_ptr<RTUDevice>& dev, RegMap::iterator& it
...
@@ -1018,7 +1018,7 @@ bool MBExchange::pollRTU( std::shared_ptr<RTUDevice>& dev, RegMap::iterator& it
case
ModbusRTU
:
:
fnReadCoilStatus
:
case
ModbusRTU
:
:
fnReadCoilStatus
:
{
{
ModbusRTU
::
ReadCoilRetMessage
ret
=
mb
->
read01
(
dev
->
mbaddr
,
p
->
mbreg
,
p
->
q_count
);
ModbusRTU
::
ReadCoilRetMessage
ret
=
mb
->
read01
(
dev
->
mbaddr
,
p
->
mbreg
,
p
->
q_count
);
int
m
=
0
;
unsigned
int
m
=
0
;
for
(
auto
i
=
0
;
i
<
ret
.
bcnt
;
i
++
)
for
(
auto
i
=
0
;
i
<
ret
.
bcnt
;
i
++
)
{
{
...
...
extensions/ModbusMaster/MBExchange.h
View file @
cae1b942
...
@@ -325,7 +325,7 @@ class MBExchange:
...
@@ -325,7 +325,7 @@ class MBExchange:
bool
mbregFromID
;
bool
mbregFromID
;
int
polltime
;
/*!< переодичность обновления данных, [мсек] */
int
polltime
;
/*!< переодичность обновления данных, [мсек] */
timeout_t
sleepPause_usec
;
timeout_t
sleepPause_usec
;
int
maxQueryCount
;
/*!< максимальное количество регистров для одного запроса */
unsigned
int
maxQueryCount
;
/*!< максимальное количество регистров для одного запроса */
PassiveTimer
ptHeartBeat
;
PassiveTimer
ptHeartBeat
;
UniSetTypes
::
ObjectId
sidHeartBeat
;
UniSetTypes
::
ObjectId
sidHeartBeat
;
...
...
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