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

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

Browse Source
This commit is contained in:
Johannes
2022-05-21 13:29:04 +02:00
parent 1a5742ae0f 2eafaf565a
commit ce99692644
6 changed files with 111 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 11:16:08.810315927 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 11:16:09.658322116 +0000
@@ -11,6 +11,3 @@
// dim value
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
- page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-21 11:16:09.658322116 +0000
@@ -788,10 +788,6 @@
{
page cardAlarm
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-21 11:16:09.658322116 +0000
@@ -1277,28 +1277,6 @@
vis bText1,0
vis hSlider1,0
@@ -153,8 +153,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-21 11:16:09.658322116 +0000
@@ -869,10 +869,6 @@
{
page cardAlarm
@@ -167,8 +167,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-21 11:16:09.658322116 +0000
@@ -740,10 +740,6 @@
{
page cardAlarm
@@ -182,8 +182,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
udelete payloadLength-1
Only in HMI/n2t-out: cardQR.txt
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-21 11:16:09.658322116 +0000
@@ -1192,10 +1192,6 @@
{
page cardAlarm
@@ -196,8 +196,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 11:16:09.658322116 +0000
@@ -152,7 +152,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -228,8 +228,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/pageTest.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 11:16:09.658322116 +0000
@@ -176,17 +176,3 @@
Touch Press Event
bauds=115200
@@ -249,8 +249,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
- page cardQR
-
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-21 11:16:09.658322116 +0000
@@ -618,10 +618,6 @@
{
page cardAlarm
@@ -263,8 +263,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-21 11:16:09.658322116 +0000
@@ -381,10 +381,6 @@
{
page cardAlarm
@@ -277,8 +277,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-21 11:16:09.658322116 +0000
@@ -422,10 +422,6 @@
{
page cardAlarm
@@ -291,8 +291,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-21 11:07:43.064904905 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-21 11:16:09.658322116 +0000
@@ -607,10 +607,6 @@
{
page cardAlarm

62
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
--- HMI/n2t-out/Program.s.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 11:16:08.810315927 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 11:16:09.234319021 +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-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 11:16:09.238319050 +0000
@@ -788,10 +788,6 @@
{
page cardAlarm
@@ -25,8 +25,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 11:07:42.592896340 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 11:16:09.238319050 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -568,8 +568,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 11:16:09.238319050 +0000
@@ -869,10 +869,6 @@
{
page cardAlarm
@@ -582,8 +582,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 11:16:09.234319021 +0000
@@ -740,10 +740,6 @@
{
page cardAlarm
@@ -596,9 +596,21 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 11:07:42.588896268 +0000
@@ -541,10 +541,6 @@
--- HMI/n2t-out/cardQR.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 11:16:09.238319050 +0000
@@ -461,10 +461,8 @@
vis bNext,1
bNext.txt=""
}
- //text heading
- spstr strCommand.txt,tHeading.txt,"~",3
//text qrcode
- spstr strCommand.txt,qr0.txt,"~",4
+ spstr strCommand.txt,qr0.txt,"~",3
}
if(tInstruction.txt=="time")
{
@@ -543,10 +541,6 @@
{
page cardAlarm
}
@@ -610,8 +622,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 11:16:09.238319050 +0000
@@ -1192,10 +1192,6 @@
{
page cardAlarm
@@ -624,8 +636,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 11:16:09.234319021 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -665,8 +677,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 11:07:42.592896340 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 11:16:09.238319050 +0000
@@ -618,10 +618,6 @@
{
page cardAlarm
@@ -679,8 +691,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 11:16:09.234319021 +0000
@@ -381,10 +381,6 @@
{
page cardAlarm
@@ -693,8 +705,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 11:16:09.234319021 +0000
@@ -422,10 +422,6 @@
{
page cardAlarm
@@ -707,8 +719,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 11:16:09.238319050 +0000
@@ -607,10 +607,6 @@
{
page cardAlarm

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 11:07:42.652897429 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 11:07:42.588896268 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 11:16:09.250319138 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-21 11:16:08.810315927 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 11:16:09.234319021 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.588896268 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 11:16:09.238319050 +0000
+@@ -788,10 +788,6 @@
+ {
+ page cardAlarm
@@ -15,8 +15,8 @@
+ }
+ // end of user code
+ udelete payloadLength-1
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 11:07:42.592896340 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 11:16:09.238319050 +0000
+ Hotspot mSwipeNext
+ Scope : local
+@@ -1277,28 +1505,6 @@
@@ -148,8 +148,8 @@
+ if(tInstruction.txt=="time")
+ {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 11:07:42.588896268 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 11:16:09.238319050 +0000
+@@ -869,10 +869,6 @@
+ {
+ page cardAlarm
@@ -162,8 +162,8 @@
+ if(tInstruction.txt=="time")
+ {
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 11:07:42.588896268 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 11:16:09.234319021 +0000
+@@ -740,10 +740,6 @@
+ {
+ page cardAlarm
@@ -176,9 +176,21 @@
+ // end of user code
+ udelete payloadLength-1
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
+--- HMI/n2t-out/cardQR.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 11:07:42.588896268 +0000
+@@ -541,10 +541,6 @@
+--- HMI/n2t-out/cardQR.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 11:16:09.238319050 +0000
+@@ -461,10 +461,8 @@
+ vis bNext,1
+ bNext.txt=""
+ }
+- //text heading
+- spstr strCommand.txt,tHeading.txt,"~",3
+ //text qrcode
+- spstr strCommand.txt,qr0.txt,"~",4
++ spstr strCommand.txt,qr0.txt,"~",3
+ }
+ if(tInstruction.txt=="time")
+ {
+@@ -543,10 +541,6 @@
+ {
+ page cardAlarm
+ }
@@ -190,8 +202,8 @@
+ // end of user code
+ udelete payloadLength-1
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 11:07:42.588896268 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 11:16:09.238319050 +0000
+@@ -1192,10 +1192,6 @@
+ {
+ page cardAlarm
@@ -203,8 +215,8 @@
+ }
+ if(tInstruction.txt=="time")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 11:07:42.588896268 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 11:16:09.234319021 +0000
+@@ -152,7 +152,7 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
@@ -226,8 +238,8 @@
+ // end of user code
+ udelete payloadLength-1
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 11:07:42.592896340 +0000
+--- HMI/n2t-out/popupLight.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 11:16:09.238319050 +0000
+@@ -618,10 +618,6 @@
+ {
+ page cardAlarm
@@ -240,8 +252,8 @@
+ // end of user code
+ udelete payloadLength-1
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 11:07:42.588896268 +0000
+--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 11:16:09.234319021 +0000
+@@ -381,10 +381,6 @@
+ {
+ page cardAlarm
@@ -254,8 +266,8 @@
+ // end of user code
+ udelete payloadLength-1
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 11:07:42.588896268 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 11:16:09.234319021 +0000
+@@ -422,10 +422,6 @@
+ {
+ page cardAlarm
@@ -268,8 +280,8 @@
+ // end of user code
+ udelete payloadLength-1
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-05-21 11:07:42.160888502 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 11:07:42.588896268 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-21 11:16:08.814315956 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 11:16:09.238319050 +0000
+@@ -607,10 +607,6 @@
+ {
+ page cardAlarm

4
HMI/n2t-out-visual/cardQR.txt
View File

@@ -749,8 +749,10 @@ Timer tmSerial
vis bNext,1
bNext.txt=""
}
//text heading
spstr strCommand.txt,tHeading.txt,"~",3
//text qrcode
spstr strCommand.txt,qr0.txt,"~",3
spstr strCommand.txt,qr0.txt,"~",4
}
if(tInstruction.txt=="time")
{

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

@@ -26,6 +26,10 @@ popupNotify
17 Component(s)
200 Line(s) of event code
125 Unique line(s) of event code
cardQR
28 Component(s)
252 Line(s) of event code
140 Unique line(s) of event code
screensaver
35 Component(s)
296 Line(s) of event code
@@ -34,10 +38,6 @@ popupLight
27 Component(s)
345 Line(s) of event code
187 Unique line(s) of event code
cardQR
28 Component(s)
251 Line(s) of event code
139 Unique line(s) of event code
cardGrid
42 Component(s)
439 Line(s) of event code
@@ -58,5 +58,5 @@ cardThermo
Total
13 Page(s)
400 Component(s)
4236 Line(s) of event code
1105 Unique line(s) of event code
4237 Line(s) of event code
1106 Unique line(s) of event code

4
HMI/n2t-out/cardQR.txt
View File

@@ -461,8 +461,10 @@ Timer tmSerial
vis bNext,1
bNext.txt=""
}
//text heading
spstr strCommand.txt,tHeading.txt,"~",3
//text qrcode
spstr strCommand.txt,qr0.txt,"~",3
spstr strCommand.txt,qr0.txt,"~",4
}
if(tInstruction.txt=="time")
{