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

haake: change parameter name running to pumprunning

Browse Source 
conflicts with 'running' parameter
This commit is contained in:
zolliker
2024-11-14 09:14:25 +01:00
parent c9c93a9d7d
commit b86ed56a38
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
haakedriv.c
View File

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