-
- Downloads
Merge remote-tracking branch 'origin/armem/subscribe' into armem/client-query
# Conflicts: # source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp # source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h # source/RobotAPI/libraries/armem/client/Reader.cpp # source/RobotAPI/libraries/armem/test/CMakeLists.txt
Showing
- scenarios/ArMemExample/config/ArMemExampleClient.cfg 8 additions, 0 deletionsscenarios/ArMemExample/config/ArMemExampleClient.cfg
- scenarios/ArMemExample/config/ArMemExampleMemory.cfg 8 additions, 0 deletionsscenarios/ArMemExample/config/ArMemExampleMemory.cfg
- source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp 19 additions, 6 deletions...omponents/armem/ArMemExampleClient/ArMemExampleClient.cpp
- source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h 13 additions, 12 deletions.../components/armem/ArMemExampleClient/ArMemExampleClient.h
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp 1 addition, 1 deletion...s/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h 2 additions, 2 deletions...ins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
- source/RobotAPI/interface/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/interface/CMakeLists.txt
- source/RobotAPI/interface/armem.ice 1 addition, 0 deletionssource/RobotAPI/interface/armem.ice
- source/RobotAPI/interface/armem/MemoryListenerInterface.ice 18 additions, 0 deletionssource/RobotAPI/interface/armem/MemoryListenerInterface.ice
- source/RobotAPI/interface/armem/memory.ice 2 additions, 0 deletionssource/RobotAPI/interface/armem/memory.ice
- source/RobotAPI/libraries/armem/CMakeLists.txt 10 additions, 6 deletionssource/RobotAPI/libraries/armem/CMakeLists.txt
- source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp 21 additions, 0 deletionssource/RobotAPI/libraries/armem/client/ComponentPlugin.cpp
- source/RobotAPI/libraries/armem/client/ComponentPlugin.h 33 additions, 0 deletionssource/RobotAPI/libraries/armem/client/ComponentPlugin.h
- source/RobotAPI/libraries/armem/client/MemoryClientComponentPlugin.cpp 0 additions, 26 deletions...PI/libraries/armem/client/MemoryClientComponentPlugin.cpp
- source/RobotAPI/libraries/armem/client/MemoryClientComponentPlugin.h 0 additions, 55 deletions...tAPI/libraries/armem/client/MemoryClientComponentPlugin.h
- source/RobotAPI/libraries/armem/client/Reader.cpp 39 additions, 9 deletionssource/RobotAPI/libraries/armem/client/Reader.cpp
- source/RobotAPI/libraries/armem/client/Reader.h 18 additions, 4 deletionssource/RobotAPI/libraries/armem/client/Reader.h
- source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp 43 additions, 0 deletions...RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
- source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h 58 additions, 0 deletions...e/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
- source/RobotAPI/libraries/armem/client/Writer.cpp 7 additions, 7 deletionssource/RobotAPI/libraries/armem/client/Writer.cpp
Loading
Please register or sign in to comment