Merge branch 'fix/emit-on-user-abort-event-on-stop' into 'master'
emitting UserAbortEvent instead of GoalReached on stop() See merge request ArmarX/skills/navigation!22
Showing
- scenarios/PlatformNavigation/config/navigator.cfg 1 addition, 1 deletionscenarios/PlatformNavigation/config/navigator.cfg
- source/armarx/navigation/client/services/MemorySubscriber.cpp 36 additions, 16 deletions...ce/armarx/navigation/client/services/MemorySubscriber.cpp
- source/armarx/navigation/components/Navigator/Navigator.cpp 9 additions, 9 deletionssource/armarx/navigation/components/Navigator/Navigator.cpp
- source/armarx/navigation/core/aron/Events.xml 27 additions, 0 deletionssource/armarx/navigation/core/aron/Events.xml
- source/armarx/navigation/core/aron_conversions.cpp 74 additions, 0 deletionssource/armarx/navigation/core/aron_conversions.cpp
- source/armarx/navigation/core/aron_conversions.h 32 additions, 1 deletionsource/armarx/navigation/core/aron_conversions.h
- source/armarx/navigation/core/events.h 15 additions, 4 deletionssource/armarx/navigation/core/events.h
- source/armarx/navigation/core/time/ChronoMonotonicTimeServer.cpp 3 additions, 14 deletions...armarx/navigation/core/time/ChronoMonotonicTimeServer.cpp
- source/armarx/navigation/core/time/ChronoMonotonicTimeServer.h 1 addition, 1 deletion...e/armarx/navigation/core/time/ChronoMonotonicTimeServer.h
- source/armarx/navigation/core/time/TimeServerInterface.h 2 additions, 2 deletionssource/armarx/navigation/core/time/TimeServerInterface.h
- source/armarx/navigation/core/types.h 0 additions, 3 deletionssource/armarx/navigation/core/types.h
- source/armarx/navigation/memory/client/events/Writer.cpp 37 additions, 11 deletionssource/armarx/navigation/memory/client/events/Writer.cpp
- source/armarx/navigation/memory/client/events/Writer.h 4 additions, 7 deletionssource/armarx/navigation/memory/client/events/Writer.h
- source/armarx/navigation/memory/client/parameterization/Writer.cpp 3 additions, 8 deletions...marx/navigation/memory/client/parameterization/Writer.cpp
- source/armarx/navigation/memory/client/parameterization/Writer.h 1 addition, 1 deletion...armarx/navigation/memory/client/parameterization/Writer.h
- source/armarx/navigation/server/event_publishing/MemoryPublisher.cpp 5 additions, 5 deletions...rx/navigation/server/event_publishing/MemoryPublisher.cpp
- source/armarx/navigation/server/parameterization/MemoryParameterizationService.cpp 2 additions, 2 deletions...server/parameterization/MemoryParameterizationService.cpp
- source/armarx/navigation/server/parameterization/MemoryParameterizationService.h 2 additions, 2 deletions...n/server/parameterization/MemoryParameterizationService.h
Loading
Please register or sign in to comment