diff --git a/slsDetectorSoftware/moenchDetectorServer/firmware_funcs.c b/slsDetectorSoftware/moenchDetectorServer/firmware_funcs.c index a91707514..996d81165 100755 --- a/slsDetectorSoftware/moenchDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/moenchDetectorServer/firmware_funcs.c @@ -257,15 +257,20 @@ int setPhaseShiftOnce(){ int cleanFifo(){ - u_int32_t addr, reg, val; + u_int32_t addr, reg, val, adc_sync; printf("Cleaning FIFO\n"); addr=ADC_SYNC_REG; + if(withGotthard) + adc_sync = GOTTHARD_ADCSYNC_VAL; + else + adc_sync = ADCSYNC_VAL; + reg = bus_r(addr) & CLEAN_FIFO_MASK; //only for start up - if(!reg) reg = ADCSYNC_VAL; + if(!reg) reg = adc_sync; // 88 3 02111 if (ROI_flag==0) { diff --git a/slsDetectorSoftware/moenchDetectorServer/moenchDetectorServer b/slsDetectorSoftware/moenchDetectorServer/moenchDetectorServer index 41c14d3cf..9b50e1022 100755 Binary files a/slsDetectorSoftware/moenchDetectorServer/moenchDetectorServer and b/slsDetectorSoftware/moenchDetectorServer/moenchDetectorServer differ diff --git a/slsDetectorSoftware/moenchDetectorServer/server_defs.h b/slsDetectorSoftware/moenchDetectorServer/server_defs.h index f826afc8a..76f9a29c6 100755 --- a/slsDetectorSoftware/moenchDetectorServer/server_defs.h +++ b/slsDetectorSoftware/moenchDetectorServer/server_defs.h @@ -40,7 +40,7 @@ #define ALLMOD 0xffff #define ALLFIFO 0xffff - +#define GOTTHARD_ADCSYNC_VAL 0x32214 #define ADCSYNC_VAL 0x02111 #define TOKEN_RESTART_DELAY 0x88000000 #define TOKEN_RESTART_DELAY_ROI 0x1b000000