- Adapted indenation to new agreed upon system

- Fixed bad status in poldi zug driver
This commit is contained in:
koennecke
2009-02-13 09:01:03 +00:00
parent 6c7bb14fad
commit eb72d5c486
151 changed files with 38234 additions and 38208 deletions

View File

@ -34,7 +34,7 @@ Markus Zolliker, August 2005
#define EURO2K_MODE 2
#define EURO2K_PAR 3
typedef enum {read_only, settable, to_set} Euro2kAccess;
typedef enum { read_only, settable, to_set } Euro2kAccess;
typedef struct Euro2kPar {
struct Euro2kPar *next;
@ -42,8 +42,8 @@ typedef struct Euro2kPar {
char *unit;
char *fmt;
int adr;
ModBusType type; /* 0: float, 1: int, 2: time */
Euro2kAccess set; /* 0: read-only; 1: settable; 2: to be set */
ModBusType type; /* 0: float, 1: int, 2: time */
Euro2kAccess set; /* 0: read-only; 1: settable; 2: to be set */
float par;
} Euro2kPar;
@ -70,14 +70,16 @@ typedef struct {
static ParClass euro2kClass = { "EURO2K", sizeof(Euro2k) };
/*----------------------------------------------------------------------------*/
static int Euro2kMakePar(void *object, void *userarg, int argc, char *argv[])
static int Euro2kMakePar(void *object, void *userarg, int argc,
char *argv[])
{
Euro2k *drv = ParCast(&euro2kClass, object);
Euro2kPar *par, **last;
int iarg;
assert(drv);
if (argc < 2) goto Usage;
if (argc < 2)
goto Usage;
last = &drv->pars;
for (par = drv->pars; par != NULL; par = par->next) {
if (strcasecmp(argv[0], par->name) == 0) {
@ -87,40 +89,47 @@ static int Euro2kMakePar(void *object, void *userarg, int argc, char *argv[])
}
if (par == NULL) {
par = calloc(1, sizeof(Euro2kPar));
if (par == NULL) return 0;
if (par == NULL)
return 0;
*last = par;
par->unit = NULL;
par->fmt = NULL;
par->par = PAR_NAN;
} else {
if (par->unit) {
free(par->unit); par->unit=NULL;
free(par->unit);
par->unit = NULL;
}
if (par->fmt) {
free(par->fmt); par->fmt=NULL;
free(par->fmt);
par->fmt = NULL;
}
}
par->name = strdup(argv[0]);
iarg = 1;
if (strcasecmp(argv[iarg],"w") == 0) { /* writeable */
if (strcasecmp(argv[iarg], "w") == 0) { /* writeable */
par->set = settable;
iarg++;
} else {
par->set = read_only;
}
par->type = modBusFloat;
if (iarg>=argc) goto Usage;
if (strcasecmp(argv[iarg],"int") == 0) {
par->type = modBusInt; iarg++;
if (iarg >= argc)
goto Usage;
if (strcasecmp(argv[iarg], "int") == 0) {
par->type = modBusInt;
iarg++;
par->fmt = "%.0f";
} else if (strcasecmp(argv[iarg],"time") == 0) {
par->type = modBusTime; iarg++;
} else if (strcasecmp(argv[iarg], "time") == 0) {
par->type = modBusTime;
iarg++;
par->unit = "sec";
par->fmt = "%.4g";
} else {
par->type = modBusFloat;
}
if (iarg >= argc) goto Usage;
if (iarg >= argc)
goto Usage;
par->adr = atoi(argv[iarg]);
iarg++;
if (iarg < argc) {
@ -133,59 +142,87 @@ static int Euro2kMakePar(void *object, void *userarg, int argc, char *argv[])
par->fmt = argv[iarg];
}
iarg++;
if (iarg < argc) goto Usage;
if (iarg < argc)
goto Usage;
}
}
if (par->unit) par->unit = strdup(par->unit);
if (par->fmt) par->fmt = strdup(par->fmt);
if (par->unit)
par->unit = strdup(par->unit);
if (par->fmt)
par->fmt = strdup(par->fmt);
ParInitPar(object, par->name);
EaseParHasChanged();
drv->readPar = NULL;
return 1;
Usage:
ParPrintf(object, eError, "Usage: %s makepar <name> [w] [int|time] adr [unit] [fmt]"
, drv->d.b.p.name);
return 0;
Usage:
ParPrintf(object, eError,
"Usage: %s makepar <name> [w] [int|time] adr [unit] [fmt]",
drv->d.b.p.name);
return 0;
}
/*----------------------------------------------------------------------------*/
void Euro2kParDef(void *object) {
void Euro2kParDef(void *object)
{
Euro2k *drv = ParCast(&euro2kClass, object);
ParData *obj = object;
Euro2kPar *par, *next;
Euro2kPar *par, *next;
FILE *saveFile;
char *w, *t, *u, *f;
static char *modeList[]={"auto", "manual", NULL };
static char *modeList[] = { "auto", "manual", NULL };
ParName(""); ParTail(drv->unit);
ParName("");
ParTail(drv->unit);
ParFloat(&drv->value, PAR_NAN);
ParName("unit"); ParAccess(usUser); ParLogAs(NULL);
ParName("unit");
ParAccess(usUser);
ParLogAs(NULL);
ParStr(&drv->unit, "C");
ParName("mode"); ParEnum(modeList); ParList(0); EaseUpdate(EURO2K_MODE);
ParName("mode");
ParEnum(modeList);
ParList(0);
EaseUpdate(EURO2K_MODE);
ParInt(&drv->mode, 1);
ParName("pbPow"); ParAccess(usUser); ParFloat(&drv->pbPow, 0.0);
ParName("pbMin"); ParAccess(usUser); ParFloat(&drv->pbMin, 8.0);
ParName("pbScl"); ParAccess(usUser); ParFloat(&drv->pbScl, 3.0);
ParName("pbPow");
ParAccess(usUser);
ParFloat(&drv->pbPow, 0.0);
ParName("pbMin");
ParAccess(usUser);
ParFloat(&drv->pbMin, 8.0);
ParName("pbScl");
ParAccess(usUser);
ParFloat(&drv->pbScl, 3.0);
ParName("output"); ParTail("%");
ParName("output");
ParTail("%");
ParFloat(&drv->output, PAR_NAN);
ParName("position"); ParTail("%"); ParAccess(usUser);
ParName("position");
ParTail("%");
ParAccess(usUser);
ParFloat(&drv->position, 50.0);
ParName("asymmetry"); ParAccess(usUser);
ParName("asymmetry");
ParAccess(usUser);
ParFloat(&drv->asymmetry, PAR_NAN);
ParName("range"); ParAccess(usUser);
ParName("range");
ParAccess(usUser);
ParFloat(&drv->range, PAR_NAN);
ParName("set"); ParTail(drv->unit); EaseUpdate(EURO2K_SET);
ParName("set");
ParTail(drv->unit);
EaseUpdate(EURO2K_SET);
ParFloat(&drv->setpoint, PAR_NAN);
ParName("task"); ParAccess(usUser); ParList(NULL); ParSave(1);
ParName("task");
ParAccess(usUser);
ParList(NULL);
ParSave(1);
ParStr(&drv->script, "0");
saveFile = ParSaveFile();
@ -193,9 +230,9 @@ void Euro2kParDef(void *object) {
if (par->adr > 0) {
if (saveFile) {
if (par->set) {
w="w ";
w = "w ";
} else {
w="";
w = "";
}
if (par->type == modBusInt) {
t = "int ";
@ -214,8 +251,8 @@ void Euro2kParDef(void *object) {
} else {
f = "";
}
fprintf(saveFile, " %s makepar %s %s%s%d \"%s\" \"%s\"\n", obj->name, par->name,
w, t, par->adr, u, f);
fprintf(saveFile, " %s makepar %s %s%s%d \"%s\" \"%s\"\n",
obj->name, par->name, w, t, par->adr, u, f);
}
ParName(par->name);
if (par->unit) {
@ -234,8 +271,10 @@ void Euro2kParDef(void *object) {
ParFloat(&par->par, PAR_NAN);
}
}
ParName("makepar"); ParAccess(usUser); ParCmd(Euro2kMakePar, NULL);
ParName("makepar");
ParAccess(usUser);
ParCmd(Euro2kMakePar, NULL);
EaseBasePar(drv);
EaseDrivPar(drv, "%.5g", drv->unit);
@ -244,7 +283,7 @@ void Euro2kParDef(void *object) {
if (ParActionIs(PAR_KILL)) {
next = drv->pars;
for (par = next; par != NULL; par = next) {
next= par->next;
next = par->next;
if (par->name) {
free(par->name);
par->name = NULL;
@ -267,14 +306,16 @@ void Euro2kParDef(void *object) {
}
}
double getTime(void) {
double getTime(void)
{
struct timeval tv;
gettimeofday(&tv, NULL);
return tv.tv_sec + 1.0e-6 * tv.tv_usec;
}
/*----------------------------------------------------------------------------*/
static long Euro2kRead(long pc, void *object) {
static long Euro2kRead(long pc, void *object)
{
Euro2k *drv = ParCast(&euro2kClass, object);
EaseBase *eab = object;
Euro2kPar *par, *par0;
@ -286,25 +327,31 @@ static long Euro2kRead(long pc, void *object) {
Statistics *old;
double now, delta;
switch (pc) { default: /* FSM BEGIN *******************************/
if (drv->script && drv->script[0] != '\0' && 0 != strcmp(drv->script, "0")) {
switch (pc) {
default: /* FSM BEGIN ****************************** */
if (drv->script && drv->script[0] != '\0'
&& 0 != strcmp(drv->script, "0")) {
pTcl = InterpGetTcl(pServ->pSics);
old = StatisticsBegin(drv->stat);
iRet = Tcl_Eval(pTcl,drv->script);
iRet = Tcl_Eval(pTcl, drv->script);
StatisticsEnd(old);
if (iRet == TCL_OK) {
if (drv->warned > 0) drv->warned--;
} else if (drv->warned<3) {
if (drv->warned > 0)
drv->warned--;
} else if (drv->warned < 3) {
drv->warned++;
ParPrintf(drv, eError, "ERROR: %s in %s.task '%s'", pTcl->result, eab->p.name, drv->script);
ParPrintf(drv, eError, "ERROR: %s in %s.task '%s'", pTcl->result,
eab->p.name, drv->script);
}
}
if (EaseGetUpdate(drv, EURO2K_MODE)) goto skipMode;
ModBusRequestValue(eab, 273, modBusInt); /* get manual or auto */
return __LINE__; case __LINE__: /**********************************/
if (EaseGetUpdate(drv, EURO2K_MODE))
goto skipMode;
ModBusRequestValue(eab, 273, modBusInt); /* get manual or auto */
return __LINE__;
case __LINE__: /**********************************/
if (!EaseGetUpdate(drv, EURO2K_MODE)) {
m = ModBusGetValue(eab, modBusInt);
if (m != drv->mode) { /* mode changed manually -> change disp */
if (m != drv->mode) { /* mode changed manually -> change disp */
drv->mode = m;
EaseSetUpdate(drv, EURO2K_MODE, 1);
}
@ -312,7 +359,8 @@ static long Euro2kRead(long pc, void *object) {
skipMode:
ModBusRequestValues(eab, 1, 9);
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
drv->value = ModBusGet(eab, 1, modBusFloat);
if (!EaseGetUpdate(drv, EURO2K_SET)) {
drv->setpoint = ModBusGet(eab, 2, modBusFloat);
@ -326,22 +374,28 @@ static long Euro2kRead(long pc, void *object) {
now = getTime();
delta = now - drv->lastRd;
drv->lastRd = now;
if (delta > 10) delta = 10;
if (delta > 10)
delta = 10;
a = drv->output * delta / drv->range;
if ((drv->position > 50.) == (drv->output > 0)) {
drv->position += a * (1 - drv->asymmetry * 0.01);
} else {
drv->position += a * (1 + drv->asymmetry * 0.01);
}
if (drv->position < 0) drv->position = 0;
if (drv->position > 100) drv->position = 100;
if (drv->position < 0)
drv->position = 0;
if (drv->position > 100)
drv->position = 100;
if (drv->pbPow <= 0.0) goto getPars;
if (drv->pbPow <= 0.0)
goto getPars;
pb = drv->pbMin + pow(drv->value * drv->pbScl, drv->pbPow);
if (pb > 999.) pb=999.;
if (pb > 999.)
pb = 999.;
ModBusPutValue(eab, 6, modBusFloat, pb);
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
getPars:
par = drv->readPar;
par0 = par;
@ -351,11 +405,13 @@ static long Euro2kRead(long pc, void *object) {
} else {
par = par->next;
}
if (par == par0) goto skipPar;
if (par == par0)
goto skipPar;
} while (par == NULL || par->adr <= 9 || par->set == to_set);
ModBusRequestValue(eab, par->adr, par->type);
drv->readPar = par;
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
par = drv->readPar;
if (par->set != to_set) {
par->par = ModBusGetValue(eab, par->type);
@ -363,15 +419,19 @@ static long Euro2kRead(long pc, void *object) {
skipPar:
if (eab->p.verbose >= 3) {
eab->p.verbose--;
if (eab->p.verbose < 3) eab->p.verbose=0;
if (eab->p.verbose < 3)
eab->p.verbose = 0;
}
finish:
ParLog(drv);
fsm_quit: return 0; } /* FSM END *********************************/
fsm_quit:return 0;
} /* FSM END ******************************** */
}
/*----------------------------------------------------------------------------*/
static long Euro2kSet(long pc, void *object) {
static long Euro2kSet(long pc, void *object)
{
Euro2k *drv = ParCast(&euro2kClass, object);
EaseBase *eab = object;
Euro2kPar *par;
@ -379,16 +439,19 @@ static long Euro2kSet(long pc, void *object) {
int l;
int upd;
char buf[4];
switch (pc) { default: /* FSM BEGIN *******************************/
switch (pc) {
default: /* FSM BEGIN ****************************** */
loop:
upd = EaseNextUpdate(drv);
if (upd == EASE_RUN) {
drv->setpoint = drv->d.targetValue;
goto run;
}
if (upd == EURO2K_MODE) goto mode;
if (upd == EURO2K_SET) goto run;
if (upd == EURO2K_MODE)
goto mode;
if (upd == EURO2K_SET)
goto run;
for (par = drv->pars; par != NULL; par = par->next) {
if (par->set == to_set) {
ModBusPutValue(eab, par->adr, par->type, par->par);
@ -399,67 +462,87 @@ static long Euro2kSet(long pc, void *object) {
goto fsm_quit;
run:
ModBusPutFloats(eab, 2, 1, &drv->setpoint);
return __LINE__; case __LINE__: /**********************************/
if (drv->mode == 0) goto loop;
return __LINE__;
case __LINE__: /**********************************/
if (drv->mode == 0)
goto loop;
drv->mode = 0;
mode:
if (drv->mode) drv->mode = 1;
ModBusPutValue(eab, 106, modBusInt, drv->mode*5); /* set display std or blank */
return __LINE__; case __LINE__: /**********************************/
ModBusPutValue(eab, 273, modBusInt, drv->mode); /* set manual to 0 */
if (drv->mode)
drv->mode = 1;
ModBusPutValue(eab, 106, modBusInt, drv->mode * 5); /* set display std or blank */
return __LINE__;
case __LINE__: /**********************************/
ModBusPutValue(eab, 273, modBusInt, drv->mode); /* set manual to 0 */
setIt:
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
goto loop;
fsm_quit: return 0; } /* FSM END *********************************/
fsm_quit:return 0;
} /* FSM END ******************************** */
}
/*----------------------------------------------------------------------------*/
static long Euro2kStart(long pc, void *object) {
static long Euro2kStart(long pc, void *object)
{
Euro2k *drv = ParCast(&euro2kClass, object);
EaseBase *eab = object;
switch (pc) { default: /* FSM BEGIN *******************************/
switch (pc) {
default: /* FSM BEGIN ****************************** */
ModBusRequestValue(eab, 1, modBusFloat);
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
if (0 == ModBusGetValue(eab, modBusFloat)) {
ParPrintf(drv, eError, "bad or no response on ModBus");
goto quit;
}
ParPrintf(drv, eLog, "connected to euro2k");
ModBusPutValue(eab, 111, modBusFloat, drv->d.upperLimit);
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
ModBusPutValue(eab, 112, modBusFloat, drv->d.lowerLimit);
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
FsmCall(Euro2kRead);
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
quit:
return 0; } /* FSM END ********************************************/
return 0;
} /* FSM END ******************************************* */
}
/*----------------------------------------------------------------------------*/
static int Euro2kInit(SConnection *con, int argc, char *argv[], int dynamic) {
static int Euro2kInit(SConnection * con, int argc, char *argv[],
int dynamic)
{
/* args:
MakeObject objectname euro2k <rs232>
<host> <port>
MakeObject objectname euro2k <rs232>
<host> <port>
*/
Euro2k *drv;
char sn[64];
drv = EaseMakeDriv(con, &euro2kClass, argc, argv, dynamic, 7,
Euro2kParDef, ModBusHandler, Euro2kStart, NULL, Euro2kRead,
Euro2kSet);
if (drv == NULL) return 0;
Euro2kParDef, ModBusHandler, Euro2kStart, NULL,
Euro2kRead, Euro2kSet);
if (drv == NULL)
return 0;
drv->pars = NULL;
drv->readPar = NULL;
snprintf(sn, sizeof sn, "%s task", argv[1]);
drv->stat = StatisticsNew(sn);
drv->lastRd = getTime();
setRS232ReplyTerminator(drv->d.b.ser,"");
setRS232SendTerminator(drv->d.b.ser,"");
setRS232ReplyTerminator(drv->d.b.ser, "");
setRS232SendTerminator(drv->d.b.ser, "");
return 1;
}
/*----------------------------------------------------------------------------*/
void Euro2kStartup(void) {
void Euro2kStartup(void)
{
ParMakeClass(&euro2kClass, EaseDrivClass());
MakeDriver("EURO2K", Euro2kInit, 0, "Eurotherm 2xxx");
MakeDriver("EURO2K", Euro2kInit, 0, "Eurotherm 2xxx");
}