Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-pco
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-pco
Commits
a9c2740c
Commit
a9c2740c
authored
Apr 12, 2019
by
Roberto Arturo Homs-Regojo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[wip] sdkVersion
parent
962c2098
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
8 deletions
+13
-8
setId
setId
+2
-2
src/PcoCamera.cpp
src/PcoCamera.cpp
+11
-6
No files found.
setId
View file @
a9c2740c
...
...
@@ -10,8 +10,8 @@
#======================================================================
FILE
=
"./include/PcoGitVersion.h"
SDK_
L
IN_H
=
"./sdkPco/PcoSdkVersion.h"
SDK_
W
IN_H
=
"./sdkPcoLin/include/PcoSdkVersion.h"
SDK_
W
IN_H
=
"./sdkPco/PcoSdkVersion.h"
SDK_
L
IN_H
=
"./sdkPcoLin/include/PcoSdkVersion.h"
LOG
=
"./doc/VERSION.log"
DT
=
`
date
+
"%Y/%m/%d %H:%M:%S"
`
...
...
src/PcoCamera.cpp
View file @
a9c2740c
...
...
@@ -95,21 +95,26 @@ const char* _timestamp_pcocamera() {return ID_FILE_TIMESTAMP ;}
#ifdef WITH_GIT_VERSION
#include "PcoGitVersion.h"
#ifndef PCO_SDK_VERSION
#define PCO_SDK_VERSION "sdkVersion - not set"
#endif
char
*
_timestamp_gitversion
(
char
*
buffVersion
,
int
len
)
{
__sprintfSExt
(
buffVersion
,
len
,
PCO_GIT_VERSION
"
\n
"
PCO_SDK_VERSION
"
\n
"
PROCLIB_GIT_VERSION
"
\n
"
LIBCONFIG_GIT_VERSION
"
\n
"
LIMA_GIT_VERSION
"
\n
"
TANGO_GIT_VERSION
"
\n
"
SPEC_GIT_VERSION
"
\n
"
);
#ifndef __linux__
PCO_SDK_WIN_VERSION
"
\n
"
#else
PCO_SDK_LIN_VERSION
"
\n
"
#endif
);
return
buffVersion
;
}
#endif
...
...
@@ -312,7 +317,7 @@ stcPcoData::stcPcoData(){
ptr
+=
__sprintfSExt
(
ptr
,
ptrMax
-
ptr
,
" %s
\n
"
,
_getPcoSdkVersion
(
buff
,
BUFFER_LEN
,
(
char
*
)
"sc2_clhs.dll"
));
ptr
+=
__sprintfSExt
(
ptr
,
ptrMax
-
ptr
,
" lima pco dll: %s
\n
"
,
_getDllPath
(
FILE_PCO_DLL
,
buff
,
BUFFER_LEN
));
#else
ptr
+=
__sprintfSExt
(
ptr
,
ptrMax
-
ptr
,
" PCO SDK version: %s
\n
"
,
_getPcoSdkVersion
(
buff
,
BUFFER_LEN
,
(
char
*
)
"sc2_cam.dll"
));
ptr
+=
__sprintfSExt
(
ptr
,
ptrMax
-
ptr
,
" PCO SDK version: %s
\n
"
,
_getPcoSdkVersion
(
buff
,
BUFFER_LEN
,
NULL
));
#endif
...
...
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