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
28e84edc
Commit
28e84edc
authored
Sep 10, 2013
by
Ilya Polshikov
Committed by
Pavel Vainerman
Jan 31, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed MTR.
parent
cd1a86d1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
MTR.h
extensions/include/MTR.h
+6
-4
MTR.cc
extensions/lib/MTR.cc
+6
-2
No files found.
extensions/include/MTR.h
View file @
28e84edc
...
@@ -664,12 +664,13 @@ namespace MTR
...
@@ -664,12 +664,13 @@ namespace MTR
T_Str16
()
:
sval
(
""
){}
T_Str16
()
:
sval
(
""
){}
T_Str16
(
const
ModbusRTU
::
ReadInputRetMessage
&
ret
)
T_Str16
(
const
ModbusRTU
::
ReadInputRetMessage
&
ret
)
{
{
char
c
[
1
6
];
char
c
[
1
7
];
ModbusRTU
::
ModbusData
data
[
8
];
ModbusRTU
::
ModbusData
data
[
8
];
for
(
int
i
=
0
;
i
<
8
;
i
++
)
for
(
int
i
=
0
;
i
<
8
;
i
++
)
data
[
i
]
=
ModbusRTU
::
SWAPSHORT
(
ret
.
data
[
i
]);
data
[
i
]
=
ModbusRTU
::
SWAPSHORT
(
ret
.
data
[
i
]);
memcpy
(
c
,
&
data
,
sizeof
(
c
));
memcpy
(
c
,
&
data
,
16
);
c
[
16
]
=
'\0'
;
sval
=
std
::
string
(
c
);
sval
=
std
::
string
(
c
);
}
}
...
@@ -693,11 +694,12 @@ namespace MTR
...
@@ -693,11 +694,12 @@ namespace MTR
T_Str8
()
:
sval
(
""
){}
T_Str8
()
:
sval
(
""
){}
T_Str8
(
const
ModbusRTU
::
ReadInputRetMessage
&
ret
)
T_Str8
(
const
ModbusRTU
::
ReadInputRetMessage
&
ret
)
{
{
char
c
[
8
];
char
c
[
9
];
ModbusRTU
::
ModbusData
data
[
4
];
ModbusRTU
::
ModbusData
data
[
4
];
for
(
int
i
=
0
;
i
<
4
;
i
++
)
for
(
int
i
=
0
;
i
<
4
;
i
++
)
data
[
i
]
=
ModbusRTU
::
SWAPSHORT
(
ret
.
data
[
i
]);
data
[
i
]
=
ModbusRTU
::
SWAPSHORT
(
ret
.
data
[
i
]);
memcpy
(
c
,
&
data
,
sizeof
(
c
));
memcpy
(
c
,
&
data
,
8
);
c
[
8
]
=
'\0'
;
sval
=
std
::
string
(
c
);
sval
=
std
::
string
(
c
);
}
}
...
...
extensions/lib/MTR.cc
View file @
28e84edc
...
@@ -412,7 +412,7 @@ bool send_param( ModbusRTUMaster* mb, DataMap& dmap, ModbusRTU::ModbusAddr addr,
...
@@ -412,7 +412,7 @@ bool send_param( ModbusRTUMaster* mb, DataMap& dmap, ModbusRTU::ModbusAddr addr,
catch
(
ModbusRTU
::
mbException
&
ex
)
catch
(
ModbusRTU
::
mbException
&
ex
)
{
{
/* if speed is changed we receive a timeout error */
/* if speed is changed we receive a timeout error */
if
(
reg
==
56
&&
it
->
first
==
ModbusRTU
::
erTimeOut
)
if
(
reg
==
56
&&
ex
.
err
==
ModbusRTU
::
erTimeOut
)
{
{
update_communication_params
(
reg
,
*
it1
,
mb
,
addr
,
verb
);
update_communication_params
(
reg
,
*
it1
,
mb
,
addr
,
verb
);
// ok = true;
// ok = true;
...
@@ -431,7 +431,11 @@ bool send_param( ModbusRTUMaster* mb, DataMap& dmap, ModbusRTU::ModbusAddr addr,
...
@@ -431,7 +431,11 @@ bool send_param( ModbusRTUMaster* mb, DataMap& dmap, ModbusRTU::ModbusAddr addr,
// if( !ok )
// if( !ok )
// return false;
// return false;
}
}
ModbusRTU
::
WriteSingleOutputRetMessage
ret
=
mb
->
write06
(
addr
,
53
,
1
);
if
(
verb
)
cout
<<
"(mtr-setup): save parameters "
<<
endl
;
return
true
;
return
true
;
}
}
// ------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------
...
...
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