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

fixes #1033 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-11-16 17:40:35 +00:00
committed by github-actions[bot]
parent 59aa703416
commit 3347a054e0
8 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,24 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard: none │ Associated Keyboard: none
│ Text : | │ Text : |
│ @@ -472,17 +449,14 @@
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ - }else
│ - {
│ - vis tAMPM,1
│ }
│ spstr strCommand.txt,tTimeAdd.txt,"~",2
│ ref tIcon1
│ ref tIcon2
│ }
│ if(tInstruction.txt=="date")
│ {
│ --- HMI/n2t-out/screensaver2.txt │ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt ├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@

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

@@ -1786,7 +1786,25 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard: none │ Associated Keyboard: none
│ Text : | │ Text : |
│ @@ -596,20 +573,14 @@ │ @@ -472,17 +449,14 @@
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ - }else
│ - {
│ - vis tAMPM,1
│ }
│ spstr strCommand.txt,tTimeAdd.txt,"~",2
│ ref tIcon1
│ ref tIcon2
│ }
│ if(tInstruction.txt=="date")
│ {
│ @@ -599,20 +573,14 @@
│ { │ {
│ vis tMainIcon,1 │ vis tMainIcon,1
│ vis tMainIconAlt,0 │ vis tMainIconAlt,0

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-11-04 20:34:35.187236495 +0000 +++ /dev/fd/62 2023-11-16 17:40:27.196451243 +0000
+le list +le list
+ +1,9 @@ + +1,9 @@
+.s.txt +.s.txt
@@ -1328,6 +1328,24 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text : | + Text : |
+17 +449,14 @@
+ //get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
+ if(tAMPM.txt=="")
+ {
+ vis tAMPM,0
+ }else
+ {
+ vis tAMPM,1
+ }
+ spstr strCommand.txt,tTimeAdd.txt,"~",2
+ ref tIcon1
+ ref tIcon2
+ }
+ if(tInstruction.txt=="date")
+ {
+20 +573,14 @@ +20 +573,14 @@
+ { + {
+ vis tMainIcon,1 + vis tMainIcon,1

2
HMI/n2t-out-visual/cardBurnRec.txt
View File

@@ -21,7 +21,7 @@ Timer tm0
Attributes Attributes
ID : 1 ID : 1
Scope : local Scope : local
Period (ms): 4000 Period (ms): 1001
Enabled : yes Enabled : yes
Events Events

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

@@ -2,14 +2,14 @@ Program.s
0 Component(s) 0 Component(s)
15 Line(s) of event code 15 Line(s) of event code
15 Unique line(s) of event code 15 Unique line(s) of event code
cardBurnRec
3 Component(s)
25 Line(s) of event code
21 Unique line(s) of event code
pageIcons pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
cardBurnRec
3 Component(s)
25 Line(s) of event code
21 Unique line(s) of event code
cardLChart cardLChart
33 Component(s) 33 Component(s)
402 Line(s) of event code 402 Line(s) of event code
@@ -74,14 +74,14 @@ popupInSel
34 Component(s) 34 Component(s)
621 Line(s) of event code 621 Line(s) of event code
297 Unique line(s) of event code 297 Unique line(s) of event code
screensaver
47 Component(s)
447 Line(s) of event code
317 Unique line(s) of event code
cardPower cardPower
54 Component(s) 54 Component(s)
531 Line(s) of event code 531 Line(s) of event code
349 Unique line(s) of event code 349 Unique line(s) of event code
screensaver
47 Component(s)
444 Line(s) of event code
316 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
516 Line(s) of event code 516 Line(s) of event code
@@ -102,5 +102,5 @@ cardEntities
Total Total
24 Page(s) 24 Page(s)
880 Component(s) 880 Component(s)
10614 Line(s) of event code 10617 Line(s) of event code
2473 Unique line(s) of event code 2474 Unique line(s) of event code

3
HMI/n2t-out-visual/screensaver.txt
View File

@@ -1069,6 +1069,9 @@ Timer tmSerial
if(tAMPM.txt=="") if(tAMPM.txt=="")
{ {
vis tAMPM,0 vis tAMPM,0
}else
{
vis tAMPM,1
} }
spstr strCommand.txt,tTimeAdd.txt,"~",2 spstr strCommand.txt,tTimeAdd.txt,"~",2
ref tIcon1 ref tIcon1

2
HMI/n2t-out/cardBurnRec.txt
View File

@@ -12,7 +12,7 @@ Page cardBurnRec
Timer tm0 Timer tm0
Attributes Attributes
Scope : local Scope : local
Period (ms): 4000 Period (ms): 1001
Enabled : yes Enabled : yes
Events Events

3
HMI/n2t-out/screensaver.txt
View File

@@ -476,6 +476,9 @@ Timer tmSerial
if(tAMPM.txt=="") if(tAMPM.txt=="")
{ {
vis tAMPM,0 vis tAMPM,0
}else
{
vis tAMPM,1
} }
spstr strCommand.txt,tTimeAdd.txt,"~",2 spstr strCommand.txt,tTimeAdd.txt,"~",2
ref tIcon1 ref tIcon1