From 302f31678f13d0e71cbc215c46370b2f3288cf5c Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 11 Oct 2018 14:40:52 +0200 Subject: [PATCH] updated gotthard binary, not run --- .../gotthardDetectorServer/ansi.h | 2 +- .../communication_funcs.c | 2 +- .../communication_funcs.h | 2 +- .../gotthardDetectorServer/gitInfo.txt | 10 +++++----- .../gotthardDetectorServer/gitInfoGotthard.h | 6 +++--- .../gotthardDetectorServer_refactor | Bin 86112 -> 86044 bytes .../sls_detector_defs.h | 2 +- .../sls_detector_funcs.h | 2 +- .../sls_receiver_defs.h | 1 - .../sls_receiver_funcs.h | 1 - .../updateGitVersion.sh | 6 +++--- .../gotthardDetectorServer/versionAPI.h | 2 +- slsSupportLib/include/versionAPI.h | 2 +- 13 files changed, 18 insertions(+), 20 deletions(-) delete mode 120000 slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h delete mode 120000 slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h diff --git a/slsDetectorServers/gotthardDetectorServer/ansi.h b/slsDetectorServers/gotthardDetectorServer/ansi.h index 1f2dbc999..4a82d0575 120000 --- a/slsDetectorServers/gotthardDetectorServer/ansi.h +++ b/slsDetectorServers/gotthardDetectorServer/ansi.h @@ -1 +1 @@ -../../../slsSupportLib/include/ansi.h \ No newline at end of file +../../slsSupportLib/include/ansi.h \ No newline at end of file diff --git a/slsDetectorServers/gotthardDetectorServer/communication_funcs.c b/slsDetectorServers/gotthardDetectorServer/communication_funcs.c index 19b563862..eacf9f393 120000 --- a/slsDetectorServers/gotthardDetectorServer/communication_funcs.c +++ b/slsDetectorServers/gotthardDetectorServer/communication_funcs.c @@ -1 +1 @@ -../../../slsSupportLib/include/communication_funcs.c \ No newline at end of file +../../slsSupportLib/include/communication_funcs.c \ No newline at end of file diff --git a/slsDetectorServers/gotthardDetectorServer/communication_funcs.h b/slsDetectorServers/gotthardDetectorServer/communication_funcs.h index 7f8c3d192..72c567747 120000 --- a/slsDetectorServers/gotthardDetectorServer/communication_funcs.h +++ b/slsDetectorServers/gotthardDetectorServer/communication_funcs.h @@ -1 +1 @@ -../../../slsSupportLib/include/communication_funcs.h \ No newline at end of file +../../slsSupportLib/include/communication_funcs.h \ No newline at end of file diff --git a/slsDetectorServers/gotthardDetectorServer/gitInfo.txt b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt index 1ab0195ee..e2fd82f88 100644 --- a/slsDetectorServers/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ -Path: slsDetectorPackage/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer +Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 923a7e8936cbfe32a8781554de32c66be2f78035 -Revision: 2 +Repsitory UUID: 32924def331e065c3955c593c07ceef2955e89e6 +Revision: 1 Branch: refactor Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4068 -Last Changed Date: 2018-10-09 09:15:04.000000002 +0200 ./firmware_funcs.c +Last Changed Rev: 4104 +Last Changed Date: 2018-10-11 13:46:09.000000002 +0200 ./server_funcs.h diff --git a/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h index 0f82650bd..621db547e 100644 --- a/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "923a7e8936cbfe32a8781554de32c66be2f78035" +#define GITREPUUID "32924def331e065c3955c593c07ceef2955e89e6" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4068 -#define GITDATE 0x20181009 +#define GITREV 0x4104 +#define GITDATE 0x20181011 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor b/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor index 2258a891c2ec21d373c313fed238da49000a809e..fdd03de642eb707d066019b47e1eaa08f0d2fd21 100755 GIT binary patch delta 27661 zcmb`v4P2E~*8jaPJO>YOz@ws|q8{D^5%ox5fT#yVMFc@b#rGqklA~o!FV;96GVjK^ zod&v0)U2>EGqV{KQxTd!IZjzQ4VibhHP&!>HD-+!niV-F&v##k14pCg`TU>f^KtpR z_S$Rjz4lsb@4c>jSOFC|^0n4D+l*lTuRJ)yybkWV%1=jzuZzvpuEkM^RlpK4MZ0h@08&RN zsY-u!g)%JD`Gul6zYzNEbA;7yYpJu8u7BOOzO~v?XiKtHW@>rV=Y5f-U5N67gq|@| zSOaZNt?&yWNe@-uQ$`J2gVdTY?Ap%mEj3vVp%+ZuS%-GWKzicT1Z_iG)jV1AzBY+iJropn&nF&Nq-@?b*VTSXBYbHem1*T+EyvtdO}ijeKSpL{TdD2 zeoJFrq?X!dv3$|nM^Ha>i&G1yJ4i3j6)tg998oSvf0miWg+SrdVyK1mJ9C{{GS|sp zMrwXGKbO!?=d{$f)TJ8ca#927i*hZl#`@s3cBfVh3({w))4L6D|0c)g@N+1xT&b3fJ>(Z>jHqa*!_0~|@GM}4)}l;pjvFeQ60-|DXJxD;2#fp-sdHkTY*?etn-P9Yt}j|$Y{)vwLJifqLckbW#jxSH#Q ztEIkmX(QBBPaIQsM*W?CRqxQR6fN|t%XKX^iX+g`8{_U&)4E5GDg25x^;M>}fcgbr z2|YN+2vVzs_2!}u(tn*ZG0LfJq_h#qLL_OW-=$V{k96;$wCAe?t@V1?JpTWoYTo6B zOh+O8Cl^X?)x1ot2AP_#t}x!N^`zZPXvAC(g_rZ&k6b(!iYGMh z@yNN+=rn?-4Z-a`f{6$wBDkcZ!)D}~4Y@~rMt@N6&4_6)og>vPwfLy!nbL7f1i=JG0)a=ET zN0Hu@lQq|+?$DK*QLnDqzkmPb{kI(G?g(-8L7|pO-r%%VTC9)S1>9+q0vQf5uEw%ous@Zxg+thDtPtOWR)A0Bs)zTQDT!+R>51MUK zhbUp=$QSw`@(|%V!baRFE$e#;q5F$=%`v$U?GoyzJ-1Ev^ycZ=)6P~IZVd?c_F}7y zbXhC`%+Oogra#*j!bolUQ*D8m+~`4lqt{gTWBD?oQqQkzOFRGTHm4TPT;jj(+?E$i zXs-7x56?1aL$iIkG93mmhoGC6q<$V80eG5nW zSG}bSyIQEWfW`~HPS9FtlIf7U+En%V-eUtwQ3TR0>c4tN_Pd)Bq~DSiXn&VHse&@3 z4^v}9XNK;hk9}YJo-wVN>ZZ`--WRC2a6`pu^}WzhLGf3Z<&{g!;*i>-�hPlvf$$ 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

6$a0UQTrfeez)AY-uF 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 e+mra`IE3I}6O;m#KpP+$9!#ad=S@nI>Hh gitInfo.txt - cd ../../../ + cd ../../ ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE cd $WD fi diff --git a/slsDetectorServers/gotthardDetectorServer/versionAPI.h b/slsDetectorServers/gotthardDetectorServer/versionAPI.h index 5336e713b..5e580d8bb 120000 --- a/slsDetectorServers/gotthardDetectorServer/versionAPI.h +++ b/slsDetectorServers/gotthardDetectorServer/versionAPI.h @@ -1 +1 @@ -../../../slsSupportLib/include/versionAPI.h \ No newline at end of file +../../slsSupportLib/include/versionAPI.h \ No newline at end of file diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 7302204dd..080d2def9 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -2,5 +2,5 @@ #define APIRECEIVER 0x180927 #define APIEIGER 0x181008 #define APIJUNGFRAU 0x181008 -#define APIGOTTHARD 0x180928 +#define APIGOTTHARD 0x181009