- Added back calculation from motor positions to Q/E variables into
TAS code. - Fixed communication problems in SerPortServer, mainly with terminator detection. - Added SPS switched motors for TOPSI - Debugged Power-PC histogram memory software for TRICS
This commit is contained in:
@@ -805,7 +805,7 @@
|
||||
|
||||
if (rply_ptr0 == NULL) rply_ptr0 = "?";
|
||||
if (rply_ptr1 == NULL) rply_ptr1 = "?";
|
||||
if ((*rply_ptr0 == '\0') &&
|
||||
if ( ((*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') ) &&
|
||||
(sscanf (rply_ptr1, "%d", status) == 1)) {
|
||||
if (EL737_errcode != 0) return False;
|
||||
EL737_call_depth--;
|
||||
@@ -851,7 +851,7 @@
|
||||
rply_ptr0 = AsynSrv_GetReply (
|
||||
&info_ptr->asyn_info, &info_ptr->from_host, NULL);
|
||||
if (rply_ptr0 == NULL) rply_ptr0 = "?";
|
||||
if (*rply_ptr0 == '\0') {
|
||||
if ( (*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') ) {
|
||||
EL737_call_depth--;
|
||||
return True;
|
||||
}
|
||||
@@ -1343,7 +1343,7 @@
|
||||
|
||||
if (rply_ptr0 == NULL) rply_ptr0 = "?";
|
||||
if (rply_ptr1 == NULL) rply_ptr1 = "?";
|
||||
if ((*rply_ptr0 == '\0') &&
|
||||
if ( ((*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') ) &&
|
||||
(sscanf (rply_ptr1, "%d", status) == 1)) {
|
||||
if (EL737_errcode != 0) return False;
|
||||
EL737_call_depth--;
|
||||
@@ -1472,7 +1472,7 @@
|
||||
rply_ptr0 = AsynSrv_GetReply (
|
||||
&info_ptr->asyn_info, &info_ptr->from_host, NULL);
|
||||
if (rply_ptr0 == NULL) rply_ptr0 = "?";
|
||||
if (*rply_ptr0 == '\0') {
|
||||
if ( (*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') ) {
|
||||
if (val >= 0) return EL737_EnableThresh (handle, indx);
|
||||
EL737_call_depth--;
|
||||
return True;
|
||||
@@ -1519,7 +1519,7 @@
|
||||
|
||||
if (rply_ptr0 == NULL) rply_ptr0 = "?";
|
||||
if (rply_ptr1 == NULL) rply_ptr1 = "?";
|
||||
if ((*rply_ptr0 == '\0') &&
|
||||
if ( ((*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') ) &&
|
||||
(sscanf (rply_ptr1, "%d", status) == 1)) {
|
||||
if (EL737_errcode != 0) return False;
|
||||
EL737_call_depth--;
|
||||
@@ -1569,7 +1569,7 @@
|
||||
|
||||
if (rply_ptr0 == NULL) rply_ptr0 = "?";
|
||||
if (rply_ptr1 == NULL) rply_ptr1 = "?";
|
||||
if ((*rply_ptr0 == '\0') &&
|
||||
if ( ((*rply_ptr0 == '\0') || (*rply_ptr0 == 'r') ) &&
|
||||
(sscanf (rply_ptr1, "%d", status) == 1)) {
|
||||
if (EL737_errcode != 0) return False;
|
||||
EL737_call_depth--;
|
||||
@@ -1635,7 +1635,7 @@
|
||||
info_ptr->c5 = info_ptr->c6 = info_ptr->c7 = info_ptr->c8 = 0;
|
||||
nvals = 9;
|
||||
}
|
||||
if ((*rply_ptr0 == '\0') &&
|
||||
if ( ((*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') )&&
|
||||
(sscanf (rply_ptr1, "%d", rs) == 1) &&
|
||||
(nvals == 9)) {
|
||||
if (EL737_errcode != 0) return False;
|
||||
@@ -1682,7 +1682,7 @@
|
||||
|
||||
if (rply_ptr0 == NULL) rply_ptr0 = "?";
|
||||
|
||||
if (*rply_ptr0 == '\0') {
|
||||
if ( (*rply_ptr0 == '\0' || (*rply_ptr0 == '\r') ) ) {
|
||||
if (EL737_errcode != 0) return False;
|
||||
EL737_call_depth--;
|
||||
return True;
|
||||
|
||||
Reference in New Issue
Block a user