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
f612b836
You need to sign in or sign up before continuing.
Commit
f612b836
authored
May 28, 2009
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug: don`t send DO,AO values
parent
c58f3217
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
RTUExchange.cc
extentions/RTUExchange/RTUExchange.cc
+8
-8
No files found.
extentions/RTUExchange/RTUExchange.cc
View file @
f612b836
...
@@ -61,6 +61,8 @@ activated(false)
...
@@ -61,6 +61,8 @@ activated(false)
if
(
!
speed
.
empty
()
)
if
(
!
speed
.
empty
()
)
mb
->
setSpeed
(
speed
);
mb
->
setSpeed
(
speed
);
mb
->
setLog
(
dlog
);
if
(
recv_timeout
>
0
)
if
(
recv_timeout
>
0
)
mb
->
setTimeout
(
recv_timeout
);
mb
->
setTimeout
(
recv_timeout
);
...
@@ -431,9 +433,7 @@ void RTUExchange::poll()
...
@@ -431,9 +433,7 @@ void RTUExchange::poll()
switch
(
it
->
mbfunc
)
switch
(
it
->
mbfunc
)
{
{
case
fnWriteOutputSingleRegister
:
case
fnWriteOutputSingleRegister
:
{
WriteSingleOutputRetMessage
ret
=
mb
->
write06
(
it
->
mbaddr
,
it
->
mbreg
,
d
);
WriteSingleOutputRetMessage
ret
=
mb
->
write06
(
it
->
mbaddr
,
it
->
mbreg
,
d
);
}
break
;
break
;
case
fnWriteOutputRegisters
:
case
fnWriteOutputRegisters
:
...
@@ -801,8 +801,8 @@ void RTUExchange::askSensors( UniversalIO::UIOCommand cmd )
...
@@ -801,8 +801,8 @@ void RTUExchange::askSensors( UniversalIO::UIOCommand cmd )
if
(
it
->
stype
!=
UniversalIO
::
DigitalOutput
&&
it
->
stype
!=
UniversalIO
::
AnalogOutput
)
if
(
it
->
stype
!=
UniversalIO
::
DigitalOutput
&&
it
->
stype
!=
UniversalIO
::
AnalogOutput
)
continue
;
continue
;
if
(
it
->
safety
==
NoSafetyState
)
//
if( it->safety == NoSafetyState )
continue
;
//
continue;
try
try
{
{
...
@@ -826,12 +826,12 @@ void RTUExchange::sensorInfo( UniSetTypes::SensorMessage* sm )
...
@@ -826,12 +826,12 @@ void RTUExchange::sensorInfo( UniSetTypes::SensorMessage* sm )
if
(
it
->
si
.
id
==
sm
->
id
)
if
(
it
->
si
.
id
==
sm
->
id
)
{
{
if
(
it
->
stype
==
UniversalIO
::
DigitalOutput
)
if
(
it
->
stype
==
UniversalIO
::
DigitalOutput
)
// || it->stype == UniversalIO::DigitalInput )
{
{
uniset_spin_lock
lock
(
it
->
val_lock
);
uniset_spin_lock
lock
(
it
->
val_lock
);
it
->
value
=
sm
->
state
?
1
:
0
;
it
->
value
=
sm
->
state
?
1
:
0
;
}
}
else
if
(
it
->
stype
==
UniversalIO
::
AnalogOutput
)
else
if
(
it
->
stype
==
UniversalIO
::
AnalogOutput
)
// || it->stype == UniversalIO::AnalogInput )
{
{
uniset_spin_lock
lock
(
it
->
val_lock
);
uniset_spin_lock
lock
(
it
->
val_lock
);
it
->
value
=
sm
->
value
;
it
->
value
=
sm
->
value
;
...
@@ -867,8 +867,8 @@ void RTUExchange::sigterm( int signo )
...
@@ -867,8 +867,8 @@ void RTUExchange::sigterm( int signo )
RSMap
::
iterator
it
=
rsmap
.
begin
();
RSMap
::
iterator
it
=
rsmap
.
begin
();
for
(
;
it
!=
rsmap
.
end
();
++
it
)
for
(
;
it
!=
rsmap
.
end
();
++
it
)
{
{
if
(
it
->
stype
!=
UniversalIO
::
DigitalOutput
&&
it
->
stype
!=
UniversalIO
::
AnalogOutput
)
//
if( it->stype!=UniversalIO::DigitalOutput && it->stype!=UniversalIO::AnalogOutput )
continue
;
//
continue;
if
(
it
->
safety
==
NoSafetyState
)
if
(
it
->
safety
==
NoSafetyState
)
continue
;
continue
;
...
...
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