mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-07 13:58:56 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
@@ -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-03 07:35:47.898571291 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 07:35:48.266571453 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-03 11:36:28.479194000 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 11:36:28.883196213 +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-03 07:35:47.902571293 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 07:35:48.266571453 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-03 11:36:28.479194000 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 11:36:28.887196235 +0000
|
||||
@@ -62,6 +62,26 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -780,9 +780,21 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-04-03 11:36:28.479194000 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-03 11:36:28.883196213 +0000
|
||||
@@ -29,7 +29,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
- Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸î°î³
|
||||
+ Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
|
||||
Max. Text Size : 170
|
||||
|
||||
Text tTmp1
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-03 07:35:47.902571293 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 07:35:48.266571453 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-03 11:36:28.479194000 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 11:36:28.883196213 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
|
||||
Reference in New Issue
Block a user