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

This commit is contained in:
joBr99
2023-02-11 09:32:21 +00:00
committed by github-actions[bot]
parent d88bc31963
commit b08df614c9
5 changed files with 20 additions and 7 deletions

View File

@@ -12,6 +12,19 @@
│ -screensaver.txt │ -screensaver.txt
│ -screensaver2.txt │ -screensaver2.txt
│ +screensaver.txt │ +screensaver.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
│ @@ -11,9 +11,9 @@
│ // dim value
│ int dimValue=40
│ int dimValueNormal=100
│ //color vars
│ int defaultFontColor=65535
│ int defaultBcoColor=6371
│ // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt │ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt ├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt
│ @@ -879,20 +879,14 @@ │ @@ -879,20 +879,14 @@

View File

@@ -15,5 +15,5 @@ Program.s
int defaultFontColor=65535 int defaultFontColor=65535
int defaultBcoColor=6371 int defaultBcoColor=6371
// fix touch offset // fix touch offset
lcd_dev fffb 0002 0000 0020 //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup

View File

@@ -1,7 +1,7 @@
Program.s Program.s
0 Component(s) 0 Component(s)
13 Line(s) of event code 12 Line(s) of event code
13 Unique line(s) of event code 12 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
@@ -86,5 +86,5 @@ cardPower
Total Total
20 Page(s) 20 Page(s)
736 Component(s) 736 Component(s)
8800 Line(s) of event code 8799 Line(s) of event code
2256 Unique line(s) of event code 2255 Unique line(s) of event code

View File

@@ -15,5 +15,5 @@ Program.s
int defaultFontColor=65535 int defaultFontColor=65535
int defaultBcoColor=6371 int defaultBcoColor=6371
// fix touch offset // fix touch offset
lcd_dev fffb 0002 0000 0020 //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-02-08 21:45:33.503663885 +0000 +++ /dev/fd/62 2023-02-11 09:32:13.287521388 +0000
+le list +le list
+ +14,8 @@ + +14,8 @@
+n.txt +n.txt