- 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

@ -53,19 +53,21 @@ typedef struct {
int sensor2alarm;
int with2sensors;
} Haake;
static ParClass haakeClass = { "HAAKE", sizeof(Haake) };
/*----------------------------------------------------------------------------*/
int HaakeHandler(void *object) {
int HaakeHandler(void *object)
{
int iret, l;
Haake *drv = ParCast(&haakeClass, object);
EaseBase *eab = EaseBaseCast(object);
char *corr;
assert(drv);
if (eab->state < EASE_idle) goto quit;
if (eab->state < EASE_idle)
goto quit;
if (availableNetRS232(eab->ser) || availableRS232(eab->ser)) {
eab->msg[0] = '\0';
l = sizeof(eab->ans);
@ -81,7 +83,7 @@ int HaakeHandler(void *object) {
ParPrintf(eab, -2, "ans: %s", eab->ans);
if (drv->errcnt < 10) {
eab->state = EASE_read;
EaseWrite(eab, NULL); /* send the same command again */
EaseWrite(eab, NULL); /* send the same command again */
drv->errcnt++;
return 0;
}
@ -89,7 +91,7 @@ int HaakeHandler(void *object) {
eab->state = EASE_idle;
goto error;
} else {
drv->errcnt=0;
drv->errcnt = 0;
}
if (iret == 1) {
ParPrintf(eab, -2, "ans: %s", eab->ans);
@ -99,8 +101,8 @@ int HaakeHandler(void *object) {
if (strcmp(eab->ans, eab->version) == 0) {
/* we are still connected with the same device */
} else if (*eab->version == '\0') {
strncat(eab->version, eab->ans, sizeof(eab->version)-1);
} else { /* version (and therefore device) changed */
strncat(eab->version, eab->ans, sizeof(eab->version) - 1);
} else { /* version (and therefore device) changed */
eab->errCode = EASE_DEV_CHANGED;
eab->state = EASE_idle;
goto error;
@ -135,43 +137,66 @@ error:
quit:
return EaseHandler(eab);
}
/*----------------------------------------------------------------------------*/
static void HaakeParDef(void *object) {
static void HaakeParDef(void *object)
{
Haake *drv = ParCast(&haakeClass, object);
EaseBase *eab = object;
int reset = 0;
ParName(""); ParFmt("%.2f"); ParTail("K");
ParName("");
ParFmt("%.2f");
ParTail("K");
ParFloat(&drv->t, PAR_NAN);
ParName("t2");
if (drv->with2sensors) { ParFmt("%.2f"); ParTail("K"); }
if (drv->with2sensors) {
ParFmt("%.2f");
ParTail("K");
}
ParFloat(&drv->t2, PAR_NAN);
ParName("set"); ParFmt("%.2f"); ParTail("K");
ParName("set");
ParFmt("%.2f");
ParTail("K");
ParFloat(&drv->set, PAR_NAN);
ParName("running"); EaseUpdate(HAAKE_ON);
ParName("running");
EaseUpdate(HAAKE_ON);
ParInt(&drv->running, 0);
ParName("extcontrol"); EaseUpdate(HAAKE_EXT);
ParName("extcontrol");
EaseUpdate(HAAKE_EXT);
ParInt(&drv->extcontrol, 0);
ParName("relais"); ParInt(&drv->relais, 0);
ParName("overtemp"); ParInt(&drv->overtemp, 0);
ParName("lowlevel"); ParInt(&drv->lowlevel, 0);
ParName("pumpalarm"); ParInt(&drv->pumpalarm, 0);
ParName("externalarm"); ParInt(&drv->externalarm, 0);
ParName("coolalarm"); ParInt(&drv->coolalarm, 0);
ParName("sensor1alarm"); ParInt(&drv->sensor1alarm, 0);
ParName("sensor2alarm"); ParInt(&drv->sensor2alarm, 0);
ParName("relais");
ParInt(&drv->relais, 0);
ParName("overtemp");
ParInt(&drv->overtemp, 0);
ParName("lowlevel");
ParInt(&drv->lowlevel, 0);
ParName("pumpalarm");
ParInt(&drv->pumpalarm, 0);
ParName("externalarm");
ParInt(&drv->externalarm, 0);
ParName("coolalarm");
ParInt(&drv->coolalarm, 0);
ParName("sensor1alarm");
ParInt(&drv->sensor1alarm, 0);
ParName("sensor2alarm");
ParInt(&drv->sensor2alarm, 0);
ParName("reset"); ParAccess(usUser); ParSave(0);
ParName("reset");
ParAccess(usUser);
ParSave(0);
ParInt(&reset, 0);
if (ParActionIs(PAR_SET) > 0) {
EaseSetUpdate(drv, HAAKE_RESET, 1);
}
ParName("with2sensors"); ParAccess(usUser); ParInt(&drv->with2sensors, 0);
ParName("with2sensors");
ParAccess(usUser);
ParInt(&drv->with2sensors, 0);
EaseBasePar(drv);
EaseSendPar(drv);
@ -179,86 +204,105 @@ static void HaakeParDef(void *object) {
ParStdDef();
EaseMsgPar(drv);
}
/*----------------------------------------------------------------------------*/
static long HaakeRead(long pc, void *object) {
static long HaakeRead(long pc, void *object)
{
Haake *drv = ParCast(&haakeClass, object);
EaseBase *eab = object;
char alarms[128];
int status;
switch (pc) { default: /* FSM BEGIN *******************************/
switch (pc) {
default: /* FSM BEGIN ****************************** */
EaseWrite(eab, "B");
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
if (!EaseGetUpdate(drv, HAAKE_ON)) {
drv->running = (eab->ans[0]!='0');
drv->running = (eab->ans[0] != '0');
}
if (!EaseGetUpdate(drv, HAAKE_EXT)) {
drv->extcontrol = (eab->ans[1]!='0');
drv->extcontrol = (eab->ans[1] != '0');
}
drv->relais = (eab->ans[2]!='0');
drv->overtemp = (eab->ans[3]!='0');
drv->lowlevel = (eab->ans[4]!='0');
drv->pumpalarm = (eab->ans[5]!='0');
drv->externalarm = (eab->ans[6]!='0');
drv->coolalarm = (eab->ans[7]!='0');
drv->sensor1alarm = (eab->ans[10]!='0');
drv->sensor2alarm = (eab->ans[11]!='0');
drv->relais = (eab->ans[2] != '0');
drv->overtemp = (eab->ans[3] != '0');
drv->lowlevel = (eab->ans[4] != '0');
drv->pumpalarm = (eab->ans[5] != '0');
drv->externalarm = (eab->ans[6] != '0');
drv->coolalarm = (eab->ans[7] != '0');
drv->sensor1alarm = (eab->ans[10] != '0');
drv->sensor2alarm = (eab->ans[11] != '0');
EaseWrite(eab, "F1");
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
drv->t = atof(eab->ans) + 273.15;
if (!drv->with2sensors) goto nof2;
if (!drv->with2sensors)
goto nof2;
EaseWrite(eab, "F2");
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
drv->t2 = atof(eab->ans) + 273.15;
if (drv->t2 < -222) {
drv->t2 = PAR_NAN;
}
nof2:
EaseWrite(eab, "S");
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
drv->set = atof(eab->ans) + 273.15;
skipGetSet:
ParLog(drv);
fsm_quit: return 0; } /* FSM END *********************************/
fsm_quit:return 0;
} /* FSM END ******************************** */
}
/*----------------------------------------------------------------------------*/
static long HaakeStart(long pc, void *object) {
static long HaakeStart(long pc, void *object)
{
Haake *drv = ParCast(&haakeClass, object);
EaseBase *eab = object;
switch (pc) { default: /* FSM BEGIN *******************************/
switch (pc) {
default: /* FSM BEGIN ****************************** */
EaseWrite(eab, "V");
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
if (0 != strncmp(eab->version, "1P/H", 4)) {
snprintf(eab->msg, sizeof eab->msg, "unknown temperature controller version: %s",
eab->version);
snprintf(eab->msg, sizeof eab->msg,
"unknown temperature controller version: %s", eab->version);
ParPrintf(drv, eError, "ERROR: %s", eab->msg);
EaseStop(eab);
goto quit;
}
ParPrintf(drv, eLog, "connected to haake thermostat %s", eab->version);
EaseWrite(eab, "W TE K");
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
FsmCall(HaakeRead);
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
quit:
return 0; } /* FSM END ********************************************/
return 0;
} /* FSM END ******************************************* */
}
/*----------------------------------------------------------------------------*/
static long HaakeSet(long pc, void *object) {
static long HaakeSet(long pc, void *object)
{
Haake *drv = ParCast(&haakeClass, object);
EaseBase *eab = object;
char cmd[32];
int upd;
switch (pc) { default: /* FSM BEGIN *******************************/
switch (pc) {
default: /* FSM BEGIN ****************************** */
upd = EaseNextUpdate(drv);
switch (upd) {
case EASE_RUN:
snprintf(cmd, sizeof cmd, "w sw %.5g", drv->d.targetValue-273.17);
case EASE_RUN:
snprintf(cmd, sizeof cmd, "w sw %.5g", drv->d.targetValue - 273.17);
break;
case HAAKE_ON:
snprintf(cmd, sizeof cmd, "w ts%d", drv->running);
@ -286,27 +330,34 @@ static long HaakeSet(long pc, void *object) {
}
EaseWrite(eab, cmd);
quit:
return 0; } /* FSM END ********************************************/
return 0;
} /* FSM END ******************************************* */
}
/*----------------------------------------------------------------------------*/
static int HaakeInit(SConnection *con, int argc, char *argv[], int dynamic) {
static int HaakeInit(SConnection * con, int argc, char *argv[],
int dynamic)
{
/* args:
MakeObject objectname haake <rs232>
MakeObject objectname haake <host> <port>
MakeObject objectname haake <rs232>
MakeObject objectname haake <host> <port>
*/
Haake *drv;
drv = EaseMakeDriv(con, &haakeClass, argc, argv, dynamic, 7,
HaakeParDef, HaakeHandler, HaakeStart, NULL, HaakeRead,
HaakeSet);
if (drv == NULL) return 0;
setRS232ReplyTerminator(drv->d.b.ser,"\r");
setRS232SendTerminator(drv->d.b.ser,"\r");
drv->d.b.tmo=5;
HaakeParDef, HaakeHandler, HaakeStart, NULL,
HaakeRead, HaakeSet);
if (drv == NULL)
return 0;
setRS232ReplyTerminator(drv->d.b.ser, "\r");
setRS232SendTerminator(drv->d.b.ser, "\r");
drv->d.b.tmo = 5;
return 1;
}
/*----------------------------------------------------------------------------*/
void HaakeStartup(void) {
void HaakeStartup(void)
{
ParMakeClass(&haakeClass, EaseDrivClass());
MakeDriver("HAAKE", HaakeInit, 0, "HAAKE Phoenix P1 thermostat");
}