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

fix icon (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-15 08:50:24 +00:00
committed by github-actions[bot]
parent 45818bdf0b
commit ec2884e5e3
6 changed files with 298 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 20:08:23.134587282 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-15 08:50:23.405295820 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/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-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 20:08:23.134587282 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-15 08:50:23.405295820 +0000
@@ -466,90 +466,6 @@ @@ -466,90 +466,6 @@
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
@@ -103,8 +103,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
Attributes Attributes
Scope : local Scope : local
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-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-15 08:50:22.553240668 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 20:08:23.134587282 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-15 08:50:23.405295820 +0000
@@ -1074,90 +1074,6 @@ @@ -1074,90 +1074,6 @@
page popupLight page popupLight
} }
@@ -197,8 +197,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Attributes Attributes
Scope : local Scope : local
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-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 20:08:23.134587282 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-15 08:50:23.405295820 +0000
@@ -522,90 +522,6 @@ @@ -522,90 +522,6 @@
page pageTest page pageTest
} }
@@ -291,8 +291,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
Attributes Attributes
Scope : local Scope : local
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-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/cardMedia.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 20:08:23.134587282 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-15 08:50:23.405295820 +0000
@@ -223,7 +223,7 @@ @@ -223,7 +223,7 @@
Events Events
@@ -403,8 +403,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
Attributes Attributes
Scope : local Scope : local
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-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 20:08:23.134587282 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-15 08:50:23.405295820 +0000
@@ -17,12 +17,9 @@ @@ -17,12 +17,9 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -437,7 +437,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -104,30 +94,12 @@ @@ -104,31 +94,13 @@
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
@@ -466,28 +466,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- Text : - Text :
- Max. Text Size: 100 - Max. Text Size: 100
- -
XFloat xTempCurr -XFloat xTempDest1
+XFloat xTempCurr
Attributes Attributes
Scope : local Scope : local
@@ -137,16 +109,7 @@ Dragging : 0
@@ -137,7 +109,7 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
-XFloat xTempDest1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempMin1 -XFloat xTempMin1
+XFloat xTempDest +XFloat xTempDest
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -155,7 +118,7 @@ @@ -146,7 +118,7 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -496,7 +489,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -164,7 +127,7 @@ @@ -155,7 +127,7 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -505,7 +498,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -173,7 +136,7 @@ @@ -164,7 +136,7 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -514,7 +507,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -182,41 +145,45 @@ @@ -173,41 +145,45 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -568,7 +561,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Text tHeading Text tHeading
Attributes Attributes
@@ -238,57 +205,7 @@ @@ -229,37 +205,7 @@
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
@@ -603,15 +596,14 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- Max. Text Size : 30 - Max. Text Size : 30
- -
-Text tCF2 -Text tCF2
- Attributes +Text t2
- Scope : local Attributes
- Dragging : 0 Scope : local
- Disable release event after dragging: 0 Dragging : 0
- Send Component ID : disabled @@ -269,36 +215,6 @@
- Associated Keyboard : none Text : 
- Text :  Max. Text Size : 10
- Max. Text Size : 10
-
-Text tALbl -Text tALbl
- Attributes - Attributes
- Scope : local - Scope : local
@@ -623,11 +615,29 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- Max. Text Size : 30 - Max. Text Size : 30
- -
-Text tCF -Text tCF
+Text t2 - Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
-Text tCurTemp
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 30
-
Picture p0
Attributes Attributes
Scope : local Scope : local
Dragging : 0 @@ -390,7 +306,7 @@
@@ -389,7 +306,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -636,7 +646,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -403,7 +320,7 @@ @@ -404,7 +320,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -645,7 +655,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.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
@@ -416,7 +333,7 @@ @@ -417,7 +333,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -654,7 +664,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -430,7 +347,7 @@ @@ -431,7 +347,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -663,7 +673,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.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
@@ -443,7 +360,7 @@ @@ -444,7 +360,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -672,7 +682,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -457,7 +374,7 @@ @@ -458,7 +374,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -681,7 +691,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.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
@@ -470,13 +387,13 @@ @@ -471,13 +387,13 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -697,7 +707,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 10
@@ -484,7 +401,7 @@ @@ -485,7 +401,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -706,7 +716,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.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
@@ -497,7 +414,7 @@ @@ -498,7 +414,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -715,7 +725,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -511,7 +428,7 @@ @@ -512,7 +428,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -724,7 +734,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.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
@@ -524,7 +441,7 @@ @@ -525,7 +441,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -733,7 +743,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -538,7 +455,7 @@ @@ -539,7 +455,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -742,7 +752,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.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
@@ -578,138 +495,21 @@ @@ -579,138 +495,21 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -886,7 +896,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.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
@@ -722,7 +522,7 @@ @@ -723,7 +522,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -895,7 +905,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -734,9 +534,9 @@ @@ -735,9 +534,9 @@
Events Events
Touch Press Event Touch Press Event
@@ -907,7 +917,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
@@ -758,7 +558,7 @@ @@ -759,7 +558,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -916,7 +926,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -770,9 +570,9 @@ @@ -771,9 +570,9 @@
Events Events
Touch Press Event Touch Press Event
@@ -928,7 +938,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
@@ -794,90 +594,6 @@ @@ -795,90 +594,6 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -1019,8 +1029,13 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local
@@ -967,19 +683,18 @@ @@ -964,22 +679,22 @@
covx tTmp.txt,xTempCurr.val,0,0 //entity name
spstr strCommand.txt,entn.txt,"~",3
//currentTemp
- spstr strCommand.txt,tCurTemp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,"~",4
+ covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
- covx tTmp.txt,xTempDest1.val,0,0 - covx tTmp.txt,xTempDest1.val,0,0
@@ -1100,8 +1115,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
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-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 20:08:23.134587282 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-15 08:50:23.405295820 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 20:08:22.698580145 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-15 08:50:22.973267856 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/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-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 20:08:22.698580145 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.977268115 +0000
@@ -466,7 +466,7 @@ @@ -466,7 +466,7 @@
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
@@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
click bPrev,1 click bPrev,1
} }
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-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-15 08:50:22.553240668 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 20:08:22.698580145 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-15 08:50:22.977268115 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/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-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 20:08:22.698580145 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-15 08:50:22.977268115 +0000
@@ -17,12 +17,9 @@ @@ -17,12 +17,9 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -527,7 +527,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -104,30 +94,12 @@ @@ -104,31 +94,13 @@
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
@@ -556,28 +556,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- Text : - Text :
- Max. Text Size: 100 - Max. Text Size: 100
- -
XFloat xTempCurr -XFloat xTempDest1
+XFloat xTempCurr
Attributes Attributes
Scope : local Scope : local
@@ -137,16 +109,7 @@ Dragging : 0
@@ -137,7 +109,7 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
-XFloat xTempDest1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempMin1 -XFloat xTempMin1
+XFloat xTempDest +XFloat xTempDest
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -155,7 +118,7 @@ @@ -146,7 +118,7 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -586,7 +579,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -164,7 +127,7 @@ @@ -155,7 +127,7 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -595,7 +588,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -173,7 +136,7 @@ @@ -164,7 +136,7 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -604,7 +597,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -182,41 +145,45 @@ @@ -173,41 +145,45 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -658,7 +651,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text tHeading Text tHeading
Attributes Attributes
@@ -238,57 +205,7 @@ @@ -229,57 +205,7 @@
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
@@ -717,7 +710,24 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -330,26 +247,30 @@ @@ -289,16 +215,6 @@
Text : 
Max. Text Size : 10
-Text tCurTemp
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 30
-
Picture p0
Attributes
Scope : local
@@ -331,26 +247,30 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -756,7 +766,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -362,21 +283,30 @@ @@ -363,21 +283,30 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -791,7 +801,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -389,21 +319,26 @@ @@ -390,21 +319,26 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -823,7 +833,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -416,7 +351,7 @@ @@ -417,7 +351,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -832,7 +842,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -430,7 +365,7 @@ @@ -431,7 +365,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -841,7 +851,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -443,7 +378,7 @@ @@ -444,7 +378,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -850,7 +860,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -457,7 +392,7 @@ @@ -458,7 +392,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -859,7 +869,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -470,13 +405,13 @@ @@ -471,13 +405,13 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -875,7 +885,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 10
@@ -484,7 +419,7 @@ @@ -485,7 +419,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -884,7 +894,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -503,7 +438,7 @@ @@ -504,7 +438,7 @@
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -893,7 +903,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 10
@@ -524,13 +459,13 @@ @@ -525,13 +459,13 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -909,7 +919,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 10
@@ -538,7 +473,7 @@ @@ -539,7 +473,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -918,7 +928,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -551,7 +486,7 @@ @@ -552,7 +486,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -927,7 +937,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -565,115 +500,7 @@ @@ -566,115 +500,7 @@
Touch Press Event Touch Press Event
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt tSend.txt="event,buttonPress2,"+entn.txt
@@ -1044,7 +1054,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -686,30 +513,21 @@ @@ -687,30 +513,21 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -1080,7 +1090,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -722,30 +540,21 @@ @@ -723,30 +540,21 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -1116,7 +1126,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -758,30 +567,21 @@ @@ -759,30 +567,21 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -1152,8 +1162,13 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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
@@ -967,19 +767,18 @@ @@ -964,22 +763,22 @@
covx tTmp.txt,xTempCurr.val,0,0 //entity name
spstr strCommand.txt,entn.txt,"~",3
//currentTemp
- spstr strCommand.txt,tCurTemp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,"~",4
+ covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
- covx tTmp.txt,xTempDest1.val,0,0 - covx tTmp.txt,xTempDest1.val,0,0
@@ -1233,8 +1248,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-14 20:08:22.302573663 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 20:08:22.698580145 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-15 08:50:22.977268115 +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

109
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 20:08:22.742580866 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-15 08:50:22.989268892 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-14 20:08:22.302573663 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-15 08:50:22.549240409 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 20:08:22.698580145 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-15 08:50:22.973267856 +0000
+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-05-14 20:08:22.302573663 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.549240409 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 20:08:22.698580145 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.977268115 +0000
+@@ -466,7 +466,7 @@ +@@ -466,7 +466,7 @@
+ prints crcval,2 + prints crcval,2
+ tCode.txt="" + tCode.txt=""
@@ -67,14 +67,14 @@
+ { + {
+ click bPrev,1 + click bPrev,1
+ } + }
+--- HMI/n2t-out/cardEntities.txt 2022-05-14 20:08:22.302573663 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-15 08:50:22.553240668 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 20:08:22.698580145 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-15 08:50:22.977268115 +0000
+ Hotspot mSwipeNext + Hotspot mSwipeNext
+ Scope : local + Scope : local
+@@ -1728,6 +1956,128 @@ +@@ -1728,6 +1956,128 @@
+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-05-14 20:08:22.302573663 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-15 08:50:22.549240409 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 20:08:22.698580145 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-15 08:50:22.977268115 +0000
+@@ -17,12 +17,9 @@ +@@ -17,12 +17,9 @@
+ vis tInstruction,0 + vis tInstruction,0
+ vis tTmp,0 + vis tTmp,0
@@ -107,7 +107,7 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
+ +
+@@ -104,30 +94,12 @@ +@@ -104,31 +94,13 @@
+ Text : + Text :
+ Max. Text Size: 10 + Max. Text Size: 10
+ +
@@ -136,28 +136,21 @@
+- Text : +- Text :
+- Max. Text Size: 100 +- Max. Text Size: 100
+- +-
+ XFloat xTempCurr +-XFloat xTempDest1
++XFloat xTempCurr
+ Attributes + Attributes
+ Scope : local + Scope : local
+@@ -137,16 +109,7 @@ + Dragging : 0
+@@ -137,7 +109,7 @@
+ Associated Keyboard : none + Associated Keyboard : none
+ Value : 0 + Value : 0
+ +
+-XFloat xTempDest1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Value : 0
+-
+-XFloat xTempMin1 +-XFloat xTempMin1
++XFloat xTempDest ++XFloat xTempDest
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -155,7 +118,7 @@ +@@ -146,7 +118,7 @@
+ Associated Keyboard : none + Associated Keyboard : none
+ Value : 0 + Value : 0
+ +
@@ -166,7 +159,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -164,7 +127,7 @@ +@@ -155,7 +127,7 @@
+ Associated Keyboard : none + Associated Keyboard : none
+ Value : 0 + Value : 0
+ +
@@ -175,7 +168,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -173,7 +136,7 @@ +@@ -164,7 +136,7 @@
+ Associated Keyboard : none + Associated Keyboard : none
+ Value : 0 + Value : 0
+ +
@@ -184,7 +177,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -182,41 +145,45 @@ +@@ -173,41 +145,45 @@
+ Associated Keyboard : none + Associated Keyboard : none
+ Value : 0 + Value : 0
+ +
@@ -238,7 +231,7 @@
+ +
+ Text tHeading + Text tHeading
+ Attributes + Attributes
+@@ -238,57 +205,7 @@ +@@ -229,57 +205,7 @@
+ Text : + Text :
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
@@ -297,7 +290,24 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -330,26 +247,30 @@ +@@ -289,16 +215,6 @@
+ Text : 
+ Max. Text Size : 10
+
+-Text tCurTemp
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 30
+-
+ Picture p0
+ Attributes
+ Scope : local
+@@ -331,26 +247,30 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -336,7 +346,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -362,21 +283,30 @@ +@@ -363,21 +283,30 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -371,7 +381,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -389,21 +319,26 @@ +@@ -390,21 +319,26 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -403,7 +413,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -416,7 +351,7 @@ +@@ -417,7 +351,7 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -412,7 +422,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -430,7 +365,7 @@ +@@ -431,7 +365,7 @@
+ Touch Press Event + Touch Press Event
+ //craft command + //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt="event,buttonPress2,"+entn.txt
@@ -421,7 +431,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -443,7 +378,7 @@ +@@ -444,7 +378,7 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -430,7 +440,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -457,7 +392,7 @@ +@@ -458,7 +392,7 @@
+ Touch Press Event + Touch Press Event
+ //craft command + //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt="event,buttonPress2,"+entn.txt
@@ -439,7 +449,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -470,13 +405,13 @@ +@@ -471,13 +405,13 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -455,7 +465,7 @@
+ Text :  + Text : 
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+@@ -484,7 +419,7 @@ +@@ -485,7 +419,7 @@
+ Touch Press Event + Touch Press Event
+ //craft command + //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt="event,buttonPress2,"+entn.txt
@@ -464,7 +474,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -503,7 +438,7 @@ +@@ -504,7 +438,7 @@
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
@@ -473,7 +483,7 @@
+ Text :  + Text : 
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+@@ -524,13 +459,13 @@ +@@ -525,13 +459,13 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -489,7 +499,7 @@
+ Text :  + Text : 
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+@@ -538,7 +473,7 @@ +@@ -539,7 +473,7 @@
+ Touch Press Event + Touch Press Event
+ //craft command + //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt="event,buttonPress2,"+entn.txt
@@ -498,7 +508,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -551,7 +486,7 @@ +@@ -552,7 +486,7 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -507,7 +517,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -565,115 +500,7 @@ +@@ -566,115 +500,7 @@
+ Touch Press Event + Touch Press Event
+ //craft command + //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt="event,buttonPress2,"+entn.txt
@@ -624,7 +634,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -686,30 +513,21 @@ +@@ -687,30 +513,21 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -660,7 +670,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -722,30 +540,21 @@ +@@ -723,30 +540,21 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -696,7 +706,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -758,30 +567,21 @@ +@@ -759,30 +567,21 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -732,8 +742,13 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -967,19 +767,18 @@ +@@ -964,22 +763,22 @@
+ covx tTmp.txt,xTempCurr.val,0,0 + //entity name
+ spstr strCommand.txt,entn.txt,"~",3
+ //currentTemp
+- spstr strCommand.txt,tCurTemp.txt,"~",4
++ spstr strCommand.txt,tTmp.txt,"~",4
++ covx tTmp.txt,xTempCurr.val,0,0
+ //dstTemp + //dstTemp
+ spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",5
+- covx tTmp.txt,xTempDest1.val,0,0 +- covx tTmp.txt,xTempDest1.val,0,0
@@ -812,8 +827,8 @@
+ } + }
+ } + }
+ if(tInstruction.txt=="pageType") + if(tInstruction.txt=="pageType")
+--- HMI/n2t-out/pageStartup.txt 2022-05-14 20:08:22.302573663 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-15 08:50:22.549240409 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 20:08:22.698580145 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-15 08:50:22.977268115 +0000
+@@ -351,7 +351,7 @@ +@@ -351,7 +351,7 @@
+ +
+ Events + Events

165
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -61,128 +61,98 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
ID : 15 ID : 14
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) va0 Variable (string) va0
Attributes Attributes
ID : 25 ID : 24
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va1 Variable (string) va1
Attributes Attributes
ID : 26 ID : 25
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va2 Variable (string) va2
Attributes Attributes
ID : 27 ID : 26
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va3 Variable (string) va3
Attributes Attributes
ID : 28 ID : 27
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va4 Variable (string) va4
Attributes Attributes
ID : 29 ID : 28
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va5 Variable (string) va5
Attributes Attributes
ID : 30 ID : 29
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va6 Variable (string) va6
Attributes Attributes
ID : 31 ID : 30
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va7 Variable (string) va7
Attributes Attributes
ID : 32 ID : 31
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) tInstruction Variable (string) tInstruction
Attributes Attributes
ID : 47 ID : 46
Scope : local Scope : local
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 48 ID : 47
Scope : local Scope : local
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) tTmp Variable (string) tTmp
Attributes Attributes
ID : 49 ID : 48
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) tSend Variable (string) tSend
Attributes Attributes
ID : 50 ID : 49
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 100
XFloat xTempCurr
Attributes
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 13
y coordinate : 121
Width : 95
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempDest1 XFloat xTempDest1
Attributes Attributes
ID : 9 ID : 8
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -212,7 +182,7 @@ XFloat xTempDest1
XFloat xTempMin1 XFloat xTempMin1
Attributes Attributes
ID : 10 ID : 9
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -242,7 +212,7 @@ XFloat xTempMin1
XFloat xTempMax1 XFloat xTempMax1
Attributes Attributes
ID : 11 ID : 10
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -272,7 +242,7 @@ XFloat xTempMax1
XFloat xTempStep1 XFloat xTempStep1
Attributes Attributes
ID : 12 ID : 11
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -302,7 +272,7 @@ XFloat xTempStep1
XFloat xTempDest2 XFloat xTempDest2
Attributes Attributes
ID : 42 ID : 41
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -332,7 +302,7 @@ XFloat xTempDest2
XFloat xTempMin2 XFloat xTempMin2
Attributes Attributes
ID : 44 ID : 43
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -362,7 +332,7 @@ XFloat xTempMin2
XFloat xTempMax2 XFloat xTempMax2
Attributes Attributes
ID : 45 ID : 44
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -392,7 +362,7 @@ XFloat xTempMax2
XFloat xTempStep2 XFloat xTempStep2
Attributes Attributes
ID : 46 ID : 45
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -422,7 +392,7 @@ XFloat xTempStep2
XFloat xTempDest XFloat xTempDest
Attributes Attributes
ID : 53 ID : 52
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -512,14 +482,14 @@ Text tStatus
Text tCF1 Text tCF1
Attributes Attributes
ID : 8 ID : 7
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 416 x coordinate : 416
y coordinate : 136 y coordinate : 116
Width : 25 Width : 25
Height : 30 Height : 30
Effect : load Effect : load
@@ -542,7 +512,7 @@ Text tCF1
Text tCurTempLbl Text tCurTempLbl
Attributes Attributes
ID : 38 ID : 37
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -572,7 +542,7 @@ Text tCurTempLbl
Text tStateLbl Text tStateLbl
Attributes Attributes
ID : 39 ID : 38
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -602,14 +572,14 @@ Text tStateLbl
Text tCF2 Text tCF2
Attributes Attributes
ID : 41 ID : 40
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 263 x coordinate : 263
y coordinate : 136 y coordinate : 116
Width : 25 Width : 25
Height : 30 Height : 30
Effect : load Effect : load
@@ -632,7 +602,7 @@ Text tCF2
Text tALbl Text tALbl
Attributes Attributes
ID : 51 ID : 50
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -662,14 +632,14 @@ Text tALbl
Text tCF Text tCF
Attributes Attributes
ID : 55 ID : 54
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 342 x coordinate : 342
y coordinate : 137 y coordinate : 116
Width : 25 Width : 25
Height : 30 Height : 30
Effect : load Effect : load
@@ -690,6 +660,36 @@ Text tCF
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tCurTemp
Attributes
ID : 55
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 13
y coordinate : 121
Width : 95
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -756,7 +756,7 @@ Button bNext
Button bPrev Button bPrev
Attributes Attributes
ID : 16 ID : 15
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -810,7 +810,7 @@ Button bPrev
Dual-state Button bt0 Dual-state Button bt0
Attributes Attributes
ID : 17 ID : 16
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -859,7 +859,7 @@ Dual-state Button bt0
Dual-state Button bt2 Dual-state Button bt2
Attributes Attributes
ID : 18 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -908,7 +908,7 @@ Dual-state Button bt2
Dual-state Button bt4 Dual-state Button bt4
Attributes Attributes
ID : 19 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -957,7 +957,7 @@ Dual-state Button bt4
Dual-state Button bt6 Dual-state Button bt6
Attributes Attributes
ID : 20 ID : 19
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1006,7 +1006,7 @@ Dual-state Button bt6
Dual-state Button bt1 Dual-state Button bt1
Attributes Attributes
ID : 21 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1055,7 +1055,7 @@ Dual-state Button bt1
Dual-state Button bt3 Dual-state Button bt3
Attributes Attributes
ID : 22 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1104,7 +1104,7 @@ Dual-state Button bt3
Dual-state Button bt5 Dual-state Button bt5
Attributes Attributes
ID : 23 ID : 22
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1153,7 +1153,7 @@ Dual-state Button bt5
Dual-state Button bt7 Dual-state Button bt7
Attributes Attributes
ID : 24 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1202,7 +1202,7 @@ Dual-state Button bt7
Dual-state Button btUp1 Dual-state Button btUp1
Attributes Attributes
ID : 33 ID : 32
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1260,7 +1260,7 @@ Dual-state Button btUp1
Dual-state Button btDown1 Dual-state Button btDown1
Attributes Attributes
ID : 34 ID : 33
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1318,7 +1318,7 @@ Dual-state Button btDown1
Dual-state Button bUp2 Dual-state Button bUp2
Attributes Attributes
ID : 40 ID : 39
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1376,7 +1376,7 @@ Dual-state Button bUp2
Dual-state Button bDown2 Dual-state Button bDown2
Attributes Attributes
ID : 43 ID : 42
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1434,7 +1434,7 @@ Dual-state Button bDown2
Dual-state Button btUp Dual-state Button btUp
Attributes Attributes
ID : 52 ID : 51
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1492,7 +1492,7 @@ Dual-state Button btUp
Dual-state Button btDown Dual-state Button btDown
Attributes Attributes
ID : 54 ID : 53
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1550,7 +1550,7 @@ Dual-state Button btDown
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
ID : 35 ID : 34
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1587,7 +1587,7 @@ Hotspot mSwipeNext
Hotspot mSwipeUp Hotspot mSwipeUp
Attributes Attributes
ID : 36 ID : 35
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1624,7 +1624,7 @@ Hotspot mSwipeUp
Hotspot mSwipePrev Hotspot mSwipePrev
Attributes Attributes
ID : 37 ID : 36
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1745,8 +1745,7 @@ Timer tmSerial
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
//currentTemp //currentTemp
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tCurTemp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest1.val,0,0 covx tTmp.txt,xTempDest1.val,0,0
@@ -2011,7 +2010,7 @@ Timer tmSerial
Timer tmSleep Timer tmSleep
Attributes Attributes
ID : 13 ID : 12
Scope : local Scope : local
Period (ms): 1000 Period (ms): 1000
Enabled : yes Enabled : yes
@@ -2042,7 +2041,7 @@ Timer tmSleep
TouchCap tc0 TouchCap tc0
Attributes Attributes
ID : 14 ID : 13
Scope: local Scope: local
Value: 0 Value: 0

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

@@ -34,6 +34,10 @@ popupLight
27 Component(s) 27 Component(s)
341 Line(s) of event code 341 Line(s) of event code
185 Unique line(s) of event code 185 Unique line(s) of event code
cardThermo
56 Component(s)
542 Line(s) of event code
288 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
435 Line(s) of event code 435 Line(s) of event code
@@ -42,10 +46,6 @@ cardAlarm
38 Component(s) 38 Component(s)
360 Line(s) of event code 360 Line(s) of event code
222 Unique line(s) of event code 222 Unique line(s) of event code
cardThermo
56 Component(s)
543 Line(s) of event code
289 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
981 Line(s) of event code 981 Line(s) of event code
@@ -54,5 +54,5 @@ cardEntities
Total Total
12 Page(s) 12 Page(s)
371 Component(s) 371 Component(s)
3861 Line(s) of event code 3860 Line(s) of event code
1061 Unique line(s) of event code 1061 Unique line(s) of event code

22
HMI/n2t-out/cardThermo.txt
View File

@@ -128,15 +128,6 @@ Variable (string) tSend
Text : Text :
Max. Text Size: 100 Max. Text Size: 100
XFloat xTempCurr
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempDest1 XFloat xTempDest1
Attributes Attributes
Scope : local Scope : local
@@ -298,6 +289,16 @@ Text tCF
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 10
Text tCurTemp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 30
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -963,8 +964,7 @@ Timer tmSerial
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
//currentTemp //currentTemp
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tCurTemp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest1.val,0,0 covx tTmp.txt,xTempDest1.val,0,0