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

Use lowercase attribute names because SICS uses lowercase internally.

Browse Source 
Allow use of named ports.

r1150 | ffr | 2006-10-16 09:28:49 +1000 (Mon, 16 Oct 2006) | 3 lines
This commit is contained in:
Ferdi Franceschini
2006-10-16 09:28:49 +10:00
committed by Douglas Clowes
parent 4535468776
commit 4f5ed50c91
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
site_ansto/motor_dmc2280.c
View File

@@ -137,11 +137,11 @@ typedef struct __MoDriv {
#define HARDUPPERLIM "hardupperlim" #define HARDUPPERLIM "hardupperlim"
#define UNITS "units" #define UNITS "units"
#define SPEED "speed" #define SPEED "speed"
#define MAXSPEED "maxSpeed" #define MAXSPEED "maxspeed"
#define ACCEL "accel" #define ACCEL "accel"
#define MAXACCEL "maxAccel" #define MAXACCEL "maxaccel"
#define DECEL "decel" #define DECEL "decel"
#define MAXDECEL "maxDecel" #define MAXDECEL "maxdecel"
static int DMC2280SetPar(void *pData, SConnection *pCon, static int DMC2280SetPar(void *pData, SConnection *pCon,
char *name, float newValue); char *name, float newValue);
@@ -1033,7 +1033,8 @@ static void KillDMC2280(/*@only@*/void *pData){
KillDMC2280(pNew); KillDMC2280(pNew);
return NULL; return NULL;
} }
sscanf(pPtr,"%d",&port); if (sscanf(pPtr,"%d",&port)==0)
port = getPortNum(pCon, pPtr);
if ((pPtr=getParam(pCon, interp, params,"host",1)) == NULL) { if ((pPtr=getParam(pCon, interp, params,"host",1)) == NULL) {
KillDMC2280(pNew); KillDMC2280(pNew);
return NULL; return NULL;
@@ -1102,34 +1103,34 @@ static void KillDMC2280(/*@only@*/void *pData){
return NULL; return NULL;
} }
sscanf(pPtr,"%c",&(pNew->axisLabel)); sscanf(pPtr,"%c",&(pNew->axisLabel));
if ((pPtr=getParam(pCon, interp, params,"stepsPerX",_REQUIRED)) == NULL) { if ((pPtr=getParam(pCon, interp, params,"stepsperx",_REQUIRED)) == NULL) {
KillDMC2280(pNew); KillDMC2280(pNew);
return NULL; return NULL;
} }
sscanf(pPtr,"%d",&(pNew->stepsPerX)); sscanf(pPtr,"%d",&(pNew->stepsPerX));
if ((pPtr=getParam(pCon, interp, params,"motorHome",_OPTIONAL)) == NULL) if ((pPtr=getParam(pCon, interp, params,"motorhome",_OPTIONAL)) == NULL)
pNew->motorHome=0; pNew->motorHome=0;
else else
sscanf(pPtr,"%d",&(pNew->motorHome)); sscanf(pPtr,"%d",&(pNew->motorHome));
if ((pPtr=getParam(pCon, interp, params,"noPowerSave",_OPTIONAL)) == NULL) if ((pPtr=getParam(pCon, interp, params,"nopowersave",_OPTIONAL)) == NULL)
pNew->noPowerSave=_SAVEPOWER; pNew->noPowerSave=_SAVEPOWER;
else else
sscanf(pPtr,"%d",&(pNew->noPowerSave)); sscanf(pPtr,"%d",&(pNew->noPowerSave));
if ((pPtr=getParam(pCon, interp, params,"motOffDelay",_OPTIONAL)) == NULL) if ((pPtr=getParam(pCon, interp, params,"motoffdelay",_OPTIONAL)) == NULL)
pNew->motOffDelay=0; pNew->motOffDelay=0;
else else
sscanf(pPtr,"%d",&(pNew->motOffDelay)); sscanf(pPtr,"%d",&(pNew->motOffDelay));
/* ABSENC: If the parameter requires an abs enc add it to the else block */ /* ABSENC: If the parameter requires an abs enc add it to the else block */
if ((pPtr=getParam(pCon, interp, params,"absEnc",_OPTIONAL)) == NULL) if ((pPtr=getParam(pCon, interp, params,"absenc",_OPTIONAL)) == NULL)
pNew->abs_endcoder=0; pNew->abs_endcoder=0;
else { else {
sscanf(pPtr,"%d",&(pNew->abs_endcoder)); sscanf(pPtr,"%d",&(pNew->abs_endcoder));
if ((pPtr=getParam(pCon, interp, params,"absEncHome",_REQUIRED)) == NULL) if ((pPtr=getParam(pCon, interp, params,"absenchome",_REQUIRED)) == NULL)
pNew->absEncHome=0; pNew->absEncHome=0;
else else
sscanf(pPtr,"%d",&(pNew->absEncHome)); sscanf(pPtr,"%d",&(pNew->absEncHome));
if ((pPtr=getParam(pCon, interp, params,"cntsPerX",_REQUIRED)) == NULL) if ((pPtr=getParam(pCon, interp, params,"cntsperx",_REQUIRED)) == NULL)
pNew->cntsPerX=1; pNew->cntsPerX=1;
else else
sscanf(pPtr,"%d",&(pNew->cntsPerX)); sscanf(pPtr,"%d",&(pNew->cntsPerX));