h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 16:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103 from jmbinette/main

Browse Source 
Updated HMI and TFT following EU mod (Daily update)
This commit is contained in:
joBr99
2022-03-31 08:30:50 +02:00
committed by GitHub
parent 43d76571c8 a755eb29df
commit 5116c3ad41
30 changed files with 372 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
__pycache__/
# don't add nextion2text
HMI/Nextion2Text.py

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

@@ -1,6 +1,6 @@
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 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 03:33:55.454391181 +0000
@@ -10,7 +10,6 @@
int sleepValue=0
// dim value
@@ -12,8 +12,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ //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-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 03:33:55.454391181 +0000
@@ -583,12 +583,12 @@
if(tInstruction.txt=="time")
{
@@ -53,8 +53,8 @@ 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
--- HMI/n2t-out/cardEntities.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 03:33:54.742386332 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 03:33:55.454391181 +0000
@@ -1675,12 +1675,12 @@
if(tInstruction.txt=="time")
{
@@ -94,8 +94,8 @@ 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
--- HMI/n2t-out/cardGrid.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/cardGrid.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 03:33:55.454391181 +0000
@@ -765,12 +765,12 @@
if(tInstruction.txt=="time")
{
@@ -135,8 +135,8 @@ 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
--- HMI/n2t-out/cardMedia.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/cardMedia.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 03:33:55.454391181 +0000
@@ -551,12 +551,12 @@
if(tInstruction.txt=="time")
{
@@ -176,8 +176,8 @@ 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
--- HMI/n2t-out/cardThermo.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/cardThermo.txt 2022-03-31 03:33:54.742386332 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 03:33:55.454391181 +0000
@@ -835,12 +835,12 @@
if(tInstruction.txt=="time")
{
@@ -217,8 +217,8 @@ 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
--- HMI/n2t-out/pageIcons.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/pageIcons.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 03:33:55.454391181 +0000
@@ -10,18 +10,6 @@
Swide left page ID : disabled
Swide right page ID : disabled
@@ -248,8 +248,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
Text tTmp1
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 03:33:55.454391181 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -275,8 +275,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
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-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/popupLight.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-31 03:33:55.454391181 +0000
@@ -382,6 +382,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
@@ -301,8 +301,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
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-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/popupNotify.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-31 03:33:55.454391181 +0000
@@ -195,6 +195,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
@@ -327,8 +327,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
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-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/popupShutter.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-31 03:33:55.454391181 +0000
@@ -268,6 +268,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
@@ -353,8 +353,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
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-30 21:36:49.205416390 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-30 21:36:50.121435295 +0000
--- HMI/n2t-out/screensaver.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 03:33:55.454391181 +0000
@@ -14,18 +14,19 @@
Preinitialize Event
recmod=1

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

@@ -1,60 +1,18 @@
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 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 21:36:49.609424728 +0000
@@ -10,7 +10,6 @@
int sleepValue=0
--- HMI/n2t-out/Program.s.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 03:33:55.098388657 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
- int dimValueNormal=100
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/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-30 21:36:49.609424728 +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/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 21:36:49.609424728 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 03:33:54.742386332 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 03:33:55.102388683 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -289,7 +247,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+ Events
+ Touch Press Event
+ tSend.txt="event,buttonPress2,"+entn4.txt+",down"
+ tSend.txt="event,buttonPress2,"+entn5.txt+",down"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
@@ -389,7 +347,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+ Events
+ Touch Press Event
+ tSend.txt="event,buttonPress2,"+entn4.txt+",down"
+ tSend.txt="event,buttonPress2,"+entn6.txt+",down"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
@@ -822,225 +780,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
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 @@
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/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-30 21:36:49.609424728 +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/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-30 21:36:49.609424728 +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/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 21:36:49.609424728 +0000
@@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
vis tId,0
+ vis nPageDisp,0
vis xTempMin,0
vis xTempMax,0
vis xTempStep,0
@@ -98,6 +99,15 @@
Text :
Max. Text Size: 10
+Number nPageDisp
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Value : 0
+
XFloat xTempCurr
Attributes
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 @@
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/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 21:36:49.609424728 +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/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 21:36:49.609424728 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-31 03:33:54.738386306 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 03:33:55.098388657 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1059,226 +801,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//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/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-30 21:36:49.609424728 +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/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-30 21:36:49.609424728 +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/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-30 21:36:49.609424728 +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/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-30 21:36:49.205416390 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-30 21:36:49.609424728 +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

1
HMI/US/portrait/n2t-out-visual/Program.s.txt
View File

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

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

@@ -1113,12 +1113,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -1201,9 +1201,20 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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
}
}

23
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -2074,7 +2074,7 @@ Button bDown5
Events
Touch Press Event
tSend.txt="event,buttonPress2,"+entn4.txt+",down"
tSend.txt="event,buttonPress2,"+entn5.txt+",down"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -2262,7 +2262,7 @@ Button bDown6
Events
Touch Press Event
tSend.txt="event,buttonPress2,"+entn4.txt+",down"
tSend.txt="event,buttonPress2,"+entn6.txt+",down"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -3710,12 +3710,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -3755,9 +3755,20 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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/portrait/n2t-out-visual/cardGrid.txt
View File

@@ -1202,12 +1202,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -1247,9 +1247,20 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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/portrait/n2t-out-visual/cardMedia.txt
View File

@@ -973,12 +973,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -1070,9 +1070,20 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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
}
}

122
HMI/US/portrait/n2t-out-visual/cardThermo.txt
View File

@@ -25,7 +25,6 @@ Page cardThermo
vis tInstruction,0
vis tTmp,0
vis tId,0
vis nPageDisp,0
vis xTempMin,0
vis xTempMax,0
vis xTempStep,0
@@ -43,114 +42,84 @@ Page cardThermo
Variable (string) strCommand
Attributes
ID : 7
ID : 6
Scope : local
Text :
Max. Text Size: 250
Variable (string) entn
Attributes
ID : 22
ID : 21
Scope : local
Text :
Max. Text Size: 50
Variable (string) va0
Attributes
ID : 33
ID : 32
Scope : local
Text :
Max. Text Size: 10
Variable (string) va1
Attributes
ID : 34
ID : 33
Scope : local
Text :
Max. Text Size: 10
Variable (string) va2
Attributes
ID : 35
ID : 34
Scope : local
Text :
Max. Text Size: 10
Variable (string) va3
Attributes
ID : 36
ID : 35
Scope : local
Text :
Max. Text Size: 10
Variable (string) va4
Attributes
ID : 37
ID : 36
Scope : local
Text :
Max. Text Size: 10
Variable (string) va5
Attributes
ID : 38
ID : 37
Scope : local
Text :
Max. Text Size: 10
Variable (string) va6
Attributes
ID : 39
ID : 38
Scope : local
Text :
Max. Text Size: 10
Variable (string) va7
Attributes
ID : 40
ID : 39
Scope : local
Text :
Max. Text Size: 10
Variable (string) va8
Attributes
ID : 41
ID : 40
Scope : local
Text :
Max. Text Size: 10
Number nPageDisp
Attributes
ID : 5
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 275
y coordinate : 1
Width : 42
Height : 24
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
XFloat xTempCurr
Attributes
ID : 14
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -180,7 +149,7 @@ XFloat xTempCurr
XFloat xTempDest
Attributes
ID : 16
ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -210,7 +179,7 @@ XFloat xTempDest
XFloat xTempMin
Attributes
ID : 17
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -240,7 +209,7 @@ XFloat xTempMin
XFloat xTempMax
Attributes
ID : 18
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -270,7 +239,7 @@ XFloat xTempMax
XFloat xTempStep
Attributes
ID : 19
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -360,7 +329,7 @@ Text tTmp
Text tInstruction
Attributes
ID : 8
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -390,7 +359,7 @@ Text tInstruction
Text tId
Attributes
ID : 9
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -420,7 +389,7 @@ Text tId
Text tHeading
Attributes
ID : 10
ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -450,7 +419,7 @@ Text tHeading
Text tStatus
Attributes
ID : 11
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -480,7 +449,7 @@ Text tStatus
Text t2
Attributes
ID : 15
ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -574,7 +543,7 @@ Button bNext
Button bDown
Attributes
ID : 12
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -628,7 +597,7 @@ Button bDown
Button bUp
Attributes
ID : 13
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -682,7 +651,7 @@ Button bUp
Button bPrev
Attributes
ID : 23
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -729,7 +698,7 @@ Button bPrev
Dual-state Button bt0
Attributes
ID : 24
ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -778,7 +747,7 @@ Dual-state Button bt0
Dual-state Button bt1
Attributes
ID : 25
ID : 24
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -827,7 +796,7 @@ Dual-state Button bt1
Dual-state Button bt2
Attributes
ID : 26
ID : 25
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -876,7 +845,7 @@ Dual-state Button bt2
Dual-state Button bt3
Attributes
ID : 27
ID : 26
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -925,7 +894,7 @@ Dual-state Button bt3
Dual-state Button bt4
Attributes
ID : 28
ID : 27
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -974,7 +943,7 @@ Dual-state Button bt4
Dual-state Button bt5
Attributes
ID : 29
ID : 28
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1023,7 +992,7 @@ Dual-state Button bt5
Dual-state Button bt6
Attributes
ID : 30
ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1072,7 +1041,7 @@ Dual-state Button bt6
Dual-state Button bt7
Attributes
ID : 31
ID : 30
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1121,7 +1090,7 @@ Dual-state Button bt7
Dual-state Button bt8
Attributes
ID : 32
ID : 31
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1170,7 +1139,7 @@ Dual-state Button bt8
Timer tmSerial
Attributes
ID : 6
ID : 5
Scope : local
Period (ms): 50
Enabled : yes
@@ -1419,12 +1388,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -1494,7 +1463,7 @@ Timer tmSerial
Timer tmSleep
Attributes
ID : 20
ID : 19
Scope : local
Period (ms): 1000
Enabled : yes
@@ -1506,15 +1475,26 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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
}
}
TouchCap tc0
Attributes
ID : 21
ID : 20
Scope: local
Value: 0

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

@@ -1,62 +1,62 @@
Program.s
0 Component(s)
9 Line(s) of event code
9 Unique line(s) of event code
10 Line(s) of event code
10 Unique line(s) of event code
pageSerialTest
13 Component(s)
48 Line(s) of event code
43 Unique line(s) of event code
pageIcons
5 Component(s)
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
popupShutter
19 Component(s)
179 Line(s) of event code
102 Unique line(s) of event code
popupNotify
17 Component(s)
179 Line(s) of event code
118 Unique line(s) of event code
178 Line(s) of event code
117 Unique line(s) of event code
cardMedia
30 Component(s)
287 Line(s) of event code
148 Unique line(s) of event code
pageTest
13 Component(s)
13 Line(s) of event code
13 Unique line(s) of event code
cardAlarm
35 Component(s)
276 Line(s) of event code
172 Unique line(s) of event code
popupLight
27 Component(s)
323 Line(s) of event code
174 Unique line(s) of event code
cardThermo
42 Component(s)
406 Line(s) of event code
218 Unique line(s) of event code
screensaver
31 Component(s)
183 Line(s) of event code
133 Unique line(s) of event code
cardGrid
39 Component(s)
388 Line(s) of event code
224 Unique line(s) of event code
cardMedia
30 Component(s)
278 Line(s) of event code
139 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 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
cardGrid
39 Component(s)
397 Line(s) of event code
233 Unique line(s) of event code
popupLight
27 Component(s)
322 Line(s) of event code
173 Unique line(s) of event code
screensaver
28 Component(s)
172 Line(s) of event code
131 Unique line(s) of event code
cardThermo
41 Component(s)
414 Line(s) of event code
226 Unique line(s) of event code
cardEntities
86 Component(s)
1320 Line(s) of event code
526 Unique line(s) of event code
1329 Line(s) of event code
537 Unique line(s) of event code
Total
13 Page(s)
376 Component(s)
3752 Line(s) of event code
1020 Unique line(s) of event code
374 Component(s)
3783 Line(s) of event code
1032 Unique line(s) of event code

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

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

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

@@ -556,12 +556,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{

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

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

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

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

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

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

135
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -22,19 +22,18 @@ Page screensaver
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 vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="")
{
vis tAMPM,0
}
tDate.txt=vaDate.txt
tDate.txt=pageIcons.vaDate.txt
dim=dimValue
vis tSend,0
//page open event
@@ -47,86 +46,42 @@ Page screensaver
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
ID : 5
ID : 4
Scope : local
Text :
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
Attributes
ID : 22
ID : 19
Scope : local
Text :
Max. Text Size: 25
Variable (int32) vaTap
Attributes
ID : 30
ID : 27
Scope: local
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 : 239
y coordinate : 430
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
Attributes
ID : 6
ID : 5
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -156,7 +111,7 @@ Text tInstruction
Text tTmp
Attributes
ID : 7
ID : 6
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -186,7 +141,7 @@ Text tTmp
Text tTime
Attributes
ID : 8
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -216,7 +171,7 @@ Text tTime
Text tDate
Attributes
ID : 9
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -246,7 +201,7 @@ Text tDate
Text tSend
Attributes
ID : 12
ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -276,7 +231,7 @@ Text tSend
Text tMainIcon
Attributes
ID : 13
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -306,7 +261,7 @@ Text tMainIcon
Text tMainText
Attributes
ID : 14
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -336,7 +291,7 @@ Text tMainText
Text tForecast1
Attributes
ID : 15
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -366,7 +321,7 @@ Text tForecast1
Text tForecast1Val
Attributes
ID : 16
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -396,7 +351,7 @@ Text tForecast1Val
Text tF1Icon
Attributes
ID : 17
ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -426,7 +381,7 @@ Text tF1Icon
Text tForecast2
Attributes
ID : 18
ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -456,7 +411,7 @@ Text tForecast2
Text tF2Icon
Attributes
ID : 19
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -486,7 +441,7 @@ Text tF2Icon
Text tForecast2Val
Attributes
ID : 20
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -516,7 +471,7 @@ Text tForecast2Val
Text t10
Attributes
ID : 21
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -546,7 +501,7 @@ Text t10
Text tAMPM
Attributes
ID : 23
ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -576,7 +531,7 @@ Text tAMPM
Text tForecast3Val
Attributes
ID : 24
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -606,7 +561,7 @@ Text tForecast3Val
Text tF3Icon
Attributes
ID : 25
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -636,7 +591,7 @@ Text tF3Icon
Text tForecast3
Attributes
ID : 26
ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -666,7 +621,7 @@ Text tForecast3
Text tForecast4
Attributes
ID : 27
ID : 24
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -696,7 +651,7 @@ Text tForecast4
Text tF4Icon
Attributes
ID : 28
ID : 25
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -726,7 +681,7 @@ Text tF4Icon
Text tForecast4Val
Attributes
ID : 29
ID : 26
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -773,7 +728,7 @@ Picture p0
Timer tmSerial
Attributes
ID : 4
ID : 3
Scope : local
Period (ms): 50
Enabled : yes
@@ -838,9 +793,9 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
//get set time to global variable
spstr strCommand.txt,vaTime.txt,",",1
spstr vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="")
{
vis tAMPM,0
@@ -849,8 +804,8 @@ Timer tmSerial
if(tInstruction.txt=="date")
{
//get set date to global variable
spstr strCommand.txt,vaDate.txt,"?",1
tDate.txt=vaDate.txt
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
tDate.txt=pageIcons.vaDate.txt
}
if(tInstruction.txt=="timeout")
{
@@ -970,7 +925,7 @@ TouchCap tc0
Events
Touch Press Event
dim=100
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0
tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
@@ -985,6 +940,4 @@ TouchCap tc0
prints sys0,2
prints tSend.txt,0
prints crcval,2
//dim=100
//page originPage.val

1
HMI/US/portrait/n2t-out/Program.s.txt
View File

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

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

@@ -583,12 +583,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -670,9 +670,20 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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
}
}

23
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -1047,7 +1047,7 @@ Button bDown5
Events
Touch Press Event
tSend.txt="event,buttonPress2,"+entn4.txt+",down"
tSend.txt="event,buttonPress2,"+entn5.txt+",down"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1147,7 +1147,7 @@ Button bDown6
Events
Touch Press Event
tSend.txt="event,buttonPress2,"+entn4.txt+",down"
tSend.txt="event,buttonPress2,"+entn6.txt+",down"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -2379,12 +2379,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -2423,9 +2423,20 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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/portrait/n2t-out/cardGrid.txt
View File

@@ -765,12 +765,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -809,9 +809,20 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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/portrait/n2t-out/cardMedia.txt
View File

@@ -551,12 +551,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -647,9 +647,20 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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
}
}

29
HMI/US/portrait/n2t-out/cardThermo.txt
View File

@@ -17,7 +17,6 @@ Page cardThermo
vis tInstruction,0
vis tTmp,0
vis tId,0
vis nPageDisp,0
vis xTempMin,0
vis xTempMax,0
vis xTempStep,0
@@ -99,15 +98,6 @@ Variable (string) va8
Text :
Max. Text Size: 10
Number nPageDisp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempCurr
Attributes
Scope : local
@@ -845,12 +835,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{
@@ -931,9 +921,20 @@ Timer tmSleep
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
screensaver.originPage.val=dp
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/portrait/n2t-out/pageIcons.txt
View File

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

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

@@ -261,12 +261,12 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,screensaver.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode")
{

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

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

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

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

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

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

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

@@ -14,19 +14,18 @@ Page screensaver
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 vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="")
{
vis tAMPM,0
}
tDate.txt=vaDate.txt
tDate.txt=pageIcons.vaDate.txt
dim=dimValue
vis tSend,0
//page open event
@@ -39,18 +38,18 @@ Page screensaver
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
@@ -58,18 +57,6 @@ Variable (string) strCommand
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
@@ -81,15 +68,6 @@ Variable (int32) vaTap
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
@@ -373,9 +351,9 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
//get set time to global variable
spstr strCommand.txt,vaTime.txt,",",1
spstr vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="")
{
vis tAMPM,0
@@ -384,8 +362,8 @@ Timer tmSerial
if(tInstruction.txt=="date")
{
//get set date to global variable
spstr strCommand.txt,vaDate.txt,"?",1
tDate.txt=vaDate.txt
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
tDate.txt=pageIcons.vaDate.txt
}
if(tInstruction.txt=="timeout")
{
@@ -504,7 +482,7 @@ TouchCap tc0
Events
Touch Press Event
dim=100
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0
tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
@@ -519,6 +497,4 @@ TouchCap tc0
prints sys0,2
prints tSend.txt,0
prints crcval,2
//dim=100
//page originPage.val

BIN
HMI/US/portrait/nspanel_US_P.HMI
View File

Binary file not shown.

BIN
HMI/US/portrait/nspanel_US_P.tft
View File

Binary file not shown.