Removed LED auxiliary files

Using YAML anchors instead. It makes it cleaner and easier to understand.
2024-12-21 08:54:41 +01:00
parent 96db05cc34
commit ee8ff66add
5 changed files with 167 additions and 252 deletions
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
@@ -34,27 +34,7 @@ globals:
    restore_value: false

 light:
-  - id: light_output_1
-    name: Light output 1
-    internal: true
-    platform: binary
-    output: output_relay_1
-  - id: light_output_2
-    name: Light output 2
-    internal: true
-    platform: binary
-    output: output_relay_2
-  - id: light_output_3
-    name: Light output 3
-    internal: true
-    platform: binary
-    output: output_relay_3
-  - id: light_output_4
-    name: Light output 4
-    internal: true
-    platform: binary
-    output: output_relay_4
-
+  # These lights are controlling the LEDs on the device
  - id: light_full
    name: Light - All
    internal: true
@@ -65,11 +45,51 @@ light:
    num_leds: 32
    pin: GPIO13

-  - id: light_eu
+  # Those lights are available based on the model selections
+  - &light_partition_with_effects
+    id: light_eu
    name: Light
+    platform: partition
+    default_transition_length: ${default_transition_length}
    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    effects:
+      - addressable_rainbow:
+          name: "Rainbow"
+      - addressable_rainbow:
+          name: "Rainbow - Fast"
+          speed: 50
+      - pulse:
+          name: "Pulse"
+          transition_length: 1s
+          update_interval: 1s
+      - pulse:
+          name: "Pulse - Slow"
+          transition_length: 2s
+          update_interval: 2s
+      - addressable_scan:
+          name: "Scan"
+          move_interval: 100ms
+          scan_width: 3
+      - addressable_twinkle:
+          name: "Twinkle"
+          twinkle_probability: 5%
+          progress_interval: 4ms
+      - addressable_random_twinkle:
+          name: "Random Twinkle"
+          twinkle_probability: 20%
+          progress_interval: 32ms
+      - addressable_fireworks:
+          name: "Fireworks"
+          update_interval: 32ms
+          spark_probability: 10%
+          use_random_color: false
+          fade_out_rate: 120
+      - addressable_flicker:
+          name: "Flicker"
+          update_interval: 16ms
+          intensity: 5%
+      - random:
+          name: "Random"
    segments:
      - id: light_full
        from: 0
@@ -77,20 +97,17 @@ light:

  - id: light_us
    name: Light
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    <<: *light_partition_with_effects
    segments:
      - id: light_full
        from: 0
        to: 31

-  # Those lights are available based on the model selections
-  - id: light_eu_bottom
+  - &light_partition_with_effects_disabled
+    id: light_eu_bottom
    name: Light - Bottom
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    disabled_by_default: true
+    <<: *light_partition_with_effects
    segments:
      - id: light_full
        from: 6
@@ -98,9 +115,7 @@ light:
        reversed: true
  - id: light_eu_left
    name: Light - Left
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
        from: 13
@@ -108,9 +123,7 @@ light:
        reversed: true
  - id: light_eu_right
    name: Light - Right
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
        from: 27
@@ -122,9 +135,7 @@ light:
        reversed: false
  - id: light_eu_top
    name: Light - Top
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
        from: 20
@@ -132,9 +143,7 @@ light:
        reversed: false
  - id: light_us_bottom
    name: Light - Bottom
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
        from: 9
@@ -142,9 +151,7 @@ light:
        reversed: true
  - id: light_us_left
    name: Light - Left
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
        from: 15
@@ -152,9 +159,7 @@ light:
        reversed: true
  - id: light_us_right
    name: Light - Right
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
        from: 31
@@ -166,444 +171,399 @@ light:
        reversed: false
  - id: light_us_top
    name: Light - Top
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
        from: 25
        to: 30
        reversed: false

-  - id: light_00
+  - &light_partition_individual_led
+    id: light_00
    name: Light - LED 00
+    platform: partition
    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    default_transition_length: ${default_transition_length}
    segments:
      - id: light_full
        from: 0
        to: 0
  - id: light_01
    name: Light - LED 01
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 1
        to: 1
  - id: light_02
    name: Light - LED 02
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 2
        to: 2
  - id: light_03
    name: Light - LED 03
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 3
        to: 3
  - id: light_04
    name: Light - LED 04
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 4
        to: 4
  - id: light_05
    name: Light - LED 05
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 5
        to: 5
  - id: light_06
    name: Light - LED 06
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 6
        to: 6
  - id: light_07
    name: Light - LED 07
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 7
        to: 7
  - id: light_08
    name: Light - LED 08
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 8
        to: 8
  - id: light_09
    name: Light - LED 09
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 9
        to: 9
  - id: light_10
    name: Light - LED 10
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 10
        to: 10
  - id: light_11
    name: Light - LED 11
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 11
        to: 11
  - id: light_12
    name: Light - LED 12
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 12
        to: 12
  - id: light_13
    name: Light - LED 13
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 13
        to: 13
  - id: light_14
    name: Light - LED 14
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 14
        to: 14
  - id: light_15
    name: Light - LED 15
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 15
        to: 15
  - id: light_16
    name: Light - LED 16
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 16
        to: 16
  - id: light_17
    name: Light - LED 17
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 17
        to: 17
  - id: light_18
    name: Light - LED 18
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 18
        to: 18
  - id: light_19
    name: Light - LED 19
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 19
        to: 19
  - id: light_20
    name: Light - LED 20
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 20
        to: 20
  - id: light_21
    name: Light - LED 21
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 21
        to: 21
  - id: light_22
    name: Light - LED 22
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 22
        to: 22
  - id: light_23
    name: Light - LED 23
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 23
        to: 23
  - id: light_24
    name: Light - LED 24
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 24
        to: 24
  - id: light_25
    name: Light - LED 25
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 25
        to: 25
  - id: light_26
    name: Light - LED 26
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 26
        to: 26
  - id: light_27
    name: Light - LED 27
-    disabled_by_default: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 27
        to: 27
-  - id: light_28
+  - id: light_28  # US Model only
    name: Light - LED 28
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    internal: true
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 28
        to: 28
-  - id: light_29
+  - id: light_29  # US Model only
    name: Light - LED 29
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    internal: true
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 29
        to: 29
-  - id: light_30
+  - id: light_30  # US Model only
    name: Light - LED 30
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    internal: true
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 30
        to: 30
-  - id: light_31
+  - id: light_31  # US Model only
    name: Light - LED 31
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    internal: true
+    <<: *light_partition_individual_led
    segments:
      - id: light_full
        from: 31
        to: 31

-  - id: light_eu_rl_1_1_bottom
+  # These lights are used to indicate relay's statuses
+  - &light_partition_relays
+    id: light_eu_rl_1_1_bottom
    name: Light - Relay 1 of 1 (bottom)
+    platform: partition
    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    default_transition_length: ${default_transition_length}
    segments:
      - id: light_full
        from: 9
        to: 9
  - id: light_eu_rl_1_1_top
    name: Light - Relay 1 of 1 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 23
        to: 23
  - id: light_eu_rl_1_2_bottom
    name: Light - Relay 1 of 2 (bottom)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 11
        to: 11
  - id: light_eu_rl_1_2_top
    name: Light - Relay 1 of 2 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 21
        to: 21
  - id: light_eu_rl_2_2_bottom
    name: Light - Relay 2 of 2 (bottom)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 7
        to: 7
  - id: light_eu_rl_2_2_top
    name: Light - Relay 2 of 2 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 25
        to: 25
  - id: light_eu_rl_1_3_bottom
    name: Light - Relay 1 of 3 (bottom)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 12
        to: 12
  - id: light_eu_rl_1_3_top
    name: Light - Relay 1 of 3 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 20
        to: 20
  - id: light_eu_rl_2_3_bottom
    name: Light - Relay 2 of 3 (bottom)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 9
        to: 9
  - id: light_eu_rl_2_3_top
    name: Light - Relay 2 of 3 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 23
        to: 23
  - id: light_eu_rl_3_3_bottom
    name: Light - Relay 3 of 3 (bottom)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 6
        to: 6
  - id: light_eu_rl_3_3_top
    name: Light - Relay 3 of 3 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 26
        to: 26
  - id: light_eu_rl_1_4_bottom
    name: Light - Relay 1 of 4 (bottom)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 12
        to: 12
  - id: light_eu_rl_1_4_top
    name: Light - Relay 1 of 4 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 20
        to: 20
  - id: light_eu_rl_2_4_bottom
    name: Light - Relay 2 of 4 (bottom)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 10
        to: 10
  - id: light_eu_rl_2_4_top
    name: Light - Relay 2 of 4 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 22
        to: 22
  - id: light_eu_rl_3_4_bottom
    name: Light - Relay 3 of 4 (bottom)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 8
        to: 8
  - id: light_eu_rl_3_4_top
    name: Light - Relay 3 of 4 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 24
        to: 24
  - id: light_eu_rl_4_4_bottom
    name: Light - Relay 4 of 4 (bottom)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 6
        to: 6
  - id: light_eu_rl_4_4_top
    name: Light - Relay 4 of 4 (top)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 26
        to: 26
  - id: light_us_rl_1_1_left
    name: Light - Relay 1 of 1 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 15
        to: 24
  - id: light_us_rl_1_1_right
    name: Light - Relay 1 of 1 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 31
@@ -613,16 +573,14 @@ light:
        to: 8
  - id: light_us_rl_1_2_left
    name: Light - Relay 1 of 2 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 20
        to: 24
  - id: light_us_rl_1_2_right
    name: Light - Relay 1 of 2 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 31
@@ -632,128 +590,112 @@ light:
        to: 3
  - id: light_us_rl_2_2_left
    name: Light - Relay 2 of 2 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 15
        to: 19
  - id: light_us_rl_2_2_right
    name: Light - Relay 2 of 2 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 4
        to: 8
  - id: light_us_rl_1_3_left
    name: Light - Relay 1 of 3 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 22
        to: 23
  - id: light_us_rl_1_3_right
    name: Light - Relay 1 of 3 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 0
        to: 1
  - id: light_us_rl_2_3_left
    name: Light - Relay 2 of 3 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 19
        to: 20
  - id: light_us_rl_2_3_right
    name: Light - Relay 2 of 3 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 3
        to: 4
  - id: light_us_rl_3_3_left
    name: Light - Relay 3 of 3 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 17
        to: 18
  - id: light_us_rl_3_3_right
    name: Light - Relay 3 of 3 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 6
        to: 7
  - id: light_us_rl_1_4_left
    name: Light - Relay 1 of 4 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 12
        to: 12
  - id: light_us_rl_1_4_right
    name: Light - Relay 1 of 4 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 31
        to: 31
  - id: light_us_rl_2_4_left
    name: Light - Relay 2 of 4 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 24
        to: 24
  - id: light_us_rl_2_4_right
    name: Light - Relay 2 of 4 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 2
        to: 2
  - id: light_us_rl_3_4_left
    name: Light - Relay 3 of 4 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 21
        to: 21
  - id: light_us_rl_3_4_right
    name: Light - Relay 3 of 4 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 4
        to: 4
  - id: light_us_rl_4_4_left
    name: Light - Relay 4 of 4 (left)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 19
        to: 19
  - id: light_us_rl_4_4_right
    name: Light - Relay 4 of 4 (right)
-    internal: true
-    <<: !include TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+    <<: *light_partition_relays
    segments:
      - id: light_full
        from: 7
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds_light_base.yaml
@@ -1,4 +0,0 @@
---
-platform: partition
-default_transition_length: ${default_transition_length}
-...
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds_light_effects.yaml
@@ -1,40 +0,0 @@
---
-effects:
-  - addressable_rainbow:
-      name: "Rainbow"
-  - addressable_rainbow:
-      name: "Rainbow - Fast"
-      speed: 50
-  - pulse:
-      name: "Pulse"
-      transition_length: 1s
-      update_interval: 1s
-  - pulse:
-      name: "Pulse - Slow"
-      transition_length: 2s
-      update_interval: 2s
-  - addressable_scan:
-      name: "Scan"
-      move_interval: 100ms
-      scan_width: 3
-  - addressable_twinkle:
-      name: "Twinkle"
-      twinkle_probability: 5%
-      progress_interval: 4ms
-  - addressable_random_twinkle:
-      name: "Random Twinkle"
-      twinkle_probability: 20%
-      progress_interval: 32ms
-  - addressable_fireworks:
-      name: "Fireworks"
-      update_interval: 32ms
-      spark_probability: 10%
-      use_random_color: false
-      fade_out_rate: 120
-  - addressable_flicker:
-      name: "Flicker"
-      update_interval: 16ms
-      intensity: 5%
-  - random:
-      name: "Random"
-...
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds_light_internal.yaml
@@ -1,4 +0,0 @@
---
-internal: true
-disabled_by_default: true
-...
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
@@ -66,6 +66,27 @@ globals:
    restore_value: false
    initial_value: 'false'

+light:
+  # These lights are used for the physical relays to be shown as lights
+  - &light_binary_base
+    id: light_output_1
+    name: Light output 1
+    output: output_relay_1
+    platform: binary
+    internal: true
+  - id: light_output_2
+    name: Light output 2
+    output: output_relay_2
+    <<: *light_binary_base
+  - id: light_output_3
+    name: Light output 3
+    output: output_relay_3
+    <<: *light_binary_base
+  - id: light_output_4
+    name: Light output 4
+    output: output_relay_4
+    <<: *light_binary_base
+
 output:
  - id: output_relay_1
    platform: gpio