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

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

Browse Source
This commit is contained in:
joBr99
2022-04-17 18:40:51 +00:00
committed by github-actions[bot]
parent c16f71980e
commit 7bb2742926
6 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
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-04-17 18:33:11.488952559 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-17 18:33:12.456957856 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-17 18:40:49.925246404 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-17 18:40:50.729250470 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-17 18:33:12.460957878 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:40:49.925246404 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-17 18:40:50.729250470 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-17 18:33:12.460957878 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-17 18:40:49.925246404 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-17 18:40:50.729250470 +0000
@@ -570,43 +570,25 @@
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
@@ -76,8 +76,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-17 18:33:12.460957878 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-17 18:40:49.925246404 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-17 18:40:50.729250470 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0
@@ -157,3 +157,20 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
if(tInstruction.txt=="pageType")
{
dim=100
@@ -646,16 +618,6 @@
Events
Touch Press Event
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
- {
- if(dim!=0)
- {
- tNotifyHead.txt=""
- tNotifyText.txt=""
- vis tNotifyHead,0
- vis tNotifyText,0
- }
- }
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0

33
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-04-17 18:33:11.488952559 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:33:11.968955186 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-17 18:40:49.925246404 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:40:50.309248346 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:33:11.968955186 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-17 18:40:49.925246404 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:40:50.313248366 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:33:11.968955186 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:40:49.925246404 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:40:50.313248366 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -448,8 +448,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-04-17 18:33:11.492952581 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:33:11.968955186 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-17 18:40:49.925246404 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:40:50.313248366 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0
@@ -507,3 +507,20 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
if(tInstruction.txt=="pageType")
{
dim=100
@@ -646,16 +610,6 @@
Events
Touch Press Event
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
- {
- if(dim!=0)
- {
- tNotifyHead.txt=""
- tNotifyText.txt=""
- vis tNotifyHead,0
- vis tNotifyText,0
- }
- }
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-17 18:33:11.980955251 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-17 18:33:11.488952559 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:33:11.968955186 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-17 18:33:11.492952581 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:33:11.968955186 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-17 18:40:50.333248468 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-17 18:40:49.925246404 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:40:50.309248346 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-17 18:40:49.925246404 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:40:50.313248366 +0000
+@@ -62,6 +62,16 @@
+@@ -117,6 +127,18 @@
+@@ -153,6 +175,15 @@
@@ -15,11 +15,11 @@
+ }
+ if(tInstruction.txt=="pageType")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:33:11.492952581 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:33:11.968955186 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:40:49.925246404 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:40:50.313248366 +0000
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-17 18:33:11.492952581 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:33:11.968955186 +0000
+--- HMI/n2t-out/screensaver.txt 2022-04-17 18:40:49.925246404 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:40:50.313248366 +0000
+@@ -17,8 +17,6 @@
+ vis tInstruction,0
+ vis tTmp,0
@@ -77,3 +77,20 @@
+ if(tInstruction.txt=="pageType")
+ {
+ dim=100
+@@ -646,16 +610,6 @@
+
+ Events
+ Touch Press Event
+- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+- {
+- if(dim!=0)
+- {
+- tNotifyHead.txt=""
+- tNotifyText.txt=""
+- vis tNotifyHead,0
+- vis tNotifyText,0
+- }
+- }
+ dim=dimValueNormal
+ vaTap.val+=1
+ covx vaTap.val,tTmp.txt,0,0