detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-29 09:30:02 +02:00
Code Issues Actions Packages Releases Activity

ctb moench: bugfix for fifofull, should not read pattern, same as executing it

Browse Source
This commit is contained in:
maliakal_d 2019-03-08 16:59:44 +01:00
parent ae5938799f
commit 6765fd0dc8
6 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorServers/ctbDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 999a2f4d154ef8e61458c8f0de91d1fd3dfab981 Repsitory UUID: 1103f56256f3f8b5037343f9e9a2ef90139dc6d0
Revision: 36 Revision: 37
Branch: refactor Branch: refactor
Last Changed Author: GitHub_GitHub Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4385 Last Changed Rev: 4389
Last Changed Date: 2019-03-07 17:06:52.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2019-03-08 14:05:26.000000002 +0100 ./RegisterDefs.h

8
slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "999a2f4d154ef8e61458c8f0de91d1fd3dfab981" #define GITREPUUID "1103f56256f3f8b5037343f9e9a2ef90139dc6d0"
#define GITAUTH "GitHub_GitHub" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4385 #define GITREV 0x4389
#define GITDATE 0x20190307 #define GITDATE 0x20190308
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

18
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -873,14 +873,14 @@ enum readOutFlags setReadOutFlags(enum readOutFlags val) {
digitalEnable = ((regval & CONFIG_ENBLE_DGTL_OTPT_MSK) >> CONFIG_ENBLE_DGTL_OTPT_OFST); digitalEnable = ((regval & CONFIG_ENBLE_DGTL_OTPT_MSK) >> CONFIG_ENBLE_DGTL_OTPT_OFST);
if (analogEnable && digitalEnable) { if (analogEnable && digitalEnable) {
FILE_LOG(logDEBUG1, ("Getting readout: Analog & Digital\n"));
retval = ANALOG_AND_DIGITAL; retval = ANALOG_AND_DIGITAL;
FILE_LOG(logDEBUG1, ("Getting readout: Analog & Digital 0x%x\n", retval));
} else if (analogEnable && !digitalEnable) { } else if (analogEnable && !digitalEnable) {
FILE_LOG(logDEBUG1, ("Getting readout: Normal\n"));
retval = NORMAL_READOUT; retval = NORMAL_READOUT;
FILE_LOG(logDEBUG1, ("Getting readout: Normal 0x%x\n", retval));
} else if (!analogEnable && digitalEnable) { } else if (!analogEnable && digitalEnable) {
FILE_LOG(logDEBUG1, ("Getting readout: Digital Only\n"));
retval = DIGITAL_ONLY; retval = DIGITAL_ONLY;
FILE_LOG(logDEBUG1, ("Getting readout: Digital Only 0x%x\n", retval));
} else { } else {
FILE_LOG(logERROR, ("Read unknown readout (Both digital and analog are disabled). " FILE_LOG(logERROR, ("Read unknown readout (Both digital and analog are disabled). "
"Config reg: 0x%x\n", regval)); "Config reg: 0x%x\n", regval));
@ -1721,13 +1721,13 @@ void configureSyncFrequency(enum CLKINDEX ind) {
// sync is greater than current // sync is greater than current
if (syncFreq > retval) { if (syncFreq > retval) {
FILE_LOG(logINFO, ("\t--Configuring Sync Clock\n"));cprintf(BG_RED, "SETTING SYNC CLOCK!!!"); FILE_LOG(logINFO, ("\t--Configuring Sync Clock\n"));
configure = 1; configure = 1;
} }
// the others are both greater than current // the others are both greater than current
else if ((aFreq > retval && bFreq > retval)) { else if ((aFreq > retval && bFreq > retval)) {
FILE_LOG(logINFO, ("\t++Configuring Sync Clock\n"));cprintf(BG_RED, "\n\nSETTING SYNC CLOCK!!!\n\n"); FILE_LOG(logINFO, ("\t++Configuring Sync Clock\n"));
configure = 1; configure = 1;
} }
@ -1841,7 +1841,8 @@ uint64_t writePatternWord(int addr, uint64_t word) {
// unset write strobe // unset write strobe
bus_w(reg, bus_r(reg) & (~PATTERN_CNTRL_WR_MSK)); bus_w(reg, bus_r(reg) & (~PATTERN_CNTRL_WR_MSK));
return readPatternWord(addr); return word;
//return readPatternWord(addr); // will start executing the pattern
} }
int setPatternWaitAddress(int level, int addr) { int setPatternWaitAddress(int level, int addr) {
@ -2283,9 +2284,10 @@ void unsetFifoReadStrobes() {
void readSample(int ns) { void readSample(int ns) {
if (!(ns%1000)) { if (!(ns%1000)) {
FILE_LOG(logDEBUG2, ("Reading sample ns:%d (out of %d), fifodinstatus:0x%x\n", FILE_LOG(logINFO, ("Reading sample ns:%d (out of %d), DigitalFifoEmpty:%d AnalogFifoEmptyReg:0x%x\n",
ns, nSamples, ns, nSamples,
bus_r(FIFO_DIN_STATUS_REG))); ((bus_r(FIFO_DIN_STATUS_REG) & FIFO_DIN_STATUS_FIFO_EMPTY_MSK) >> FIFO_DIN_STATUS_FIFO_EMPTY_OFST),
bus_r(FIFO_EMPTY_REG)));
} }
uint32_t addr = DUMMY_REG; uint32_t addr = DUMMY_REG;
uint32_t fifoAddr = FIFO_DATA_REG; uint32_t fifoAddr = FIFO_DATA_REG;

10
slsDetectorServers/moenchDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/moenchDetectorServer Path: slsDetectorPackage/slsDetectorServers/moenchDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 999a2f4d154ef8e61458c8f0de91d1fd3dfab981 Repsitory UUID: ae5938799fb1bf7a5cb64bdb329f9c0d9ab44a03
Revision: 14 Revision: 15
Branch: refactor Branch: refactor
Last Changed Author: GitHub_GitHub Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4385 Last Changed Rev: 4393
Last Changed Date: 2019-03-07 17:06:49.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2019-03-08 14:05:26.000000002 +0100 ./RegisterDefs.h

8
slsDetectorServers/moenchDetectorServer/gitInfoMoench.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "999a2f4d154ef8e61458c8f0de91d1fd3dfab981" #define GITREPUUID "ae5938799fb1bf7a5cb64bdb329f9c0d9ab44a03"
#define GITAUTH "GitHub_GitHub" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4385 #define GITREV 0x4393
#define GITDATE 0x20190307 #define GITDATE 0x20190308
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

12
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -1356,13 +1356,13 @@ void configureSyncFrequency(enum CLKINDEX ind) {
// sync is greater than current // sync is greater than current
if (syncFreq > retval) { if (syncFreq > retval) {
FILE_LOG(logINFO, ("\t--Configuring Sync Clock\n"));cprintf(BG_RED, "SETTING SYNC CLOCK!!!"); FILE_LOG(logINFO, ("\t--Configuring Sync Clock\n"));
configure = 1; configure = 1;
} }
// the others are both greater than current // the others are both greater than current
else if ((aFreq > retval && bFreq > retval)) { else if ((aFreq > retval && bFreq > retval)) {
FILE_LOG(logINFO, ("\t++Configuring Sync Clock\n"));cprintf(BG_RED, "\n\nSETTING SYNC CLOCK!!!\n\n"); FILE_LOG(logINFO, ("\t++Configuring Sync Clock\n"));
configure = 1; configure = 1;
} }
@ -1476,7 +1476,8 @@ uint64_t writePatternWord(int addr, uint64_t word) {
// unset write strobe // unset write strobe
bus_w(reg, bus_r(reg) & (~PATTERN_CNTRL_WR_MSK)); bus_w(reg, bus_r(reg) & (~PATTERN_CNTRL_WR_MSK));
return readPatternWord(addr); return word;
//return readPatternWord(addr); // will start executing the pattern
} }
int setPatternWaitAddress(int level, int addr) { int setPatternWaitAddress(int level, int addr) {
@ -1918,9 +1919,10 @@ void unsetFifoReadStrobes() {
void readSample(int ns) { void readSample(int ns) {
if (!(ns%1000)) { if (!(ns%1000)) {
FILE_LOG(logDEBUG2, ("Reading sample ns:%d (out of %d), fifodinstatus:0x%x\n", FILE_LOG(logINFO, ("Reading sample ns:%d (out of %d), DigitalFifoEmpty:%d AnalogFifoEmptyReg:0x%x\n",
ns, nSamples, ns, nSamples,
bus_r(FIFO_DIN_STATUS_REG))); ((bus_r(FIFO_DIN_STATUS_REG) & FIFO_DIN_STATUS_FIFO_EMPTY_MSK) >> FIFO_DIN_STATUS_FIFO_EMPTY_OFST),
bus_r(FIFO_EMPTY_REG)));
} }
uint32_t addr = DUMMY_REG; uint32_t addr = DUMMY_REG;
uint32_t fifoAddr = FIFO_DATA_REG; uint32_t fifoAddr = FIFO_DATA_REG;