mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-01-30 18:14:13 +01:00
remove debug element (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
9d66b0a341
commit
98f00a65aa
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-05-30 18:24:32.989991642 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 18:27:23.923228884 +0000
|
||||||
@@ -11,6 +11,4 @@
|
@@ -11,6 +11,4 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
|||||||
- lcd_dev fffb 0002 0000 0020
|
- lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
||||||
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 18:24:32.989991642 +0000
|
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 18:27:23.927229036 +0000
|
||||||
@@ -12,7 +12,6 @@
|
@@ -12,7 +12,6 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -32,8 +32,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
|||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||||
--- HMI/n2t-out/cardEntities.txt 2022-05-30 18:24:32.993991614 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 18:27:23.927229036 +0000
|
||||||
@@ -12,7 +12,6 @@
|
@@ -12,7 +12,6 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -42,23 +42,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
|||||||
//wup=cardEntities
|
//wup=cardEntities
|
||||||
//remove background & activate reparse mode
|
//remove background & activate reparse mode
|
||||||
vis p0,0
|
vis p0,0
|
||||||
@@ -156,15 +155,6 @@
|
@@ -1925,10 +1924,6 @@
|
||||||
Associated Keyboard : none
|
|
||||||
Value : 0
|
|
||||||
|
|
||||||
-Number n0
|
|
||||||
- Attributes
|
|
||||||
- Scope : local
|
|
||||||
- Dragging : 0
|
|
||||||
- Disable release event after dragging: 0
|
|
||||||
- Send Component ID : disabled
|
|
||||||
- Associated Keyboard : none
|
|
||||||
- Value : 0
|
|
||||||
-
|
|
||||||
Text tHeading
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
@@ -1934,11 +1924,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
|
||||||
@@ -66,13 +50,12 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
|||||||
- spstr strCommand.txt,tTmp.txt,"~",2
|
- spstr strCommand.txt,tTmp.txt,"~",2
|
||||||
- covx tTmp.txt,dimValueNormal,0,0
|
- covx tTmp.txt,dimValueNormal,0,0
|
||||||
- dim=dimValueNormal
|
- dim=dimValueNormal
|
||||||
- n0.val=dimValueNormal
|
|
||||||
}
|
}
|
||||||
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-05-30 18:24:32.993991614 +0000
|
--- HMI/n2t-out/cardGrid.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 18:27:23.927229036 +0000
|
||||||
@@ -12,7 +12,7 @@
|
@@ -12,7 +12,7 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -94,8 +77,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-05-30 18:24:32.993991614 +0000
|
--- HMI/n2t-out/cardMedia.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 18:27:23.927229036 +0000
|
||||||
@@ -12,7 +12,6 @@
|
@@ -12,7 +12,6 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -117,8 +100,8 @@ 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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
||||||
--- HMI/n2t-out/cardQR.txt 2022-05-30 18:24:32.989991642 +0000
|
--- HMI/n2t-out/cardQR.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 18:27:23.927229036 +0000
|
||||||
@@ -12,7 +12,6 @@
|
@@ -12,7 +12,6 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -140,8 +123,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.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-05-30 18:24:32.993991614 +0000
|
--- HMI/n2t-out/cardThermo.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 18:27:23.923228884 +0000
|
||||||
@@ -12,7 +12,6 @@
|
@@ -12,7 +12,6 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -162,8 +145,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-05-30 18:24:32.993991614 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 18:27:23.923228884 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
@@ -185,8 +168,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-05-30 18:24:32.989991642 +0000
|
--- HMI/n2t-out/popupLight.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 18:27:23.927229036 +0000
|
||||||
@@ -12,7 +12,6 @@
|
@@ -12,7 +12,6 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -207,8 +190,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-05-30 18:24:32.989991642 +0000
|
--- HMI/n2t-out/popupNotify.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 18:27:23.923228884 +0000
|
||||||
@@ -12,7 +12,6 @@
|
@@ -12,7 +12,6 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -229,8 +212,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-05-30 18:24:32.989991642 +0000
|
--- HMI/n2t-out/popupShutter.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 18:27:23.923228884 +0000
|
||||||
@@ -12,7 +12,6 @@
|
@@ -12,7 +12,6 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -251,32 +234,15 @@ 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-05-30 18:24:32.993991614 +0000
|
--- HMI/n2t-out/screensaver.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 18:24:33.853985580 +0000
|
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 18:27:23.927229036 +0000
|
||||||
@@ -68,15 +68,6 @@
|
@@ -397,9 +397,6 @@
|
||||||
Text :
|
|
||||||
Max. Text Size: 50
|
|
||||||
|
|
||||||
-Number n0
|
|
||||||
- Attributes
|
|
||||||
- Scope : local
|
|
||||||
- Dragging : 0
|
|
||||||
- Disable release event after dragging: 0
|
|
||||||
- Send Component ID : disabled
|
|
||||||
- Associated Keyboard : none
|
|
||||||
- Value : 0
|
|
||||||
-
|
|
||||||
Text tTime
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
@@ -406,10 +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
|
||||||
dim=dimValue
|
dim=dimValue
|
||||||
- // get value normal
|
- // get value normal
|
||||||
- spstr strCommand.txt,tTmp.txt,"~",2
|
- spstr strCommand.txt,tTmp.txt,"~",2
|
||||||
- covx tTmp.txt,dimValueNormal,0,0
|
- covx tTmp.txt,dimValueNormal,0,0
|
||||||
- n0.val=dimValueNormal
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-05-30 18:24:32.989991642 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 18:24:33.409988695 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 18:27:23.351207165 +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-05-30 18:24:32.993991614 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 18:24:33.409988695 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 18:27:23.351207165 +0000
|
||||||
@@ -63,6 +63,16 @@
|
@@ -63,6 +63,16 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -49,16 +49,23 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
Number nNum1
|
Number nNum1
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -156,7 +178,7 @@
|
@@ -156,6 +178,15 @@
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Value : 0
|
Value : 0
|
||||||
|
|
||||||
-Number n0
|
|
||||||
+Number nNum5
|
+Number nNum5
|
||||||
|
+ Attributes
|
||||||
|
+ Scope : local
|
||||||
|
+ Dragging : 0
|
||||||
|
+ Disable release event after dragging: 0
|
||||||
|
+ Send Component ID : disabled
|
||||||
|
+ Associated Keyboard : none
|
||||||
|
+ Value : 0
|
||||||
|
+
|
||||||
|
Text tHeading
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
@@ -286,6 +317,26 @@
|
||||||
@@ -295,6 +317,26 @@
|
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 50
|
Max. Text Size : 50
|
||||||
|
|
||||||
@@ -85,7 +92,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
Picture p0
|
Picture p0
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -414,6 +456,34 @@
|
@@ -405,6 +456,34 @@
|
||||||
prints tSend.txt,0
|
prints tSend.txt,0
|
||||||
prints crcval,2
|
prints crcval,2
|
||||||
|
|
||||||
@@ -120,7 +127,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
Button bDown1
|
Button bDown1
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -871,6 +941,106 @@
|
@@ -862,6 +941,106 @@
|
||||||
prints tSend.txt,0
|
prints tSend.txt,0
|
||||||
prints crcval,2
|
prints crcval,2
|
||||||
|
|
||||||
@@ -227,7 +234,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
Dual-state Button btOnOff1
|
Dual-state Button btOnOff1
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -979,6 +1149,33 @@
|
@@ -970,6 +1149,33 @@
|
||||||
prints tSend.txt,0
|
prints tSend.txt,0
|
||||||
prints crcval,2
|
prints crcval,2
|
||||||
|
|
||||||
@@ -261,7 +268,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
Hotspot mSpecial
|
Hotspot mSpecial
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -1084,6 +1281,28 @@
|
@@ -1075,6 +1281,28 @@
|
||||||
page popupLight
|
page popupLight
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -290,7 +297,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
Hotspot mSwipeNext
|
Hotspot mSwipeNext
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -1859,6 +2078,169 @@
|
@@ -1850,6 +2078,169 @@
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
hSlider4.maxval=sys0
|
hSlider4.maxval=sys0
|
||||||
}
|
}
|
||||||
@@ -460,17 +467,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
}
|
}
|
||||||
if(tInstruction.txt=="pageType")
|
if(tInstruction.txt=="pageType")
|
||||||
{
|
{
|
||||||
@@ -1938,7 +2320,6 @@
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",2
|
|
||||||
covx tTmp.txt,dimValueNormal,0,0
|
|
||||||
dim=dimValueNormal
|
|
||||||
- n0.val=dimValueNormal
|
|
||||||
}
|
|
||||||
if(tInstruction.txt=="timeout")
|
|
||||||
{
|
|
||||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||||
--- HMI/n2t-out/cardQR.txt 2022-05-30 18:24:32.989991642 +0000
|
--- HMI/n2t-out/cardQR.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 18:24:33.409988695 +0000
|
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 18:27:23.351207165 +0000
|
||||||
@@ -35,7 +35,7 @@
|
@@ -35,7 +35,7 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -481,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
|||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-05-30 18:24:32.993991614 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 18:24:33.409988695 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 18:27:23.351207165 +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
|
||||||
@@ -502,33 +501,9 @@ 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-05-30 18:24:32.993991614 +0000
|
--- HMI/n2t-out/screensaver.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 18:24:33.409988695 +0000
|
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 18:27:23.351207165 +0000
|
||||||
@@ -68,15 +68,6 @@
|
@@ -474,22 +474,6 @@
|
||||||
Text :
|
|
||||||
Max. Text Size: 50
|
|
||||||
|
|
||||||
-Number n0
|
|
||||||
- Attributes
|
|
||||||
- Scope : local
|
|
||||||
- Dragging : 0
|
|
||||||
- Disable release event after dragging: 0
|
|
||||||
- Send Component ID : disabled
|
|
||||||
- Associated Keyboard : none
|
|
||||||
- Value : 0
|
|
||||||
-
|
|
||||||
Text tTime
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
@@ -409,7 +400,6 @@
|
|
||||||
// get value normal
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",2
|
|
||||||
covx tTmp.txt,dimValueNormal,0,0
|
|
||||||
- n0.val=dimValueNormal
|
|
||||||
}
|
|
||||||
if(tInstruction.txt=="time")
|
|
||||||
{
|
|
||||||
@@ -484,22 +474,6 @@
|
|
||||||
vis tMainIconAlt,1
|
vis tMainIconAlt,1
|
||||||
vis tMRIcon,1
|
vis tMRIcon,1
|
||||||
vis tMR,1
|
vis tMR,1
|
||||||
|
|||||||
@@ -1,56 +1,22 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 18:24:33.421988611 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 18:27:23.395208836 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-05-30 18:24:32.989991642 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 18:24:33.409988695 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 18:27:23.351207165 +0000
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-30 18:24:32.993991614 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 18:24:33.409988695 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 18:27:23.351207165 +0000
|
||||||
+@@ -63,6 +63,16 @@
|
+@@ -63,6 +63,16 @@
|
||||||
+@@ -120,6 +130,18 @@
|
+@@ -120,6 +130,18 @@
|
||||||
+@@ -156,7 +178,7 @@
|
+@@ -156,6 +178,15 @@
|
||||||
+-Number n0
|
+@@ -286,6 +317,26 @@
|
||||||
+ Dragging : 0
|
+@@ -405,6 +456,34 @@
|
||||||
+@@ -295,6 +317,26 @@
|
+@@ -862,6 +941,106 @@
|
||||||
+@@ -414,6 +456,34 @@
|
+@@ -970,6 +1149,33 @@
|
||||||
+@@ -871,6 +941,106 @@
|
+@@ -1075,6 +1281,28 @@
|
||||||
+@@ -979,6 +1149,33 @@
|
+@@ -1850,6 +2078,169 @@
|
||||||
+@@ -1084,6 +1281,28 @@
|
+--- HMI/n2t-out/cardQR.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
+@@ -1859,6 +2078,169 @@
|
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 18:27:23.351207165 +0000
|
||||||
+@@ -1938,7 +2320,6 @@
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",2
|
|
||||||
+ covx tTmp.txt,dimValueNormal,0,0
|
|
||||||
+ dim=dimValueNormal
|
|
||||||
+- n0.val=dimValueNormal
|
|
||||||
+ }
|
|
||||||
+ if(tInstruction.txt=="timeout")
|
|
||||||
+ {
|
|
||||||
+--- HMI/n2t-out/cardQR.txt 2022-05-30 18:24:32.989991642 +0000
|
|
||||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 18:24:33.409988695 +0000
|
|
||||||
+@@ -35,7 +35,7 @@
|
+@@ -35,7 +35,7 @@
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-30 18:24:32.993991614 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 18:24:33.409988695 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 18:27:23.351207165 +0000
|
||||||
+--- HMI/n2t-out/screensaver.txt 2022-05-30 18:24:32.993991614 +0000
|
+--- HMI/n2t-out/screensaver.txt 2022-05-30 18:27:22.843187876 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 18:24:33.409988695 +0000
|
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 18:27:23.351207165 +0000
|
||||||
+@@ -68,15 +68,6 @@
|
+@@ -474,22 +474,6 @@
|
||||||
+ Text :
|
|
||||||
+ Max. Text Size: 50
|
|
||||||
+
|
|
||||||
+-Number n0
|
|
||||||
+- Attributes
|
|
||||||
+- Scope : local
|
|
||||||
+- Dragging : 0
|
|
||||||
+- Disable release event after dragging: 0
|
|
||||||
+- Send Component ID : disabled
|
|
||||||
+- Associated Keyboard : none
|
|
||||||
+- Value : 0
|
|
||||||
+-
|
|
||||||
+ Text tTime
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+@@ -409,7 +400,6 @@
|
|
||||||
+ // get value normal
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",2
|
|
||||||
+ covx tTmp.txt,dimValueNormal,0,0
|
|
||||||
+- n0.val=dimValueNormal
|
|
||||||
+ }
|
|
||||||
+ if(tInstruction.txt=="time")
|
|
||||||
+ {
|
|
||||||
+@@ -484,22 +474,6 @@
|
|
||||||
|
|||||||
@@ -257,36 +257,6 @@ Number nNum4
|
|||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|
||||||
Number n0
|
|
||||||
Attributes
|
|
||||||
ID : 65
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Opacity : 127
|
|
||||||
x coordinate : 151
|
|
||||||
y coordinate : 172
|
|
||||||
Width : 100
|
|
||||||
Height : 30
|
|
||||||
Effect : load
|
|
||||||
Effect Priority : 0
|
|
||||||
Effect Time : 300
|
|
||||||
Fill : solid color
|
|
||||||
Style : flat
|
|
||||||
Associated Keyboard : none
|
|
||||||
Font ID : 0
|
|
||||||
Back. Color : 65535
|
|
||||||
Font Color : 0
|
|
||||||
Horizontal Alignment : center
|
|
||||||
Vertical Alignment : center
|
|
||||||
Value : 0
|
|
||||||
Significant digits shown : all
|
|
||||||
Format : decimal
|
|
||||||
Word wrap : enabled
|
|
||||||
Horizontal Spacing : 0
|
|
||||||
Vertical Spacing : 0
|
|
||||||
|
|
||||||
Text tHeading
|
Text tHeading
|
||||||
Attributes
|
Attributes
|
||||||
ID : 2
|
ID : 2
|
||||||
@@ -2931,7 +2901,6 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,tTmp.txt,"~",2
|
spstr strCommand.txt,tTmp.txt,"~",2
|
||||||
covx tTmp.txt,dimValueNormal,0,0
|
covx tTmp.txt,dimValueNormal,0,0
|
||||||
dim=dimValueNormal
|
dim=dimValueNormal
|
||||||
n0.val=dimValueNormal
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,21 +42,21 @@ cardGrid
|
|||||||
42 Component(s)
|
42 Component(s)
|
||||||
439 Line(s) of event code
|
439 Line(s) of event code
|
||||||
259 Unique line(s) of event code
|
259 Unique line(s) of event code
|
||||||
screensaver
|
|
||||||
38 Component(s)
|
|
||||||
308 Line(s) of event code
|
|
||||||
246 Unique line(s) of event code
|
|
||||||
cardThermo
|
cardThermo
|
||||||
56 Component(s)
|
56 Component(s)
|
||||||
546 Line(s) of event code
|
546 Line(s) of event code
|
||||||
295 Unique line(s) of event code
|
295 Unique line(s) of event code
|
||||||
|
screensaver
|
||||||
|
37 Component(s)
|
||||||
|
307 Line(s) of event code
|
||||||
|
245 Unique line(s) of event code
|
||||||
cardEntities
|
cardEntities
|
||||||
66 Component(s)
|
65 Component(s)
|
||||||
1134 Line(s) of event code
|
1133 Line(s) of event code
|
||||||
497 Unique line(s) of event code
|
496 Unique line(s) of event code
|
||||||
|
|
||||||
Total
|
Total
|
||||||
13 Page(s)
|
13 Page(s)
|
||||||
406 Component(s)
|
404 Component(s)
|
||||||
4487 Line(s) of event code
|
4485 Line(s) of event code
|
||||||
1181 Unique line(s) of event code
|
1180 Unique line(s) of event code
|
||||||
|
|||||||
@@ -82,36 +82,6 @@ Variable (string) tSend
|
|||||||
Text :
|
Text :
|
||||||
Max. Text Size: 50
|
Max. Text Size: 50
|
||||||
|
|
||||||
Number n0
|
|
||||||
Attributes
|
|
||||||
ID : 37
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Opacity : 127
|
|
||||||
x coordinate : 188
|
|
||||||
y coordinate : 231
|
|
||||||
Width : 100
|
|
||||||
Height : 30
|
|
||||||
Effect : load
|
|
||||||
Effect Priority : 0
|
|
||||||
Effect Time : 300
|
|
||||||
Fill : solid color
|
|
||||||
Style : flat
|
|
||||||
Associated Keyboard : none
|
|
||||||
Font ID : 0
|
|
||||||
Back. Color : 65535
|
|
||||||
Font Color : 0
|
|
||||||
Horizontal Alignment : center
|
|
||||||
Vertical Alignment : center
|
|
||||||
Value : 0
|
|
||||||
Significant digits shown : all
|
|
||||||
Format : decimal
|
|
||||||
Word wrap : enabled
|
|
||||||
Horizontal Spacing : 0
|
|
||||||
Vertical Spacing : 0
|
|
||||||
|
|
||||||
Text tTime
|
Text tTime
|
||||||
Attributes
|
Attributes
|
||||||
ID : 5
|
ID : 5
|
||||||
@@ -975,7 +945,6 @@ Timer tmSerial
|
|||||||
// get value normal
|
// get value normal
|
||||||
spstr strCommand.txt,tTmp.txt,"~",2
|
spstr strCommand.txt,tTmp.txt,"~",2
|
||||||
covx tTmp.txt,dimValueNormal,0,0
|
covx tTmp.txt,dimValueNormal,0,0
|
||||||
n0.val=dimValueNormal
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -156,15 +156,6 @@ Number nNum4
|
|||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Value : 0
|
Value : 0
|
||||||
|
|
||||||
Number n0
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Value : 0
|
|
||||||
|
|
||||||
Text tHeading
|
Text tHeading
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -1938,7 +1929,6 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,tTmp.txt,"~",2
|
spstr strCommand.txt,tTmp.txt,"~",2
|
||||||
covx tTmp.txt,dimValueNormal,0,0
|
covx tTmp.txt,dimValueNormal,0,0
|
||||||
dim=dimValueNormal
|
dim=dimValueNormal
|
||||||
n0.val=dimValueNormal
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -68,15 +68,6 @@ Variable (string) tSend
|
|||||||
Text :
|
Text :
|
||||||
Max. Text Size: 50
|
Max. Text Size: 50
|
||||||
|
|
||||||
Number n0
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Value : 0
|
|
||||||
|
|
||||||
Text tTime
|
Text tTime
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -409,7 +400,6 @@ Timer tmSerial
|
|||||||
// get value normal
|
// get value normal
|
||||||
spstr strCommand.txt,tTmp.txt,"~",2
|
spstr strCommand.txt,tTmp.txt,"~",2
|
||||||
covx tTmp.txt,dimValueNormal,0,0
|
covx tTmp.txt,dimValueNormal,0,0
|
||||||
n0.val=dimValueNormal
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user