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

minor

Browse Source
This commit is contained in:
maliakal_d 2020-05-07 17:14:51 +02:00
parent 1a39f92f8f
commit 1623448086
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -594,9 +594,9 @@ int getModule(sls_detector_module *myMod) {
return OK; return OK;
} }
int SetBit(int ibit, int patword) { return patword |= (1 << ibit); } int setBit(int ibit, int patword) { return patword |= (1 << ibit); }
int ClearBit(int ibit, int patword) { return patword &= ~(1 << ibit); } int clearBit(int ibit, int patword) { return patword &= ~(1 << ibit); }
int setTrimbits(int *trimbits) { int setTrimbits(int *trimbits) {
LOG(logINFOBLUE, ("Setting trimbits\n")); LOG(logINFOBLUE, ("Setting trimbits\n"));
@ -623,34 +623,34 @@ int setTrimbits(int *trimbits) {
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
// chip select // chip select
patword = SetBit(SIGNAL_TBLoad_1 + ichip, patword); patword = setBit(SIGNAL_TBLoad_1 + ichip, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
// reset trimbits // reset trimbits
patword = SetBit(SIGNAL_resStorage, patword); patword = setBit(SIGNAL_resStorage, patword);
patword = SetBit(SIGNAL_resCounter, patword); patword = setBit(SIGNAL_resCounter, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
patword = ClearBit(SIGNAL_resStorage, patword); patword = clearBit(SIGNAL_resStorage, patword);
patword = ClearBit(SIGNAL_resCounter, patword); patword = clearBit(SIGNAL_resCounter, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
// select first channel // select first channel
patword = SetBit(SIGNAL_CHSserialIN, patword); patword = setBit(SIGNAL_CHSserialIN, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
// 1 clk pulse // 1 clk pulse
patword = SetBit(SIGNAL_CHSclk, patword); patword = setBit(SIGNAL_CHSclk, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
patword = ClearBit(SIGNAL_CHSclk, patword); patword = clearBit(SIGNAL_CHSclk, patword);
// clear 1st channel // clear 1st channel
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
patword = ClearBit(SIGNAL_CHSserialIN, patword); patword = clearBit(SIGNAL_CHSserialIN, patword);
// 2 clk pulses // 2 clk pulses
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
patword = SetBit(SIGNAL_CHSclk, patword); patword = setBit(SIGNAL_CHSclk, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
patword = ClearBit(SIGNAL_CHSclk, patword); patword = clearBit(SIGNAL_CHSclk, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
} }
@ -668,24 +668,24 @@ int setTrimbits(int *trimbits) {
// push 6 0 bits // push 6 0 bits
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
patword = ClearBit(SIGNAL_serialIN, patword); patword = clearBit(SIGNAL_serialIN, patword);
patword = ClearBit(SIGNAL_clk, patword); patword = clearBit(SIGNAL_clk, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
patword = SetBit(SIGNAL_clk, patword); patword = setBit(SIGNAL_clk, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
} }
// deserialize // deserialize
for (int i = 0; i < 18; i++) { for (int i = 0; i < 18; i++) {
if (val & (1 << i)) { if (val & (1 << i)) {
patword = SetBit(SIGNAL_serialIN, patword); patword = setBit(SIGNAL_serialIN, patword);
} else { } else {
patword = ClearBit(SIGNAL_serialIN, patword); patword = clearBit(SIGNAL_serialIN, patword);
} }
patword = ClearBit(SIGNAL_clk, patword); patword = clearBit(SIGNAL_clk, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
patword = SetBit(SIGNAL_clk, patword); patword = setBit(SIGNAL_clk, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
} }
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
@ -693,14 +693,14 @@ int setTrimbits(int *trimbits) {
// move to next channel // move to next channel
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
patword = SetBit(SIGNAL_CHSclk, patword); patword = setBit(SIGNAL_CHSclk, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
patword = ClearBit(SIGNAL_CHSclk, patword); patword = clearBit(SIGNAL_CHSclk, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
} }
} }
// chip unselect // chip unselect
patword = ClearBit(SIGNAL_TBLoad_1 + ichip, patword); patword = clearBit(SIGNAL_TBLoad_1 + ichip, patword);
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
// last iaddr check // last iaddr check

4
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -258,8 +258,8 @@ int getModule(sls_detector_module *myMod);
#endif #endif
#ifdef MYTHEN3D #ifdef MYTHEN3D
int setTrimbits(int *trimbits); int setTrimbits(int *trimbits);
int SetBit(int ibit, int patword); int setBit(int ibit, int patword);
int ClearBit(int ibit, int patword); int clearBit(int ibit, int patword);
int setAllTrimbits(int val); int setAllTrimbits(int val);
int getAllTrimbits(); int getAllTrimbits();
#endif #endif