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

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

Browse Source
This commit is contained in:
joBr99
2022-06-06 12:47:25 +00:00
committed by github-actions[bot]
parent d3425353b7
commit 7141c7d006
12 changed files with 215 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
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-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-06 12:47:19.779824907 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 12:47:20.835832380 +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/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-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 12:47:20.835832380 +0000
@@ -1925,10 +1925,6 @@ @@ -1925,10 +1925,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/cardGrid.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 12:47:20.835832380 +0000
@@ -846,10 +846,6 @@ @@ -846,10 +846,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 12:47:20.835832380 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -99,9 +99,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 12:47:20.835832380 +0000
@@ -1170,10 +1170,6 @@ @@ -1152,10 +1152,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
@@ -113,8 +113,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 12:47:20.835832380 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -136,8 +136,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 12:47:20.835832380 +0000
@@ -561,10 +561,6 @@ @@ -561,10 +561,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -150,8 +150,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/popupNotify.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 12:47:20.835832380 +0000
@@ -311,10 +311,6 @@ @@ -311,10 +311,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -164,8 +164,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-06 12:47:20.835832380 +0000
@@ -406,10 +406,6 @@ @@ -406,10 +406,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -178,8 +178,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-05 14:52:20.324222977 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-06 12:47:20.835832380 +0000
@@ -397,9 +397,6 @@ @@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0

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

@@ -29,9 +29,6 @@ Page cardThermo
vis xTempMin1,0 vis xTempMin1,0
vis xTempMax1,0 vis xTempMax1,0
vis xTempStep1,0 vis xTempStep1,0
vis xTempMin2,0
vis xTempMax2,0
vis xTempStep2,0
//tEntity.txt=tHeading.txt //tEntity.txt=tHeading.txt
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -125,28 +122,28 @@ Variable (string) va7
Variable (string) tInstruction Variable (string) tInstruction
Attributes Attributes
ID : 46 ID : 43
Scope : local Scope : local
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 47 ID : 44
Scope : local Scope : local
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) tTmp Variable (string) tTmp
Attributes Attributes
ID : 48 ID : 45
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) tSend Variable (string) tSend
Attributes Attributes
ID : 49 ID : 46
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 100
@@ -301,99 +298,9 @@ XFloat xTempDest2
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
XFloat xTempMin2
Attributes
ID : 43
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 246
y coordinate : 69
Width : 50
Height : 21
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 left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempMax2
Attributes
ID : 44
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 246
y coordinate : 91
Width : 45
Height : 20
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 left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempStep2
Attributes
ID : 45
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 247
y coordinate : 179
Width : 45
Height : 20
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 left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempDest XFloat xTempDest
Attributes Attributes
ID : 52 ID : 49
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -603,7 +510,7 @@ Text tCF2
Text tALbl Text tALbl
Attributes Attributes
ID : 50 ID : 47
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -633,7 +540,7 @@ Text tALbl
Text tCF Text tCF
Attributes Attributes
ID : 54 ID : 51
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -663,7 +570,7 @@ Text tCF
Text tCurTemp Text tCurTemp
Attributes Attributes
ID : 55 ID : 52
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1243,10 +1150,13 @@ Dual-state Button btUp1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -1301,10 +1211,13 @@ Dual-state Button btDown1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -1339,7 +1252,7 @@ Dual-state Button bUp2
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371 Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712 Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512 Font Color (Pressed) : 50712
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
@@ -1351,16 +1264,19 @@ Dual-state Button bUp2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val<xTempMax2.val) if(xTempDest2.val<xTempMax1.val)
{ {
xTempDest2.val=xTempDest2.val+xTempStep2.val xTempDest2.val=xTempDest2.val+xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -1409,16 +1325,19 @@ Dual-state Button bDown2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val>xTempMin2.val) if(xTempDest2.val>xTempMin1.val)
{ {
xTempDest2.val=xTempDest2.val-xTempStep2.val xTempDest2.val=xTempDest2.val-xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -1435,7 +1354,7 @@ Dual-state Button bDown2
Dual-state Button btUp Dual-state Button btUp
Attributes Attributes
ID : 51 ID : 48
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1493,7 +1412,7 @@ Dual-state Button btUp
Dual-state Button btDown Dual-state Button btDown
Attributes Attributes
ID : 53 ID : 50
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0

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

@@ -39,9 +39,9 @@ popupShutter
245 Line(s) of event code 245 Line(s) of event code
139 Unique line(s) of event code 139 Unique line(s) of event code
cardThermo cardThermo
56 Component(s) 53 Component(s)
543 Line(s) of event code 552 Line(s) of event code
293 Unique line(s) of event code 290 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1130 Line(s) of event code 1130 Line(s) of event code
@@ -57,6 +57,6 @@ cardAlarm
Total Total
13 Page(s) 13 Page(s)
408 Component(s) 405 Component(s)
4500 Line(s) of event code 4509 Line(s) of event code
1194 Unique line(s) of event code 1190 Unique line(s) of event code

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

@@ -21,9 +21,6 @@ Page cardThermo
vis xTempMin1,0 vis xTempMin1,0
vis xTempMax1,0 vis xTempMax1,0
vis xTempStep1,0 vis xTempStep1,0
vis xTempMin2,0
vis xTempMax2,0
vis xTempStep2,0
//tEntity.txt=tHeading.txt //tEntity.txt=tHeading.txt
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -174,33 +171,6 @@ XFloat xTempDest2
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
XFloat xTempMin2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempMax2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempStep2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempDest XFloat xTempDest
Attributes Attributes
Scope : local Scope : local
@@ -600,10 +570,13 @@ Dual-state Button btUp1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -636,10 +609,13 @@ Dual-state Button btDown1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -664,16 +640,19 @@ Dual-state Button bUp2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val<xTempMax2.val) if(xTempDest2.val<xTempMax1.val)
{ {
xTempDest2.val=xTempDest2.val+xTempStep2.val xTempDest2.val=xTempDest2.val+xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -700,16 +679,19 @@ Dual-state Button bDown2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val>xTempMin2.val) if(xTempDest2.val>xTempMin1.val)
{ {
xTempDest2.val=xTempDest2.val-xTempStep2.val xTempDest2.val=xTempDest2.val-xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc

20
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-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-06 12:47:19.779824907 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-05 14:52:19.924217323 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 12:47:20.275828417 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-05 14:52:19.924217323 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 12:47:20.279828445 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,8 +468,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-05 14:52:19.924217323 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 12:47:20.279828445 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
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-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-05 14:52:19.924217323 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 12:47:20.279828445 +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
@@ -539,8 +539,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-05 14:52:19.480211048 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-05 14:52:19.924217323 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-06 12:47:20.279828445 +0000
@@ -474,22 +474,6 @@ @@ -474,22 +474,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-05 14:52:19.936217493 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 12:47:20.327828785 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-05 14:52:19.480211048 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 12:47:19.779824907 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-05 14:52:19.924217323 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 12:47:20.275828417 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-05 14:52:19.480211048 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-05 14:52:19.924217323 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 12:47:20.279828445 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
@@ -13,8 +13,8 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-05 14:52:19.480211048 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-05 14:52:19.924217323 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 12:47:20.279828445 +0000
+@@ -45,12 +45,6 @@ +@@ -45,12 +45,6 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0
@@ -59,10 +59,10 @@
+ } + }
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-06-05 14:52:19.480211048 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-05 14:52:19.924217323 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 12:47:20.279828445 +0000
+--- HMI/n2t-out/screensaver.txt 2022-06-05 14:52:19.480211048 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-05 14:52:19.924217323 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-06 12:47:20.279828445 +0000
+@@ -474,22 +474,6 @@ +@@ -474,22 +474,6 @@
+@@ -501,14 +485,6 @@ +@@ -501,14 +485,6 @@
+ spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tIcon2.txt,"~",19

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

@@ -29,9 +29,6 @@ Page cardThermo
vis xTempMin1,0 vis xTempMin1,0
vis xTempMax1,0 vis xTempMax1,0
vis xTempStep1,0 vis xTempStep1,0
vis xTempMin2,0
vis xTempMax2,0
vis xTempStep2,0
//tEntity.txt=tHeading.txt //tEntity.txt=tHeading.txt
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -125,28 +122,28 @@ Variable (string) va7
Variable (string) tInstruction Variable (string) tInstruction
Attributes Attributes
ID : 43 ID : 40
Scope : local Scope : local
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 44 ID : 41
Scope : local Scope : local
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) tTmp Variable (string) tTmp
Attributes Attributes
ID : 45 ID : 42
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) tSend Variable (string) tSend
Attributes Attributes
ID : 46 ID : 43
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 100
@@ -301,99 +298,9 @@ XFloat xTempDest2
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
XFloat xTempMin2
Attributes
ID : 40
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 110
y coordinate : 178
Width : 50
Height : 21
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 left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempMax2
Attributes
ID : 41
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 110
y coordinate : 200
Width : 45
Height : 20
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 left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempStep2
Attributes
ID : 42
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 111
y coordinate : 288
Width : 45
Height : 20
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 left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempDest XFloat xTempDest
Attributes Attributes
ID : 49 ID : 46
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -603,7 +510,7 @@ Text tCF2
Text tALbl Text tALbl
Attributes Attributes
ID : 47 ID : 44
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -633,7 +540,7 @@ Text tALbl
Text tCF Text tCF
Attributes Attributes
ID : 51 ID : 48
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -663,7 +570,7 @@ Text tCF
Text tCurTemp Text tCurTemp
Attributes Attributes
ID : 52 ID : 49
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1243,10 +1150,13 @@ Dual-state Button btUp1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -1301,10 +1211,13 @@ Dual-state Button btDown1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -1351,16 +1264,19 @@ Dual-state Button bUp2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val<xTempMax2.val) if(xTempDest2.val<xTempMax1.val)
{ {
xTempDest2.val=xTempDest2.val+xTempStep2.val xTempDest2.val=xTempDest2.val+xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -1409,16 +1325,19 @@ Dual-state Button bDown2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val>xTempMin2.val) if(xTempDest2.val>xTempMin1.val)
{ {
xTempDest2.val=xTempDest2.val-xTempStep2.val xTempDest2.val=xTempDest2.val-xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -1435,7 +1354,7 @@ Dual-state Button bDown2
Dual-state Button btUp Dual-state Button btUp
Attributes Attributes
ID : 48 ID : 45
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1493,7 +1412,7 @@ Dual-state Button btUp
Dual-state Button btDown Dual-state Button btDown
Attributes Attributes
ID : 50 ID : 47
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1551,7 +1470,7 @@ Dual-state Button btDown
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
ID : 53 ID : 50
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1571,7 +1490,7 @@ Hotspot mSwipeNext
Hotspot mSwipeUp Hotspot mSwipeUp
Attributes Attributes
ID : 54 ID : 51
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1591,7 +1510,7 @@ Hotspot mSwipeUp
Hotspot mSwipePrev Hotspot mSwipePrev
Attributes Attributes
ID : 55 ID : 52
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0

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

@@ -27,9 +27,9 @@ popupNotify
204 Line(s) of event code 204 Line(s) of event code
128 Unique line(s) of event code 128 Unique line(s) of event code
cardThermo cardThermo
56 Component(s) 53 Component(s)
546 Line(s) of event code 555 Line(s) of event code
295 Unique line(s) of event code 292 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1363 Line(s) of event code 1363 Line(s) of event code
@@ -57,6 +57,6 @@ screensaver
Total Total
13 Page(s) 13 Page(s)
420 Component(s) 417 Component(s)
4740 Line(s) of event code 4749 Line(s) of event code
1251 Unique line(s) of event code 1247 Unique line(s) of event code

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

@@ -21,9 +21,6 @@ Page cardThermo
vis xTempMin1,0 vis xTempMin1,0
vis xTempMax1,0 vis xTempMax1,0
vis xTempStep1,0 vis xTempStep1,0
vis xTempMin2,0
vis xTempMax2,0
vis xTempStep2,0
//tEntity.txt=tHeading.txt //tEntity.txt=tHeading.txt
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -174,33 +171,6 @@ XFloat xTempDest2
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
XFloat xTempMin2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempMax2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempStep2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempDest XFloat xTempDest
Attributes Attributes
Scope : local Scope : local
@@ -600,10 +570,13 @@ Dual-state Button btUp1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -636,10 +609,13 @@ Dual-state Button btDown1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -664,16 +640,19 @@ Dual-state Button bUp2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val<xTempMax2.val) if(xTempDest2.val<xTempMax1.val)
{ {
xTempDest2.val=xTempDest2.val+xTempStep2.val xTempDest2.val=xTempDest2.val+xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -700,16 +679,19 @@ Dual-state Button bDown2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val>xTempMin2.val) if(xTempDest2.val>xTempMin1.val)
{ {
xTempDest2.val=xTempDest2.val-xTempStep2.val xTempDest2.val=xTempDest2.val-xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc

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

@@ -29,9 +29,6 @@ Page cardThermo
vis xTempMin1,0 vis xTempMin1,0
vis xTempMax1,0 vis xTempMax1,0
vis xTempStep1,0 vis xTempStep1,0
vis xTempMin2,0
vis xTempMax2,0
vis xTempStep2,0
//tEntity.txt=tHeading.txt //tEntity.txt=tHeading.txt
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -125,28 +122,28 @@ Variable (string) va7
Variable (string) tInstruction Variable (string) tInstruction
Attributes Attributes
ID : 46 ID : 43
Scope : local Scope : local
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 47 ID : 44
Scope : local Scope : local
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) tTmp Variable (string) tTmp
Attributes Attributes
ID : 48 ID : 45
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) tSend Variable (string) tSend
Attributes Attributes
ID : 49 ID : 46
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 100
@@ -301,99 +298,9 @@ XFloat xTempDest2
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
XFloat xTempMin2
Attributes
ID : 43
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 231
y coordinate : 69
Width : 50
Height : 21
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 left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempMax2
Attributes
ID : 44
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 231
y coordinate : 91
Width : 45
Height : 20
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 left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempStep2
Attributes
ID : 45
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 232
y coordinate : 179
Width : 45
Height : 20
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 left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempDest XFloat xTempDest
Attributes Attributes
ID : 52 ID : 49
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -603,7 +510,7 @@ Text tCF2
Text tALbl Text tALbl
Attributes Attributes
ID : 50 ID : 47
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -633,7 +540,7 @@ Text tALbl
Text tCF Text tCF
Attributes Attributes
ID : 54 ID : 51
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -663,7 +570,7 @@ Text tCF
Text tCurTemp Text tCurTemp
Attributes Attributes
ID : 55 ID : 52
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1243,10 +1150,13 @@ Dual-state Button btUp1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -1301,10 +1211,13 @@ Dual-state Button btDown1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -1339,7 +1252,7 @@ Dual-state Button bUp2
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371 Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712 Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512 Font Color (Pressed) : 50712
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
@@ -1351,16 +1264,19 @@ Dual-state Button bUp2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val<xTempMax2.val) if(xTempDest2.val<xTempMax1.val)
{ {
xTempDest2.val=xTempDest2.val+xTempStep2.val xTempDest2.val=xTempDest2.val+xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -1409,16 +1325,19 @@ Dual-state Button bDown2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val>xTempMin2.val) if(xTempDest2.val>xTempMin1.val)
{ {
xTempDest2.val=xTempDest2.val-xTempStep2.val xTempDest2.val=xTempDest2.val-xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -1435,7 +1354,7 @@ Dual-state Button bDown2
Dual-state Button btUp Dual-state Button btUp
Attributes Attributes
ID : 51 ID : 48
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1493,7 +1412,7 @@ Dual-state Button btUp
Dual-state Button btDown Dual-state Button btDown
Attributes Attributes
ID : 53 ID : 50
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0

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

@@ -47,9 +47,9 @@ cardAlarm
392 Line(s) of event code 392 Line(s) of event code
239 Unique line(s) of event code 239 Unique line(s) of event code
cardThermo cardThermo
56 Component(s) 53 Component(s)
546 Line(s) of event code 555 Line(s) of event code
295 Unique line(s) of event code 292 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1133 Line(s) of event code
@@ -57,6 +57,6 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
409 Component(s) 406 Component(s)
4548 Line(s) of event code 4557 Line(s) of event code
1211 Unique line(s) of event code 1207 Unique line(s) of event code

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

@@ -21,9 +21,6 @@ Page cardThermo
vis xTempMin1,0 vis xTempMin1,0
vis xTempMax1,0 vis xTempMax1,0
vis xTempStep1,0 vis xTempStep1,0
vis xTempMin2,0
vis xTempMax2,0
vis xTempStep2,0
//tEntity.txt=tHeading.txt //tEntity.txt=tHeading.txt
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -174,33 +171,6 @@ XFloat xTempDest2
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
XFloat xTempMin2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempMax2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempStep2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
XFloat xTempDest XFloat xTempDest
Attributes Attributes
Scope : local Scope : local
@@ -600,10 +570,13 @@ Dual-state Button btUp1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -636,10 +609,13 @@ Dual-state Button btDown1
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdHigh," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0 covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.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
@@ -664,16 +640,19 @@ Dual-state Button bUp2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val<xTempMax2.val) if(xTempDest2.val<xTempMax1.val)
{ {
xTempDest2.val=xTempDest2.val+xTempStep2.val xTempDest2.val=xTempDest2.val+xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -700,16 +679,19 @@ Dual-state Button bDown2
Events Events
Touch Press Event Touch Press Event
if(xTempDest2.val>xTempMin2.val) if(xTempDest2.val>xTempMin1.val)
{ {
xTempDest2.val=xTempDest2.val-xTempStep2.val xTempDest2.val=xTempDest2.val-xTempStep1.val
} }
// event,buttonPress2,entn,tempUpd,X // event,buttonPress2,entn,tempUpd,X
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
tSend.txt+="tempUpdLow," tSend.txt+="tempUpdHighLow,"
//convert temperature //convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx xTempDest2.val,tTmp.txt,0,0 covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc