Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
Navigation
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
Skills
Navigation
Commits
f3cd80fb
Commit
f3cd80fb
authored
2 years ago
by
Fabian Reister
Browse files
Options
Downloads
Patches
Plain Diff
moving hard coded names to events.h (will be used elsewhere as well...)
parent
fe49a3ea
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!22
emitting UserAbortEvent instead of GoalReached on stop()
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/armarx/navigation/core/events.h
+12
-0
12 additions, 0 deletions
source/armarx/navigation/core/events.h
source/armarx/navigation/memory/client/events/Writer.cpp
+10
-8
10 additions, 8 deletions
source/armarx/navigation/memory/client/events/Writer.cpp
with
22 additions
and
8 deletions
source/armarx/navigation/core/events.h
+
12
−
0
View file @
f3cd80fb
...
@@ -10,6 +10,18 @@
...
@@ -10,6 +10,18 @@
namespace
armarx
::
navigation
::
core
namespace
armarx
::
navigation
::
core
{
{
namespace
event_names
{
inline
const
std
::
string
GlobalPlanningFailed
=
"GlobalPlanningFailedEvent"
;
inline
const
std
::
string
MovementStarted
=
"MovementStartedEvent"
;
inline
const
std
::
string
GoalReached
=
"GoalReachedEvent"
;
inline
const
std
::
string
WaypointReached
=
"WaypointReachedEvent"
;
inline
const
std
::
string
SafetyThrottlingTriggered
=
"SafetyThrottlingTriggeredEvent"
;
inline
const
std
::
string
SafetyStopTriggered
=
"SafetyStopTriggeredEvent"
;
inline
const
std
::
string
UserAbortTriggered
=
"UserAbortTriggeredEvent"
;
inline
const
std
::
string
InternalError
=
"InternalErrorEventEvent"
;
}
// namespace event_names
struct
Event
struct
Event
{
{
armarx
::
core
::
time
::
DateTime
timestamp
;
armarx
::
core
::
time
::
DateTime
timestamp
;
...
...
This diff is collapsed.
Click to expand it.
source/armarx/navigation/memory/client/events/Writer.cpp
+
10
−
8
View file @
f3cd80fb
...
@@ -64,55 +64,57 @@ namespace armarx::navigation::memory::client::events
...
@@ -64,55 +64,57 @@ namespace armarx::navigation::memory::client::events
bool
bool
Writer
::
store
(
const
core
::
GoalReachedEvent
&
event
,
const
std
::
string
&
clientID
)
Writer
::
store
(
const
core
::
GoalReachedEvent
&
event
,
const
std
::
string
&
clientID
)
{
{
return
storeImpl
<
core
::
arondto
::
GoalReachedEvent
>
(
event
,
"GoalReachedEvent"
,
clientID
);
return
storeImpl
<
core
::
arondto
::
GoalReachedEvent
>
(
event
,
core
::
event_names
::
GoalReached
,
clientID
);
}
}
bool
bool
Writer
::
store
(
const
core
::
WaypointReachedEvent
&
event
,
const
std
::
string
&
clientID
)
Writer
::
store
(
const
core
::
WaypointReachedEvent
&
event
,
const
std
::
string
&
clientID
)
{
{
return
storeImpl
<
core
::
arondto
::
WaypointReachedEvent
>
(
return
storeImpl
<
core
::
arondto
::
WaypointReachedEvent
>
(
event
,
"
WaypointReached
Event"
,
clientID
);
event
,
core
::
event_names
::
WaypointReached
,
clientID
);
}
}
bool
bool
Writer
::
store
(
const
core
::
InternalErrorEvent
&
event
,
const
std
::
string
&
clientID
)
Writer
::
store
(
const
core
::
InternalErrorEvent
&
event
,
const
std
::
string
&
clientID
)
{
{
return
storeImpl
<
core
::
arondto
::
InternalErrorEvent
>
(
event
,
"InternalErrorEvent"
,
clientID
);
return
storeImpl
<
core
::
arondto
::
InternalErrorEvent
>
(
event
,
core
::
event_names
::
InternalError
,
clientID
);
}
}
bool
bool
Writer
::
store
(
const
core
::
GlobalPlanningFailedEvent
&
event
,
const
std
::
string
&
clientID
)
Writer
::
store
(
const
core
::
GlobalPlanningFailedEvent
&
event
,
const
std
::
string
&
clientID
)
{
{
return
storeImpl
<
core
::
arondto
::
GlobalPlanningFailedEvent
>
(
return
storeImpl
<
core
::
arondto
::
GlobalPlanningFailedEvent
>
(
event
,
"
GlobalPlanningFailed
Event"
,
clientID
);
event
,
core
::
event_names
::
GlobalPlanningFailed
,
clientID
);
}
}
bool
bool
Writer
::
store
(
const
core
::
MovementStartedEvent
&
event
,
const
std
::
string
&
clientID
)
Writer
::
store
(
const
core
::
MovementStartedEvent
&
event
,
const
std
::
string
&
clientID
)
{
{
return
storeImpl
<
core
::
arondto
::
MovementStartedEvent
>
(
return
storeImpl
<
core
::
arondto
::
MovementStartedEvent
>
(
event
,
"
MovementStarted
Event"
,
clientID
);
event
,
core
::
event_names
::
MovementStarted
,
clientID
);
}
}
bool
bool
Writer
::
store
(
const
core
::
UserAbortTriggeredEvent
&
event
,
const
std
::
string
&
clientID
)
Writer
::
store
(
const
core
::
UserAbortTriggeredEvent
&
event
,
const
std
::
string
&
clientID
)
{
{
return
storeImpl
<
core
::
arondto
::
UserAbortTriggeredEvent
>
(
return
storeImpl
<
core
::
arondto
::
UserAbortTriggeredEvent
>
(
event
,
"
UserAbortTriggered
"
,
clientID
);
event
,
core
::
event_names
::
UserAbortTriggered
,
clientID
);
}
}
bool
bool
Writer
::
store
(
const
core
::
SafetyThrottlingTriggeredEvent
&
event
,
const
std
::
string
&
clientID
)
Writer
::
store
(
const
core
::
SafetyThrottlingTriggeredEvent
&
event
,
const
std
::
string
&
clientID
)
{
{
return
storeImpl
<
core
::
arondto
::
SafetyThrottlingTriggeredEvent
>
(
return
storeImpl
<
core
::
arondto
::
SafetyThrottlingTriggeredEvent
>
(
event
,
"
SafetyThrottlingTriggered
Event"
,
clientID
);
event
,
core
::
event_names
::
SafetyThrottlingTriggered
,
clientID
);
}
}
bool
bool
Writer
::
store
(
const
core
::
SafetyStopTriggeredEvent
&
event
,
const
std
::
string
&
clientID
)
Writer
::
store
(
const
core
::
SafetyStopTriggeredEvent
&
event
,
const
std
::
string
&
clientID
)
{
{
return
storeImpl
<
core
::
arondto
::
SafetyStopTriggeredEvent
>
(
return
storeImpl
<
core
::
arondto
::
SafetyStopTriggeredEvent
>
(
event
,
"
SafetyStopTriggered
Event"
,
clientID
);
event
,
core
::
event_names
::
SafetyStopTriggered
,
clientID
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment