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

log fix for eiger server

Browse Source
This commit is contained in:
maliakal_d 2018-10-31 15:02:43 +01:00
parent e0cbbde01d
commit 17027962ea
1 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c
View File

@ -25,13 +25,13 @@ int i2c_open(const char* file,unsigned int addr){
//device file //device file
int fd = open( file, O_RDWR ); int fd = open( file, O_RDWR );
if (fd < 0) { if (fd < 0) {
cprintf(RED,"Warning: Unable to open file %s\n",file); FILE_LOG(logERROR, ("Warning: Unable to open file %s\n",file));
return -1; return -1;
} }
//device address //device address
if( ioctl( fd, I2C_SLAVE, addr&0x7F ) < 0 ) { if( ioctl( fd, I2C_SLAVE, addr&0x7F ) < 0 ) {
cprintf(RED,"Warning: Unable to set slave address:0x%x \n",addr); FILE_LOG(logERROR, ("Warning: Unable to set slave address:0x%x \n",addr));
return -2; return -2;
} }
return fd; return fd;
@ -45,17 +45,17 @@ int i2c_read(){
unsigned char buf = reg; unsigned char buf = reg;
if (write(fd, &buf, 1)!= 1){ if (write(fd, &buf, 1)!= 1){
cprintf(RED,"Warning: Unable to write read request to register %d\n", reg); FILE_LOG(logERROR, ("Warning: Unable to write read request to register %d\n", reg));
return -1; return -1;
} }
//read and update value (but old value read out) //read and update value (but old value read out)
if(read(fd, &buf, 1) != 1){ if(read(fd, &buf, 1) != 1){
cprintf(RED,"Warning: Unable to read register %d\n", reg); FILE_LOG(logERROR, ("Warning: Unable to read register %d\n", reg));
return -2; return -2;
} }
//read again to read the updated value //read again to read the updated value
if(read(fd, &buf, 1) != 1){ if(read(fd, &buf, 1) != 1){
cprintf(RED,"Warning: Unable to read register %d\n", reg); FILE_LOG(logERROR, ("Warning: Unable to read register %d\n", reg));
return -2; return -2;
} }
close(fd); close(fd);
@ -76,7 +76,7 @@ int i2c_write(unsigned int value){
buf[0] = reg; buf[0] = reg;
buf[1] = val; buf[1] = val;
if (write(fd, buf, 2) != 2) { if (write(fd, buf, 2) != 2) {
cprintf(RED,"Warning: Unable to write %d to register %d\n",val, reg); FILE_LOG(logERROR, ("Warning: Unable to write %d to register %d\n",val, reg));
return -1; return -1;
} }
@ -92,10 +92,10 @@ int main(int argc, char* argv[]) {
int fd = open(PORTNAME, O_RDWR | O_NOCTTY | O_SYNC); int fd = open(PORTNAME, O_RDWR | O_NOCTTY | O_SYNC);
if(fd < 0){ if(fd < 0){
cprintf(RED,"Warning: Unable to open port %s\n", PORTNAME); FILE_LOG(logERROR, ("Warning: Unable to open port %s\n", PORTNAME));
return -1; return -1;
} }
cprintf(GREEN,"opened port at %s\n",PORTNAME); FILE_LOG(logINFO, ("opened port at %s\n",PORTNAME));
struct termios serial_conf; struct termios serial_conf;
// reset structure // reset structure
@ -110,17 +110,17 @@ int main(int argc, char* argv[]) {
serial_conf.c_lflag = ICANON; serial_conf.c_lflag = ICANON;
// flush input // flush input
if(tcflush(fd, TCIOFLUSH) < 0){ if(tcflush(fd, TCIOFLUSH) < 0){
cprintf(RED,"Warning: error form tcflush %d\n", errno); FILE_LOG(logERROR, ("Warning: error form tcflush %d\n", errno));
return 0; return 0;
} }
// set new options for the port, TCSANOW:changes occur immediately without waiting for data to complete // set new options for the port, TCSANOW:changes occur immediately without waiting for data to complete
if(tcsetattr(fd, TCSANOW, &serial_conf) < 0){ if(tcsetattr(fd, TCSANOW, &serial_conf) < 0){
cprintf(RED,"Warning: error form tcsetattr %d\n", errno); FILE_LOG(logERROR, ("Warning: error form tcsetattr %d\n", errno));
return 0; return 0;
} }
if(tcsetattr(fd, TCSAFLUSH, &serial_conf) < 0){ if(tcsetattr(fd, TCSAFLUSH, &serial_conf) < 0){
cprintf(RED,"Warning: error form tcsetattr %d\n", errno); FILE_LOG(logERROR, ("Warning: error form tcsetattr %d\n", errno));
return 0; return 0;
} }
@ -130,27 +130,25 @@ int main(int argc, char* argv[]) {
char buffer[BUFFERSIZE]; char buffer[BUFFERSIZE];
memset(buffer,0,BUFFERSIZE); memset(buffer,0,BUFFERSIZE);
buffer[BUFFERSIZE-1] = '\n'; buffer[BUFFERSIZE-1] = '\n';
cprintf(GREEN,"Ready...\n"); FILE_LOG(logINFO, ("Ready...\n"));
while(ret != GOODBYE){ while(ret != GOODBYE){
memset(buffer,0,BUFFERSIZE); memset(buffer,0,BUFFERSIZE);
n = read(fd,buffer,BUFFERSIZE); n = read(fd,buffer,BUFFERSIZE);
#ifdef VERBOSE FILE_LOG(logDEBUG1, ("Received %d Bytes\n", n));
cprintf(BLUE,"Received %d Bytes\n", n); FILE_LOG(logINFO, ("Got message: '%s'\n",buffer));
#endif
cprintf(BLUE,"Got message: '%s'\n",buffer);
switch(buffer[0]){ switch(buffer[0]){
case '\0': case '\0':
cprintf(GREEN,"Got Start (Detector restart)\n"); FILE_LOG(logINFO, ("Got Start (Detector restart)\n"));
break; break;
case 's': case 's':
cprintf(GREEN,"Got Start \n"); FILE_LOG(logINFO, ("Got Start \n"));
break; break;
case 'p': case 'p':
if (!sscanf(&buffer[1],"%d",&ival)){ if (!sscanf(&buffer[1],"%d",&ival)){
cprintf(RED,"Warning: cannot scan voltage value\n"); FILE_LOG(logERROR, ("Warning: cannot scan voltage value\n"));
break; break;
} }
// ok/ fail // ok/ fail
@ -160,11 +158,9 @@ int main(int argc, char* argv[]) {
strcpy(buffer,"fail "); strcpy(buffer,"fail ");
else else
strcpy(buffer,"success "); strcpy(buffer,"success ");
cprintf(GREEN,"Sending: '%s'\n",buffer); FILE_LOG(logINFO, ("Sending: '%s'\n",buffer));
n = write(fd, buffer, BUFFERSIZE); n = write(fd, buffer, BUFFERSIZE);
#ifdef VERBOSE FILE_LOG(logDEBUG1, ("Sent %d Bytes\n", n));
cprintf(GREEN,"Sent %d Bytes\n", n);
#endif
break; break;
case 'g': case 'g':
@ -177,21 +173,17 @@ int main(int argc, char* argv[]) {
else else
strcpy(buffer,"success "); strcpy(buffer,"success ");
n = write(fd, buffer, BUFFERSIZE); n = write(fd, buffer, BUFFERSIZE);
cprintf(GREEN,"Sending: '%s'\n",buffer); FILE_LOG(logINFO, ("Sending: '%s'\n",buffer));
#ifdef VERBOSE FILE_LOG(logDEBUG1, ("Sent %d Bytes\n", n));
cprintf(GREEN,"Sent %d Bytes\n", n);
#endif
//value //value
memset(buffer,0,BUFFERSIZE); memset(buffer,0,BUFFERSIZE);
buffer[BUFFERSIZE-1] = '\n'; buffer[BUFFERSIZE-1] = '\n';
if(ival >= 0){ if(ival >= 0){
cprintf(GREEN,"Sending: '%d'\n",ival); FILE_LOG(logINFO, ("Sending: '%d'\n",ival));
sprintf(buffer,"%d ",ival); sprintf(buffer,"%d ",ival);
n = write(fd, buffer, BUFFERSIZE); n = write(fd, buffer, BUFFERSIZE);
#ifdef VERBOSE FILE_LOG(logINFO, ("Sent %d Bytes\n", n));
cprintf(GREEN,"Sent %d Bytes\n", n); }else FILE_LOG(logERROR, ("%s\n",buffer));
#endif
}else cprintf(RED,"%s\n",buffer);
break; break;
case 'e': case 'e':
@ -199,7 +191,7 @@ int main(int argc, char* argv[]) {
ret = GOODBYE; ret = GOODBYE;
break; break;
default: default:
cprintf(RED,"Unknown Command. buffer:'%s'\n",buffer); FILE_LOG(logERROR, ("Unknown Command. buffer:'%s'\n",buffer));
break; break;
} }
} }