detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 23:37:14 +02:00
Code Issues Actions Packages Releases Activity

gotthard, cmakefiles language line removed

Browse Source
This commit is contained in:
maliakal_d
2019-01-04 16:34:34 +01:00
parent bfda07d262
commit 06a6d53a3f
23 changed files with 198 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/slsDetectorServer/commonServerFunctions.h
View File

@ -5,7 +5,7 @@
void SPIChipSelect (uint32_t* valw, uint32_t addr, uint32_t csmask, uint32_t clkmask, uint32_t digoutmask) {
// start point
(*valw) = (bus_r(addr) | csmask | clkmask &~(digoutmask));
(*valw) = ((bus_r(addr) | csmask | clkmask) &(~digoutmask));
bus_w (addr, (*valw));
// chip sel bar down
@ -74,7 +74,7 @@ void serializeToSPI(uint32_t addr, uint32_t val, uint32_t csmask, int numbitstos
}
uint32_t valw;
SPIChipSelect (&valw, addr, csmask);
SPIChipSelect (&valw, addr, csmask, clkmask, digoutmask);
sendDataToSPI(&valw, addr, val, numbitstosend, clkmask, digoutmask, digofset);