mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-15 17:36:59 +01:00
implement #471 (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
673f4c20da
commit
cd1fecd9f2
@@ -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-09-17 17:53:20.407846944 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 17:53:20.875848746 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-09-17 19:57:23.628206782 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 19:57:24.072211415 +0000
|
||||
@@ -14,6 +14,6 @@
|
||||
//color vars
|
||||
int defaultFontColor=65535
|
||||
@@ -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-09-17 17:53:20.407846944 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 17:53:20.875848746 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-09-17 19:57:23.628206782 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 19:57:24.072211415 +0000
|
||||
@@ -65,6 +65,16 @@
|
||||
vis nNum4,0
|
||||
vis bPrev,0
|
||||
@@ -268,7 +268,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Hotspot mSpecial
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1107,6 +1313,32 @@
|
||||
@@ -1111,6 +1317,33 @@
|
||||
page popupFan
|
||||
}
|
||||
|
||||
@@ -283,6 +283,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
+ Touch Press Event
|
||||
+ pageIcons.tTmp1.txt=tEntity5.txt
|
||||
+ pageIcons.tTmp2.txt=entn5.txt
|
||||
+ pageIcons.tTmp3.txt=tIcon5.txt
|
||||
+ if(type5.txt=="shutter")
|
||||
+ {
|
||||
+ //popupShutter.tHeading.txt=tEntity5.txt
|
||||
@@ -301,7 +302,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Hotspot mSwipeNext
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1826,6 +2058,155 @@
|
||||
@@ -1830,6 +2063,155 @@
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider4.maxval=sys0
|
||||
}
|
||||
@@ -459,8 +460,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
{
|
||||
Only in HMI/n2t-out: cardPower.txt
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-09-17 17:53:20.407846944 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 17:53:20.875848746 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-09-17 19:57:23.628206782 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 19:57:24.072211415 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -480,8 +481,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
||||
--- HMI/n2t-out/pageTest.txt 2022-09-17 17:53:20.407846944 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 17:53:20.875848746 +0000
|
||||
--- HMI/n2t-out/pageTest.txt 2022-09-17 19:57:23.628206782 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 19:57:24.072211415 +0000
|
||||
@@ -13,36 +13,6 @@
|
||||
Events
|
||||
Preinitialize Event
|
||||
@@ -617,8 +618,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
||||
- }
|
||||
-
|
||||
diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
|
||||
--- HMI/n2t-out/popupFan.txt 2022-09-17 17:53:20.407846944 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 17:53:20.875848746 +0000
|
||||
--- HMI/n2t-out/popupFan.txt 2022-09-17 19:57:23.628206782 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 19:57:24.072211415 +0000
|
||||
@@ -81,23 +81,23 @@
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Reference in New Issue
Block a user