From 63f5b52a6effdac9d750a7b6cb7ddcc00cc0240a Mon Sep 17 00:00:00 2001 From: Anna Bergamaschi Date: Wed, 19 Feb 2020 12:26:35 +0100 Subject: [PATCH] jctbDetectorServer compilation flags match only for moench --- slsDetectorSoftware/jctbDetectorServer/Makefile | 2 +- slsDetectorSoftware/jctbDetectorServer/gitInfo.txt | 12 ++++++------ .../jctbDetectorServer/gitInfoMoench.h | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/slsDetectorSoftware/jctbDetectorServer/Makefile b/slsDetectorSoftware/jctbDetectorServer/Makefile index fe60da6f6..8fa564630 100644 --- a/slsDetectorSoftware/jctbDetectorServer/Makefile +++ b/slsDetectorSoftware/jctbDetectorServer/Makefile @@ -6,7 +6,7 @@ CROSS = bfin-uclinux- CC = $(CROSS)gcc -CFLAGS += -Wall -DMOENCHD -DMCB_FUNCS -DDACS_INT -DDEBUG -DV1 -DCTB +CFLAGS += -Wall -DMOENCHD -DMCB_FUNCS -DDACS_INT -DDEBUG -DV1 -DCTB -DOLDVERSION PROGS= jctbDetectorServer diff --git a/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt b/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt index 430dc823b..6712f3cd5 100644 --- a/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 9e5ec6a57bf206fe9384260fc4040867a9bbd71c -Revision: 33 -Branch: developer -Last Changed Author: Erik_Frojdh -Last Changed Rev: 4065 -Last Changed Date: 2019-01-30 17:38:35.000000002 +0100 ./firmware_funcs.c +Repsitory UUID: 53ba22dbc40d17c8ca77647d4ca2edad230f9f8a +Revision: 34 +Branch: moench +Last Changed Author: Anna_Bergamaschi +Last Changed Rev: 4088 +Last Changed Date: 2020-02-19 12:03:18.000000002 +0100 ./Makefile diff --git a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h index 4a97bf6f0..454ace874 100644 --- a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h +++ b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "9e5ec6a57bf206fe9384260fc4040867a9bbd71c" -#define GITAUTH "Erik_Frojdh" -#define GITREV 0x4065 -#define GITDATE 0x20190130 -#define GITBRANCH "developer" +#define GITREPUUID "53ba22dbc40d17c8ca77647d4ca2edad230f9f8a" +#define GITAUTH "Anna_Bergamaschi" +#define GITREV 0x4088 +#define GITDATE 0x20200219 +#define GITBRANCH "moench"