linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ANSTO_MERGE_2' of ssh://gitorious.psi.ch/~hauser_n/sinqdev/ansto-sics into develop

Browse Source 
Conflicts:
	conman.c
	drive.c
This commit is contained in:
koennecke
2016-01-15 15:17:17 +01:00
parent cdce9cc2c9 eff54a5fd9
commit a37aae2361
31 changed files with 1492 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drive.c
View File

@ -302,7 +302,7 @@ int DriveWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
return 0;
}
/* interpret arguments as pairs (name, value) and check */
/* interpret arguments as pairs (name, value) and try to start */
for (i = 1; i < argc; i += 2) {
if (argv[i + 1] == NULL) {
snprintf(pBueffel, 511, "ERROR: no value found for driving %s", argv[i]);
@ -318,6 +318,7 @@ int DriveWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
"ERROR: target %s value for %s is not a finite number",
argv[i + 1], argv[i]);
SCWrite(pCon, pBueffel, eError);
StopExe(GetExecutor(), "ALL");
return 0;
}
iRet = Start2Run(pCon, pSics, argv[i], RUNDRIVE, dTarget);