From 51a3f3fd4de49cb3038e0aaae15d159b6bc2f9bc Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 20 Aug 2019 08:48:12 +0200 Subject: [PATCH] changed logger.h to clogger.h for c files --- .../bin/ctbDetectorServer_developer | Bin 155792 -> 155792 bytes .../slsDetectorFunctionList.c | 2 +- slsDetectorServers/eigerDetectorServer/Beb.c | 2 +- .../eigerDetectorServer/CMakeLists.txt | 11 ++++++++--- .../eigerDetectorServer/FebControl.c | 2 +- .../eigerDetectorServer/FebInterface.c | 2 +- .../eigerDetectorServer/LocalLinkInterface.c | 2 +- .../bin/eigerDetectorServer_developer | Bin 302608 -> 302608 bytes .../slsDetectorFunctionList.c | 2 +- .../bin/gotthardDetectorServer_developer | Bin 117276 -> 117276 bytes .../slsDetectorFunctionList.c | 2 +- .../jungfrauDetectorServer/CMakeLists.txt | 11 ++++++++--- .../bin/jungfrauDetectorServer_developer | Bin 124224 -> 124224 bytes .../slsDetectorFunctionList.c | 2 +- .../slsDetectorFunctionList.c | 2 +- .../UDPPacketHeaderGenerator.h | 2 +- .../slsDetectorServer/{logger.h => clogger.h} | 0 .../slsDetectorServer/communication_funcs.c | 2 +- .../communication_funcs_UDP.h | 2 +- .../slsDetectorFunctionList.h | 2 +- .../slsDetectorServer/slsDetectorServer.c | 2 +- .../slsDetectorServer_funcs.c | 2 +- .../slsDetectorServer_funcs.h | 2 +- slsSupportLib/include/versionAPI.h | 10 +++++----- 24 files changed, 37 insertions(+), 27 deletions(-) rename slsDetectorServers/slsDetectorServer/{logger.h => clogger.h} (100%) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 449ef09f5e44ca766de80a1081cfeb434fbc819a..61e1d440bb9904cb7e5ce82dda2630362bfaa4f9 100755 GIT binary patch delta 925 zcmXYvT}TvB9L4{48%@n@Otzib%AGaPG&ReJjReP#3KQBgBdUijtS1FSdnlolA|euY zyVBP7p+bZ&k&?^odd;r~k?O&~poap7D_s%OH{;Ic0lQ3aO&gu9?|b`3H%>|KzWIqjx zAtyIYgUF4?@MYP2Vq#B9KI6ajO{|Ukyn16hO^C^)iZk4$3HWZs3JlW@qXm*@XjZ&- zT5ixRR?O>v?o>&Y9Iv+r^h zk;hcXQw#0~Z-Qa)KG+A&fp5VDa8V&`1CeHc0k8^e23x@%@D4Zvjwz(46X{tX`gQc{ z@agdB@agdBpTVyR<$JSEGh|=ignU- H?J)iT>L*2~ delta 986 zcmXw%T}TvB9L4{48*7!#2F-S6O`SE+{HiUBzDP#t3p3fuA|z;|MS761>>(;jE24;E zw~3V1Qi4K)pv-M|9TN?rARiR0hw8!GH3JLUAju%w&Q1k;_IKyrbIzSRGlAjM0DeVt z>Sr?BTE8;o(I(lsqfnXcmRIIC%E3ymbuoyD7RfsIBL#_0rkjjGSmIKjN;PRn(RdEvTgY*Y%%8sXY2dt!D^sz2J@YR^=3-h%`rYMIYG7$e+6GxH(Q zXatoKR%bj_^3H0k$vkSUZDvhatLXT7Xx-F!BHhiSI{%IaNX%y~W~;U5O4b5bNe6cF zd(0KF=9txTnMSdCE|jTN^Gg|NkQ_{ilQU#ejON=F z{EK%i-cPZFxNBT-xepKgh)3PL>9^g!7_Y4djgTm#36op0UjBu;kdd;nueWKi7vX5GgciX-I-k#8*?{MyO!gmGr^qQ|A#1tC^!><$;@sv3zL zoNCNmh|w}@v;b%N`{5bw;oS4la3mUL@w}9VFi}I~!E2Vj^=t)^vq~c87O)z;23`km zgLl9;;9GDCoR&z*B~tRi^ diff --git a/slsDetectorServers/eigerDetectorServer/FebInterface.c b/slsDetectorServers/eigerDetectorServer/FebInterface.c index 9c7d33051..d4fa1815c 100755 --- a/slsDetectorServers/eigerDetectorServer/FebInterface.c +++ b/slsDetectorServers/eigerDetectorServer/FebInterface.c @@ -1,7 +1,7 @@ #include "FebInterface.h" #include "LocalLinkInterface.h" #include "xparameters.h" -#include "logger.h" +#include "clogger.h" #include diff --git a/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c index 3e47cd61a..0e3cc52bc 100755 --- a/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c +++ b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c @@ -1,6 +1,6 @@ #include "LocalLinkInterface.h" #include "HardwareMMappingDefs.h" -#include "logger.h" +#include "clogger.h" #include #include diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index 802dbd8416febb8ebdd55306101e2fde8c1c7377..2caab4127a7ee9f93566a1dd9ce43c7be99d6ce6 100755 GIT binary patch delta 35 qcmbQRM`*$xp$&`885K4!F^^xzsL;&vtexcufXL-iVvjYGF7!BS4 delta 35 qcmbQRM`*$xp$&`886`I_F^^xzDA~;NtexcufXL-iVvjYGD>kZHV diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 2cbc68982..eedc0b4d6 100755 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -1,6 +1,6 @@ #include "slsDetectorFunctionList.h" #include "versionAPI.h" -#include "logger.h" +#include "clogger.h" #include "common.h" #ifndef VIRTUAL diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 70f74637b99338a237926b9234524a179560ffcc..a6acd6dcf9cffd338eb7c14bd6c1335396420c70 100755 GIT binary patch delta 28014 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 Pt5DRUV_UvdmOK0(R1`HY diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index c8b277102..9c2bbebb7 100755 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -1,6 +1,6 @@ #include "slsDetectorFunctionList.h" #include "versionAPI.h" -#include "logger.h" +#include "clogger.h" #include "RegisterDefs.h" #ifndef VIRTUAL diff --git a/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt b/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt index 50574aa34..a7461a986 100644 --- a/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt +++ b/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt @@ -1,8 +1,13 @@ add_executable(jungfrauDetectorServer slsDetectorFunctionList.c - slsDetectorServer.c - slsDetectorServer_funcs.c - communication_funcs.c + ../slsDetectorServer/slsDetectorServer.c + ../slsDetectorServer/slsDetectorServer_funcs.c + ../slsDetectorServer/communication_funcs.c +) + +include_directories( + ../slsDetectorServer/ + ../../slsSupportLib/include ) target_include_directories(jungfrauDetectorServer diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 3f3b9d796195149cdf21cc8899f0756a5506178a..085e1a7aa7cd945dc0c72c9edc5e7d70b2bf910d 100755 GIT binary patch delta 921 zcmXAnTSyd99LE2L)=OqFwro4ImCjmZTAJF+7E-ezAsV=97pRx*Zcv~ofoZxc^b!Uu zC$y`q5m8UA80@acYAp#d=mI|UAhE-dlCBnXp^)v{>EWB-nRCAH`_F+%OlKvgvqHs7 z4h^0htOzl6q*`&-ZBT!QmCC}?O25}kHZX{!w}*0F3i%ZgFuhY7>lI;`pBf1Anz@Y( zS{Wxf#dP70Z}gM=%yhh;<-<+~JHw;S0{1dBtWpefeIunMZ!$x8E$y74e;FQR!2-_ABM_?DD0@V&P!6T{X;RBp_MO{Niw&@D1(E zkHjM9>L#|xAFBma1& zytY~{(kqKYJJH3n-@EfY@AH1|;l!rWV^itv zMJcuM>5kHNruH3B>_-dLUm>Neph*ck>n{c!2~+u3>&2FlUxAKU_S3 zN%d}C8cois$}JYh6CJgcZsscx^+fVht4G}J$$*p~*$%78tVv`+@+-CTpqXW3?G}VR zFivZwY{m#`JNFEp{~txN>!#vNHY&#`DH)VJKFakp0GQZ4o@V)+nR1(Eahe&(a(aZbHv>|F33>Ggaf;F! ztBPOwfyIX@nvhS8I}TUF$j|tYOEmwnTJsdVUL-=Ygci6k=he_cvd8ZcVJsg`E-&-0 z=;9)rkj%KLi&oT-%%nK~X5M2r#nBb>ldl{vzWmF4!nl!_Gq63k_!cWRPKAo{H7Cgp z*lLciN43MO)?ufAAD+=2${!dB^?pok3=uU(&R%CrWo`S3?3EU>9|Aq#J@7vG80-Px zf$zaZaLGbyK9O1g?gjUQ=fDf#L$C`R0b>@@tVEg(M81Z64L%J%4L%J%Ee?LSP`+a= zkt5SWj#khQJ_DbF{or6E9%j3;vWGEz6yd)RzJlh@XkP3npI|MilPISn;R$vvEwvLZ u-4XX&R+myTis$2q*^Xy!5TBc)!9rf#+lza94}(V#xeAeKk=P9L=lli4WM6my diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 3af6300e4..4c2fb1fbb 100755 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -1,6 +1,6 @@ #include "slsDetectorFunctionList.h" #include "versionAPI.h" -#include "logger.h" +#include "clogger.h" #include #include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h #include "LTC2620.h" // dacs diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index b86eed9c0..9dcca2085 100755 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -1,6 +1,6 @@ #include "slsDetectorFunctionList.h" #include "versionAPI.h" -#include "logger.h" +#include "clogger.h" #include "communication_funcs_UDP.h" #include "UDPPacketHeaderGenerator.h" diff --git a/slsDetectorServers/slsDetectorServer/UDPPacketHeaderGenerator.h b/slsDetectorServers/slsDetectorServer/UDPPacketHeaderGenerator.h index 9350d4bd6..7e9c47263 100755 --- a/slsDetectorServers/slsDetectorServer/UDPPacketHeaderGenerator.h +++ b/slsDetectorServers/slsDetectorServer/UDPPacketHeaderGenerator.h @@ -1,6 +1,6 @@ #pragma once -#include "logger.h" +#include "clogger.h" #include "sls_detector_defs.h" diff --git a/slsDetectorServers/slsDetectorServer/logger.h b/slsDetectorServers/slsDetectorServer/clogger.h similarity index 100% rename from slsDetectorServers/slsDetectorServer/logger.h rename to slsDetectorServers/slsDetectorServer/clogger.h diff --git a/slsDetectorServers/slsDetectorServer/communication_funcs.c b/slsDetectorServers/slsDetectorServer/communication_funcs.c index 3c4bae02e..756530280 100755 --- a/slsDetectorServers/slsDetectorServer/communication_funcs.c +++ b/slsDetectorServers/slsDetectorServer/communication_funcs.c @@ -1,5 +1,5 @@ #include "communication_funcs.h" -#include "logger.h" +#include "clogger.h" #include #include diff --git a/slsDetectorServers/slsDetectorServer/communication_funcs_UDP.h b/slsDetectorServers/slsDetectorServer/communication_funcs_UDP.h index 622e92694..0182ae46e 100755 --- a/slsDetectorServers/slsDetectorServer/communication_funcs_UDP.h +++ b/slsDetectorServers/slsDetectorServer/communication_funcs_UDP.h @@ -1,6 +1,6 @@ #pragma once -#include "logger.h" +#include "clogger.h" #include "sls_detector_defs.h" diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h index 381ea21cb..03734d2e5 100755 --- a/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h +++ b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h @@ -1,7 +1,7 @@ #include "sls_detector_defs.h" #include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h #ifdef GOTTHARDD -#include "logger.h" // runState(enum TLogLevel) +#include "clogger.h" // runState(enum TLogLevel) #endif #include #include // FILE diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c index 46ede3893..64c64a4b6 100755 --- a/slsDetectorServers/slsDetectorServer/slsDetectorServer.c +++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c @@ -2,7 +2,7 @@ The port number is passed as an argument */ #include "sls_detector_defs.h" -#include "logger.h" +#include "clogger.h" #include "communication_funcs.h" #include "slsDetectorServer_funcs.h" #include "slsDetectorServer_defs.h" diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c index 79e946b11..5e23140ce 100755 --- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c @@ -1,7 +1,7 @@ #include "slsDetectorServer_funcs.h" #include "slsDetectorFunctionList.h" #include "communication_funcs.h" -#include "logger.h" +#include "clogger.h" #include #include diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h index 181d1bd21..90f5836f2 100755 --- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h +++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h @@ -1,6 +1,6 @@ #pragma once #include "sls_detector_defs.h" -#include "logger.h" +#include "clogger.h" enum numberMode {DEC, HEX}; #define GOODBYE (-200) diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index c1c9c91c8..38452d4d8 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -3,8 +3,8 @@ #define APILIB 0x190723 #define APIRECEIVER 0x190722 #define APIGUI 0x190723 -#define APIJUNGFRAU 0x190819 -#define APIGOTTHARD 0x190819 -#define APICTB 0x190819 -#define APIMOENCH 0x190819 -#define APIEIGER 0x190819 +#define APICTB 0x190820 +#define APIGOTTHARD 0x190820 +#define APIJUNGFRAU 0x190820 +#define APIMOENCH 0x190820 +#define APIEIGER 0x190820