Merge branch 'dev' of https://github.com/Blackymas/NSPanel_HA_Blueprint into beta
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user