- Fixed a bug in conman.c which could cause a core dump when terminating

a connection during an active run.
- Added an additional output mode for the connection in order to
  support the batch run editor.
- Made clientput send everything with eWarning mode in order to support
  the batch run editor.
- Added a better NetReadTillTerm
- Fixed a problem in synchronize.c
- Fixed an issue with reading empty line on normal connection sockets.
- Added a psi scan mode to mesure.c for TRICS
- Made motor print warnings when trying to reposition.
- Fixed abug in hkl.c which cause wrong signs.


SKIPPED:
	psi/el734driv.c
	psi/el734hp.c
	psi/el737driv.c
	psi/el737hpdriv.c
	psi/nextrics.c
	psi/nxamor.c
	psi/psi.c
	psi/slsmagnet.c
	psi/swmotor2.c
	psi/tasscan.c
	psi/tasutil.c
This commit is contained in:
cvs
2004-07-21 12:03:06 +00:00
parent 6bfeac8c02
commit a55d2f0f7f
41 changed files with 823 additions and 372 deletions

View File

@@ -124,6 +124,10 @@ int writeRS232(prs232 self, void *data, int dataLen)
if(self->debug > 0)
{
printf("RS232 OUT: %s",(char *)data);
if(strchr((char *)data,'\n') == NULL)
{
puts("\n");
}
fflush(stdout);
}
@@ -172,6 +176,10 @@ int readRS232(prs232 self, void *data, int *dataLen)
if(self->debug > 0)
{
printf("RS232 IN: %s",(char *)data);
if(strchr((char *)data,'\n') == NULL)
{
puts("\n");
}
fflush(stdout);
}
*dataLen = lRead;
@@ -208,6 +216,10 @@ int readRS232TillTerm(prs232 self, void *data, int *datalen){
if(self->debug > 0)
{
printf("RS232 IN/TERM: %s",(char *)data);
if(strchr((char *)data,'\n') == NULL)
{
puts("\n");
}
fflush(stdout);
}
if(iRet == 0)
@@ -265,7 +277,7 @@ int availableNetRS232(prs232 self)
int transactRS232(prs232 self, void *send, int sendLen,
void *reply, int replyLen)
{
int iRet;
int iRet, len;
assert(self);
@@ -277,6 +289,15 @@ int transactRS232(prs232 self, void *send, int sendLen,
return NOTCONNECTED;
}
/*
if there is still data on the socket: clear it
while(availableRS232(self)){
len = replyLen;
readRS232(self,reply,&len);
}
*/
/*
write data
*/
@@ -295,6 +316,10 @@ int transactRS232(prs232 self, void *send, int sendLen,
if(self->debug > 0)
{
printf("RS232 IN/TRANS: %s",(char *)reply);
if(strchr((char *)reply,'\n') == NULL)
{
puts("\n");
}
fflush(stdout);
}
if(iRet == 0)
@@ -559,6 +584,12 @@ int RS232Action(SConnection *pCon, SicsInterp *pSics,
return 1;
}
}
else if(strcmp(argv[1],"debug") == 0)
{
self->debug = atoi(argv[2]);
SCSendOK(pCon);
return 1;
}
else if(strcmp(argv[1],"timeout") == 0)
{
if(checkSet(pCon,argc,usMugger))