mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-21 15:04:24 +01:00
:wqerge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui
This commit is contained in:
@@ -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-05-28 19:58:06.686291753 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:58:07.586304354 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-28 20:18:16.481462743 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 20:18:17.549463034 +0000
|
||||
@@ -11,6 +11,4 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -9,8 +9,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-05-28 19:58:06.686291753 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:58:07.590304410 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-28 20:18:16.481462743 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 20:18:17.549463034 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -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-05-28 19:58:06.686291753 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-28 20:18:16.481462743 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 20:18:16.997462884 +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-05-28 19:58:06.686291753 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-28 20:18:16.485462744 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 20:18:16.997462884 +0000
|
||||
@@ -62,6 +62,16 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||
--- HMI/n2t-out/cardQR.txt 2022-05-28 19:58:06.686291753 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
--- HMI/n2t-out/cardQR.txt 2022-05-28 20:18:16.485462744 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 20:18:16.997462884 +0000
|
||||
@@ -34,7 +34,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:58:06.686291753 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-28 20:18:16.481462743 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 20:18:16.997462884 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -501,8 +501,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-05-28 19:58:06.686291753 +0000
|
||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
--- HMI/n2t-out/screensaver.txt 2022-05-28 20:18:16.485462744 +0000
|
||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 20:18:16.997462884 +0000
|
||||
@@ -471,22 +471,6 @@
|
||||
vis tMainIconAlt,1
|
||||
vis tMRIcon,1
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 19:58:07.138298050 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-28 19:58:06.686291753 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:58:06.686291753 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
+--- HMI/n2t-out/cardQR.txt 2022-05-28 19:58:06.686291753 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:58:06.686291753 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
+--- HMI/n2t-out/screensaver.txt 2022-05-28 19:58:06.686291753 +0000
|
||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:58:07.122297824 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 20:18:17.037462894 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-28 20:18:16.481462743 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 20:18:16.997462884 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 20:18:16.485462744 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 20:18:16.997462884 +0000
|
||||
+--- HMI/n2t-out/cardQR.txt 2022-05-28 20:18:16.485462744 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 20:18:16.997462884 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 20:18:16.481462743 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 20:18:16.997462884 +0000
|
||||
+--- HMI/n2t-out/screensaver.txt 2022-05-28 20:18:16.485462744 +0000
|
||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 20:18:16.997462884 +0000
|
||||
+@@ -471,22 +471,6 @@
|
||||
|
||||
@@ -2,6 +2,10 @@ Program.s
|
||||
0 Component(s)
|
||||
10 Line(s) of event code
|
||||
10 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
348 Line(s) of event code
|
||||
188 Unique line(s) of event code
|
||||
pageIcons
|
||||
6 Component(s)
|
||||
0 Line(s) of event code
|
||||
@@ -34,10 +38,6 @@ cardMedia
|
||||
33 Component(s)
|
||||
350 Line(s) of event code
|
||||
179 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
348 Line(s) of event code
|
||||
188 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
154 Line(s) of event code
|
||||
|
||||
@@ -439,10 +439,10 @@ Picture pColorWheel
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 160
|
||||
y coordinate : 69
|
||||
Width : 160
|
||||
Height : 160
|
||||
x coordinate : 67
|
||||
y coordinate : 89
|
||||
Width : 245
|
||||
Height : 245
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
|
||||
Reference in New Issue
Block a user