h3n3/NSPanel_HA_Blueprint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix alarm not changing status

Browse Source 
Do not clear `entity_id` when opening keyboard page, so the info can be used when sending commands.

Solves #1039
This commit is contained in:
Edward Firmo
2023-09-16 14:05:22 +02:00
parent 20b672085e
commit 00d888817f
10 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nspanel_esphome.yaml
View File

@@ -1245,7 +1245,7 @@ text_sensor:
on_value:
then:
- lambda: |-
if (x != "climate" and x != "cover" and x != "fan" and x != "light" and x != "media_player" ) id(entity_id) = "";
if (x != "climate" and x != "cover" and x != "fan" and x != "light" and x != "media_player" and x != "confirm" and x != "keyb_num" ) id(entity_id) = "";
ESP_LOGD("text_sensor.current_page", "New page: %s", x.c_str());
if (!id(entity_id).empty()) ESP_LOGD("text_sensor.current_page", "Entity shown: %s", id(entity_id).c_str());
id(timer_reset_all).execute(x.c_str());

BIN
nspanel_eu.HMI
View File

Binary file not shown.

BIN
nspanel_eu.tft
View File

Binary file not shown.

17
nspanel_eu_code/keyb_num.txt
View File

@@ -52,30 +52,23 @@ Variable (string) key
Text :
Max. Text Size: 10
Variable (string) entity
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 100
Variable (string) domain
Attributes
ID : 21
ID : 20
Scope : local
Text : alarm
Max. Text Size: 10
Variable (string) aux
Attributes
ID : 22
ID : 21
Scope : local
Text :
Max. Text Size: 255
Variable (string) value
Attributes
ID : 23
ID : 22
Scope : local
Text :
Max. Text Size: 10
@@ -345,7 +338,7 @@ Button benter
Events
Touch Release Event
aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"entity\": \""+entity.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
printh 92
prints "localevent",0
printh 00
@@ -375,7 +368,7 @@ Button bview
Timer wakeup_timer
Attributes
ID : 24
ID : 23
Scope : local
Period (ms): 100
Enabled : yes

BIN
nspanel_us.HMI
View File

Binary file not shown.

BIN
nspanel_us.tft
View File

Binary file not shown.

17
nspanel_us_code/keyb_num.txt
View File

@@ -52,30 +52,23 @@ Variable (string) key
Text :
Max. Text Size: 10
Variable (string) entity
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 100
Variable (string) domain
Attributes
ID : 21
ID : 20
Scope : local
Text : alarm
Max. Text Size: 10
Variable (string) aux
Attributes
ID : 22
ID : 21
Scope : local
Text :
Max. Text Size: 255
Variable (string) value
Attributes
ID : 23
ID : 22
Scope : local
Text :
Max. Text Size: 10
@@ -345,7 +338,7 @@ Button benter
Events
Touch Release Event
aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"entity\": \""+entity.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
printh 92
prints "localevent",0
printh 00
@@ -375,7 +368,7 @@ Button bview
Timer wakeup_timer
Attributes
ID : 24
ID : 23
Scope : local
Period (ms): 100
Enabled : yes

BIN
nspanel_us_land.HMI
View File

Binary file not shown.

BIN
nspanel_us_land.tft
View File

Binary file not shown.

17
nspanel_us_land_code/keyb_num.txt
View File

@@ -52,30 +52,23 @@ Variable (string) key
Text :
Max. Text Size: 10
Variable (string) entity
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 100
Variable (string) domain
Attributes
ID : 21
ID : 20
Scope : local
Text : alarm
Max. Text Size: 10
Variable (string) aux
Attributes
ID : 22
ID : 21
Scope : local
Text :
Max. Text Size: 255
Variable (string) value
Attributes
ID : 23
ID : 22
Scope : local
Text :
Max. Text Size: 10
@@ -345,7 +338,7 @@ Button benter
Events
Touch Release Event
aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"entity\": \""+entity.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
printh 92
prints "localevent",0
printh 00
@@ -375,7 +368,7 @@ Button bview
Timer wakeup_timer
Attributes
ID : 24
ID : 23
Scope : local
Period (ms): 100
Enabled : yes