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

2026-01-22 22:24:11 +01:00 · 2022-03-30 22:07:31 +02:00
parent 5009afb9d5 42164508db
commit 75078020f7
4 changed files with 38 additions and 14 deletions
--- a/HMI/US/landscape/diff-eu-version.txt
+++ b/HMI/US/landscape/diff-eu-version.txt
@@ -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-03-30 16:28:19.999450404 +0000
-+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-03-30 16:28:20.967456859 +0000
+--- HMI/n2t-out/Program.s.txt	2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-03-30 16:55:43.136039156 +0000
@@ -10,6 +10,6 @@
     int sleepValue=0
     // dim value
@@ -10,9 +10,21 @@ 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-03-30 16:55:42.160038424 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt	2022-03-30 16:55:43.136039156 +0000
+@@ -17,7 +17,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-03-30 16:28:19.999450404 +0000
-+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-03-30 16:28:20.967456859 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-03-30 16:55:43.136039156 +0000
@@ -177,7 +177,7 @@
             recmod=1
             bauds=115200
--- a/HMI/US/portrait/diff-eu-version.txt
+++ b/HMI/US/portrait/diff-eu-version.txt
@@ -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-03-30 16:28:19.999450404 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-03-30 16:28:20.451453418 +0000
+--- HMI/n2t-out/Program.s.txt	2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-03-30 16:55:42.648038790 +0000
@@ -10,6 +10,6 @@
     int sleepValue=0
     // 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
     page pageStartup
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt	2022-03-30 16:28:19.999450404 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-03-30 16:28:20.455453444 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-03-30 16:55:42.652038793 +0000
@@ -62,6 +62,26 @@
             vis bText4,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")
                                     {
 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt	2022-03-30 16:28:19.999450404 +0000
-+++ HMI/US/portrait/n2t-out/cardThermo.txt	2022-03-30 16:28:20.455453444 +0000
+--- HMI/n2t-out/cardThermo.txt	2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt	2022-03-30 16:55:42.652038793 +0000
@@ -17,6 +17,7 @@
             vis tInstruction,0
             vis tTmp,0
@@ -807,9 +807,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
 XFloat xTempCurr
     Attributes
         Scope                               : local
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt	2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt	2022-03-30 16:55:42.648038790 +0000
+@@ -17,7 +17,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-03-30 16:28:19.999450404 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-03-30 16:28:20.455453444 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-03-30 16:55:42.652038793 +0000
@@ -142,7 +142,7 @@
         Disable release event after dragging: 0
         Send Component ID                   : disabled
--- a/HMI/n2t-out-visual/pageIcons.txt
+++ b/HMI/n2t-out-visual/pageIcons.txt
@@ -42,7 +42,7 @@ Text tIcons
        Horizontal Alignment                : left
        Vertical Alignment                  : top
        Input Type                          : character
-        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸
+        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
        Max. Text Size                      : 170
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
--- a/HMI/n2t-out/pageIcons.txt
+++ b/HMI/n2t-out/pageIcons.txt
@@ -17,7 +17,7 @@ Text tIcons
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
-        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸
+        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
        Max. Text Size                      : 170
    
 Text tTmp1