Clean-up page settings

nspanel_esphome.yaml

@@ -902,8 +902,6 @@ sensor:
         - number.set:
             id: display_brightness
             value: !lambda 'return int(x);'
-          # send text field percentage of current_lightslider_val
-        - lambda: id(disp1).set_component_text_printf("settings.a03", "%i", id(display_brightness_global));
 
   ###### Display DIM Brightness GET VALUE FROM NSPanel SLIDER #####
   - name: ${device_name} dim brightness slider
@@ -916,8 +914,6 @@ sensor:
         - number.set:
             id: display_dim_brightness
             value: !lambda 'return int(x);'
-          # send text field percentage of current_lightslider_val
-        - lambda: id(disp1).set_component_text_printf("settings.a04", "%i", id(display_dim_brightness_global));
 
 ##### START - TEXT SENSOR CONFIGURATION #####
 text_sensor:
@@ -1237,14 +1233,14 @@ switch:
     turn_on_action: &sleep_mode-turn_on
       - logger.log: "Sleep mode - Turn on"
       - lambda: id(disp1).send_command_printf("home.sleepmodus.val=1");
-      - lambda: id(disp1).set_component_value("settings.bt1",1);
+      - lambda: id(disp1).set_component_value("settings.bt_sleep",1);
       - switch.template.publish:
           id: sleep_mode
           state: ON
     turn_off_action: &sleep_mode-turn_off
       - logger.log: "Sleep mode - Turn off"
       - lambda: id(disp1).send_command_printf("home.sleepmodus.val=0");
-      - lambda: id(disp1).set_component_value("settings.bt1",0);
+      - lambda: id(disp1).set_component_value("settings.bt_sleep",0);
       - switch.template.publish:
           id: sleep_mode
           state: OFF
@@ -1292,13 +1288,13 @@ number:
         - lambda: |-
             id(display_brightness_global) = int(x);
             id(disp1).send_command_printf("brightness=%i", int(x));
-            id(disp1).set_component_text_printf("settings.a03", "%i", int(x));
             id(disp1).send_command_printf("settings.brightslider.val=%i", int(x));
             if (id(current_page).state != "screensaver")
               {
                 id(disp1).set_backlight_brightness(x/100);
                 id(disp1).send_command_printf("home.dimtimer.en=1");
               }
+            if (id(current_page).state == "settings") id(disp1).set_component_text_printf("bright_text", "%i", int(x));
 
   ##### SCREEN BRIGHTNESS DIMMED DOWN #####
   - platform: template
@@ -1316,8 +1312,8 @@ number:
         - lambda: |-
             id(display_dim_brightness_global) = int(x);
             id(disp1).send_command_printf("brightness_dim=%i", int(x));
-            id(disp1).set_component_text_printf("settings.a04", "%i", int(x));
             id(disp1).send_command_printf("settings.dimslider.val=%i", int(x));
+            if (id(current_page).state == "settings") id(disp1).set_component_text_printf("dim_text", "%i", int(x));
 
   ##### Temperature Correction #####
   - platform: template
@@ -1375,8 +1371,6 @@ display:
         - lambda: |-
             id(display_brightness).publish_state(id(display_brightness_global));
             id(display_dim_brightness).publish_state(id(display_dim_brightness_global));
-            id(disp1).set_component_text_printf("settings.a03", "%i", id(display_brightness_global));
-            id(disp1).set_component_text_printf("settings.a04", "%i", id(display_dim_brightness_global));
             id(disp1).send_command_printf("settings.brightslider.val=%i", id(display_brightness_global));
             id(disp1).send_command_printf("settings.dimslider.val=%i", id(display_dim_brightness_global));
         - if:

nspanel_eu_code/settings.txt

@@ -13,6 +13,8 @@ Page settings
     Events
         Preinitialize Event
             dim=brightness
+            covx brightslider.val,bright_text.txt,0,0
+            covx dimslider.val,dim_text.txt,0,0
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -36,27 +38,27 @@ Page settings
             printh 00
             printh FF FF FF
         
-Text a03
+Text bright_text
     Attributes
         ID                 : 5
-        Scope              : global
+        Scope              : local
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : 
         Max. Text Size     : 3
     
-Text a04
+Text dim_text
     Attributes
         ID                 : 6
-        Scope              : global
+        Scope              : local
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : 
         Max. Text Size     : 3
     
-Text a06
+Text lbl_reboot
     Attributes
         ID                 : 7
         Scope              : local
@@ -66,7 +68,7 @@ Text a06
         Text               : Reboot
         Max. Text Size     : 6
     
-Text a07
+Text lbl_sleep
     Attributes
         ID                 : 8
         Scope              : local
@@ -76,7 +78,7 @@ Text a07
         Text               : Sleep
         Max. Text Size     : 5
     
-Text a08
+Text lbl_brightness
     Attributes
         ID                 : 9
         Scope              : local
@@ -86,7 +88,7 @@ Text a08
         Text               : Brightness
         Max. Text Size     : 10
     
-Text a09
+Text lbl_dimming
     Attributes
         ID                 : 10
         Scope              : local
@@ -108,6 +110,7 @@ Slider brightslider
     
     Events
         Touch Release Event
+            covx brightslider.val,bright_text.txt,0,0
             printh 91
             prints "brightslider",0
             printh 00
@@ -126,6 +129,7 @@ Slider dimslider
     
     Events
         Touch Release Event
+            covx dimslider.val,dim_text.txt,0,0
             printh 91
             prints "dimslider",0
             printh 00
@@ -146,7 +150,7 @@ Button button_back
         Touch Press Event
             page home
         
-Dual-state Button bt0
+Dual-state Button bt_reboot
     Attributes
         ID               : 11
         Scope            : local
@@ -156,7 +160,7 @@ Dual-state Button bt0
         Text             : 
         Max. Text Size   : 0
     
-Dual-state Button bt1
+Dual-state Button bt_sleep
     Attributes
         ID               : 12
         Scope            : global
@@ -166,6 +170,86 @@ Dual-state Button bt1
         Text             : 
         Max. Text Size   : 0
     
+Hotspot bt_bright_down
+    Attributes
+        ID               : 14
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(brightslider.val>0)
+            {
+                brightslider.val--
+                covx brightslider.val,bright_text.txt,0,0
+                printh 91
+                prints "brightslider",0
+                printh 00
+                prints brightslider.val,0
+                printh FF FF FF
+            }
+        
+Hotspot bt_bright_up
+    Attributes
+        ID               : 15
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(brightslider.val<100)
+            {
+                brightslider.val++
+                covx brightslider.val,bright_text.txt,0,0
+                printh 91
+                prints "brightslider",0
+                printh 00
+                prints brightslider.val,0
+                printh FF FF FF
+            }
+        
+Hotspot bt_dim_down
+    Attributes
+        ID               : 16
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(dimslider.val>0)
+            {
+                dimslider.val--
+                covx dimslider.val,dim_text.txt,0,0
+                printh 91
+                prints "dimslider",0
+                printh 00
+                prints dimslider.val,0
+                printh FF FF FF
+            }
+        
+Hotspot bt_dim_up
+    Attributes
+        ID               : 17
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(dimslider.val<100)
+            {
+                dimslider.val++
+                covx dimslider.val,dim_text.txt,0,0
+                printh 91
+                prints "dimslider",0
+                printh 00
+                prints dimslider.val,0
+                printh FF FF FF
+            }
+        
 Timer swipestore
     Attributes
         ID         : 2

nspanel_us_code/settings.txt

@@ -13,6 +13,8 @@ Page settings
     Events
         Preinitialize Event
             dim=brightness
+            covx brightslider.val,bright_text.txt,0,0
+            covx dimslider.val,dim_text.txt,0,0
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -36,27 +38,27 @@ Page settings
             printh 00
             printh FF FF FF
         
-Text a03
+Text bright_text
     Attributes
         ID                 : 3
-        Scope              : global
+        Scope              : local
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : 80
         Max. Text Size     : 3
     
-Text a04
+Text dim_text
     Attributes
         ID                 : 4
-        Scope              : global
+        Scope              : local
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : 10
         Max. Text Size     : 3
     
-Text a06
+Text lbl_reboot
     Attributes
         ID                 : 5
         Scope              : local
@@ -66,7 +68,7 @@ Text a06
         Text               : Reboot
         Max. Text Size     : 6
     
-Text a07
+Text lbl_sleep
     Attributes
         ID                 : 6
         Scope              : local
@@ -76,7 +78,7 @@ Text a07
         Text               : Sleep
         Max. Text Size     : 5
     
-Text a08
+Text lbl_brightness
     Attributes
         ID                 : 7
         Scope              : local
@@ -86,7 +88,7 @@ Text a08
         Text               : Brightness
         Max. Text Size     : 10
     
-Text a09
+Text lbl_dimming
     Attributes
         ID                 : 8
         Scope              : local
@@ -108,6 +110,7 @@ Slider brightslider
     
     Events
         Touch Release Event
+            covx brightslider.val,bright_text.txt,0,0
             printh 91
             prints "brightslider",0
             printh 00
@@ -126,6 +129,7 @@ Slider dimslider
     
     Events
         Touch Release Event
+            covx dimslider.val,dim_text.txt,0,0
             printh 91
             prints "dimslider",0
             printh 00
@@ -146,7 +150,7 @@ Button button_back
         Touch Press Event
             page home
         
-Dual-state Button bt0
+Dual-state Button bt_reboot
     Attributes
         ID               : 11
         Scope            : local
@@ -154,9 +158,9 @@ Dual-state Button bt0
         Send Component ID: on press and release
         State            : unpressed
         Text             : 
-        Max. Text Size   : 0
+        Max. Text Size   : 3
     
-Dual-state Button bt1
+Dual-state Button bt_sleep
     Attributes
         ID               : 12
         Scope            : global
@@ -166,6 +170,86 @@ Dual-state Button bt1
         Text             : 
         Max. Text Size   : 0
     
+Hotspot bt_bright_down
+    Attributes
+        ID               : 14
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(brightslider.val>0)
+            {
+                brightslider.val--
+                covx brightslider.val,bright_text.txt,0,0
+                printh 91
+                prints "brightslider",0
+                printh 00
+                prints brightslider.val,0
+                printh FF FF FF
+            }
+        
+Hotspot bt_bright_up
+    Attributes
+        ID               : 15
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(brightslider.val<100)
+            {
+                brightslider.val++
+                covx brightslider.val,bright_text.txt,0,0
+                printh 91
+                prints "brightslider",0
+                printh 00
+                prints brightslider.val,0
+                printh FF FF FF
+            }
+        
+Hotspot bt_dim_down
+    Attributes
+        ID               : 16
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(dimslider.val>0)
+            {
+                dimslider.val--
+                covx dimslider.val,dim_text.txt,0,0
+                printh 91
+                prints "dimslider",0
+                printh 00
+                prints dimslider.val,0
+                printh FF FF FF
+            }
+        
+Hotspot bt_dim_up
+    Attributes
+        ID               : 17
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(dimslider.val<100)
+            {
+                dimslider.val++
+                covx dimslider.val,dim_text.txt,0,0
+                printh 91
+                prints "dimslider",0
+                printh 00
+                prints dimslider.val,0
+                printh FF FF FF
+            }
+        
 Timer swipestore
     Attributes
         ID         : 9

nspanel_us_land_code/settings.txt

@@ -13,6 +13,8 @@ Page settings
     Events
         Preinitialize Event
             dim=brightness
+            covx brightslider.val,bright_text.txt,0,0
+            covx dimslider.val,dim_text.txt,0,0
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -36,27 +38,27 @@ Page settings
             printh 00
             printh FF FF FF
         
-Text a03
+Text bright_text
     Attributes
         ID                 : 5
-        Scope              : global
+        Scope              : local
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : 
         Max. Text Size     : 3
     
-Text a04
+Text dim_text
     Attributes
         ID                 : 6
-        Scope              : global
+        Scope              : local
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : 
         Max. Text Size     : 3
     
-Text a06
+Text lbl_reboot
     Attributes
         ID                 : 7
         Scope              : local
@@ -66,7 +68,7 @@ Text a06
         Text               : Reboot
         Max. Text Size     : 6
     
-Text a07
+Text lbl_sleep
     Attributes
         ID                 : 8
         Scope              : local
@@ -76,7 +78,7 @@ Text a07
         Text               : Sleep
         Max. Text Size     : 5
     
-Text a08
+Text lbl_brightness
     Attributes
         ID                 : 9
         Scope              : local
@@ -86,7 +88,7 @@ Text a08
         Text               : Brightness
         Max. Text Size     : 10
     
-Text a09
+Text lbl_dimming
     Attributes
         ID                 : 10
         Scope              : local
@@ -108,6 +110,7 @@ Slider brightslider
     
     Events
         Touch Release Event
+            covx brightslider.val,bright_text.txt,0,0
             printh 91
             prints "brightslider",0
             printh 00
@@ -126,6 +129,7 @@ Slider dimslider
     
     Events
         Touch Release Event
+            covx dimslider.val,dim_text.txt,0,0
             printh 91
             prints "dimslider",0
             printh 00
@@ -146,7 +150,7 @@ Button button_back
         Touch Press Event
             page home
         
-Dual-state Button bt0
+Dual-state Button bt_reboot
     Attributes
         ID               : 11
         Scope            : local
@@ -156,7 +160,7 @@ Dual-state Button bt0
         Text             : 
         Max. Text Size   : 0
     
-Dual-state Button bt1
+Dual-state Button bt_sleep
     Attributes
         ID               : 12
         Scope            : global
@@ -166,6 +170,86 @@ Dual-state Button bt1
         Text             : 
         Max. Text Size   : 0
     
+Hotspot bt_bright_down
+    Attributes
+        ID               : 14
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(brightslider.val>0)
+            {
+                brightslider.val--
+                covx brightslider.val,bright_text.txt,0,0
+                printh 91
+                prints "brightslider",0
+                printh 00
+                prints brightslider.val,0
+                printh FF FF FF
+            }
+        
+Hotspot bt_bright_up
+    Attributes
+        ID               : 15
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(brightslider.val<100)
+            {
+                brightslider.val++
+                covx brightslider.val,bright_text.txt,0,0
+                printh 91
+                prints "brightslider",0
+                printh 00
+                prints brightslider.val,0
+                printh FF FF FF
+            }
+        
+Hotspot bt_dim_down
+    Attributes
+        ID               : 16
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(dimslider.val>0)
+            {
+                dimslider.val--
+                covx dimslider.val,dim_text.txt,0,0
+                printh 91
+                prints "dimslider",0
+                printh 00
+                prints dimslider.val,0
+                printh FF FF FF
+            }
+        
+Hotspot bt_dim_up
+    Attributes
+        ID               : 17
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+    Events
+        Touch Release Event
+            if(dimslider.val<100)
+            {
+                dimslider.val++
+                covx dimslider.val,dim_text.txt,0,0
+                printh 91
+                prints "dimslider",0
+                printh 00
+                prints dimslider.val,0
+                printh FF FF FF
+            }
+        
 Timer swipestore
     Attributes
         ID         : 2