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

Merge branch 'maverick' into develop

Browse Source 
Compile under OSX
This commit is contained in:
koennecke
2016-01-26 09:48:11 +01:00
parent f0021db2ff cdb9a8fba2
commit 5e597e2d10
46 changed files with 174 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
singlex.c
View File

@@ -70,7 +70,7 @@ static MotorFunction TextToFunc(char *txt)
}
count++;
}
return -1;
return None;
}
/*---------------------------------------------------------------------------*/
@@ -112,7 +112,7 @@ static int ConfigureCmd(pSICSOBJ self, SConnection * pCon,
}
mf = TextToFunc(v.v.text);
if (mf < 0) {
if (mf == None) {
SCPrintf(pCon, eError,
"ERROR: failed to map %s to configuration parameter",
v.v.text);
@@ -167,7 +167,7 @@ static int MotorCmd(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
}
mf = TextToFunc(par[0]->value.v.text);
if (mf < 0) {
if (mf == None) {
SCPrintf(pCon, eError, "ERROR: %s is not a four circle motor",
par[0]->value.v.text);
return 0;
@@ -198,7 +198,7 @@ static int MotorNamCmd(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
}
mf = TextToFunc(par[0]->value.v.text);
if (mf < 0) {
if (mf == None) {
SCPrintf(pCon, eError, "ERROR: %s is not a four circle motor",
par[0]->value.v.text);
return 0;
@@ -450,7 +450,7 @@ static int SymRefCmd(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
hkl[2] = equiv.l[i];
if (priv->diffractometer->
calculateSettings(priv->diffractometer, hkl, settings) == 1) {
snprintf(buffer, 512, "%d,%d,%d", equiv.h[i], equiv.k[i],
snprintf(buffer, sizeof(buffer), "%d,%d,%d", equiv.h[i], equiv.k[i],
equiv.l[i]);
SCWrite(pCon, buffer, eValue);
return 1;