mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-19 22:24:15 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
f2549a6a91
commit
b067a2c187
@@ -1,340 +0,0 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-18 20:12:47.683701912 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
int dimValueNormal=100
|
||||
- // fix touch offset
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
+ // fix touch offset (Removed for US version)
|
||||
+ //lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-18 20:12:47.683701912 +0000
|
||||
@@ -44,7 +44,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 50
|
||||
|
||||
Variable (string) tSend
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-18 20:12:47.687701944 +0000
|
||||
@@ -97,25 +97,25 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 70
|
||||
|
||||
Variable (string) entn2
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 70
|
||||
|
||||
Variable (string) entn3
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 70
|
||||
|
||||
Variable (string) entn4
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 70
|
||||
|
||||
Number nNum1
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-18 20:12:47.683701912 +0000
|
||||
@@ -69,25 +69,25 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 70
|
||||
|
||||
Variable (string) entn2
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 70
|
||||
|
||||
Variable (string) entn3
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 70
|
||||
|
||||
Variable (string) entn4
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 70
|
||||
|
||||
Variable (string) type5
|
||||
Attributes
|
||||
@@ -105,13 +105,13 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 50
|
||||
|
||||
Variable (string) entn6
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 50
|
||||
|
||||
Text tHeading
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-18 20:12:47.683701912 +0000
|
||||
@@ -30,7 +30,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 50
|
||||
|
||||
Variable (string) vaSpeakerList
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-18 20:12:47.683701912 +0000
|
||||
@@ -42,7 +42,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 80
|
||||
+ Max. Text Size: 50
|
||||
|
||||
Variable (string) va0
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-18 20:12:47.683701912 +0000
|
||||
@@ -30,7 +30,7 @@
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
- Max. Text Size : 80
|
||||
+ Max. Text Size : 50
|
||||
|
||||
Text tTmp2
|
||||
Attributes
|
||||
@@ -40,7 +40,7 @@
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
- Max. Text Size : 80
|
||||
+ Max. Text Size : 50
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-18 20:12:47.683701912 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
// startup event
|
||||
- tSend.txt="event,startup,"+tVersion.txt+",eu"
|
||||
+ tSend.txt="event,startup,"+tVersion.txt+",us-l"
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
||||
--- HMI/n2t-out/popupLight.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-18 20:12:47.687701944 +0000
|
||||
@@ -59,8 +59,8 @@
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 80
|
||||
+ Text : newtxt
|
||||
+ Max. Text Size: 50
|
||||
|
||||
Variable (int32) mode
|
||||
Attributes
|
||||
@@ -570,43 +570,25 @@
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
- if(tId.txt=="pageStartup")
|
||||
- {
|
||||
- page pageStartup
|
||||
- }
|
||||
- if(tId.txt=="screensaver")
|
||||
- {
|
||||
- page screensaver
|
||||
- }
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
- if(tId.txt=="cardGrid")
|
||||
- {
|
||||
- page cardGrid
|
||||
- }
|
||||
- if(tId.txt=="popupLight")
|
||||
+ if(tId.txt=="cardMedia")
|
||||
{
|
||||
- pageIcons.tTmp1.txt=tTmp.txt
|
||||
- page popupLight
|
||||
+ page cardMedia
|
||||
}
|
||||
- if(tId.txt=="popupShutter")
|
||||
+ if(tId.txt=="pageStartup")
|
||||
{
|
||||
- pageIcons.tTmp1.txt=tTmp.txt
|
||||
- page popupShutter
|
||||
+ page pageStartup
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
- if(tId.txt=="cardThermo")
|
||||
- {
|
||||
- page cardThermo
|
||||
- }
|
||||
- if(tId.txt=="cardMedia")
|
||||
+ if(tId.txt=="cardGrid")
|
||||
{
|
||||
- page cardMedia
|
||||
+ page cardGrid
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-18 20:12:47.683701912 +0000
|
||||
@@ -46,8 +46,8 @@
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 80
|
||||
+ Text : newtxt
|
||||
+ Max. Text Size: 50
|
||||
|
||||
Text tEntity
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
|
||||
--- HMI/n2t-out/screensaver.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-18 20:12:47.687701944 +0000
|
||||
@@ -17,8 +17,6 @@
|
||||
vis tInstruction,0
|
||||
vis tTmp,0
|
||||
vis p0,0
|
||||
- vis tNotifyHead,0
|
||||
- vis tNotifyText,0
|
||||
//load gloabl time string from pageIcons
|
||||
//tTime.txt=vaTime.txt
|
||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||
@@ -50,18 +48,6 @@
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
-Variable (string) tInstruction
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 50
|
||||
-
|
||||
-Variable (string) tTmp
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 50
|
||||
-
|
||||
Text tTime
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -292,7 +278,7 @@
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
|
||||
-Text tNotifyHead
|
||||
+Text tTmp
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -300,9 +286,9 @@
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
- Max. Text Size : 35
|
||||
+ Max. Text Size : 50
|
||||
|
||||
-Text tNotifyText
|
||||
+Text tInstruction
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -310,7 +296,7 @@
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
- Max. Text Size : 35
|
||||
+ Max. Text Size : 50
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
@@ -543,20 +529,6 @@
|
||||
spstr strCommand.txt,tTmp.txt,"~",23
|
||||
covx tTmp.txt,tMR.pco,0,0
|
||||
}
|
||||
- if(tInstruction.txt=="notify")
|
||||
- {
|
||||
- spstr strCommand.txt,tNotifyHead.txt,"~",1
|
||||
- spstr strCommand.txt,tNotifyText.txt,"~",2
|
||||
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||
- {
|
||||
- vis tNotifyHead,1
|
||||
- vis tNotifyText,1
|
||||
- }else
|
||||
- {
|
||||
- vis tNotifyHead,0
|
||||
- vis tNotifyText,0
|
||||
- }
|
||||
- }
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
dim=100
|
||||
@@ -646,16 +618,6 @@
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||
- {
|
||||
- if(dim!=0)
|
||||
- {
|
||||
- tNotifyHead.txt=""
|
||||
- tNotifyText.txt=""
|
||||
- vis tNotifyHead,0
|
||||
- vis tNotifyText,0
|
||||
- }
|
||||
- }
|
||||
dim=dimValueNormal
|
||||
vaTap.val+=1
|
||||
covx vaTap.val,tTmp.txt,0,0
|
||||
|
||||
@@ -11,6 +11,6 @@ Program.s
|
||||
// dim value
|
||||
int dimValue=40
|
||||
int dimValueNormal=100
|
||||
// fix touch offset (Removed for US version)
|
||||
//lcd_dev fffb 0002 0000 0020
|
||||
// fix touch offset
|
||||
lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
|
||||
@@ -54,7 +54,7 @@ Variable (string) entn
|
||||
ID : 9
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) tSend
|
||||
Attributes
|
||||
|
||||
@@ -111,28 +111,28 @@ Variable (string) entn1
|
||||
ID : 49
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn2
|
||||
Attributes
|
||||
ID : 50
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn3
|
||||
Attributes
|
||||
ID : 51
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn4
|
||||
Attributes
|
||||
ID : 52
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Number nNum1
|
||||
Attributes
|
||||
|
||||
@@ -83,28 +83,28 @@ Variable (string) entn1
|
||||
ID : 18
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn2
|
||||
Attributes
|
||||
ID : 19
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn3
|
||||
Attributes
|
||||
ID : 20
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn4
|
||||
Attributes
|
||||
ID : 21
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) type5
|
||||
Attributes
|
||||
@@ -125,14 +125,14 @@ Variable (string) entn5
|
||||
ID : 36
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn6
|
||||
Attributes
|
||||
ID : 37
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Text tHeading
|
||||
Attributes
|
||||
|
||||
@@ -40,7 +40,7 @@ Variable (string) entn
|
||||
ID : 18
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) vaSpeakerList
|
||||
Attributes
|
||||
|
||||
@@ -52,7 +52,7 @@ Variable (string) entn
|
||||
ID : 21
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) va0
|
||||
Attributes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Program.s
|
||||
0 Component(s)
|
||||
10 Line(s) of event code
|
||||
10 Unique line(s) of event code
|
||||
11 Line(s) of event code
|
||||
11 Unique line(s) of event code
|
||||
pageIcons
|
||||
6 Component(s)
|
||||
0 Line(s) of event code
|
||||
@@ -10,49 +10,49 @@ pageTest
|
||||
13 Component(s)
|
||||
13 Line(s) of event code
|
||||
13 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
cardMedia
|
||||
30 Component(s)
|
||||
329 Line(s) of event code
|
||||
169 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
196 Line(s) of event code
|
||||
123 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
343 Line(s) of event code
|
||||
214 Unique line(s) of event code
|
||||
popupShutter
|
||||
19 Component(s)
|
||||
191 Line(s) of event code
|
||||
107 Unique line(s) of event code
|
||||
cardGrid
|
||||
39 Component(s)
|
||||
418 Line(s) of event code
|
||||
244 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
338 Line(s) of event code
|
||||
182 Unique line(s) of event code
|
||||
popupShutter
|
||||
19 Component(s)
|
||||
191 Line(s) of event code
|
||||
107 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
196 Line(s) of event code
|
||||
123 Unique line(s) of event code
|
||||
cardMedia
|
||||
30 Component(s)
|
||||
329 Line(s) of event code
|
||||
169 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
442 Line(s) of event code
|
||||
247 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
343 Line(s) of event code
|
||||
214 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
screensaver
|
||||
35 Component(s)
|
||||
292 Line(s) of event code
|
||||
235 Unique line(s) of event code
|
||||
cardEntities
|
||||
62 Component(s)
|
||||
964 Line(s) of event code
|
||||
410 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
320 Line(s) of event code
|
||||
173 Unique line(s) of event code
|
||||
screensaver
|
||||
33 Component(s)
|
||||
266 Line(s) of event code
|
||||
218 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
12 Page(s)
|
||||
341 Component(s)
|
||||
3642 Line(s) of event code
|
||||
1001 Unique line(s) of event code
|
||||
343 Component(s)
|
||||
3687 Line(s) of event code
|
||||
1018 Unique line(s) of event code
|
||||
|
||||
@@ -57,7 +57,7 @@ Text tTmp1
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
Max. Text Size : 80
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
@@ -87,7 +87,7 @@ Text tTmp2
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
Max. Text Size : 80
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
@@ -296,7 +296,7 @@ Text tMsg1
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 52
|
||||
x coordinate : 57
|
||||
y coordinate : 223
|
||||
Width : 375
|
||||
Height : 30
|
||||
@@ -326,7 +326,7 @@ Text tMsg2
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 35
|
||||
x coordinate : 40
|
||||
y coordinate : 256
|
||||
Width : 408
|
||||
Height : 25
|
||||
@@ -356,7 +356,7 @@ Text tMsg3
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 35
|
||||
x coordinate : 25
|
||||
y coordinate : 278
|
||||
Width : 408
|
||||
Height : 25
|
||||
@@ -462,7 +462,7 @@ Button bSendStartup
|
||||
recmod=1
|
||||
bauds=115200
|
||||
// startup event
|
||||
tSend.txt="event,startup,"+tVersion.txt+",us-l"
|
||||
tSend.txt="event,startup,"+tVersion.txt+",eu"
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -483,7 +483,7 @@ Hotspot mSpinner
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 164
|
||||
x coordinate : 169
|
||||
y coordinate : 49
|
||||
Width : 140
|
||||
Height : 140
|
||||
|
||||
@@ -69,8 +69,8 @@ Variable (string) entn
|
||||
Attributes
|
||||
ID : 21
|
||||
Scope : local
|
||||
Text : newtxt
|
||||
Max. Text Size: 50
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (int32) mode
|
||||
Attributes
|
||||
@@ -916,25 +916,43 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardMedia
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardGrid
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
|
||||
@@ -56,8 +56,8 @@ Variable (string) entn
|
||||
Attributes
|
||||
ID : 18
|
||||
Scope : local
|
||||
Text : newtxt
|
||||
Max. Text Size: 50
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Text tEntity
|
||||
Attributes
|
||||
@@ -67,7 +67,7 @@ Text tEntity
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 80
|
||||
x coordinate : 82
|
||||
y coordinate : 108
|
||||
Width : 195
|
||||
Height : 30
|
||||
@@ -97,7 +97,7 @@ Text tIcon1
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 27
|
||||
x coordinate : 29
|
||||
y coordinate : 109
|
||||
Width : 45
|
||||
Height : 30
|
||||
@@ -127,7 +127,7 @@ Text tSend
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 15
|
||||
x coordinate : 17
|
||||
y coordinate : 0
|
||||
Width : 348
|
||||
Height : 22
|
||||
@@ -157,7 +157,7 @@ Text tTmp
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 421
|
||||
x coordinate : 423
|
||||
y coordinate : 277
|
||||
Width : 34
|
||||
Height : 30
|
||||
@@ -187,7 +187,7 @@ Text tInstruction
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 15
|
||||
x coordinate : 17
|
||||
y coordinate : 290
|
||||
Width : 100
|
||||
Height : 30
|
||||
@@ -217,7 +217,7 @@ Text tId
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 115
|
||||
x coordinate : 117
|
||||
y coordinate : 290
|
||||
Width : 100
|
||||
Height : 30
|
||||
@@ -247,7 +247,7 @@ Text t1
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 79
|
||||
x coordinate : 81
|
||||
y coordinate : 164
|
||||
Width : 100
|
||||
Height : 30
|
||||
@@ -294,7 +294,7 @@ Slider hPosition
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 80
|
||||
x coordinate : 82
|
||||
y coordinate : 194
|
||||
Width : 335
|
||||
Height : 43
|
||||
@@ -338,7 +338,7 @@ Button b0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 412
|
||||
x coordinate : 414
|
||||
y coordinate : 8
|
||||
Width : 50
|
||||
Height : 50
|
||||
@@ -385,7 +385,7 @@ Button bDown1
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 408
|
||||
x coordinate : 410
|
||||
y coordinate : 96
|
||||
Width : 50
|
||||
Height : 50
|
||||
@@ -432,7 +432,7 @@ Button bStop1
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 356
|
||||
x coordinate : 358
|
||||
y coordinate : 96
|
||||
Width : 50
|
||||
Height : 50
|
||||
@@ -479,7 +479,7 @@ Button bUp1
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 304
|
||||
x coordinate : 306
|
||||
y coordinate : 96
|
||||
Width : 50
|
||||
Height : 50
|
||||
|
||||
@@ -25,6 +25,8 @@ Page screensaver
|
||||
vis tInstruction,0
|
||||
vis tTmp,0
|
||||
vis p0,0
|
||||
vis tNotifyHead,0
|
||||
vis tNotifyText,0
|
||||
//load gloabl time string from pageIcons
|
||||
//tTime.txt=vaTime.txt
|
||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||
@@ -59,6 +61,20 @@ Variable (int32) vaTap
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) tInstruction
|
||||
Attributes
|
||||
ID : 31
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
|
||||
Variable (string) tTmp
|
||||
Attributes
|
||||
ID : 32
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
|
||||
Text tTime
|
||||
Attributes
|
||||
ID : 5
|
||||
@@ -127,7 +143,7 @@ Text tSend
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 405
|
||||
x coordinate : 420
|
||||
y coordinate : 2
|
||||
Width : 29
|
||||
Height : 30
|
||||
@@ -749,48 +765,48 @@ Text tMR
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Text tTmp
|
||||
Text tNotifyHead
|
||||
Attributes
|
||||
ID : 31
|
||||
ID : 33
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 368
|
||||
y coordinate : 0
|
||||
Width : 25
|
||||
Height : 30
|
||||
x coordinate : 15
|
||||
y coordinate : 201
|
||||
Width : 450
|
||||
Height : 58
|
||||
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
|
||||
Font ID : 3
|
||||
Back. Color : 0
|
||||
Font Color : 65535
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Vertical Alignment : top
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
Max. Text Size : 35
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Text tInstruction
|
||||
Text tNotifyText
|
||||
Attributes
|
||||
ID : 32
|
||||
ID : 34
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 335
|
||||
y coordinate : 0
|
||||
Width : 27
|
||||
Height : 30
|
||||
x coordinate : 15
|
||||
y coordinate : 258
|
||||
Width : 450
|
||||
Height : 47
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
@@ -798,13 +814,13 @@ Text tInstruction
|
||||
Style : flat
|
||||
Associated Keyboard : none
|
||||
Font ID : 0
|
||||
Back. Color : 65535
|
||||
Font Color : 0
|
||||
Back. Color : 0
|
||||
Font Color : 65535
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Vertical Alignment : top
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
Max. Text Size : 35
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
@@ -1051,6 +1067,20 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",23
|
||||
covx tTmp.txt,tMR.pco,0,0
|
||||
}
|
||||
if(tInstruction.txt=="notify")
|
||||
{
|
||||
spstr strCommand.txt,tNotifyHead.txt,"~",1
|
||||
spstr strCommand.txt,tNotifyText.txt,"~",2
|
||||
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||
{
|
||||
vis tNotifyHead,1
|
||||
vis tNotifyText,1
|
||||
}else
|
||||
{
|
||||
vis tNotifyHead,0
|
||||
vis tNotifyText,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
dim=100
|
||||
@@ -1142,6 +1172,16 @@ TouchCap tc0
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||
{
|
||||
if(dim!=0)
|
||||
{
|
||||
tNotifyHead.txt=""
|
||||
tNotifyText.txt=""
|
||||
vis tNotifyHead,0
|
||||
vis tNotifyText,0
|
||||
}
|
||||
}
|
||||
dim=dimValueNormal
|
||||
vaTap.val+=1
|
||||
covx vaTap.val,tTmp.txt,0,0
|
||||
|
||||
@@ -11,6 +11,6 @@ Program.s
|
||||
// dim value
|
||||
int dimValue=40
|
||||
int dimValueNormal=100
|
||||
// fix touch offset (Removed for US version)
|
||||
//lcd_dev fffb 0002 0000 0020
|
||||
// fix touch offset
|
||||
lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
|
||||
@@ -44,7 +44,7 @@ Variable (string) entn
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) tSend
|
||||
Attributes
|
||||
|
||||
@@ -97,25 +97,25 @@ Variable (string) entn1
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn2
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn3
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn4
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Number nNum1
|
||||
Attributes
|
||||
|
||||
@@ -69,25 +69,25 @@ Variable (string) entn1
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn2
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn3
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn4
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) type5
|
||||
Attributes
|
||||
@@ -105,13 +105,13 @@ Variable (string) entn5
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) entn6
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Text tHeading
|
||||
Attributes
|
||||
|
||||
@@ -30,7 +30,7 @@ Variable (string) entn
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) vaSpeakerList
|
||||
Attributes
|
||||
|
||||
@@ -42,7 +42,7 @@ Variable (string) entn
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) va0
|
||||
Attributes
|
||||
|
||||
@@ -30,7 +30,7 @@ Text tTmp1
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
Max. Text Size : 80
|
||||
|
||||
Text tTmp2
|
||||
Attributes
|
||||
@@ -40,7 +40,7 @@ Text tTmp2
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
Max. Text Size : 80
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
|
||||
@@ -177,7 +177,7 @@ Button bSendStartup
|
||||
recmod=1
|
||||
bauds=115200
|
||||
// startup event
|
||||
tSend.txt="event,startup,"+tVersion.txt+",us-l"
|
||||
tSend.txt="event,startup,"+tVersion.txt+",eu"
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
|
||||
@@ -59,8 +59,8 @@ Variable (string) strCommand
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
Scope : local
|
||||
Text : newtxt
|
||||
Max. Text Size: 50
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (int32) mode
|
||||
Attributes
|
||||
@@ -570,25 +570,43 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardMedia
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardGrid
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
|
||||
@@ -46,8 +46,8 @@ Variable (string) strCommand
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
Scope : local
|
||||
Text : newtxt
|
||||
Max. Text Size: 50
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Text tEntity
|
||||
Attributes
|
||||
|
||||
@@ -17,6 +17,8 @@ Page screensaver
|
||||
vis tInstruction,0
|
||||
vis tTmp,0
|
||||
vis p0,0
|
||||
vis tNotifyHead,0
|
||||
vis tNotifyText,0
|
||||
//load gloabl time string from pageIcons
|
||||
//tTime.txt=vaTime.txt
|
||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||
@@ -48,6 +50,18 @@ Variable (int32) vaTap
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) tInstruction
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
|
||||
Variable (string) tTmp
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
|
||||
Text tTime
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -278,7 +292,7 @@ Text tMR
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
|
||||
Text tTmp
|
||||
Text tNotifyHead
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -286,9 +300,9 @@ Text tTmp
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
Max. Text Size : 35
|
||||
|
||||
Text tInstruction
|
||||
Text tNotifyText
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -296,7 +310,7 @@ Text tInstruction
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
Max. Text Size : 35
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
@@ -529,6 +543,20 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",23
|
||||
covx tTmp.txt,tMR.pco,0,0
|
||||
}
|
||||
if(tInstruction.txt=="notify")
|
||||
{
|
||||
spstr strCommand.txt,tNotifyHead.txt,"~",1
|
||||
spstr strCommand.txt,tNotifyText.txt,"~",2
|
||||
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||
{
|
||||
vis tNotifyHead,1
|
||||
vis tNotifyText,1
|
||||
}else
|
||||
{
|
||||
vis tNotifyHead,0
|
||||
vis tNotifyText,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
dim=100
|
||||
@@ -618,6 +646,16 @@ TouchCap tc0
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||
{
|
||||
if(dim!=0)
|
||||
{
|
||||
tNotifyHead.txt=""
|
||||
tNotifyText.txt=""
|
||||
vis tNotifyHead,0
|
||||
vis tNotifyText,0
|
||||
}
|
||||
}
|
||||
dim=dimValueNormal
|
||||
vaTap.val+=1
|
||||
covx vaTap.val,tTmp.txt,0,0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-18 20:12:47.271698536 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
// dim value
|
||||
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
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -44,7 +44,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
Variable (string) tSend
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:11:27.443306476 +0000
|
||||
@@ -62,6 +62,16 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -462,8 +462,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -69,25 +69,25 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -511,8 +511,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||
Text tHeading
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -30,7 +30,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -523,8 +523,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
||||
Variable (string) vaSpeakerList
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -42,7 +42,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -535,8 +535,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
Variable (string) va0
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-18 20:12:47.271698536 +0000
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -30,7 +30,7 @@
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
@@ -556,8 +556,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
||||
Picture p0
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -577,8 +577,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
||||
--- HMI/n2t-out/popupLight.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
--- HMI/n2t-out/popupLight.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -59,8 +59,8 @@
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
@@ -591,8 +591,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
||||
Variable (int32) mode
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -46,8 +46,8 @@
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
@@ -605,8 +605,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
Text tEntity
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
|
||||
--- HMI/n2t-out/screensaver.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
--- HMI/n2t-out/screensaver.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
@@ -17,8 +17,6 @@
|
||||
vis tInstruction,0
|
||||
vis tTmp,0
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-18 20:12:47.287698667 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-18 20:12:47.271698536 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-19 18:11:27.467306986 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
+--- HMI/n2t-out/cardAlarm.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
+--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+@@ -44,7 +44,7 @@
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
@@ -13,8 +13,8 @@
|
||||
+
|
||||
+ Variable (string) tSend
|
||||
+ Attributes
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:11:27.443306476 +0000
|
||||
+@@ -62,6 +62,16 @@
|
||||
+@@ -97,25 +107,37 @@
|
||||
+ Attributes
|
||||
@@ -54,8 +54,8 @@
|
||||
+ if(tInstruction.txt=="pageType")
|
||||
+ {
|
||||
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||
+--- HMI/n2t-out/cardGrid.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
+--- HMI/n2t-out/cardGrid.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+@@ -69,25 +69,25 @@
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
@@ -103,8 +103,8 @@
|
||||
+ Text tHeading
|
||||
+ Attributes
|
||||
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
||||
+--- HMI/n2t-out/cardMedia.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
+--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+@@ -30,7 +30,7 @@
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
@@ -115,8 +115,8 @@
|
||||
+ Variable (string) vaSpeakerList
|
||||
+ Attributes
|
||||
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
+--- HMI/n2t-out/cardThermo.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
+--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+@@ -42,7 +42,7 @@
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
@@ -127,8 +127,8 @@
|
||||
+ Variable (string) va0
|
||||
+ Attributes
|
||||
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
||||
+--- HMI/n2t-out/pageIcons.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-18 20:12:47.271698536 +0000
|
||||
+--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+@@ -30,7 +30,7 @@
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
@@ -147,11 +147,11 @@
|
||||
+
|
||||
+ Picture p0
|
||||
+ Attributes
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
||||
+--- HMI/n2t-out/popupLight.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
+--- HMI/n2t-out/popupLight.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+@@ -59,8 +59,8 @@
|
||||
+ Variable (string) entn
|
||||
+ Attributes
|
||||
@@ -164,8 +164,8 @@
|
||||
+ Variable (int32) mode
|
||||
+ Attributes
|
||||
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
+--- HMI/n2t-out/popupShutter.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
+--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+@@ -46,8 +46,8 @@
|
||||
+ Variable (string) entn
|
||||
+ Attributes
|
||||
@@ -178,8 +178,8 @@
|
||||
+ Text tEntity
|
||||
+ Attributes
|
||||
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
|
||||
+--- HMI/n2t-out/screensaver.txt 2022-04-18 20:12:46.891695422 +0000
|
||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-18 20:12:47.275698569 +0000
|
||||
+--- HMI/n2t-out/screensaver.txt 2022-04-19 18:11:27.067298484 +0000
|
||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:11:27.439306391 +0000
|
||||
+@@ -17,8 +17,6 @@
|
||||
+ vis tInstruction,0
|
||||
+ vis tTmp,0
|
||||
|
||||
@@ -10,6 +10,10 @@ pageTest
|
||||
13 Component(s)
|
||||
13 Line(s) of event code
|
||||
13 Unique line(s) of event code
|
||||
cardEntities
|
||||
62 Component(s)
|
||||
964 Line(s) of event code
|
||||
410 Unique line(s) of event code
|
||||
cardGrid
|
||||
39 Component(s)
|
||||
418 Line(s) of event code
|
||||
@@ -42,10 +46,6 @@ screensaver
|
||||
35 Component(s)
|
||||
292 Line(s) of event code
|
||||
235 Unique line(s) of event code
|
||||
cardEntities
|
||||
62 Component(s)
|
||||
964 Line(s) of event code
|
||||
410 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
442 Line(s) of event code
|
||||
|
||||
Reference in New Issue
Block a user