Merge pull request #29 from deejaybeam/dev

Dev

esphome.yaml

@@ -2,29 +2,8 @@
 ##### START - SUBSTITUTIONS #####
 #############################################################
 substitutions:
-  ##### GENEREL CONFIG MOVED TO ESPHOME SECRETS FILE -> PASTE THIS BLOCK AND MODIFY FOR YOUR NEEDS ########
-  ##### This way you don't need to modify this file anymore
-  # # Blackymas-NSPanel
-  # nspanel_update_url: 'http://1.2.3.4:8123/local/nspanel/nspanel.tft'
-  # nspanel_ota_password: "OTA-PASSWORD"
-  # nspanel_wifi_password: "WIFI-PASSWORD"
-  # nspanel_web_password: "WEBSERVER-PASSWORD"
-  # nspanel_wifi_ssid: "SSID"
-  # nspanel_node_name: "nspanel01"
-  # nspanel_device_name: "NSPanel01"
-  # nspanel_ip: '1.2.3.4'
-  # nspanel_gateway: '1.2.3.4'
-  # nspanel_subnet: '255.255.255.0'
-  # nspanel_dns: '1.2.3.4'
-  # nspanel_domain: ".lan"
-  # nspanel_hotwater_charge: switch.wwontime
-  # nspanel_ha_heating_system_flame: binary_sensor.ems_boiler_burngas
-  # nspanel_ha_climate_thermostat_target_temp: sensor.xxxx
-  # nspanel_ha_climate_thermostat: climate.xxxxx
-  ###### END OF SECRETS BLOCK TO PASTE ####################################################################
-
 ###### Change ME ######
-  node_name: "nspanel_NAME" # ändere Name zum Beispiel in den Raum wo das NSPanel verbaut wird
+  node_name: "nspanel_name" # ändere Name zum Beispiel in den Raum wo das NSPanel verbaut wird
   device_name: "NSPanel NAME" # ändere Name zum Beispiel Raum - ist der Name der in HA verwnedet wird
   wifi_ssid:  "WLAN NAME" # Gib dein WLAN Name ein
   wifi_password: "WLAN PASSWORD" # Gib dein Passwort fürs WLAN ein
@@ -804,35 +783,6 @@ 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
@@ -850,7 +800,6 @@ 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