h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-19 22:24:15 +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-03-31 07:32:24 +00:00
committed by GitHub Actions
parent 0fd2c961e7
commit e22f237a79
33 changed files with 327 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

484
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,484 +0,0 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 07:13:41.681299774 +0000
@@ -10,7 +10,6 @@
int sleepValue=0
// dim value
int dimValue=40
- int dimValueNormal=100
- // fix touch offset
- lcd_dev fffb 0002 0000 0020
+ // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 07:13:41.685299825 +0000
@@ -583,12 +583,12 @@
if(tInstruction.txt=="time")
{
// get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ spstr strCommand.txt,screensaver.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ spstr strCommand.txt,screensaver.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -670,20 +670,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,sleepReached,cardAlarm"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 07:13:41.685299825 +0000
@@ -1675,12 +1675,12 @@
if(tInstruction.txt=="time")
{
// get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ spstr strCommand.txt,screensaver.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ spstr strCommand.txt,screensaver.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -1719,20 +1719,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,sleepReached,cardEntities"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 07:13:41.685299825 +0000
@@ -765,12 +765,12 @@
if(tInstruction.txt=="time")
{
// get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ spstr strCommand.txt,screensaver.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ spstr strCommand.txt,screensaver.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -809,20 +809,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,sleepReached,cardGrid"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 07:13:41.685299825 +0000
@@ -551,12 +551,12 @@
if(tInstruction.txt=="time")
{
// get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ spstr strCommand.txt,screensaver.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ spstr strCommand.txt,screensaver.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -647,20 +647,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,sleepReached,cardMedia"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 07:13:40.777288362 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 07:13:41.685299825 +0000
@@ -835,12 +835,12 @@
if(tInstruction.txt=="time")
{
// get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ spstr strCommand.txt,screensaver.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ spstr strCommand.txt,screensaver.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -921,20 +921,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,sleepReached,cardThermo"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 07:13:41.681299774 +0000
@@ -10,18 +10,6 @@
Swide left page ID : disabled
Swide right page ID : disabled
-Variable (string) vaTime
- Attributes
- Scope : global
- Text :
- Max. Text Size: 15
-
-Variable (string) vaDate
- Attributes
- Scope : global
- Text :
- Max. Text Size: 30
-
Text tIcons
Attributes
Scope : global
@@ -29,7 +17,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 
+ Text : 
Max. Text Size : 170
Text tTmp1
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 07:13:41.685299825 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
// startup event
- tSend.txt="event,startup,"+tVersion.txt+",eu"
+ tSend.txt="event,startup,"+tVersion.txt+",us-l"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -261,12 +261,12 @@
if(tInstruction.txt=="time")
{
// get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ spstr strCommand.txt,screensaver.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ spstr strCommand.txt,screensaver.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-31 07:13:41.685299825 +0000
@@ -382,6 +382,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
click b0,1
click b0,0
@@ -541,12 +542,12 @@
if(tInstruction.txt=="time")
{
// get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ spstr strCommand.txt,screensaver.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ spstr strCommand.txt,screensaver.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-31 07:13:41.685299825 +0000
@@ -195,6 +195,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
click b0,1
click b0,0
@@ -298,12 +299,12 @@
if(tInstruction.txt=="time")
{
// get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ spstr strCommand.txt,screensaver.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ spstr strCommand.txt,screensaver.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-31 07:13:41.685299825 +0000
@@ -268,6 +268,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
click b0,1
click b0,0
@@ -341,12 +342,12 @@
if(tInstruction.txt=="time")
{
// get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ spstr strCommand.txt,screensaver.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ spstr strCommand.txt,screensaver.vaDate.txt,"?",1
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 07:13:41.685299825 +0000
@@ -14,18 +14,19 @@
Preinitialize Event
recmod=1
bauds=115200
+ vis originPage,0
vis tInstruction,0
vis tTmp,0
vis p0,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
- spstr pageIcons.vaTime.txt,tTime.txt,"?",0
- spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
+ spstr vaTime.txt,tTime.txt,"?",0
+ spstr vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="")
{
vis tAMPM,0
}
- tDate.txt=pageIcons.vaDate.txt
+ tDate.txt=vaDate.txt
dim=dimValue
vis tSend,0
//page open event
@@ -38,18 +39,18 @@
tForecast2.txt=""
tF2Icon.txt=""
tForecast2Val.txt=""
- //tSend.txt="event,screensaverOpen"
+ tSend.txt="event,screensaverOpen"
//send calc crc
- //btlen tSend.txt,sys0
- //crcrest 1,0xffff // reset CRC
- //crcputh 55 bb
- //crcputs sys0,1
- //crcputs tSend.txt,0
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,1
+ crcputs tSend.txt,0
//send cmd
- //printh 55 bb
- //prints sys0,2
- //prints tSend.txt,0
- //prints crcval,2
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
Variable (string) strCommand
Attributes
@@ -57,6 +58,18 @@
Text :
Max. Text Size: 200
+Variable (string) vaTime
+ Attributes
+ Scope : global
+ Text :
+ Max. Text Size: 15
+
+Variable (string) vaDate
+ Attributes
+ Scope : global
+ Text :
+ Max. Text Size: 30
+
Variable (string) tId
Attributes
Scope : local
@@ -68,6 +81,15 @@
Scope: local
Value: 0
+Number originPage
+ Attributes
+ Scope : global
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Value : 0
+
Text tInstruction
Attributes
Scope : local
@@ -351,9 +373,9 @@
if(tInstruction.txt=="time")
{
//get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,",",1
- spstr pageIcons.vaTime.txt,tTime.txt,"?",0
- spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
+ spstr strCommand.txt,vaTime.txt,",",1
+ spstr vaTime.txt,tTime.txt,"?",0
+ spstr vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="")
{
vis tAMPM,0
@@ -362,8 +384,8 @@
if(tInstruction.txt=="date")
{
//get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
- tDate.txt=pageIcons.vaDate.txt
+ spstr strCommand.txt,vaDate.txt,"?",1
+ tDate.txt=vaDate.txt
}
if(tInstruction.txt=="timeout")
{
@@ -482,7 +504,7 @@
Events
Touch Press Event
- dim=dimValueNormal
+ dim=100
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0
tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
@@ -497,4 +519,6 @@
prints sys0,2
prints tSend.txt,0
prints crcval,2
+ //dim=100
+ //page originPage.val

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

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

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

@@ -1113,12 +1113,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -1201,9 +1201,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

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

@@ -2620,12 +2620,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -2665,9 +2665,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardEntities"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

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

@@ -1202,12 +1202,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -1247,9 +1247,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardGrid"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

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

@@ -93,8 +93,8 @@ Text tTmp
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 21 x coordinate : 22
y coordinate : 147 y coordinate : 155
Width : 27 Width : 27
Height : 30 Height : 30
Effect : load Effect : load
@@ -153,8 +153,8 @@ Text tId
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 51 x coordinate : 73
y coordinate : 167 y coordinate : 158
Width : 30 Width : 30
Height : 30 Height : 30
Effect : load Effect : load
@@ -973,12 +973,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -1070,9 +1070,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardMedia"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

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

@@ -1388,12 +1388,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -1475,9 +1475,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardThermo"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

64
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -1,9 +1,9 @@
Program.s Program.s
0 Component(s) 0 Component(s)
9 Line(s) of event code 11 Line(s) of event code
9 Unique line(s) of event code 11 Unique line(s) of event code
pageIcons pageIcons
5 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
pageTest pageTest
@@ -16,47 +16,47 @@ pageSerialTest
43 Unique line(s) of event code 43 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
179 Line(s) of event code 178 Line(s) of event code
118 Unique line(s) of event code 117 Unique line(s) of event code
popupShutter
19 Component(s)
179 Line(s) of event code
102 Unique line(s) of event code
screensaver
31 Component(s)
183 Line(s) of event code
133 Unique line(s) of event code
popupLight
27 Component(s)
323 Line(s) of event code
174 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
113 Unique line(s) of event code 113 Unique line(s) of event code
cardAlarm screensaver
35 Component(s) 28 Component(s)
276 Line(s) of event code 172 Line(s) of event code
172 Unique line(s) of event code 131 Unique line(s) of event code
cardMedia cardMedia
30 Component(s) 30 Component(s)
278 Line(s) of event code 287 Line(s) of event code
139 Unique line(s) of event code 148 Unique line(s) of event code
popupLight
27 Component(s)
322 Line(s) of event code
173 Unique line(s) of event code
popupShutter
19 Component(s)
178 Line(s) of event code
101 Unique line(s) of event code
cardAlarm
35 Component(s)
285 Line(s) of event code
181 Unique line(s) of event code
cardThermo cardThermo
41 Component(s) 41 Component(s)
405 Line(s) of event code 414 Line(s) of event code
217 Unique line(s) of event code 226 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
388 Line(s) of event code 397 Line(s) of event code
224 Unique line(s) of event code 233 Unique line(s) of event code
cardEntities cardEntities
62 Component(s) 62 Component(s)
930 Line(s) of event code 939 Line(s) of event code
388 Unique line(s) of event code 397 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
351 Component(s) 350 Component(s)
3361 Line(s) of event code 3394 Line(s) of event code
908 Unique line(s) of event code 920 Unique line(s) of event code

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

@@ -18,6 +18,20 @@ Page pageIcons
Fill : solid color Fill : solid color
Back. Color : 65535 Back. Color : 65535
Variable (string) vaTime
Attributes
ID : 5
Scope : global
Text :
Max. Text Size: 15
Variable (string) vaDate
Attributes
ID : 6
Scope : global
Text :
Max. Text Size: 30
Text tIcons Text tIcons
Attributes Attributes
ID : 2 ID : 2
@@ -42,7 +56,7 @@ Text tIcons
Horizontal Alignment : left Horizontal Alignment : left
Vertical Alignment : top Vertical Alignment : top
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 170 Max. Text Size : 170
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -296,7 +296,7 @@ Text tMsg1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 42 x coordinate : 57
y coordinate : 223 y coordinate : 223
Width : 375 Width : 375
Height : 30 Height : 30
@@ -326,9 +326,9 @@ Text tMsg2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 25 x coordinate : 40
y coordinate : 256 y coordinate : 256
Width : 423 Width : 408
Height : 25 Height : 25
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -356,9 +356,9 @@ Text tMsg3
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 25 x coordinate : 40
y coordinate : 278 y coordinate : 278
Width : 423 Width : 408
Height : 25 Height : 25
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 23 Text : 24
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -462,7 +462,7 @@ Button bSendStartup
recmod=1 recmod=1
bauds=115200 bauds=115200
// startup event // startup event
tSend.txt="event,startup,"+tVersion.txt+",us-l" tSend.txt="event,startup,"+tVersion.txt+",eu"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -556,12 +556,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

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

@@ -727,7 +727,6 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 click b0,0
@@ -888,12 +887,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

5
HMI/US/landscape/n2t-out-visual/popupNotify.txt
View File

@@ -403,7 +403,6 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 click b0,0
@@ -508,12 +507,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

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

@@ -532,7 +532,6 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 click b0,0
@@ -607,12 +606,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -22,19 +22,18 @@ Page screensaver
Preinitialize Event Preinitialize Event
recmod=1 recmod=1
bauds=115200 bauds=115200
vis originPage,0
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
//load gloabl time string from pageIcons //load gloabl time string from pageIcons
//tTime.txt=vaTime.txt //tTime.txt=vaTime.txt
spstr vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="") if(tAMPM.txt=="")
{ {
vis tAMPM,0 vis tAMPM,0
} }
tDate.txt=vaDate.txt tDate.txt=pageIcons.vaDate.txt
dim=dimValue dim=dimValue
vis tSend,0 vis tSend,0
//page open event //page open event
@@ -47,86 +46,42 @@ Page screensaver
tForecast2.txt="" tForecast2.txt=""
tF2Icon.txt="" tF2Icon.txt=""
tForecast2Val.txt="" tForecast2Val.txt=""
tSend.txt="event,screensaverOpen" //tSend.txt="event,screensaverOpen"
//send calc crc //send calc crc
btlen tSend.txt,sys0 //btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC //crcrest 1,0xffff // reset CRC
crcputh 55 bb //crcputh 55 bb
crcputs sys0,1 //crcputs sys0,1
crcputs tSend.txt,0 //crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb //printh 55 bb
prints sys0,2 //prints sys0,2
prints tSend.txt,0 //prints tSend.txt,0
prints crcval,2 //prints crcval,2
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
ID : 5 ID : 4
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 200
Variable (string) vaTime
Attributes
ID : 10
Scope : global
Text :
Max. Text Size: 15
Variable (string) vaDate
Attributes
ID : 11
Scope : global
Text :
Max. Text Size: 30
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 22 ID : 19
Scope : local Scope : local
Text : Text :
Max. Text Size: 25 Max. Text Size: 25
Variable (int32) vaTap Variable (int32) vaTap
Attributes Attributes
ID : 30 ID : 27
Scope: local Scope: local
Value: 0 Value: 0
Number originPage
Attributes
ID : 3
Scope : global
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 452
y coordinate : 267
Width : 24
Height : 49
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits shown : all
Format : decimal
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInstruction Text tInstruction
Attributes Attributes
ID : 6 ID : 5
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -156,7 +111,7 @@ Text tInstruction
Text tTmp Text tTmp
Attributes Attributes
ID : 7 ID : 6
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -186,7 +141,7 @@ Text tTmp
Text tTime Text tTime
Attributes Attributes
ID : 8 ID : 7
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -216,7 +171,7 @@ Text tTime
Text tDate Text tDate
Attributes Attributes
ID : 9 ID : 8
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -246,7 +201,7 @@ Text tDate
Text tSend Text tSend
Attributes Attributes
ID : 12 ID : 9
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -276,7 +231,7 @@ Text tSend
Text tMainIcon Text tMainIcon
Attributes Attributes
ID : 13 ID : 10
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -306,7 +261,7 @@ Text tMainIcon
Text tMainText Text tMainText
Attributes Attributes
ID : 14 ID : 11
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -336,7 +291,7 @@ Text tMainText
Text tForecast1 Text tForecast1
Attributes Attributes
ID : 15 ID : 12
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -366,7 +321,7 @@ Text tForecast1
Text tForecast1Val Text tForecast1Val
Attributes Attributes
ID : 16 ID : 13
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -396,7 +351,7 @@ Text tForecast1Val
Text tF1Icon Text tF1Icon
Attributes Attributes
ID : 17 ID : 14
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -426,7 +381,7 @@ Text tF1Icon
Text tForecast2 Text tForecast2
Attributes Attributes
ID : 18 ID : 15
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -456,7 +411,7 @@ Text tForecast2
Text tF2Icon Text tF2Icon
Attributes Attributes
ID : 19 ID : 16
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -486,7 +441,7 @@ Text tF2Icon
Text tForecast2Val Text tForecast2Val
Attributes Attributes
ID : 20 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -516,13 +471,13 @@ Text tForecast2Val
Text t10 Text t10
Attributes Attributes
ID : 21 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 46 x coordinate : 61
y coordinate : 195 y coordinate : 195
Width : 360 Width : 360
Height : 2 Height : 2
@@ -546,7 +501,7 @@ Text t10
Text tAMPM Text tAMPM
Attributes Attributes
ID : 23 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -576,7 +531,7 @@ Text tAMPM
Text tForecast3Val Text tForecast3Val
Attributes Attributes
ID : 24 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -606,7 +561,7 @@ Text tForecast3Val
Text tF3Icon Text tF3Icon
Attributes Attributes
ID : 25 ID : 22
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -636,7 +591,7 @@ Text tF3Icon
Text tForecast3 Text tForecast3
Attributes Attributes
ID : 26 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -666,7 +621,7 @@ Text tForecast3
Text tForecast4 Text tForecast4
Attributes Attributes
ID : 27 ID : 24
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -696,7 +651,7 @@ Text tForecast4
Text tF4Icon Text tF4Icon
Attributes Attributes
ID : 28 ID : 25
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -726,7 +681,7 @@ Text tF4Icon
Text tForecast4Val Text tForecast4Val
Attributes Attributes
ID : 29 ID : 26
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -773,7 +728,7 @@ Picture p0
Timer tmSerial Timer tmSerial
Attributes Attributes
ID : 4 ID : 3
Scope : local Scope : local
Period (ms): 50 Period (ms): 50
Enabled : yes Enabled : yes
@@ -838,9 +793,9 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
//get set time to global variable //get set time to global variable
spstr strCommand.txt,vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
spstr vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="") if(tAMPM.txt=="")
{ {
vis tAMPM,0 vis tAMPM,0
@@ -849,8 +804,8 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
//get set date to global variable //get set date to global variable
spstr strCommand.txt,vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
tDate.txt=vaDate.txt tDate.txt=pageIcons.vaDate.txt
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
@@ -970,7 +925,7 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
dim=100 dim=dimValueNormal
vaTap.val+=1 vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
@@ -985,6 +940,4 @@ TouchCap tc0
prints sys0,2 prints sys0,2
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
//dim=100
//page originPage.val

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

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

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

@@ -583,12 +583,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -670,9 +670,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

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

@@ -1675,12 +1675,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -1719,9 +1719,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardEntities"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

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

@@ -765,12 +765,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -809,9 +809,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardGrid"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

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

@@ -551,12 +551,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -647,9 +647,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardMedia"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

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

@@ -835,12 +835,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
@@ -921,9 +921,20 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
page screensaver dim=dimValue
tSend.txt="event,sleepReached,cardThermo"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
} }
} }

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

@@ -10,6 +10,18 @@ Page pageIcons
Swide left page ID : disabled Swide left page ID : disabled
Swide right page ID : disabled Swide right page ID : disabled
Variable (string) vaTime
Attributes
Scope : global
Text :
Max. Text Size: 15
Variable (string) vaDate
Attributes
Scope : global
Text :
Max. Text Size: 30
Text tIcons Text tIcons
Attributes Attributes
Scope : global Scope : global
@@ -17,7 +29,7 @@ Text tIcons
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 170 Max. Text Size : 170
Text tTmp1 Text tTmp1

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

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 23 Text : 24
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0
@@ -177,7 +177,7 @@ Button bSendStartup
recmod=1 recmod=1
bauds=115200 bauds=115200
// startup event // startup event
tSend.txt="event,startup,"+tVersion.txt+",us-l" tSend.txt="event,startup,"+tVersion.txt+",eu"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -261,12 +261,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

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

@@ -382,7 +382,6 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 click b0,0
@@ -542,12 +541,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

5
HMI/US/landscape/n2t-out/popupNotify.txt
View File

@@ -195,7 +195,6 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 click b0,0
@@ -299,12 +298,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

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

@@ -268,7 +268,6 @@ Timer tmSleep
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
{ {
screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 click b0,0
@@ -342,12 +341,12 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -14,19 +14,18 @@ Page screensaver
Preinitialize Event Preinitialize Event
recmod=1 recmod=1
bauds=115200 bauds=115200
vis originPage,0
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
//load gloabl time string from pageIcons //load gloabl time string from pageIcons
//tTime.txt=vaTime.txt //tTime.txt=vaTime.txt
spstr vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="") if(tAMPM.txt=="")
{ {
vis tAMPM,0 vis tAMPM,0
} }
tDate.txt=vaDate.txt tDate.txt=pageIcons.vaDate.txt
dim=dimValue dim=dimValue
vis tSend,0 vis tSend,0
//page open event //page open event
@@ -39,18 +38,18 @@ Page screensaver
tForecast2.txt="" tForecast2.txt=""
tF2Icon.txt="" tF2Icon.txt=""
tForecast2Val.txt="" tForecast2Val.txt=""
tSend.txt="event,screensaverOpen" //tSend.txt="event,screensaverOpen"
//send calc crc //send calc crc
btlen tSend.txt,sys0 //btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC //crcrest 1,0xffff // reset CRC
crcputh 55 bb //crcputh 55 bb
crcputs sys0,1 //crcputs sys0,1
crcputs tSend.txt,0 //crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb //printh 55 bb
prints sys0,2 //prints sys0,2
prints tSend.txt,0 //prints tSend.txt,0
prints crcval,2 //prints crcval,2
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -58,18 +57,6 @@ Variable (string) strCommand
Text : Text :
Max. Text Size: 200 Max. Text Size: 200
Variable (string) vaTime
Attributes
Scope : global
Text :
Max. Text Size: 15
Variable (string) vaDate
Attributes
Scope : global
Text :
Max. Text Size: 30
Variable (string) tId Variable (string) tId
Attributes Attributes
Scope : local Scope : local
@@ -81,15 +68,6 @@ Variable (int32) vaTap
Scope: local Scope: local
Value: 0 Value: 0
Number originPage
Attributes
Scope : global
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
Text tInstruction Text tInstruction
Attributes Attributes
Scope : local Scope : local
@@ -373,9 +351,9 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
//get set time to global variable //get set time to global variable
spstr strCommand.txt,vaTime.txt,",",1 spstr strCommand.txt,pageIcons.vaTime.txt,",",1
spstr vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="") if(tAMPM.txt=="")
{ {
vis tAMPM,0 vis tAMPM,0
@@ -384,8 +362,8 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
//get set date to global variable //get set date to global variable
spstr strCommand.txt,vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
tDate.txt=vaDate.txt tDate.txt=pageIcons.vaDate.txt
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
@@ -504,7 +482,7 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
dim=100 dim=dimValueNormal
vaTap.val+=1 vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
@@ -519,6 +497,4 @@ TouchCap tc0
prints sys0,2 prints sys0,2
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
//dim=100
//page originPage.val

12
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-31 07:13:40.773288311 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 07:32:23.198849247 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 07:13:41.229294068 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 07:32:23.602851692 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 07:13:40.773288311 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 07:32:23.198849247 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 07:13:41.233294118 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 07:32:23.602851692 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -781,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 07:13:40.773288311 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 07:32:23.198849247 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 07:13:41.233294118 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 07:32:23.602851692 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

8
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -14,6 +14,10 @@ popupNotify
17 Component(s) 17 Component(s)
178 Line(s) of event code 178 Line(s) of event code
117 Unique line(s) of event code 117 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
cardMedia cardMedia
30 Component(s) 30 Component(s)
287 Line(s) of event code 287 Line(s) of event code
@@ -22,10 +26,6 @@ pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
13 Unique line(s) of event code 13 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupShutter popupShutter
19 Component(s) 19 Component(s)
178 Line(s) of event code 178 Line(s) of event code

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

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 23 Text : 24
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 23 Text : 24
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

8
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -22,14 +22,14 @@ popupShutter
19 Component(s) 19 Component(s)
178 Line(s) of event code 178 Line(s) of event code
101 Unique line(s) of event code 101 Unique line(s) of event code
cardAlarm
35 Component(s)
285 Line(s) of event code
181 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
113 Unique line(s) of event code 113 Unique line(s) of event code
cardAlarm
35 Component(s)
285 Line(s) of event code
181 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
322 Line(s) of event code 322 Line(s) of event code

2
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 23 Text : 24
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 23 Text : 24
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0