h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-17 10:27:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed pre-filled code from cardAlarm in us-l version (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-07 16:14:07 +00:00
committed by GitHub Actions
parent 2bbe3ff335
commit b223954480
7 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-06 21:34:50.751296428 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-07 16:14:06.171998815 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-06 21:34:51.675351557 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-07 16:14:06.952034176 +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/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/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-04-06 21:34:50.751296428 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-07 16:14:06.171998815 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-06 21:34:51.675351557 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-07 16:14:06.952034176 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

2
HMI/US/landscape/n2t-out-visual/cardAlarm.txt
View File

@@ -205,7 +205,7 @@ Text tCode
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : password Input Type : password
Text : 3333 Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

8
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -14,6 +14,10 @@ screensaver
33 Component(s) 33 Component(s)
195 Line(s) of event code 195 Line(s) of event code
152 Unique line(s) of event code 152 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
213 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
178 Line(s) of event code 178 Line(s) of event code
@@ -34,10 +38,6 @@ popupLight
27 Component(s) 27 Component(s)
320 Line(s) of event code 320 Line(s) of event code
173 Unique line(s) of event code 173 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
213 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
418 Line(s) of event code 418 Line(s) of event code

2
HMI/US/landscape/n2t-out/cardAlarm.txt
View File

@@ -113,7 +113,7 @@ Text tCode
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 3333 Text :
Max. Text Size : 10 Max. Text Size : 10
Text tIcon Text tIcon

28
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-06 21:34:50.751296428 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-07 16:14:06.171998815 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-06 21:34:51.215324112 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-07 16:14:06.556016223 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -10,21 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version) + // fix touch offset (Removed for US version)
+ //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/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-06 21:34:51.215324112 +0000
@@ -113,7 +113,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 3333
+ Text :
Max. Text Size : 10
Text tIcon
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-04-06 21:34:50.751296428 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-07 16:14:06.175998996 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-06 21:34:51.215324112 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-07 16:14:06.556016223 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -789,8 +777,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
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-04-06 21:34:50.751296428 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-07 16:14:06.171998815 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-06 21:34:51.215324112 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-07 16:14:06.556016223 +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
@@ -810,8 +798,8 @@ 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-04-06 21:34:50.751296428 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-07 16:14:06.175998996 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-06 21:34:51.215324112 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-07 16:14:06.556016223 +0000
@@ -48,6 +48,26 @@ @@ -48,6 +48,26 @@
Scope: local Scope: local
Value: 0 Value: 0

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

@@ -205,7 +205,7 @@ Text tCode
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : password Input Type : password
Text : 3333 Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -113,7 +113,7 @@ Text tCode
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 3333 Text :
Max. Text Size : 10 Max. Text Size : 10
Text tIcon Text tIcon