mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-25 17:04:25 +01:00
added some icons #120 (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
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-03 11:36:28.479194000 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 11:36:29.307198536 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-03 16:02:24.464717607 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 16:02:25.284722859 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -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)
|
||||
+ //lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-04-03 11:36:28.479194000 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-03 11:36:29.307198536 +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/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-03 11:36:28.479194000 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 11:36:29.307198536 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-03 16:02:24.464717607 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 16:02:25.288722884 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -2,6 +2,10 @@ Program.s
|
||||
0 Component(s)
|
||||
10 Line(s) of event code
|
||||
10 Unique line(s) of event code
|
||||
pageIcons
|
||||
7 Component(s)
|
||||
0 Line(s) of event code
|
||||
0 Unique line(s) of event code
|
||||
pageTest
|
||||
13 Component(s)
|
||||
13 Line(s) of event code
|
||||
@@ -10,10 +14,6 @@ pageSerialTest
|
||||
13 Component(s)
|
||||
48 Line(s) of event code
|
||||
43 Unique line(s) of event code
|
||||
pageIcons
|
||||
7 Component(s)
|
||||
0 Line(s) of event code
|
||||
0 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
178 Line(s) of event code
|
||||
|
||||
@@ -56,8 +56,8 @@ Text tIcons
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : top
|
||||
Input Type : character
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
|
||||
Max. Text Size : 170
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸î°î³î¸ïî¢î·î¥
|
||||
Max. Text Size : 185
|
||||
Word wrap : enabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 28
|
||||
Text : 29
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -29,8 +29,8 @@ Text tIcons
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
|
||||
Max. Text Size : 170
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸î°î³î¸ïî¢î·î¥
|
||||
Max. Text Size : 185
|
||||
|
||||
Text tTmp1
|
||||
Attributes
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 28
|
||||
Text : 29
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
@@ -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 11:36:28.479194000 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 11:36:28.883196213 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-03 16:02:24.464717607 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 16:02:24.872720220 +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 11:36:28.479194000 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 11:36:28.887196235 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-03 16:02:24.468717633 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 16:02:24.872720220 +0000
|
||||
@@ -62,6 +62,26 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -780,21 +780,9 @@ 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 11:36:28.479194000 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 11:36:28.883196213 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-03 16:02:24.464717607 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 16:02:24.872720220 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
|
||||
@@ -56,8 +56,8 @@ Text tIcons
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : top
|
||||
Input Type : character
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
|
||||
Max. Text Size : 170
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸î°î³î¸ïî¢î·î¥
|
||||
Max. Text Size : 185
|
||||
Word wrap : enabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 28
|
||||
Text : 29
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -29,8 +29,8 @@ Text tIcons
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
|
||||
Max. Text Size : 170
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸î°î³î¸ïî¢î·î¥
|
||||
Max. Text Size : 185
|
||||
|
||||
Text tTmp1
|
||||
Attributes
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 28
|
||||
Text : 29
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
@@ -14,6 +14,10 @@ pageSerialTest
|
||||
13 Component(s)
|
||||
48 Line(s) of event code
|
||||
43 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
178 Line(s) of event code
|
||||
@@ -26,10 +30,6 @@ popupLight
|
||||
27 Component(s)
|
||||
322 Line(s) of event code
|
||||
173 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
460 Line(s) of event code
|
||||
|
||||
@@ -56,8 +56,8 @@ Text tIcons
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : top
|
||||
Input Type : character
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸î°î³
|
||||
Max. Text Size : 170
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸î°î³î¸ïî¢î·î¥
|
||||
Max. Text Size : 185
|
||||
Word wrap : enabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 28
|
||||
Text : 29
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -29,8 +29,8 @@ Text tIcons
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸î°î³
|
||||
Max. Text Size : 170
|
||||
Text : îî´îï§îîî î
î£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸î°î³î¸ïî¢î·î¥
|
||||
Max. Text Size : 185
|
||||
|
||||
Text tTmp1
|
||||
Attributes
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 28
|
||||
Text : 29
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
Reference in New Issue
Block a user