diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 4fadae18..93f16602 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 : 3 + Text : 4 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index b95dbaf7..90f3b7d1 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -68,7 +68,7 @@ Variable (int32) mode Attributes ID : 23 Scope: local - Value: 0 + Value: 1 Variable (int32) mode_bright Attributes @@ -384,9 +384,10 @@ Button bColor Events Touch Press Event - if(mode.val==0) + if(mode.val==1) { - mode.val=1 + mode.val=0 + //enable color wheel vis pColorWheel,1 vis t0,1 //disable brightness @@ -399,7 +400,8 @@ Button bColor vis hTempSlider,0 }else { - mode.val=0 + mode.val=1 + //disable color wheel vis pColorWheel,0 vis t0,0 if(mode_bright.val==1) @@ -529,7 +531,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 - if(mode.val==0) + if(mode.val==1) { // get Brightness value spstr strCommand.txt,tTmp.txt,",",2 diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 4f0cd070..134c6a7d 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index a2c6e17f..3a5a3600 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 ba82c961..5621087f 100644 --- a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py +++ b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py @@ -451,7 +451,11 @@ 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: