Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
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
RobotAPI
Commits
9ef9796e
Commit
9ef9796e
authored
2 years ago
by
Fabian Tërnava
Browse files
Options
Downloads
Plain Diff
Merge branch 'armem/ltm/pse' of
https://gitlab.com/ArmarX/RobotAPI
into armem/ltm/dev
parents
1b0f53ab
b69f853a
Branches
armem/fix/no-locks-memory-viewer
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!286
skill provider usability updates
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/interface/armem/server/RecordingMemoryInterface.ice
+2
-1
2 additions, 1 deletion
...otAPI/interface/armem/server/RecordingMemoryInterface.ice
source/RobotAPI/libraries/armem/client/Reader.cpp
+1
-0
1 addition, 0 deletions
source/RobotAPI/libraries/armem/client/Reader.cpp
with
3 additions
and
1 deletion
source/RobotAPI/interface/armem/server/RecordingMemoryInterface.ice
+
2
−
1
View file @
9ef9796e
...
...
@@ -65,7 +65,8 @@ module armarx
struct
StartRecordInput
{
armarx
::
core
::
time
::
dto
::
DateTime
executionTime
;
string
recordingID
;
//recordingID is formatted: timestamp_recordingName
string
recordingID
;
armarx
::
core
::
time
::
dto
::
DateTime
startTime
;
Configuration
configuration
;
};
}
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/armem/client/Reader.cpp
+
1
−
0
View file @
9ef9796e
...
...
@@ -429,6 +429,7 @@ namespace armarx::armem::client
{
server
::
dto
::
StartRecordInput
i
;
i
.
executionTime
=
armarx
::
core
::
time
::
dto
::
DateTime
();
i
.
startTime
=
armarx
::
core
::
time
::
dto
::
DateTime
();
i
.
recordingID
=
""
;
i
.
configuration
.
clear
();
...
...
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