From 68cf4f74e3e724f2f1248a4e147689f7655be684 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 21 Feb 2023 21:44:40 +0100 Subject: [PATCH 1/6] Generate cardThermo Mode buttons based on Alias Mode State Property instead of Number --- ioBroker/NsPanelTs.ts | 105 ++++++++++++++++--------- ioBroker/NsPanelTs_without_Examples.ts | 105 ++++++++++++++++--------- 2 files changed, 140 insertions(+), 70 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 608b02a0..4dfb9765 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -3764,6 +3764,7 @@ function GenerateThermoPage(page: PageThermo): Payload[] { if (o.common.role == 'airCondition') { if (existsState(id + '.MODE') && getState(id + '.MODE').val != null) { let Mode = getState(id + '.MODE').val + if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) { if (Mode != 0 || getState(id + '.POWER').val) { //0=ON oder .POWER = true bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~'; @@ -3773,48 +3774,82 @@ function GenerateThermoPage(page: PageThermo): Payload[] { statusStr = 'OFF'; } } - if (Mode == 1) { //1=AUTO - bt[1] = Icons.GetIcon('air-conditioner') + '~1024~1~' + 'AUTO' + '~'; - statusStr = 'AUTO'; - } else { - bt[1] = Icons.GetIcon('air-conditioner') + '~35921~0~' + 'AUTO' + '~'; + + let States = getObject(id + '.MODE').common.states; + let iconIndex: number = 1; + for(const statekey in States) { + let stateName: string = States[statekey]; + let stateKeyNumber: number = parseInt(statekey); + if(stateName == 'OFF' || stateKeyNumber > 6) { + continue; + } + if(stateKeyNumber == Mode) { + statusStr = stateName.replace('_', ' '); + } + switch(stateName) { + case 'AUTO': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('air-conditioner') + '~1024~1~' + 'AUTO' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('air-conditioner') + '~35921~0~' + 'AUTO' + '~'; + } + break; + case 'COOL': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('snowflake') + '~11487~1~' + 'COOL' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('snowflake') + '~35921~0~' + 'COOL' + '~'; + } + break; + case 'HEAT': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('fire') + '~64512~1~' + 'HEAT' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('fire') + '~35921~0~' + 'HEAT' + '~'; + } + break; + case 'ECO': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~'; + } + break; + case 'FAN_ONLY': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN' + '~'; + } + break; + case 'DRY': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('water-percent') + '~60897~1~' + 'DRY' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('water-percent') + '~35921~0~' + 'DRY' + '~'; + } + break; + } + iconIndex++; } - if (Mode == 2) { //2=COOL - bt[2] = Icons.GetIcon('snowflake') + '~11487~1~' + 'COOL' + '~'; - statusStr = 'COOL'; - } else { - bt[2] = Icons.GetIcon('snowflake') + '~35921~0~' + 'COOL' + '~'; + + if (iconIndex <= 7 && existsState(id + '.ECO') && getState(id + '.ECO').val != null) { + if (getState(id + '.ECO').val && getState(id + '.ECO').val == 1) { + bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~'; + statusStr = 'ECO'; + } else { + bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~'; + } + iconIndex++; } - if (Mode == 3) { //3=HEAT - bt[3] = Icons.GetIcon('fire') + '~64512~1~' + 'HEAT' + '~'; - statusStr = 'HEAT'; - } else { - bt[3] = Icons.GetIcon('fire') + '~35921~0~' + 'HEAT' + '~'; - } - if (Mode == 4) { //4=ECO - bt[4] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~'; - statusStr = 'ECO'; - } else { - bt[4] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~'; - } - if (Mode == 5) { //5=FANONLY - bt[5] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN' + '~'; - statusStr = 'FAN ONLY'; - } else { - bt[5] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN' + '~'; - } - if (Mode == 6) { //6=DRY - bt[6] = Icons.GetIcon('water-percent') + '~60897~1~' + 'DRY' + '~'; - statusStr = 'DRY'; - } else { - bt[6] = Icons.GetIcon('water-percent') + '~35921~0~' + 'DRY' + '~'; - } - if (existsState(id + '.SWING') && getState(id + '.SWING').val != null) { + + if (iconIndex <= 7 && existsState(id + '.SWING') && getState(id + '.SWING').val != null) { if (getState(id + '.POWER').val && getState(id + '.SWING').val == 1) { //0=ON oder .SWING = true bt[7] = Icons.GetIcon('swap-vertical-bold') + '~2016~1~' + 'SWING' + '~'; } else { bt[7] = Icons.GetIcon('swap-vertical-bold') + '~35921~0~' + 'SWING' + '~'; } + iconIndex++; } } } diff --git a/ioBroker/NsPanelTs_without_Examples.ts b/ioBroker/NsPanelTs_without_Examples.ts index 8dd4a982..2c7e36fb 100644 --- a/ioBroker/NsPanelTs_without_Examples.ts +++ b/ioBroker/NsPanelTs_without_Examples.ts @@ -3381,6 +3381,7 @@ function GenerateThermoPage(page: PageThermo): Payload[] { if (o.common.role == 'airCondition') { if (existsState(id + '.MODE') && getState(id + '.MODE').val != null) { let Mode = getState(id + '.MODE').val + if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) { if (Mode != 0 || getState(id + '.POWER').val) { //0=ON oder .POWER = true bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~'; @@ -3390,48 +3391,82 @@ function GenerateThermoPage(page: PageThermo): Payload[] { statusStr = 'OFF'; } } - if (Mode == 1) { //1=AUTO - bt[1] = Icons.GetIcon('air-conditioner') + '~1024~1~' + 'AUTO' + '~'; - statusStr = 'AUTO'; - } else { - bt[1] = Icons.GetIcon('air-conditioner') + '~35921~0~' + 'AUTO' + '~'; + + let States = getObject(id + '.MODE').common.states; + let iconIndex: number = 1; + for(const statekey in States) { + let stateName: string = States[statekey]; + let stateKeyNumber: number = parseInt(statekey); + if(stateName == 'OFF' || stateKeyNumber > 6) { + continue; + } + if(stateKeyNumber == Mode) { + statusStr = stateName.replace('_', ' '); + } + switch(stateName) { + case 'AUTO': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('air-conditioner') + '~1024~1~' + 'AUTO' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('air-conditioner') + '~35921~0~' + 'AUTO' + '~'; + } + break; + case 'COOL': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('snowflake') + '~11487~1~' + 'COOL' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('snowflake') + '~35921~0~' + 'COOL' + '~'; + } + break; + case 'HEAT': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('fire') + '~64512~1~' + 'HEAT' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('fire') + '~35921~0~' + 'HEAT' + '~'; + } + break; + case 'ECO': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~'; + } + break; + case 'FAN_ONLY': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN' + '~'; + } + break; + case 'DRY': + if(stateKeyNumber == Mode) { + bt[iconIndex] = Icons.GetIcon('water-percent') + '~60897~1~' + 'DRY' + '~'; + } else { + bt[iconIndex] = Icons.GetIcon('water-percent') + '~35921~0~' + 'DRY' + '~'; + } + break; + } + iconIndex++; } - if (Mode == 2) { //2=COOL - bt[2] = Icons.GetIcon('snowflake') + '~11487~1~' + 'COOL' + '~'; - statusStr = 'COOL'; - } else { - bt[2] = Icons.GetIcon('snowflake') + '~35921~0~' + 'COOL' + '~'; + + if (iconIndex <= 7 && existsState(id + '.ECO') && getState(id + '.ECO').val != null) { + if (getState(id + '.ECO').val && getState(id + '.ECO').val == 1) { + bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~'; + statusStr = 'ECO'; + } else { + bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~'; + } + iconIndex++; } - if (Mode == 3) { //3=HEAT - bt[3] = Icons.GetIcon('fire') + '~64512~1~' + 'HEAT' + '~'; - statusStr = 'HEAT'; - } else { - bt[3] = Icons.GetIcon('fire') + '~35921~0~' + 'HEAT' + '~'; - } - if (Mode == 4) { //4=ECO - bt[4] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~'; - statusStr = 'ECO'; - } else { - bt[4] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~'; - } - if (Mode == 5) { //5=FANONLY - bt[5] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN' + '~'; - statusStr = 'FAN ONLY'; - } else { - bt[5] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN' + '~'; - } - if (Mode == 6) { //6=DRY - bt[6] = Icons.GetIcon('water-percent') + '~60897~1~' + 'DRY' + '~'; - statusStr = 'DRY'; - } else { - bt[6] = Icons.GetIcon('water-percent') + '~35921~0~' + 'DRY' + '~'; - } - if (existsState(id + '.SWING') && getState(id + '.SWING').val != null) { + + if (iconIndex <= 7 && existsState(id + '.SWING') && getState(id + '.SWING').val != null) { if (getState(id + '.POWER').val && getState(id + '.SWING').val == 1) { //0=ON oder .SWING = true bt[7] = Icons.GetIcon('swap-vertical-bold') + '~2016~1~' + 'SWING' + '~'; } else { bt[7] = Icons.GetIcon('swap-vertical-bold') + '~35921~0~' + 'SWING' + '~'; } + iconIndex++; } } } From 394e5b4614583f862c9b83e1d9225316c2349aff Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 21 Feb 2023 22:07:49 +0100 Subject: [PATCH 2/6] Fix power off state visualization --- ioBroker/NsPanelTs.ts | 25 ++++++++++++++----------- ioBroker/NsPanelTs_without_Examples.ts | 25 ++++++++++++++----------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 4dfb9765..920f2e21 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -3764,18 +3764,8 @@ function GenerateThermoPage(page: PageThermo): Payload[] { if (o.common.role == 'airCondition') { if (existsState(id + '.MODE') && getState(id + '.MODE').val != null) { let Mode = getState(id + '.MODE').val - - if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) { - if (Mode != 0 || getState(id + '.POWER').val) { //0=ON oder .POWER = true - bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~'; - statusStr = 'ON'; - } else { - bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~'; - statusStr = 'OFF'; - } - } - let States = getObject(id + '.MODE').common.states; + let iconIndex: number = 1; for(const statekey in States) { let stateName: string = States[statekey]; @@ -3851,6 +3841,19 @@ function GenerateThermoPage(page: PageThermo): Payload[] { } iconIndex++; } + + // Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann + if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) { + console.log(Mode); + console.log(States[Mode]); + if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) { + bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~'; + statusStr = 'OFF'; + } + else { + bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~'; + } + } } } } diff --git a/ioBroker/NsPanelTs_without_Examples.ts b/ioBroker/NsPanelTs_without_Examples.ts index 2c7e36fb..52174357 100644 --- a/ioBroker/NsPanelTs_without_Examples.ts +++ b/ioBroker/NsPanelTs_without_Examples.ts @@ -3381,18 +3381,8 @@ function GenerateThermoPage(page: PageThermo): Payload[] { if (o.common.role == 'airCondition') { if (existsState(id + '.MODE') && getState(id + '.MODE').val != null) { let Mode = getState(id + '.MODE').val - - if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) { - if (Mode != 0 || getState(id + '.POWER').val) { //0=ON oder .POWER = true - bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~'; - statusStr = 'ON'; - } else { - bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~'; - statusStr = 'OFF'; - } - } - let States = getObject(id + '.MODE').common.states; + let iconIndex: number = 1; for(const statekey in States) { let stateName: string = States[statekey]; @@ -3468,6 +3458,19 @@ function GenerateThermoPage(page: PageThermo): Payload[] { } iconIndex++; } + + // Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann + if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) { + console.log(Mode); + console.log(States[Mode]); + if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) { + bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~'; + statusStr = 'OFF'; + } + else { + bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~'; + } + } } } } From 5bb932293bc333f5753ff18386f8775e711d9420 Mon Sep 17 00:00:00 2001 From: bembelstemmer Date: Wed, 22 Feb 2023 21:51:36 +0100 Subject: [PATCH 3/6] Support Event Actions of dynamic types --- ioBroker/NsPanelTs.ts | 61 +++++++++++--------------- ioBroker/NsPanelTs_without_Examples.ts | 61 +++++++++++--------------- 2 files changed, 52 insertions(+), 70 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 920f2e21..3cdcace3 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -5384,42 +5384,33 @@ function HandleButtonEvent(words: any): void { } GeneratePage(config.pages[pageId]); } else { - let HVACMode = 0; - switch (words[4]) { - case 'POWER': - HVACMode = 0; - setIfExists(words[2] + '.' + words[4], !getState(words[2] + '.' + words[4]).val); - if (getState(words[2] + '.' + words[4]).val) { - HVACMode = 1; - } - break; - case 'AUTO': - HVACMode = 1; - break; - case 'COOL': - HVACMode = 2; - break; - case 'HEAT': - HVACMode = 3; - break; - case 'ECO': - HVACMode = 4; - break; - case 'FAN': - HVACMode = 5; - break; - case 'DRY': - HVACMode = 6; - break; - case 'SWING': - HVACMode = getState(words[2] + '.MODE').val; - if (getState(words[2] + '.SWING').val == 0) { - setIfExists(words[2] + '.SWING', 1); - } else { - setIfExists(words[2] + '.' + 'SWING', 0); - } - break; + let HVACMode = getState(words[2] + '.MODE').val; + + // Event ist an ein eigenes Objekt gebunden + if(existsObject(words[2] + '.' + words[4])) { + switch(words[4]) { + case 'SWING': + if (getState(words[2] + '.SWING').val == 0) { + setIfExists(words[2] + '.SWING', 1); + } else { + setIfExists(words[2] + '.' + 'SWING', 0); + } + break; + default: // Power und Eco koennen einfach getoggelt werden + setIfExists(words[2] + '.' + words[4], !getState(words[2] + '.' + words[4]).val); + break; + } } + + // Event ist ein Modus der Liste (Moduswechsel) + let HVACModeList = getObject(words[2] + '.MODE').common.states; + for(const statekey in HVACModeList) { + if(HVACModeList[statekey] == words[4]) { + HVACMode = parseInt(statekey); + break; + } + } + setIfExists(words[2] + '.' + 'MODE', HVACMode); GeneratePage(config.pages[pageId]); } diff --git a/ioBroker/NsPanelTs_without_Examples.ts b/ioBroker/NsPanelTs_without_Examples.ts index 52174357..f893d284 100644 --- a/ioBroker/NsPanelTs_without_Examples.ts +++ b/ioBroker/NsPanelTs_without_Examples.ts @@ -5001,42 +5001,33 @@ function HandleButtonEvent(words: any): void { } GeneratePage(config.pages[pageId]); } else { - let HVACMode = 0; - switch (words[4]) { - case 'POWER': - HVACMode = 0; - setIfExists(words[2] + '.' + words[4], !getState(words[2] + '.' + words[4]).val); - if (getState(words[2] + '.' + words[4]).val) { - HVACMode = 1; - } - break; - case 'AUTO': - HVACMode = 1; - break; - case 'COOL': - HVACMode = 2; - break; - case 'HEAT': - HVACMode = 3; - break; - case 'ECO': - HVACMode = 4; - break; - case 'FAN': - HVACMode = 5; - break; - case 'DRY': - HVACMode = 6; - break; - case 'SWING': - HVACMode = getState(words[2] + '.MODE').val; - if (getState(words[2] + '.SWING').val == 0) { - setIfExists(words[2] + '.SWING', 1); - } else { - setIfExists(words[2] + '.' + 'SWING', 0); - } - break; + let HVACMode = getState(words[2] + '.MODE').val; + + // Event ist an ein eigenes Objekt gebunden + if(existsObject(words[2] + '.' + words[4])) { + switch(words[4]) { + case 'SWING': + if (getState(words[2] + '.SWING').val == 0) { + setIfExists(words[2] + '.SWING', 1); + } else { + setIfExists(words[2] + '.' + 'SWING', 0); + } + break; + default: // Power und Eco koennen einfach getoggelt werden + setIfExists(words[2] + '.' + words[4], !getState(words[2] + '.' + words[4]).val); + break; + } } + + // Event ist ein Modus der Liste (Moduswechsel) + let HVACModeList = getObject(words[2] + '.MODE').common.states; + for(const statekey in HVACModeList) { + if(HVACModeList[statekey] == words[4]) { + HVACMode = parseInt(statekey); + break; + } + } + setIfExists(words[2] + '.' + 'MODE', HVACMode); GeneratePage(config.pages[pageId]); } From 4cfd7a5c3c97b5865b652d74c1224b0ccd047a73 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 26 Feb 2023 17:51:36 +0100 Subject: [PATCH 4/6] Fix jumping back to previous card when switching mode and cardThermo is subElement --- ioBroker/NsPanelTs.ts | 4 ++-- ioBroker/NsPanelTs_without_Examples.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 3cdcace3..3938ea20 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -5382,7 +5382,7 @@ function HandleButtonEvent(words: any): void { setIfExists(words[2] + '.' + modesDP[mode], false); } } - GeneratePage(config.pages[pageId]); + GeneratePage(activePage); } else { let HVACMode = getState(words[2] + '.MODE').val; @@ -5412,7 +5412,7 @@ function HandleButtonEvent(words: any): void { } setIfExists(words[2] + '.' + 'MODE', HVACMode); - GeneratePage(config.pages[pageId]); + GeneratePage(activePage); } break; case 'mode-modus1': diff --git a/ioBroker/NsPanelTs_without_Examples.ts b/ioBroker/NsPanelTs_without_Examples.ts index f893d284..4c797bd8 100644 --- a/ioBroker/NsPanelTs_without_Examples.ts +++ b/ioBroker/NsPanelTs_without_Examples.ts @@ -4999,7 +4999,7 @@ function HandleButtonEvent(words: any): void { setIfExists(words[2] + '.' + modesDP[mode], false); } } - GeneratePage(config.pages[pageId]); + GeneratePage(activePage); } else { let HVACMode = getState(words[2] + '.MODE').val; @@ -5029,7 +5029,7 @@ function HandleButtonEvent(words: any): void { } setIfExists(words[2] + '.' + 'MODE', HVACMode); - GeneratePage(config.pages[pageId]); + GeneratePage(activePage); } break; case 'mode-modus1': From 683eaca479e6a3f89e32db1ed573f3fb035c769c Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 26 Feb 2023 17:54:56 +0100 Subject: [PATCH 5/6] Fix setting FAN_ONLY Mode --- ioBroker/NsPanelTs.ts | 4 ++-- ioBroker/NsPanelTs_without_Examples.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 3938ea20..1cf04444 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -3807,9 +3807,9 @@ function GenerateThermoPage(page: PageThermo): Payload[] { break; case 'FAN_ONLY': if(stateKeyNumber == Mode) { - bt[iconIndex] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN' + '~'; + bt[iconIndex] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN_ONLY' + '~'; } else { - bt[iconIndex] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN' + '~'; + bt[iconIndex] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN_ONLY' + '~'; } break; case 'DRY': diff --git a/ioBroker/NsPanelTs_without_Examples.ts b/ioBroker/NsPanelTs_without_Examples.ts index 4c797bd8..d2cc26b5 100644 --- a/ioBroker/NsPanelTs_without_Examples.ts +++ b/ioBroker/NsPanelTs_without_Examples.ts @@ -3424,9 +3424,9 @@ function GenerateThermoPage(page: PageThermo): Payload[] { break; case 'FAN_ONLY': if(stateKeyNumber == Mode) { - bt[iconIndex] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN' + '~'; + bt[iconIndex] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN_ONLY' + '~'; } else { - bt[iconIndex] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN' + '~'; + bt[iconIndex] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN_ONLY' + '~'; } break; case 'DRY': From b087cafdb5a5336477545a94831f1e56b58ae8a5 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 26 Feb 2023 18:12:49 +0100 Subject: [PATCH 6/6] cleanup logging --- ioBroker/NsPanelTs.ts | 2 -- ioBroker/NsPanelTs_without_Examples.ts | 2 -- 2 files changed, 4 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 1cf04444..5ffcb6ec 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -3844,8 +3844,6 @@ function GenerateThermoPage(page: PageThermo): Payload[] { // Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) { - console.log(Mode); - console.log(States[Mode]); if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) { bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~'; statusStr = 'OFF'; diff --git a/ioBroker/NsPanelTs_without_Examples.ts b/ioBroker/NsPanelTs_without_Examples.ts index d2cc26b5..ab83f0c9 100644 --- a/ioBroker/NsPanelTs_without_Examples.ts +++ b/ioBroker/NsPanelTs_without_Examples.ts @@ -3461,8 +3461,6 @@ function GenerateThermoPage(page: PageThermo): Payload[] { // Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) { - console.log(Mode); - console.log(States[Mode]); if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) { bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~'; statusStr = 'OFF';