mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-17 10:27:00 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
GitHub Actions
@@ -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-03-30 15:03:45.667488911 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-03-30 16:28:19.999450404 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 15:03:46.575489457 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 16:28:20.967456859 +0000
|
||||||
@@ -10,6 +10,6 @@
|
@@ -10,6 +10,6 @@
|
||||||
int sleepValue=0
|
int sleepValue=0
|
||||||
// dim value
|
// dim value
|
||||||
@@ -10,21 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/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/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
|
|
||||||
--- HMI/n2t-out/pageIcons.txt 2022-03-30 15:03:45.667488911 +0000
|
|
||||||
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 15:03:46.575489457 +0000
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
- Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾
|
|
||||||
+ Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯
|
|
||||||
Max. Text Size : 150
|
|
||||||
|
|
||||||
Text tTmp1
|
|
||||||
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-03-30 15:03:45.667488911 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-03-30 16:28:19.999450404 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 15:03:46.575489457 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 16:28:20.967456859 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
|
|||||||
@@ -42,8 +42,8 @@ Text tIcons
|
|||||||
Horizontal Alignment : left
|
Horizontal Alignment : left
|
||||||
Vertical Alignment : top
|
Vertical Alignment : top
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯
|
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸
|
||||||
Max. Text Size : 150
|
Max. Text Size : 170
|
||||||
Word wrap : enabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ Text tIcons
|
|||||||
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 : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯
|
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸
|
||||||
Max. Text Size : 150
|
Max. Text Size : 170
|
||||||
|
|
||||||
Text tTmp1
|
Text tTmp1
|
||||||
Attributes
|
Attributes
|
||||||
|
|||||||
@@ -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-03-30 15:03:45.667488911 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-03-30 16:28:19.999450404 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 15:03:46.111489178 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 16:28:20.451453418 +0000
|
||||||
@@ -10,6 +10,6 @@
|
@@ -10,6 +10,6 @@
|
||||||
int sleepValue=0
|
int sleepValue=0
|
||||||
// dim value
|
// dim value
|
||||||
@@ -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
|
+ //lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
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-03-30 15:03:45.671488913 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-03-30 16:28:19.999450404 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 15:03:46.111489178 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 16:28:20.455453444 +0000
|
||||||
@@ -62,6 +62,26 @@
|
@@ -62,6 +62,26 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -781,8 +781,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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||||
--- HMI/n2t-out/cardThermo.txt 2022-03-30 15:03:45.671488913 +0000
|
--- HMI/n2t-out/cardThermo.txt 2022-03-30 16:28:19.999450404 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 15:03:46.111489178 +0000
|
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 16:28:20.455453444 +0000
|
||||||
@@ -17,6 +17,7 @@
|
@@ -17,6 +17,7 @@
|
||||||
vis tInstruction,0
|
vis tInstruction,0
|
||||||
vis tTmp,0
|
vis tTmp,0
|
||||||
@@ -807,21 +807,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
|||||||
XFloat xTempCurr
|
XFloat xTempCurr
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
|
||||||
--- HMI/n2t-out/pageIcons.txt 2022-03-30 15:03:45.667488911 +0000
|
|
||||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 15:03:46.111489178 +0000
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
- Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾
|
|
||||||
+ Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯
|
|
||||||
Max. Text Size : 150
|
|
||||||
|
|
||||||
Text tTmp1
|
|
||||||
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-03-30 15:03:45.667488911 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-03-30 16:28:19.999450404 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 15:03:46.111489178 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 16:28:20.455453444 +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
|
||||||
|
|||||||
@@ -6,6 +6,10 @@ pageSerialTest
|
|||||||
13 Component(s)
|
13 Component(s)
|
||||||
48 Line(s) of event code
|
48 Line(s) of event code
|
||||||
43 Unique line(s) of event code
|
43 Unique line(s) of event code
|
||||||
|
pageIcons
|
||||||
|
5 Component(s)
|
||||||
|
0 Line(s) of event code
|
||||||
|
0 Unique line(s) of event code
|
||||||
popupShutter
|
popupShutter
|
||||||
19 Component(s)
|
19 Component(s)
|
||||||
179 Line(s) of event code
|
179 Line(s) of event code
|
||||||
@@ -42,10 +46,6 @@ cardMedia
|
|||||||
30 Component(s)
|
30 Component(s)
|
||||||
278 Line(s) of event code
|
278 Line(s) of event code
|
||||||
139 Unique line(s) of event code
|
139 Unique line(s) of event code
|
||||||
pageIcons
|
|
||||||
5 Component(s)
|
|
||||||
0 Line(s) of event code
|
|
||||||
0 Unique line(s) of event code
|
|
||||||
pageStartup
|
pageStartup
|
||||||
19 Component(s)
|
19 Component(s)
|
||||||
150 Line(s) of event code
|
150 Line(s) of event code
|
||||||
|
|||||||
@@ -42,8 +42,8 @@ Text tIcons
|
|||||||
Horizontal Alignment : left
|
Horizontal Alignment : left
|
||||||
Vertical Alignment : top
|
Vertical Alignment : top
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯
|
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸
|
||||||
Max. Text Size : 150
|
Max. Text Size : 170
|
||||||
Word wrap : enabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ Text tIcons
|
|||||||
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 : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯
|
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸
|
||||||
Max. Text Size : 150
|
Max. Text Size : 170
|
||||||
|
|
||||||
Text tTmp1
|
Text tTmp1
|
||||||
Attributes
|
Attributes
|
||||||
|
|||||||
@@ -42,8 +42,8 @@ Text tIcons
|
|||||||
Horizontal Alignment : left
|
Horizontal Alignment : left
|
||||||
Vertical Alignment : top
|
Vertical Alignment : top
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾
|
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸
|
||||||
Max. Text Size : 150
|
Max. Text Size : 170
|
||||||
Word wrap : enabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ Text tIcons
|
|||||||
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 : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾
|
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸
|
||||||
Max. Text Size : 150
|
Max. Text Size : 170
|
||||||
|
|
||||||
Text tTmp1
|
Text tTmp1
|
||||||
Attributes
|
Attributes
|
||||||
|
|||||||
Reference in New Issue
Block a user