diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index bfe561700..0de10d7c7 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 53c2dab9e..8c78275d9 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 8ab06efee..7ef09ba79 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c index bfbe08b28..199966891 100644 --- a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c @@ -32,9 +32,12 @@ void defineGPIOpins() { // define the gpio pins system("echo 7 > /sys/class/gpio/export"); system("echo 9 > /sys/class/gpio/export"); + // gpio 3 = not chip enable + system("echo 3 > /sys/class/gpio/export"); // define their direction system("echo in > /sys/class/gpio/gpio7/direction"); system("echo out > /sys/class/gpio/gpio9/direction"); + system("echo out > /sys/class/gpio/gpio3/direction"); LOG(logINFO, ("gpio pins defined\n")); gpioDefined = 1; } else @@ -47,6 +50,7 @@ void FPGAdontTouchFlash() { #endif // tell FPGA to not touch flash system("echo 0 > /sys/class/gpio/gpio9/value"); + system("echo 1 > /sys/class/gpio/gpio3/value"); // usleep(100*1000); } @@ -56,6 +60,7 @@ void FPGATouchFlash() { #endif // tell FPGA to touch flash to program itself system("echo 1 > /sys/class/gpio/gpio9/value"); + system("echo 0 > /sys/class/gpio/gpio3/value"); } void resetFPGA() { diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index e86f19f2c..a24f2253d 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -6,10 +6,10 @@ #define APILIB 0x211027 #define APIRECEIVER 0x211020 #define APIGUI 0x211021 -#define APICTB 0x211027 #define APIGOTTHARD 0x211027 #define APIGOTTHARD2 0x211027 -#define APIJUNGFRAU 0x211027 #define APIMYTHEN3 0x211027 -#define APIMOENCH 0x211025 #define APIEIGER 0x211027 +#define APIJUNGFRAU 0x211028 +#define APICTB 0x211028 +#define APIMOENCH 0x211027