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

changed from int to uint32_t in read and writeRegister

Browse Source
This commit is contained in:
Erik Frojdh
2018-03-08 16:08:31 +01:00
parent 3878212ffd
commit 339956e5de
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2309,13 +2309,13 @@ int slsDetector::digitalTest( digitalTestMode mode, int imod){
/* write or read register */
int slsDetector::writeRegister(int addr, int val){
uint32_t slsDetector::writeRegister(uint32_t addr, uint32_t val){
int retval=-1;
uint32_t retval = 0;
int fnum=F_WRITE_REGISTER;
int ret=FAIL;
char mess[MAX_STR_LENGTH]="";
int arg[2];
uint32_t arg[2];
arg[0]=addr;
arg[1]=val;
@ -2358,7 +2358,7 @@ int slsDetector::writeAdcRegister(int addr, int val){
int ret=FAIL;
char mess[MAX_STR_LENGTH]="";
int arg[2];
uint32_t arg[2];
arg[0]=addr;
arg[1]=val;
@ -2397,13 +2397,13 @@ int slsDetector::writeAdcRegister(int addr, int val){
int slsDetector::readRegister(int addr){
uint32_t slsDetector::readRegister(uint32_t addr){
int retval=-1;
uint32_t retval = 0;
int fnum=F_READ_REGISTER;
int ret=FAIL;
char mess[MAX_STR_LENGTH]="";
int arg;
uint32_t arg;
arg=addr;