Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
49c85a78
Commit
49c85a78
authored
Oct 28, 2009
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix in mh SelectListIsUpdated
parent
0d605b2d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
java/exe/jpwr_rt_gdh/src/jpwr_rt_mh.c
java/exe/jpwr_rt_gdh/src/jpwr_rt_mh.c
+1
-1
java/jpwr/rt/src/MhServer.java
java/jpwr/rt/src/MhServer.java
+1
-1
src/lib/rt/src/rt_mh_outunit.c
src/lib/rt/src/rt_mh_outunit.c
+1
-1
No files found.
java/exe/jpwr_rt_gdh/src/jpwr_rt_mh.c
View file @
49c85a78
...
@@ -259,7 +259,6 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitReceive
...
@@ -259,7 +259,6 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitReceive
jint
jsts
;
jint
jsts
;
jobject
return_obj
;
jobject
return_obj
;
pwrtStatus_id
=
(
*
env
)
->
FindClass
(
env
,
"jpwr/rt/PwrtStatus"
);
pwrtStatus_id
=
(
*
env
)
->
FindClass
(
env
,
"jpwr/rt/PwrtStatus"
);
if
(
pwrtStatus_id
==
NULL
)
if
(
pwrtStatus_id
==
NULL
)
{
{
...
@@ -287,6 +286,7 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitReceive
...
@@ -287,6 +286,7 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitReceive
(
*
env
)
->
DeleteLocalRef
(
env
,
pwrtStatus_id
);
(
*
env
)
->
DeleteLocalRef
(
env
,
pwrtStatus_id
);
return
return_obj
;
return
return_obj
;
}
}
...
...
java/jpwr/rt/src/MhServer.java
View file @
49c85a78
...
@@ -151,7 +151,7 @@ public class MhServer
...
@@ -151,7 +151,7 @@ public class MhServer
cdhrMaxAlarms
=
gdh
.
getObjectInfoInt
(
maxAlarmsAttr
);
cdhrMaxAlarms
=
gdh
.
getObjectInfoInt
(
maxAlarmsAttr
);
cdhrMaxEvents
=
gdh
.
getObjectInfoInt
(
maxEventsAttr
);
cdhrMaxEvents
=
gdh
.
getObjectInfoInt
(
maxEventsAttr
);
cdhrMaxCon
=
gdh
.
getObjectInfoInt
(
maxConAttr
);
cdhrMaxCon
=
gdh
.
getObjectInfoInt
(
maxConAttr
);
System
.
out
.
println
(
"MaxNoOfAlarms: "
+
cdhrString
.
str
+
" "
+
cdhrMaxAlarms
.
value
+
" "
+
cdhrMaxAlarms
.
evenSts
());
//
System.out.println( "MaxNoOfAlarms: " + cdhrString.str + " " + cdhrMaxAlarms.value + " " + cdhrMaxAlarms.evenSts());
if
(
cdhrMaxCon
.
evenSts
())
if
(
cdhrMaxCon
.
evenSts
())
{
{
return
cdhrMaxCon
.
getSts
();
return
cdhrMaxCon
.
getSts
();
...
...
src/lib/rt/src/rt_mh_outunit.c
View file @
49c85a78
...
@@ -394,7 +394,7 @@ mh_OutunitReceive ()
...
@@ -394,7 +394,7 @@ mh_OutunitReceive ()
XDR
xdrs
;
XDR
xdrs
;
/* If SelectListIsUpdated is set, the outunit will be updated */
/* If SelectListIsUpdated is set, the outunit will be updated */
if
(
l
.
type
==
mh_eOutunitType_Operator
&&
*
l
.
SelectListIsUpdated
)
if
(
l
.
type
==
mh_eOutunitType_Operator
&&
l
.
SelectListIsUpdated
&&
*
l
.
SelectListIsUpdated
)
{
{
*
l
.
SelectListIsUpdated
=
0
;
*
l
.
SelectListIsUpdated
=
0
;
mh_OutunitUpdate
();
mh_OutunitUpdate
();
...
...
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