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
697825c4
Commit
697825c4
authored
7 years ago
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Xtt, satellite alarm list delete alarm fix
parent
1a0e4470
master
bugfix_backports
slapos-adapt
slapos-adapt-release
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
15 deletions
+33
-15
xtt/lib/xtt/src/xtt_ev.cpp
xtt/lib/xtt/src/xtt_ev.cpp
+23
-2
xtt/lib/xtt/src/xtt_evlist.cpp
xtt/lib/xtt/src/xtt_evlist.cpp
+10
-13
No files found.
xtt/lib/xtt/src/xtt_ev.cpp
View file @
697825c4
...
...
@@ -631,6 +631,15 @@ pwr_tStatus Ev::mh_ack_bc( mh_sAck *MsgP)
pwr_tStatus
Ev
::
mh_return_bc
(
mh_sReturn
*
MsgP
)
{
// Test
static
int
test
=
0
;
if
(
test
==
11
)
{
test
=
0
;
return
1
;
}
test
++
;
// End test
if
(
ev
->
eve_display_return
)
{
// Insert in eve
...
...
@@ -651,6 +660,15 @@ pwr_tStatus Ev::mh_return_bc( mh_sReturn *MsgP)
pwr_tStatus
Ev
::
mh_alarm_bc
(
mh_sMessage
*
MsgP
)
{
// Test
static
int
test
=
0
;
if
(
test
==
9
)
{
test
=
0
;
return
1
;
}
test
++
;
// End test
ev
->
eve
->
event_alarm
(
MsgP
);
for
(
int
i
=
0
;
i
<
ev
->
seve_cnt
;
i
++
)
ev
->
seve
[
i
]
->
mh_alarm
(
MsgP
);
...
...
@@ -839,9 +857,12 @@ pwr_tStatus Ev::mh_alarmstatus_bc( mh_sAlarmStatus *MsgP)
switch
(
item
->
type
)
{
case
evlist_eItemType_Alarm
:
if
(
MsgP
->
Nix
==
item
->
eventid
.
Nix
&&
!
item
->
check
)
{
mh_sEventId
eventid
=
item
->
eventid
;
ev
->
ala
->
event_delete
(
&
item
->
eventid
);
// Note, item is now deleted
for
(
int
k
=
0
;
k
<
ev
->
sala_cnt
;
k
++
)
ev
->
sala
[
k
]
->
event_delete
(
&
item
->
eventid
);
ev
->
sala
[
k
]
->
event_delete
(
&
eventid
);
i
--
;
object_cnt
--
;
modified
=
1
;
...
...
@@ -928,4 +949,4 @@ void Ev::view_shift()
}
}
}
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
xtt/lib/xtt/src/xtt_evlist.cpp
View file @
697825c4
...
...
@@ -1314,21 +1314,18 @@ int EvList::event_delete( mh_sEventId *id)
if
(
type
==
ev_eType_AlarmList
)
{
// Alarmlist
ItemAlarm
*
item
;
brow_tObject
item_tree_node
;
if
(
!
id_to_item
(
id
,
(
void
**
)
&
item
))
return
0
;
item_tree_node
=
item
->
tree_node
;
brow_DeleteNode
(
browbase
->
ctx
,
item
->
node
);
// Note, item is deleted now
if
(
browtree
)
{
if
(
item
_
tree_node
)
brow_DeleteNode
(
browtree
->
ctx
,
item
_
tree_node
);
if
(
item
->
tree_node
)
brow_DeleteNode
(
browtree
->
ctx
,
item
->
tree_node
);
view_configure
();
}
brow_DeleteNode
(
browbase
->
ctx
,
item
->
node
);
size
--
;
}
return
1
;
...
...
@@ -1558,10 +1555,10 @@ int EvList::brow_cb( FlowCtx *ctx, flow_tEvent event)
EvList
*
evlist
;
ItemAlarm
*
item
;
if
(
event
->
event
==
flow_eEvent_ObjectDeleted
)
{
brow_GetUserData
(
event
->
object
.
object
,
(
void
**
)
&
item
);
delete
item
;
if
(
event
->
event
==
flow_eEvent_ObjectDeleted
)
{
ItemEvBase
*
ditem
;
brow_GetUserData
(
event
->
object
.
object
,
(
void
**
)
&
d
item
);
delete
d
item
;
return
1
;
}
...
...
@@ -3290,4 +3287,4 @@ static unsigned int prio_enum_to_mask( unsigned int prio)
return
pwr_mEventPrioMask_D
;
}
return
0
;
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
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