h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 15:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

moved time and date to pageicons (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-03-30 20:32:27 +00:00
committed by GitHub Actions
parent 1f948c9320
commit 70538f9de2
27 changed files with 639 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,34 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-30 20:07:58.195056766 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 20:32:26.895241964 +0000
@@ -10,6 +10,6 @@ @@ -10,7 +10,6 @@
int sleepValue=0 int sleepValue=0
// dim value // dim value
int dimValue=40 int dimValue=40
- int dimValueNormal=100
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
+ // fix touch offset (Removed for US version) + // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-30 20:32:26.899241936 +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 @@ @@ -670,20 +670,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -37,8 +53,23 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
} }
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-30 20:32:26.899241936 +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 @@ @@ -1719,20 +1719,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -63,8 +94,23 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
} }
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-30 20:32:26.899241936 +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 @@ @@ -809,20 +809,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -89,8 +135,23 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
} }
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-30 20:32:26.899241936 +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 @@ @@ -647,20 +647,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -115,8 +176,23 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
} }
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-30 20:32:26.899241936 +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 @@ @@ -921,20 +921,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -141,9 +217,28 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
} }
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-30 20:07:58.195056766 +0000 --- HMI/n2t-out/pageIcons.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 20:32:26.895241964 +0000
@@ -17,7 +17,7 @@ @@ -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 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
@@ -153,8 +248,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
Text tTmp1 Text tTmp1
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 20:32:26.899241936 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -164,9 +259,24 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//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 @@
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 diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/popupLight.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-30 20:32:26.899241936 +0000
@@ -382,6 +382,7 @@ @@ -382,6 +382,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -175,9 +285,24 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 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 diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/popupNotify.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-30 20:32:26.899241936 +0000
@@ -195,6 +195,7 @@ @@ -195,6 +195,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -186,9 +311,24 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 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 diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/popupShutter.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-30 20:32:26.899241936 +0000
@@ -268,6 +268,7 @@ @@ -268,6 +268,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -197,10 +337,25 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 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 diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-30 20:07:59.147136815 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-30 20:32:26.899241936 +0000
@@ -14,6 +14,7 @@ @@ -14,18 +14,19 @@
Preinitialize Event Preinitialize Event
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -208,7 +363,41 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
@@ -80,6 +81,15 @@ //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
@@ -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 Scope: local
Value: 0 Value: 0
@@ -224,3 +413,43 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
Text tInstruction Text tInstruction
Attributes Attributes
Scope : local 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

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

@@ -1,18 +1,34 @@
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-30 20:07:58.195056766 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 20:07:58.635093763 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 20:32:26.483244832 +0000
@@ -10,6 +10,6 @@ @@ -10,7 +10,6 @@
int sleepValue=0 int sleepValue=0
// dim value // dim value
int dimValue=40 int dimValue=40
- int dimValueNormal=100
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
+ // fix touch offset (Removed for US version) + // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-30 20:07:58.635093763 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-30 20:32:26.483244832 +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 @@ @@ -670,20 +670,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -37,8 +53,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
} }
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-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 20:07:58.639094100 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 20:32:26.483244832 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -806,6 +822,21 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
@@ -1675,12 +2379,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 +2423,9 @@ @@ -1719,20 +2423,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -830,8 +861,23 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-30 20:07:58.639094100 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-30 20:32:26.483244832 +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 @@ @@ -809,20 +809,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -856,8 +902,23 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
} }
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-30 20:07:58.639094100 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-30 20:32:26.483244832 +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 @@ @@ -647,20 +647,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -882,8 +943,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
} }
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 20:07:58.639094100 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 20:32:26.483244832 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -908,6 +969,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
XFloat xTempCurr XFloat xTempCurr
Attributes Attributes
Scope : local Scope : local
@@ -835,12 +845,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 +931,9 @@ @@ -921,20 +931,9 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -932,9 +1008,28 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
} }
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-30 20:07:58.195056766 +0000 --- HMI/n2t-out/pageIcons.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 20:07:58.635093763 +0000 +++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 20:32:26.483244832 +0000
@@ -17,7 +17,7 @@ @@ -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 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
@@ -944,8 +1039,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Text tTmp1 Text tTmp1
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-30 20:07:58.199057102 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 20:07:58.639094100 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 20:32:26.483244832 +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
@@ -964,9 +1059,24 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//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 @@
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/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/popupLight.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-30 20:07:58.639094100 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-30 20:32:26.483244832 +0000
@@ -382,6 +382,7 @@ @@ -382,6 +382,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -975,9 +1085,24 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 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/portrait/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/popupNotify.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-30 20:07:58.635093763 +0000 +++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-30 20:32:26.483244832 +0000
@@ -195,6 +195,7 @@ @@ -195,6 +195,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -986,9 +1111,24 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 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/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/popupShutter.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-30 20:07:58.635093763 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-30 20:32:26.483244832 +0000
@@ -268,6 +268,7 @@ @@ -268,6 +268,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -997,10 +1137,25 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0 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/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-30 20:07:58.199057102 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-30 20:32:26.087247588 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-30 20:07:58.639094100 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-30 20:32:26.483244832 +0000
@@ -14,6 +14,7 @@ @@ -14,18 +14,19 @@
Preinitialize Event Preinitialize Event
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -1008,7 +1163,41 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
@@ -80,6 +81,15 @@ //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
@@ -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 Scope: local
Value: 0 Value: 0
@@ -1024,3 +1213,43 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
Text tInstruction Text tInstruction
Attributes Attributes
Scope : local 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

1
HMI/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
int dimValueNormal=100
// fix touch offset // fix touch offset
lcd_dev fffb 0002 0000 0020 lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup

4
HMI/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")
{ {

4
HMI/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")
{ {

4
HMI/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")
{ {

4
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -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")
{ {

4
HMI/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")
{ {

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

@@ -1,9 +1,9 @@
Program.s Program.s
0 Component(s) 0 Component(s)
10 Line(s) of event code 11 Line(s) of event code
10 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
@@ -22,34 +22,34 @@ 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
popupLight
27 Component(s)
322 Line(s) of event code
173 Unique line(s) of event code
pageStartup
19 Component(s)
150 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
cardGrid
39 Component(s)
397 Line(s) of event code
233 Unique line(s) of event code
screensaver
30 Component(s)
182 Line(s) of event code
132 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
148 Unique line(s) of event code 148 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
screensaver
28 Component(s)
182 Line(s) of event code
132 Unique line(s) of event code
popupLight
27 Component(s)
322 Line(s) of event code
173 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)
414 Line(s) of event code 414 Line(s) of event code
226 Unique line(s) of event code 226 Unique line(s) of event code
cardGrid
39 Component(s)
397 Line(s) of event code
233 Unique line(s) of event code
cardEntities cardEntities
62 Component(s) 62 Component(s)
939 Line(s) of event code 939 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
350 Component(s) 350 Component(s)
3403 Line(s) of event code 3404 Line(s) of event code
921 Unique line(s) of event code 921 Unique line(s) of event code

14
HMI/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

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

@@ -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")
{ {

4
HMI/n2t-out-visual/popupLight.txt
View File

@@ -887,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")
{ {

4
HMI/n2t-out-visual/popupNotify.txt
View File

@@ -507,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")
{ {

4
HMI/n2t-out-visual/popupShutter.txt
View File

@@ -606,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")
{ {

72
HMI/n2t-out-visual/screensaver.txt
View File

@@ -27,13 +27,13 @@ Page screensaver
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
@@ -66,30 +66,16 @@ Variable (string) strCommand
Text : Text :
Max. Text Size: 200 Max. Text Size: 200
Variable (string) vaTime
Attributes
ID : 9
Scope : global
Text :
Max. Text Size: 15
Variable (string) vaDate
Attributes
ID : 10
Scope : global
Text :
Max. Text Size: 30
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 21 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 : 29 ID : 27
Scope: local Scope: local
Value: 0 Value: 0
@@ -215,7 +201,7 @@ Text tDate
Text tSend Text tSend
Attributes Attributes
ID : 11 ID : 9
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -245,7 +231,7 @@ Text tSend
Text tMainIcon Text tMainIcon
Attributes Attributes
ID : 12 ID : 10
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -275,7 +261,7 @@ Text tMainIcon
Text tMainText Text tMainText
Attributes Attributes
ID : 13 ID : 11
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -305,7 +291,7 @@ Text tMainText
Text tForecast1 Text tForecast1
Attributes Attributes
ID : 14 ID : 12
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -335,7 +321,7 @@ Text tForecast1
Text tForecast1Val Text tForecast1Val
Attributes Attributes
ID : 15 ID : 13
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -365,7 +351,7 @@ Text tForecast1Val
Text tF1Icon Text tF1Icon
Attributes Attributes
ID : 16 ID : 14
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -395,7 +381,7 @@ Text tF1Icon
Text tForecast2 Text tForecast2
Attributes Attributes
ID : 17 ID : 15
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -425,7 +411,7 @@ Text tForecast2
Text tF2Icon Text tF2Icon
Attributes Attributes
ID : 18 ID : 16
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -455,7 +441,7 @@ Text tF2Icon
Text tForecast2Val Text tForecast2Val
Attributes Attributes
ID : 19 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -485,7 +471,7 @@ Text tForecast2Val
Text t10 Text t10
Attributes Attributes
ID : 20 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -515,7 +501,7 @@ Text t10
Text tAMPM Text tAMPM
Attributes Attributes
ID : 22 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -545,7 +531,7 @@ Text tAMPM
Text tForecast3Val Text tForecast3Val
Attributes Attributes
ID : 23 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -575,7 +561,7 @@ Text tForecast3Val
Text tF3Icon Text tF3Icon
Attributes Attributes
ID : 24 ID : 22
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -605,7 +591,7 @@ Text tF3Icon
Text tForecast3 Text tForecast3
Attributes Attributes
ID : 25 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -635,7 +621,7 @@ Text tForecast3
Text tForecast4 Text tForecast4
Attributes Attributes
ID : 26 ID : 24
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -665,7 +651,7 @@ Text tForecast4
Text tF4Icon Text tF4Icon
Attributes Attributes
ID : 27 ID : 25
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -695,7 +681,7 @@ Text tF4Icon
Text tForecast4Val Text tForecast4Val
Attributes Attributes
ID : 28 ID : 26
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -807,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
@@ -818,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")
{ {
@@ -939,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
@@ -954,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

1
HMI/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
int dimValueNormal=100
// fix touch offset // fix touch offset
lcd_dev fffb 0002 0000 0020 lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup

4
HMI/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")
{ {

4
HMI/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")
{ {

4
HMI/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")
{ {

4
HMI/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")
{ {

4
HMI/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")
{ {

12
HMI/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

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

@@ -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")
{ {

4
HMI/n2t-out/popupLight.txt
View File

@@ -541,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")
{ {

4
HMI/n2t-out/popupNotify.txt
View File

@@ -298,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")
{ {

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

@@ -341,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")
{ {

32
HMI/n2t-out/screensaver.txt
View File

@@ -19,13 +19,13 @@ Page screensaver
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
@@ -57,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
@@ -363,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
@@ -374,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")
{ {
@@ -494,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
@@ -509,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