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

2026-02-26 19:02:15 +01:00 · 2022-03-29 11:46:12 +00:00
parent 5aa2cf2a37
commit 50febe8d73
4 changed files with 20 additions and 58 deletions
--- a/HMI/US/portrait/n2t-out/pageIcons.txt
+++ b/HMI/US/portrait/n2t-out/pageIcons.txt
@@ -27,7 +27,7 @@ Text tIcons
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
-        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºî
+        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîî
        Max. Text Size                      : 150
    
 Text tTmp1
--- a/HMI/US/portrait/n2t-out/pageStartup.txt
+++ b/HMI/US/portrait/n2t-out/pageStartup.txt
@@ -297,6 +297,10 @@ Timer tmSerial
                                        {
                                            page cardThermo
                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                        if(tId.txt=="popupLight")
                                        {
                                            pageIcons.tTmp1.txt=tTmp.txt
--- a/HMI/US/portrait/n2t-out/popupLight.txt
+++ b/HMI/US/portrait/n2t-out/popupLight.txt
@@ -468,7 +468,10 @@ Timer tmSerial
                                            vis t2,1
                                            vis hBrightness,1
                                            covx tTmp.txt,sys0,0,0
-                                            hBrightness.val=sys0
+                                            if(tmCooldown.en==0)
+                                            {
+                                                hBrightness.val=sys0
+                                            }
                                        }
                                        // get ColorTemp value
                                        spstr strCommand.txt,tTmp.txt,",",5
@@ -501,6 +504,11 @@ Timer tmSerial
                                            vis hTempSlider,1
                                            vis t3,1
                                            vis t4,1
+                                            if(tmCooldown.en==0)
+                                            {
+                                                covx tTmp.txt,sys0,0,0
+                                                hTempSlider.val=sys0
+                                            }
                                            // mode == 0 is rgb controls currently shown
                                            if(mode.val==0)
                                            {