Merge branch 'dev' of https://github.com/deejaybeam/NSPanel_HA_Blueprint into dev

esphome.yaml

@@ -804,6 +804,35 @@ text_sensor:
   ##### last click sensor, the main action variable - push to HA #####
   - platform: nextion
     nextion_id: disp1
+<<<<<<< HEAD
+    name: $device_name last click
+    id: disp1_last_click_va
+  #  update_interval: 50ms
+    component_name: lastclick
+    on_value:
+      then:
+        - wait_until:
+            switch.is_on: nextion_init
+        - number.set:
+             id: display_brightness
+             value: !lambda 'return string(x);'
+        
+
+
+  # - platform: nextion
+  #   id: brightslider
+  #   name: $device_name brightness Slider
+  #   variable_name: brightslider
+  #   internal: true
+  #   on_value:
+  #     then:
+  #       - wait_until:
+  #           switch.is_on: nextion_init
+  #       - number.set:
+  #           id: display_brightness
+  #           value: !lambda 'return int(x);'
+
+=======
     name: ${device_name} Last Click
     id: disp1_last_click_nextion
     update_interval: 50ms
@@ -821,6 +850,7 @@ text_sensor:
         - globals.set:
             id: lastclick_global
             value: !lambda return x;
+>>>>>>> 629aafbba250e71a90531a9472055b2d2e19ca0c
   
   ##### last click lightsettings page, the main action variable - push to HA #####
   - platform: nextion