updating versioning to only have date

This commit is contained in:
2018-03-27 11:00:15 +02:00
parent b8bdbf4da6
commit fe2ba8621b
10 changed files with 26 additions and 31 deletions

View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "5340b8ef24e00cbc04e9827adc55e3adc9046a24"
#define GITREPUUID "b8bdbf4da61f95b88893b02ddabc2491b16fa10f"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3745
#define GITDATE 0x20180326
#define GITREV 0x3746
#define GITDATE 0x20180327
#define GITBRANCH "developer"

View File

@ -2246,8 +2246,7 @@ int64_t slsDetector::getId( idMode mode, int imod){
#endif
if (mode==THIS_SOFTWARE_VERSION) {
ret=OK;
retval=GITREV;
retval=(retval<<32) | GITDATE;
retval=GITDATE;
} else if (mode==RECEIVER_VERSION) {
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
if (connectData() == OK){