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
94c9da47
Commit
94c9da47
authored
Jun 28, 2017
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(MBExchange): minor fixes
parent
5bfe3264
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
MBExchange.cc
extensions/ModbusMaster/MBExchange.cc
+1
-1
MBExchange.h
extensions/ModbusMaster/MBExchange.h
+3
-3
No files found.
extensions/ModbusMaster/MBExchange.cc
View file @
94c9da47
...
@@ -2390,7 +2390,7 @@ namespace uniset
...
@@ -2390,7 +2390,7 @@ namespace uniset
/*! приоритет опроса:
/*! приоритет опроса:
* 1...n - задаёт "часоту" опроса. Т.е. каждые 1...n циклов
* 1...n - задаёт "часоту" опроса. Т.е. каждые 1...n циклов
*/
*/
unsigned
in
t
pollfactor
=
IOBase
::
initIntProp
(
it
,
"pollfactor"
,
prop_prefix
,
false
,
0
);
size_
t
pollfactor
=
IOBase
::
initIntProp
(
it
,
"pollfactor"
,
prop_prefix
,
false
,
0
);
std
::
shared_ptr
<
RegMap
>
rmap
;
std
::
shared_ptr
<
RegMap
>
rmap
;
...
...
extensions/ModbusMaster/MBExchange.h
View file @
94c9da47
...
@@ -95,10 +95,10 @@ namespace uniset
...
@@ -95,10 +95,10 @@ namespace uniset
public
IOBase
public
IOBase
{
{
// only for RTU
// only for RTU
int
16_t
nbit
;
/*!< bit number (-1 - not used) */
int
8_t
nbit
;
/*!< bit number (-1 - not used) */
VTypes
::
VType
vType
;
/*!< type of value */
VTypes
::
VType
vType
;
/*!< type of value */
uint16_t
rnum
;
/*!< count of registers */
uint16_t
rnum
;
/*!< count of registers */
uint
16
_t
nbyte
;
/*!< byte number (1-2) */
uint
8
_t
nbyte
;
/*!< byte number (1-2) */
RSProperty
()
:
RSProperty
()
:
nbit
(
-
1
),
vType
(
VTypes
::
vtUnknown
),
nbit
(
-
1
),
vType
(
VTypes
::
vtUnknown
),
...
@@ -194,7 +194,7 @@ namespace uniset
...
@@ -194,7 +194,7 @@ namespace uniset
}
}
ModbusRTU
::
ModbusAddr
mbaddr
;
/*!< адрес устройства */
ModbusRTU
::
ModbusAddr
mbaddr
;
/*!< адрес устройства */
std
::
unordered_map
<
unsigned
in
t
,
std
::
shared_ptr
<
RegMap
>>
pollmap
;
std
::
unordered_map
<
size_
t
,
std
::
shared_ptr
<
RegMap
>>
pollmap
;
DeviceType
dtype
;
/*!< тип устройства */
DeviceType
dtype
;
/*!< тип устройства */
...
...
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