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

Bump to v4.3.2b1

Browse Source
This commit is contained in:
Edward Firmo
2024-04-03 14:41:01 +02:00
parent e61f78fdcf
commit 18e9458a57
53 changed files with 208 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hmi/dev/nspanel_CJK_eu_code/boot.txt
View File

@@ -96,7 +96,7 @@ Text tft_version
Dragging : 0
Send Component ID : on press and release
Associated Keyboard: none
Text : 4.3.2d1
Text : 4.3.2b1
Max. Text Size : 9
Text esph_version

6
hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt
View File

@@ -789,6 +789,10 @@ TouchCap swipe
swipestore.en=1 // Start swipestore timer
Touch Release Event
if(api==0)
{
page home
}
swipestore.en=0
// Touch has ended, x
if(tch0==0)
@@ -840,7 +844,7 @@ TouchCap swipe
}
}
// Down to Up
swipec=0-swipedy
swipec2=0-swipedy
if(swipec<-100)
{
// Assume starting from buttonpage01 and aiming to navigate two pages ahead based on active pages.

6
hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt
View File

@@ -789,6 +789,10 @@ TouchCap swipe
swipestore.en=1 // Start swipestore timer
Touch Release Event
if(api==0)
{
page home
}
swipestore.en=0
// Touch has ended, x
if(tch0==0)
@@ -846,7 +850,7 @@ TouchCap swipe
}
}
// Down to Up
swipec=0-swipedy
swipec2=0-swipedy
if(swipec<-100)
{
if(is_buttonpage03==1&&is_buttonpage04==1)

6
hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt
View File

@@ -789,6 +789,10 @@ TouchCap swipe
swipestore.en=1 // Start swipestore timer
Touch Release Event
if(api==0)
{
page home
}
swipestore.en=0
// Touch has ended, x
if(tch0==0)
@@ -842,7 +846,7 @@ TouchCap swipe
}
}
// Down to Up
swipec=0-swipedy
swipec2=0-swipedy
if(swipec<-100)
{
// Navigate back up the sequence based on active status

40
hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt
View File

@@ -789,6 +789,10 @@ TouchCap swipe
swipestore.en=1 // Start swipestore timer
Touch Release Event
if(api==0)
{
page home
}
swipestore.en=0
// Touch has ended, x
if(tch0==0)
@@ -798,15 +802,15 @@ TouchCap swipe
if(swipec>swipedx)
{
// Navigate back based on active status
if(is_entitypage03==1)
if(is_buttonpage03==1)
{
page entitypage03
}else if(is_entitypage02==1)
page buttonpage03
}else if(is_buttonpage02==1)
{
page entitypage02
}else if(is_entitypage01==1)
page buttonpage02
}else if(is_buttonpage01==1)
{
page entitypage01
page buttonpage01
}else
{
page home
@@ -826,14 +830,14 @@ TouchCap swipe
// From Up to Down
if(swipec>100)
{
if(is_entitypage03==1&&is_entitypage02==1)
if(is_buttonpage03==1&&is_buttonpage02==1)
{
page entitypage02
}else if(is_entitypage03==1||is_entitypage02==1)
page buttonpage02
}else if(is_buttonpage03==1||is_buttonpage02==1)
{
if(is_entitypage01==1)
if(is_buttonpage01==1)
{
page entitypage01
page buttonpage01
}else
{
page home
@@ -844,19 +848,19 @@ TouchCap swipe
}
}
// Down to Up
swipec=0-swipedy
swipec2=0-swipedy
if(swipec<-100)
{
// Navigate back up the sequence based on active status
if(is_entitypage01==1)
if(is_buttonpage01==1)
{
page entitypage01
}else if(is_entitypage02==1)
page buttonpage01
}else if(is_buttonpage02==1)
{
page entitypage02
}else if(is_entitypage03==1)
page buttonpage02
}else if(is_buttonpage03==1)
{
page entitypage03
page buttonpage03
}else
{
page home

6
hmi/dev/nspanel_CJK_eu_code/entitypage01.txt
View File

@@ -374,6 +374,10 @@ TouchCap swipe
swipestore.en=1 // Start swipestore timer
Touch Release Event
if(api==0)
{
page home
}
swipestore.en=0
// Touch has ended, x
if(tch0==0)
@@ -425,7 +429,7 @@ TouchCap swipe
}
}
// Down to Up
swipec=0-swipedy
swipec2=0-swipedy
if(swipec<-100)
{
if(is_entitypage02==1) // Check if entitypage02 is active

6
hmi/dev/nspanel_CJK_eu_code/entitypage02.txt
View File

@@ -374,6 +374,10 @@ TouchCap swipe
swipestore.en=1 // Start swipestore timer
Touch Release Event
if(api==0)
{
page home
}
swipestore.en=0
// Touch has ended, x
if(tch0==0)
@@ -431,7 +435,7 @@ TouchCap swipe
}
}
// Down to Up
swipec=0-swipedy
swipec2=0-swipedy
if(swipec<-100)
{
if(is_entitypage03==1&&is_entitypage04==1)

6
hmi/dev/nspanel_CJK_eu_code/entitypage03.txt
View File

@@ -374,6 +374,10 @@ TouchCap swipe
swipestore.en=1 // Start swipestore timer
Touch Release Event
if(api==0)
{
page home
}
swipestore.en=0
// Touch has ended, x
if(tch0==0)
@@ -425,7 +429,7 @@ TouchCap swipe
}
}
// Down to Up
swipec=0-swipedy
swipec2=0-swipedy
if(swipec<-100)
{
if(is_entitypage04==1)

6
hmi/dev/nspanel_CJK_eu_code/entitypage04.txt
View File

@@ -374,6 +374,10 @@ TouchCap swipe
swipestore.en=1 // Start swipestore timer
Touch Release Event
if(api==0)
{
page home
}
swipestore.en=0
// Touch has ended, x
if(tch0==0)
@@ -429,7 +433,7 @@ TouchCap swipe
}
}
// Down to Up
swipec=0-swipedy
swipec2=0-swipedy
if(swipec<-100)
{
// Navigate back up the sequence based on active status

36
hmi/dev/nspanel_CJK_eu_code/home.txt
View File

@@ -83,15 +83,6 @@ Text indr_temp
Text :
Max. Text Size : 8
Events
Touch Release Event
printh 92
prints "localevent",0
printh 00
prints "{\"page\": \"home\", \"component\": \"climate\", \"event\": \"click\"}",0
printh 00
printh FF FF FF
Text outdoor_temp
Attributes
ID : 5
@@ -326,15 +317,6 @@ Text indr_temp_icon
Text :
Max. Text Size : 3
Events
Touch Release Event
printh 92
prints "localevent",0
printh 00
prints "{\"page\": \"home\", \"component\": \"climate\", \"event\": \"click\"}",0
printh 00
printh FF FF FF
Text bt_notific
Attributes
ID : 28
@@ -751,6 +733,10 @@ TouchCap swipe
wakeup_timer.en=1 // Set brightness to saved value (from HA)
Touch Release Event
if(api==0)
{
page home
}
swipestore.en=0
// Touch has ended, x
if(tch0==0)
@@ -772,9 +758,6 @@ TouchCap swipe
}else if(is_buttonpage01==1)
{
page buttonpage01
}else
{
// Do nothing
}
}
// Right to Left swipe now navigates to home, looping back to the start.
@@ -794,9 +777,6 @@ TouchCap swipe
}else if(is_buttonpage04==1)
{
page buttonpage04
}else
{
// Do nothing
}
}
}
@@ -825,13 +805,10 @@ TouchCap swipe
}else if(is_buttonpage02==1&&is_buttonpage01==1)
{
page buttonpage01
}else
{
// Do nothing
}
}
// Down to Up
swipec=0-swipedy
swipec2=0-swipedy
if(swipec<-100)
{
// Navigate back up the sequence based on active status
@@ -853,9 +830,6 @@ TouchCap swipe
}else if(is_buttonpage03==1&&is_buttonpage04==1)
{
page buttonpage04
}else
{
// Do nothing
}
}
}

2
hmi/dev/nspanel_CJK_eu_code/light.txt
View File

@@ -383,7 +383,7 @@ Picture colorwheel
covx b,va3.txt,0,0
lightsetting.txt="{\"page\": \"light\", \"component\": \"rgb_color\", \"value\": ["+va1.txt+", "+va2.txt+", "+va3.txt+"]}"
printh 92
prints "nspanelevent",0
prints "localevent",0
printh 00
prints lightsetting.txt,0
printh 00

18
hmi/dev/nspanel_CJK_eu_code/utilities.txt
View File

@@ -27,7 +27,7 @@ Page utilities
printh 00
printh FF FF FF
Variable (int32) line_main_d
Variable (int32) home_line_d
Attributes
ID : 46
Scope: local
@@ -419,7 +419,7 @@ Text group06b
Text :
Max. Text Size : 10
Slider line_main
Slider home_line
Attributes
ID : 10
Scope : local
@@ -530,19 +530,19 @@ Timer tm_movement
Attributes
ID : 45
Scope : local
Period (ms): 50
Period (ms): 150
Enabled : yes
Events
Timer Event
//line_main
line_main.val+=line_main_d.val
if(line_main.val>=line_main.maxval)
//home_line
home_line.val+=home_line_d.val
if(home_line.val>=home_line.maxval)
{
line_main.val=line_main.minval
}else if(line_main.val<=line_main.minval)
home_line.val=home_line.minval
}else if(home_line.val<=home_line.minval)
{
line_main.val=line_main.maxval
home_line.val=home_line.maxval
}
//group01_line
group01_line.val+=group01_line_d.val