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

fixes #252 clr button on cardalarm (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-31 15:07:50 +00:00
committed by github-actions[bot]
parent 763d212395
commit 27ad3d74a2
12 changed files with 73 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
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-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 15:07:44.910974530 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -10,20 +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)
+ //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-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000
@@ -33,7 +33,6 @@
vis b8,0
vis b9,0
vis b10,0
- vis b11,0
vis tCode,0
vis bPrev,0
vis bNext,0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 15:07:44.910974530 +0000
@@ -63,6 +63,16 @@
vis bText4,0
vis hSlider4,0
@@ -479,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 15:07:44.910974530 +0000
@@ -35,7 +35,7 @@
Attributes
Scope : local
@@ -491,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 15:07:44.910974530 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -512,8 +501,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 15:07:44.910974530 +0000
@@ -474,22 +474,6 @@
vis tMainIconAlt,1
vis tMRIcon,1