h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-06 14:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
joBr99
2022-06-03 18:16:42 +02:00
parent 115f9f1ec6 bc1369bee9
commit 1c8cb1e989
11 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
HMI/US/portrait/diff-eu-version.txt
View File

@@ -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-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 16:20:53.475102767 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-03 10:28:27.854115047 +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-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 16:20:53.475102767 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-03 10:28:27.854115047 +0000
@@ -63,6 +63,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-01 16:20:53.479102832 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-03 10:28:27.854115047 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 16:20:53.479102832 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-03 10:28:27.854115047 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -539,8 +539,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-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 16:20:53.479102832 +0000
--- HMI/n2t-out/screensaver.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-03 10:28:27.854115047 +0000
@@ -474,22 +474,6 @@
vis tMainIconAlt,1
vis tMRIcon,1

22
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-01 16:20:53.523103552 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 16:20:53.475102767 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 16:20:53.475102767 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-03 10:28:27.866115231 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-03 10:28:27.854115047 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-03 10:28:27.854115047 +0000
+@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@
@@ -13,8 +13,8 @@
+@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-01 16:20:53.479102832 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-03 10:28:27.854115047 +0000
+@@ -45,12 +45,6 @@
+ Scope: local
+ Value: 0
@@ -59,10 +59,10 @@
+ }
+ if(tInstruction.txt=="time")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 16:20:53.479102832 +0000
+--- HMI/n2t-out/screensaver.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 16:20:53.479102832 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-03 10:28:27.854115047 +0000
+--- HMI/n2t-out/screensaver.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-03 10:28:27.854115047 +0000
+@@ -474,22 +474,6 @@
+@@ -501,14 +485,6 @@
+ spstr strCommand.txt,tIcon2.txt,"~",19

2
HMI/US/portrait/n2t-out-visual/cardAlarm.txt
View File

@@ -100,7 +100,7 @@ Variable (string) vaAddBtn
ID : 39
Scope : local
Text :
Max. Text Size: 20
Max. Text Size: 80
Text tTmp
Attributes

2
HMI/US/portrait/n2t-out/cardAlarm.txt
View File

@@ -84,7 +84,7 @@ Variable (string) vaAddBtn
Attributes
Scope : local
Text :
Max. Text Size: 20
Max. Text Size: 80
Text tTmp
Attributes