diff --git a/slsDetectorSoftware/moenchDetectorServer/firmware_funcs.c b/slsDetectorSoftware/moenchDetectorServer/firmware_funcs.c index 253f0d82e..ba407059a 100755 --- a/slsDetectorSoftware/moenchDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/moenchDetectorServer/firmware_funcs.c @@ -261,6 +261,7 @@ int cleanFifo(){ printf("Cleaning FIFO\n"); addr=ADC_SYNC_REG; + reg = bus_r(addr) & CLEAN_FIFO_MASK; //only for start up diff --git a/slsDetectorSoftware/moenchDetectorServer/mcb_funcs.c b/slsDetectorSoftware/moenchDetectorServer/mcb_funcs.c index 291b14c81..88cd7a138 100755 --- a/slsDetectorSoftware/moenchDetectorServer/mcb_funcs.c +++ b/slsDetectorSoftware/moenchDetectorServer/mcb_funcs.c @@ -15,6 +15,7 @@ #include "firmware_funcs.h" #include "mcb_funcs.h" + /* global variables */ #undef DEBUG #undef DEBUGOUT diff --git a/slsDetectorSoftware/moenchDetectorServer/registers_m.h b/slsDetectorSoftware/moenchDetectorServer/registers_m.h index a83a590a7..a9476007f 100755 --- a/slsDetectorSoftware/moenchDetectorServer/registers_m.h +++ b/slsDetectorSoftware/moenchDetectorServer/registers_m.h @@ -229,6 +229,7 @@ #define EXT_RO_TRIG_OUT_FALLING 0xC + /* for temperature register */ #define T1_CLK_BIT 0x00000001 #define T1_CS_BIT 0x00000002 diff --git a/slsDetectorSoftware/moenchDetectorServer/server_funcs.c b/slsDetectorSoftware/moenchDetectorServer/server_funcs.c index 5e1938ef1..bf52db6f3 100755 --- a/slsDetectorSoftware/moenchDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/moenchDetectorServer/server_funcs.c @@ -15,6 +15,7 @@ #define CONTROL_REG 0x24<<11 // Global variables + int (*flist[256])(int);