diff --git a/slsDetectorServers/ctbDetectorServer/Makefile b/slsDetectorServers/ctbDetectorServer/Makefile index 099b148f6..a6a3e48a3 100755 --- a/slsDetectorServers/ctbDetectorServer/Makefile +++ b/slsDetectorServers/ctbDetectorServer/Makefile @@ -1,6 +1,6 @@ CROSS = bfin-uclinux- CC = $(CROSS)gcc -CFLAGS += -Wall -DCHIPTESTBOARDD -DSTOP_SERVER #-DDEBUG1 #-DJCTB -DVERBOSEI #-DVERBOSE +CFLAGS += -Wall -DCHIPTESTBOARDD -DSTOP_SERVER -DDEBUG1 #-DJCTB -DVERBOSEI #-DVERBOSE LDLIBS += -lm -lstdc++ PROGS = ctbDetectorServer diff --git a/slsDetectorServers/ctbDetectorServer/gitInfo.txt b/slsDetectorServers/ctbDetectorServer/gitInfo.txt index 13a20eab9..11c551081 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfo.txt +++ b/slsDetectorServers/ctbDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: a4f1b7670f7a6e5bfae9f34f561350643eab6ca5 -Revision: 23 -Branch: ctbBugFixes +Repsitory UUID: 40d15264c56a7a3b1a00291b0735dcec75a39f1d +Revision: 24 +Branch: refactor Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4340 -Last Changed Date: 2019-02-21 11:22:00.000000002 +0100 ./Makefile +Last Changed Rev: 4346 +Last Changed Date: 2019-02-22 08:18:54.000000002 +0100 ./Makefile diff --git a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h index 01768d0b3..e657c769b 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h +++ b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "a4f1b7670f7a6e5bfae9f34f561350643eab6ca5" +#define GITREPUUID "40d15264c56a7a3b1a00291b0735dcec75a39f1d" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4340 -#define GITDATE 0x20190221 -#define GITBRANCH "ctbBugFixes" +#define GITREV 0x4346 +#define GITDATE 0x20190222 +#define GITBRANCH "refactor" diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 2292d7c7b..dc013d02f 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -523,9 +523,6 @@ void setupDetector() { INA226_CalibrateCurrentRegister(I2C_POWER_VD_DEVICE_ID); setVchip(VCHIP_MIN_MV); - // set vio to minimum for fpga to function - setPower(D_PWR_IO, VIO_MIN_MV); - // altera pll ALTERA_PLL_SetDefines(PLL_CNTRL_REG, PLL_PARAM_REG, PLL_CNTRL_RCNFG_PRMTR_RST_MSK, PLL_CNTRL_WR_PRMTR_MSK, PLL_CNTRL_PLL_RST_MSK, PLL_CNTRL_ADDR_MSK, PLL_CNTRL_ADDR_OFST);