haake: change parameter name running to pumprunning
conflicts with 'running' parameter
This commit is contained in:
12
haakedriv.c
12
haakedriv.c
@ -42,7 +42,7 @@ typedef struct {
|
||||
float set;
|
||||
int errcnt;
|
||||
int status;
|
||||
int running;
|
||||
int pumprunning;
|
||||
int extcontrol;
|
||||
int relais;
|
||||
int overtemp;
|
||||
@ -178,9 +178,9 @@ static void HaakeParDef(void *object)
|
||||
ParTail(drv->unit);
|
||||
ParFloat(&drv->set, PAR_NAN);
|
||||
|
||||
ParName("running");
|
||||
ParName("pumprunning");
|
||||
EaseUpdate(HAAKE_ON);
|
||||
ParInt(&drv->running, 0);
|
||||
ParInt(&drv->pumprunning, 0);
|
||||
|
||||
ParName("extcontrol");
|
||||
EaseUpdate(HAAKE_EXT);
|
||||
@ -236,7 +236,7 @@ static long HaakeRead(long pc, void *object)
|
||||
return __LINE__;
|
||||
case __LINE__: /**********************************/
|
||||
if (!EaseGetUpdate(drv, HAAKE_ON)) {
|
||||
drv->running = (eab->ans[0] != '0');
|
||||
drv->pumprunning = (eab->ans[0] != '0');
|
||||
}
|
||||
if (!EaseGetUpdate(drv, HAAKE_EXT)) {
|
||||
drv->extcontrol = (eab->ans[1] != '0');
|
||||
@ -339,7 +339,7 @@ static long HaakeSet(long pc, void *object)
|
||||
drv->d.targetValue - drv->kelvin);
|
||||
break;
|
||||
case HAAKE_ON:
|
||||
snprintf(cmd, sizeof cmd, "w ts%d", drv->running);
|
||||
snprintf(cmd, sizeof cmd, "w ts%d", drv->pumprunning);
|
||||
break;
|
||||
case HAAKE_EXT:
|
||||
if (drv->extcontrol) {
|
||||
@ -354,7 +354,7 @@ static long HaakeSet(long pc, void *object)
|
||||
default:
|
||||
goto quit;
|
||||
}
|
||||
if (!drv->running) {
|
||||
if (!drv->pumprunning) {
|
||||
ParPrintf(eab, eWarning, "WARNING: Haake is not running");
|
||||
}
|
||||
if (drv->relais || drv->overtemp || drv->lowlevel
|
||||
|
Reference in New Issue
Block a user