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

Resolved a conflict that was missed during 'git merge' conflict resolution.

Browse Source
This commit is contained in:
Ferdi Franceschini
2015-04-24 13:36:59 +10:00
parent 10d29d597c
commit 64b212c4a0
1 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drive.c
View File

@ -39,7 +39,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <math.h>
#include "fortify.h" #include "fortify.h"
#include "sics.h" #include "sics.h"
#include "drive.h" #include "drive.h"
@ -302,11 +301,7 @@ int DriveWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
return 0; return 0;
} }
<<<<<<< HEAD /* interpret arguments as pairs (name, value) and try to start */
/* interpret arguments as pairs (name, value) and check */
=======
/* interprete arguments as pairs name value and try to start */
>>>>>>> master
for (i = 1; i < argc; i += 2) { for (i = 1; i < argc; i += 2) {
if (argv[i + 1] == NULL) { if (argv[i + 1] == NULL) {
snprintf(pBueffel, 511, "ERROR: no value found for driving %s", argv[i]); snprintf(pBueffel, 511, "ERROR: no value found for driving %s", argv[i]);
@ -316,25 +311,7 @@ int DriveWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
iRet = Tcl_GetDouble(tcl_interp, argv[i + 1], &dTarget); iRet = Tcl_GetDouble(tcl_interp, argv[i + 1], &dTarget);
if (iRet == TCL_ERROR) { if (iRet == TCL_ERROR) {
SCWrite(pCon, Tcl_GetStringResult(tcl_interp), eError); SCWrite(pCon, Tcl_GetStringResult(tcl_interp), eError);
<<<<<<< HEAD
SetStatus(eOld);
return 0;
} else if (!isfinite(dTarget)) {
snprintf(pBueffel, 511,
"ERROR: target %s value for %s is not a finite number",
argv[i + 1], argv[i]);
SCWrite(pCon, pBueffel, eError);
return 0;
}
}
/* interpret arguments as pairs (name, value) and try to start */
for (i = 1; i < argc; i += 2) {
iRet = Tcl_GetDouble(tcl_interp, argv[i + 1], &dTarget);
if (iRet == TCL_ERROR) {
SCWrite(pCon, Tcl_GetStringResult(tcl_interp), eError);
=======
StopExe(GetExecutor(), "ALL"); StopExe(GetExecutor(), "ALL");
>>>>>>> master
return 0; return 0;
} }
iRet = Start2Run(pCon, pSics, argv[i], RUNDRIVE, dTarget); iRet = Start2Run(pCon, pSics, argv[i], RUNDRIVE, dTarget);
@ -377,11 +354,7 @@ int DriveWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
ClearExecutor(GetExecutor()); ClearExecutor(GetExecutor());
return 0; return 0;
} }
<<<<<<< HEAD
SCWrite(pCon, "Driving finished successfully", eValue); SCWrite(pCon, "Driving finished successfully", eValue);
=======
SCWrite(pCon, "Driving finished sucessfully", eValue);
>>>>>>> master
return 1; return 1;
} }
@ -418,11 +391,7 @@ int RunWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
return 0; return 0;
} }
<<<<<<< HEAD
/* interpret arguments as pairs name value and try to start */ /* interpret arguments as pairs name value and try to start */
=======
/* interprete arguments as pairs name value and try to start */
>>>>>>> master
for (i = 1; i < argc; i += 2) { for (i = 1; i < argc; i += 2) {
if (argv[i + 1] == NULL) { if (argv[i + 1] == NULL) {
snprintf(pBueffel,511, "ERROR: no value found for driving %s", argv[i]); snprintf(pBueffel,511, "ERROR: no value found for driving %s", argv[i]);