h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-28 13:20:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-19 18:11:28 +00:00
committed by github-actions[bot]
parent f2549a6a91
commit b067a2c187
27 changed files with 294 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HMI/US/landscape/n2t-out/Program.s.txt
View File

@@ -11,6 +11,6 @@ Program.s
// dim value
int dimValue=40
int dimValueNormal=100
// fix touch offset (Removed for US version)
//lcd_dev fffb 0002 0000 0020
// fix touch offset
lcd_dev fffb 0002 0000 0020
page pageStartup

2
HMI/US/landscape/n2t-out/cardAlarm.txt
View File

@@ -44,7 +44,7 @@ Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 50
Max. Text Size: 80
Variable (string) tSend
Attributes

8
HMI/US/landscape/n2t-out/cardEntities.txt
View File

@@ -97,25 +97,25 @@ Variable (string) entn1
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn2
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn3
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn4
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Number nNum1
Attributes

12
HMI/US/landscape/n2t-out/cardGrid.txt
View File

@@ -69,25 +69,25 @@ Variable (string) entn1
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn2
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn3
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn4
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) type5
Attributes
@@ -105,13 +105,13 @@ Variable (string) entn5
Attributes
Scope : local
Text :
Max. Text Size: 50
Max. Text Size: 80
Variable (string) entn6
Attributes
Scope : local
Text :
Max. Text Size: 50
Max. Text Size: 80
Text tHeading
Attributes

2
HMI/US/landscape/n2t-out/cardMedia.txt
View File

@@ -30,7 +30,7 @@ Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 50
Max. Text Size: 80
Variable (string) vaSpeakerList
Attributes

2
HMI/US/landscape/n2t-out/cardThermo.txt
View File

@@ -42,7 +42,7 @@ Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 50
Max. Text Size: 80
Variable (string) va0
Attributes

4
HMI/US/landscape/n2t-out/pageIcons.txt
View File

@@ -30,7 +30,7 @@ Text tTmp1
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 50
Max. Text Size : 80
Text tTmp2
Attributes
@@ -40,7 +40,7 @@ Text tTmp2
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 50
Max. Text Size : 80
Picture p0
Attributes

2
HMI/US/landscape/n2t-out/pageStartup.txt
View File

@@ -177,7 +177,7 @@ Button bSendStartup
recmod=1
bauds=115200
// startup event
tSend.txt="event,startup,"+tVersion.txt+",us-l"
tSend.txt="event,startup,"+tVersion.txt+",eu"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

34
HMI/US/landscape/n2t-out/popupLight.txt
View File

@@ -59,8 +59,8 @@ Variable (string) strCommand
Variable (string) entn
Attributes
Scope : local
Text : newtxt
Max. Text Size: 50
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
@@ -570,25 +570,43 @@ Timer tmSerial
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
if(tId.txt=="pageStartup")
{
page pageStartup
}
if(tId.txt=="screensaver")
{
page screensaver
}
if(tId.txt=="cardEntities")
{
page cardEntities
}
if(tId.txt=="cardMedia")
if(tId.txt=="cardGrid")
{
page cardMedia
page cardGrid
}
if(tId.txt=="pageStartup")
if(tId.txt=="popupLight")
{
page pageStartup
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardGrid")
if(tId.txt=="cardThermo")
{
page cardGrid
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{

4
HMI/US/landscape/n2t-out/popupShutter.txt
View File

@@ -46,8 +46,8 @@ Variable (string) strCommand
Variable (string) entn
Attributes
Scope : local
Text : newtxt
Max. Text Size: 50
Text :
Max. Text Size: 80
Text tEntity
Attributes

46
HMI/US/landscape/n2t-out/screensaver.txt
View File

@@ -17,6 +17,8 @@ Page screensaver
vis tInstruction,0
vis tTmp,0
vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -48,6 +50,18 @@ Variable (int32) vaTap
Scope: local
Value: 0
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 50
Variable (string) tTmp
Attributes
Scope : local
Text :
Max. Text Size: 50
Text tTime
Attributes
Scope : local
@@ -278,7 +292,7 @@ Text tMR
Text :
Max. Text Size : 10
Text tTmp
Text tNotifyHead
Attributes
Scope : local
Dragging : 0
@@ -286,9 +300,9 @@ Text tTmp
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 50
Max. Text Size : 35
Text tInstruction
Text tNotifyText
Attributes
Scope : local
Dragging : 0
@@ -296,7 +310,7 @@ Text tInstruction
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 50
Max. Text Size : 35
Picture p0
Attributes
@@ -529,6 +543,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType")
{
dim=100
@@ -618,6 +646,16 @@ TouchCap tc0
Events
Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0