diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 97afaf7e..4fadae18 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -165,7 +165,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 2 + Text : 3 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 73bfa98b..b95dbaf7 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -529,39 +529,42 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 - // get Brightness value - spstr strCommand.txt,tTmp.txt,",",2 - if(tTmp.txt=="disable") + if(mode.val==0) { - vis t1,0 - vis t2,0 - vis hBrightness,0 - mode_bright.val=0 - }else - { - vis t1,1 - vis t2,1 - vis hBrightness,1 - mode_bright.val=1 - covx tTmp.txt,sys0,0,0 - hBrightness.val=sys0 - } - // get ColorTemp value - spstr strCommand.txt,tTmp.txt,",",3 - if(tTmp.txt=="disable") - { - vis t4,0 - vis t3,0 - vis hTempSlider,0 - mode_temp.val=0 - }else - { - vis t4,1 - vis t3,1 - vis hTempSlider,1 - mode_temp.val=1 - covx tTmp.txt,sys0,0,0 - hTempSlider.val=sys0 + // get Brightness value + spstr strCommand.txt,tTmp.txt,",",2 + if(tTmp.txt=="disable") + { + vis t1,0 + vis t2,0 + vis hBrightness,0 + mode_bright.val=0 + }else + { + vis t1,1 + vis t2,1 + vis hBrightness,1 + mode_bright.val=1 + covx tTmp.txt,sys0,0,0 + hBrightness.val=sys0 + } + // get ColorTemp value + spstr strCommand.txt,tTmp.txt,",",3 + if(tTmp.txt=="disable") + { + vis t4,0 + vis t3,0 + vis hTempSlider,0 + mode_temp.val=0 + }else + { + vis t4,1 + vis t3,1 + vis hTempSlider,1 + mode_temp.val=1 + covx tTmp.txt,sys0,0,0 + hTempSlider.val=sys0 + } } // get ColorWheel value spstr strCommand.txt,tTmp.txt,",",4 diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 280476fb..4f0cd070 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index a62c259d..a2c6e17f 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ diff --git a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py index cfe47045..ba82c961 100644 --- a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py +++ b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py @@ -451,10 +451,7 @@ class NsPanelLovelanceUI: if "color_temp" in entity.attributes: # scale ha color temp range to 0-100 color_temp = int(self.scale(entity.attributes.color_temp,(entity.attributes.min_mireds, entity.attributes.max_mireds),(0,100))) - else: - color_temp = 0 - else: - color_temp = "disable" + if "xy" in entity.attributes.supported_color_modes: color = "enable" else: