Merge branch 'dev' of https://github.com/Blackymas/NSPanel_HA_Blueprint into beta
This commit is contained in:
@@ -17,12 +17,7 @@ Page alarm
|
||||
page home
|
||||
}else
|
||||
{
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "alarm",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
vis bt_home,0
|
||||
vis bt_away,0
|
||||
vis bt_night,0
|
||||
|
||||
@@ -12,12 +12,7 @@ Page boot
|
||||
|
||||
Events
|
||||
Preinitialize Event
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "boot",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
dim=0
|
||||
vis bt_reboot,0
|
||||
covx baud,baud_rate.txt,0,0
|
||||
@@ -142,7 +137,7 @@ Text tft_version
|
||||
Dragging : 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard: none
|
||||
Text : 4.1.4
|
||||
Text : 4.2dev
|
||||
Max. Text Size : 9
|
||||
|
||||
Text esph_version
|
||||
|
||||
@@ -17,12 +17,16 @@ Page buttonpage01
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage01.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "buttonpage01",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage01.txt
|
||||
vis 255,0
|
||||
vis button_back,1
|
||||
vis page_index,1
|
||||
|
||||
@@ -17,12 +17,16 @@ Page buttonpage02
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage02.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "buttonpage02",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage02.txt
|
||||
vis 255,0
|
||||
vis button_back,1
|
||||
vis page_index,1
|
||||
|
||||
@@ -17,12 +17,16 @@ Page buttonpage03
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage03.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "buttonpage03",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage03.txt
|
||||
vis 255,0
|
||||
vis button_back,1
|
||||
vis page_index,1
|
||||
|
||||
@@ -17,12 +17,16 @@ Page buttonpage04
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage04.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "buttonpage04",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage04.txt
|
||||
vis 255,0
|
||||
vis button_back,1
|
||||
vis page_index,1
|
||||
|
||||
@@ -14,12 +14,7 @@ Page climate
|
||||
Preinitialize Event
|
||||
if(api==1||embedded.val==1)
|
||||
{
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "climate",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
vis target_icon,0
|
||||
vis target_temp,0
|
||||
vis current_temp,0
|
||||
|
||||
@@ -17,12 +17,7 @@ Page confirm
|
||||
page home
|
||||
}else
|
||||
{
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "confirm",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,7 @@ Page cover
|
||||
page home
|
||||
}else
|
||||
{
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "cover",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,16 @@ Page entitypage01
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage01.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "entitypage01",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage01.txt
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,16 @@ Page entitypage02
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage02.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "entitypage02",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage02.txt
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,16 @@ Page entitypage03
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage03.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "entitypage03",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage03.txt
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,16 @@ Page entitypage04
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage04.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "entitypage04",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage04.txt
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,7 @@ Page fan
|
||||
page home
|
||||
}else
|
||||
{
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "fan",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -12,12 +12,16 @@ Page home
|
||||
|
||||
Events
|
||||
Preinitialize Event
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/home.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "home",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/home.txt
|
||||
vis bt_notific,is_notification
|
||||
vis bt_qrcode,is_qrcode
|
||||
vis bt_entities,is_entities
|
||||
|
||||
@@ -17,12 +17,7 @@ Page keyb_num
|
||||
page page_id.val
|
||||
}else
|
||||
{
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "keyb_num",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,7 @@ Page light
|
||||
page home
|
||||
}else
|
||||
{
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "light",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
vis light_b_press,1
|
||||
vis lightslider,1
|
||||
vis light_value,1
|
||||
|
||||
@@ -17,12 +17,7 @@ Page media_player
|
||||
page home
|
||||
}else
|
||||
{
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "media_player",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,7 @@ Page notification
|
||||
page home
|
||||
}else
|
||||
{
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "notification",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -12,12 +12,7 @@ Page qrcode
|
||||
|
||||
Events
|
||||
Preinitialize Event
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "qrcode",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
|
||||
Touch Press Event
|
||||
printh 91
|
||||
|
||||
@@ -12,12 +12,7 @@ Page screensaver
|
||||
|
||||
Events
|
||||
Preinitialize Event
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "screensaver",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
sendme
|
||||
dim=0
|
||||
|
||||
Touch Release Event
|
||||
|
||||
@@ -12,12 +12,16 @@ Page settings
|
||||
|
||||
Events
|
||||
Preinitialize Event
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/settings.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "settings",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/settings.txt
|
||||
covx brightslider.val,bright_text.txt,0,0
|
||||
bright_text.txt+="%"
|
||||
covx dimslider.val,dim_text.txt,0,0
|
||||
|
||||
@@ -17,12 +17,16 @@ Page weather01
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather01.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "weather01",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather01.txt
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,16 @@ Page weather02
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather02.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "weather02",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather02.txt
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,16 @@ Page weather03
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather03.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "weather03",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather03.txt
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,16 @@ Page weather04
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather04.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "weather04",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather04.txt
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
@@ -17,12 +17,16 @@ Page weather05
|
||||
page home
|
||||
}else
|
||||
{
|
||||
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather05.txt
|
||||
printh 92
|
||||
prints "currentpage",0
|
||||
printh 00
|
||||
prints "weather05",0
|
||||
printh 00
|
||||
printh FF FF FF
|
||||
========
|
||||
sendme
|
||||
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather05.txt
|
||||
}
|
||||
|
||||
Touch Press Event
|
||||
|
||||
Reference in New Issue
Block a user