Compare commits
7 Commits
v2025.10.1
...
v2025.8.2d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa5bbfe870 | ||
|
|
9978657d28 | ||
|
|
5ca68c8ab4 | ||
|
|
671a10da81 | ||
|
|
36d9ad196c | ||
|
|
7f8e0c7edc | ||
|
|
a5761c6393 |
53
.github/workflows/validate_esphome.yml
vendored
53
.github/workflows/validate_esphome.yml
vendored
@@ -65,18 +65,6 @@ jobs:
|
|||||||
yaml-file: ".test/esphome_ard_core.yaml"
|
yaml-file: ".test/esphome_ard_core.yaml"
|
||||||
version: latest
|
version: latest
|
||||||
|
|
||||||
build_ard_core_dev:
|
|
||||||
name: "🏗️ Arduino Core (dev)"
|
|
||||||
needs: code_scan
|
|
||||||
if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@main
|
|
||||||
- name: Build Arduino Core - dev
|
|
||||||
uses: esphome/build-action@main
|
|
||||||
with:
|
|
||||||
yaml-file: ".test/esphome_ard_core.yaml"
|
|
||||||
version: dev
|
|
||||||
build_ard_basic:
|
build_ard_basic:
|
||||||
name: "📦 Arduino Basic (latest)"
|
name: "📦 Arduino Basic (latest)"
|
||||||
needs: build_ard_core
|
needs: build_ard_core
|
||||||
@@ -91,8 +79,8 @@ jobs:
|
|||||||
|
|
||||||
build_ard_basic_dev:
|
build_ard_basic_dev:
|
||||||
name: "📦 Arduino Basic (dev)"
|
name: "📦 Arduino Basic (dev)"
|
||||||
needs: build_ard_core_dev
|
needs: build_ard_core
|
||||||
if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
|
if: success() && !github.event.inputs.skip_dev
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@main
|
- uses: actions/checkout@main
|
||||||
@@ -153,7 +141,7 @@ jobs:
|
|||||||
build_ard_ble_proxy_dev:
|
build_ard_ble_proxy_dev:
|
||||||
name: "⚡ Arduino BLE Proxy (dev)"
|
name: "⚡ Arduino BLE Proxy (dev)"
|
||||||
needs: build_ard_basic_dev
|
needs: build_ard_basic_dev
|
||||||
if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
|
if: success() && !github.event.inputs.skip_dev
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@main
|
- uses: actions/checkout@main
|
||||||
@@ -176,19 +164,6 @@ jobs:
|
|||||||
yaml-file: ".test/esphome_idf_core.yaml"
|
yaml-file: ".test/esphome_idf_core.yaml"
|
||||||
version: latest
|
version: latest
|
||||||
|
|
||||||
build_idf_core_dev:
|
|
||||||
name: "🏗️ IDF Core (dev)"
|
|
||||||
needs: code_scan
|
|
||||||
if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@main
|
|
||||||
- name: Build IDF Core - dev
|
|
||||||
uses: esphome/build-action@main
|
|
||||||
with:
|
|
||||||
yaml-file: ".test/esphome_idf_core.yaml"
|
|
||||||
version: dev
|
|
||||||
|
|
||||||
build_idf_basic:
|
build_idf_basic:
|
||||||
name: "📦 IDF Basic (latest)"
|
name: "📦 IDF Basic (latest)"
|
||||||
needs: build_idf_core
|
needs: build_idf_core
|
||||||
@@ -203,8 +178,8 @@ jobs:
|
|||||||
|
|
||||||
build_idf_basic_dev:
|
build_idf_basic_dev:
|
||||||
name: "📦 IDF Basic (dev)"
|
name: "📦 IDF Basic (dev)"
|
||||||
needs: build_idf_core_dev
|
needs: build_idf_core
|
||||||
if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
|
if: success() && !github.event.inputs.skip_dev
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@main
|
- uses: actions/checkout@main
|
||||||
@@ -265,7 +240,7 @@ jobs:
|
|||||||
build_idf_ble_proxy_dev:
|
build_idf_ble_proxy_dev:
|
||||||
name: "⚡ IDF BLE Proxy (dev)"
|
name: "⚡ IDF BLE Proxy (dev)"
|
||||||
needs: build_idf_basic_dev
|
needs: build_idf_basic_dev
|
||||||
if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
|
if: success() && !github.event.inputs.skip_dev
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@main
|
- uses: actions/checkout@main
|
||||||
@@ -280,7 +255,6 @@ jobs:
|
|||||||
name: "📊 Arduino Framework"
|
name: "📊 Arduino Framework"
|
||||||
needs:
|
needs:
|
||||||
- build_ard_core
|
- build_ard_core
|
||||||
- build_ard_core_dev
|
|
||||||
- build_ard_basic
|
- build_ard_basic
|
||||||
- build_ard_basic_dev
|
- build_ard_basic_dev
|
||||||
- build_ard_hw_relays
|
- build_ard_hw_relays
|
||||||
@@ -307,10 +281,9 @@ jobs:
|
|||||||
|
|
||||||
# Count dev builds (if not skipped)
|
# Count dev builds (if not skipped)
|
||||||
if [ "${{ github.event.inputs.skip_dev }}" != "true" ]; then
|
if [ "${{ github.event.inputs.skip_dev }}" != "true" ]; then
|
||||||
[ "${{ needs.build_ard_core_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
|
||||||
[ "${{ needs.build_ard_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
[ "${{ needs.build_ard_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
||||||
[ "${{ needs.build_ard_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
[ "${{ needs.build_ard_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
||||||
TOTAL=$((TOTAL + 3))
|
TOTAL=$((TOTAL + 2))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "🤖 Arduino Framework: $SUCCESS/$TOTAL builds passed"
|
echo "🤖 Arduino Framework: $SUCCESS/$TOTAL builds passed"
|
||||||
@@ -326,7 +299,6 @@ jobs:
|
|||||||
name: "📊 ESP-IDF Framework"
|
name: "📊 ESP-IDF Framework"
|
||||||
needs:
|
needs:
|
||||||
- build_idf_core
|
- build_idf_core
|
||||||
- build_idf_core_dev
|
|
||||||
- build_idf_basic
|
- build_idf_basic
|
||||||
- build_idf_basic_dev
|
- build_idf_basic_dev
|
||||||
- build_idf_hw_relays
|
- build_idf_hw_relays
|
||||||
@@ -353,10 +325,9 @@ jobs:
|
|||||||
|
|
||||||
# Count dev builds (if not skipped)
|
# Count dev builds (if not skipped)
|
||||||
if [ "${{ github.event.inputs.skip_dev }}" != "true" ]; then
|
if [ "${{ github.event.inputs.skip_dev }}" != "true" ]; then
|
||||||
[ "${{ needs.build_idf_core_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
|
||||||
[ "${{ needs.build_idf_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
[ "${{ needs.build_idf_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
||||||
[ "${{ needs.build_idf_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
[ "${{ needs.build_idf_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
||||||
TOTAL=$((TOTAL + 3))
|
TOTAL=$((TOTAL + 2))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "🔧 ESP-IDF Framework: $SUCCESS/$TOTAL builds passed"
|
echo "🔧 ESP-IDF Framework: $SUCCESS/$TOTAL builds passed"
|
||||||
@@ -419,27 +390,23 @@ jobs:
|
|||||||
summary_dev:
|
summary_dev:
|
||||||
name: "📊 ESPHome (Dev)"
|
name: "📊 ESPHome (Dev)"
|
||||||
needs:
|
needs:
|
||||||
- build_ard_core_dev
|
|
||||||
- build_ard_basic_dev
|
- build_ard_basic_dev
|
||||||
- build_ard_ble_proxy_dev
|
- build_ard_ble_proxy_dev
|
||||||
- build_idf_core_dev
|
|
||||||
- build_idf_basic_dev
|
- build_idf_basic_dev
|
||||||
- build_idf_ble_proxy_dev
|
- build_idf_ble_proxy_dev
|
||||||
if: ${{ always() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
|
if: always() && !github.event.inputs.skip_dev
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Dev ESPHome Results
|
- name: Dev ESPHome Results
|
||||||
run: |
|
run: |
|
||||||
SUCCESS=0
|
SUCCESS=0
|
||||||
TOTAL=6
|
TOTAL=4
|
||||||
|
|
||||||
# Arduino Dev builds
|
# Arduino Dev builds
|
||||||
[ "${{ needs.build_ard_core_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
|
||||||
[ "${{ needs.build_ard_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
[ "${{ needs.build_ard_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
||||||
[ "${{ needs.build_ard_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
[ "${{ needs.build_ard_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
||||||
|
|
||||||
# ESP-IDF Dev builds
|
# ESP-IDF Dev builds
|
||||||
[ "${{ needs.build_idf_core_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
|
||||||
[ "${{ needs.build_idf_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
[ "${{ needs.build_idf_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
||||||
[ "${{ needs.build_idf_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
[ "${{ needs.build_idf_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ substitutions:
|
|||||||
TX_MODEL_3_GANG_TEXT: "3 Gang"
|
TX_MODEL_3_GANG_TEXT: "3 Gang"
|
||||||
TX_MODEL_4_GANG_TEXT: "4 Gang"
|
TX_MODEL_4_GANG_TEXT: "4 Gang"
|
||||||
|
|
||||||
DUMP_CONFIG_CALLER_DELAY: 5s # Delay to dump config after requested
|
DUMP_CONFIG_CALLER_DELAY: 10s # Delay to dump config after requested
|
||||||
|
|
||||||
TAG_CORE_COMMON: core.common
|
TAG_CORE_COMMON: core.common
|
||||||
|
|
||||||
@@ -48,18 +48,11 @@ binary_sensor:
|
|||||||
device_class: problem
|
device_class: problem
|
||||||
on_state:
|
on_state:
|
||||||
then:
|
then:
|
||||||
- script.execute: dump_config_caller
|
- lambda: |-
|
||||||
|
if (x)
|
||||||
- id: bs_boot_completed
|
ESP_LOGW("${TAG_CORE_COMMON}", "Pending restart: YES");
|
||||||
name: Boot Completed
|
else
|
||||||
internal: false
|
ESP_LOGD("${TAG_CORE_COMMON}", "Pending restart: No");
|
||||||
disabled_by_default: false
|
|
||||||
platform: template
|
|
||||||
entity_category: diagnostic
|
|
||||||
device_class: connectivity
|
|
||||||
icon: mdi:rocket-launch
|
|
||||||
on_state:
|
|
||||||
then:
|
|
||||||
- script.execute: dump_config_caller
|
- script.execute: dump_config_caller
|
||||||
|
|
||||||
button:
|
button:
|
||||||
@@ -78,7 +71,6 @@ esphome:
|
|||||||
name: ${name}
|
name: ${name}
|
||||||
friendly_name: ${friendly_name}
|
friendly_name: ${friendly_name}
|
||||||
comment: TX Ultimate Easy
|
comment: TX Ultimate Easy
|
||||||
min_version: 2025.8.0
|
|
||||||
project:
|
project:
|
||||||
name: "edwardtfn.tx_ultimate_easy"
|
name: "edwardtfn.tx_ultimate_easy"
|
||||||
version: ${version}
|
version: ${version}
|
||||||
@@ -87,12 +79,6 @@ esphome:
|
|||||||
- -D TX_ULTIMATE_EASY_CORE_COMMON
|
- -D TX_ULTIMATE_EASY_CORE_COMMON
|
||||||
|
|
||||||
on_boot:
|
on_boot:
|
||||||
- priority: 1000 # Very early in boot process
|
|
||||||
then:
|
|
||||||
- binary_sensor.template.publish:
|
|
||||||
id: bs_boot_completed
|
|
||||||
state: OFF # yamllint disable-line rule:truthy
|
|
||||||
|
|
||||||
- priority: 750
|
- priority: 750
|
||||||
then:
|
then:
|
||||||
- script.execute: restore_from_nvs
|
- script.execute: restore_from_nvs
|
||||||
@@ -119,16 +105,16 @@ external_components:
|
|||||||
- tx_ultimate_easy
|
- tx_ultimate_easy
|
||||||
|
|
||||||
globals:
|
globals:
|
||||||
- id: gang_count
|
|
||||||
type: uint8_t
|
|
||||||
restore_value: true
|
|
||||||
initial_value: '0'
|
|
||||||
|
|
||||||
- id: is_us_model
|
- id: is_us_model
|
||||||
type: bool
|
type: bool
|
||||||
restore_value: true
|
restore_value: true
|
||||||
initial_value: 'false'
|
initial_value: 'false'
|
||||||
|
|
||||||
|
- id: gang_count
|
||||||
|
type: uint8_t
|
||||||
|
restore_value: true
|
||||||
|
initial_value: '0'
|
||||||
|
|
||||||
logger:
|
logger:
|
||||||
level: DEBUG
|
level: DEBUG
|
||||||
|
|
||||||
@@ -156,16 +142,9 @@ script:
|
|||||||
- id: boot_done
|
- id: boot_done
|
||||||
mode: restart
|
mode: restart
|
||||||
then:
|
then:
|
||||||
- script.wait: restore_from_nvs
|
|
||||||
- script.wait: boot_initialize
|
|
||||||
- script.wait: boot_sequence
|
|
||||||
- script.execute:
|
- script.execute:
|
||||||
id: api_send_ha_event_boot
|
id: api_send_ha_event_boot
|
||||||
type: done
|
type: done
|
||||||
- script.wait: api_send_ha_event_boot
|
|
||||||
- binary_sensor.template.publish:
|
|
||||||
id: bs_boot_completed
|
|
||||||
state: ON # yamllint disable-line rule:truthy
|
|
||||||
|
|
||||||
- id: boot_initialize
|
- id: boot_initialize
|
||||||
mode: restart
|
mode: restart
|
||||||
@@ -228,12 +207,6 @@ script:
|
|||||||
ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Gangs (detected): %" PRIu8 "-Gang%s",
|
ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Gangs (detected): %" PRIu8 "-Gang%s",
|
||||||
id(gang_count), id(gang_count) > 1 ? "s" : "");
|
id(gang_count), id(gang_count) > 1 ? "s" : "");
|
||||||
|
|
||||||
// Boot completion status
|
|
||||||
if (bs_boot_completed->state)
|
|
||||||
ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Boot completed: Yes");
|
|
||||||
else
|
|
||||||
ESP_LOGW("${TAG_CORE_COMMON}", "Boot completed: NO");
|
|
||||||
|
|
||||||
// System state
|
// System state
|
||||||
if (bs_pending_restart->state)
|
if (bs_pending_restart->state)
|
||||||
ESP_LOGW("${TAG_CORE_COMMON}", "Pending restart: YES");
|
ESP_LOGW("${TAG_CORE_COMMON}", "Pending restart: YES");
|
||||||
@@ -283,9 +256,7 @@ script:
|
|||||||
index: !lambda if (id(is_us_model)) return 1; else return 0;
|
index: !lambda if (id(is_us_model)) return 1; else return 0;
|
||||||
- select.set_index:
|
- select.set_index:
|
||||||
id: sl_tx_model_gang
|
id: sl_tx_model_gang
|
||||||
index: !lambda |-
|
index: !lambda return (id(gang_count)-1);
|
||||||
if (id(gang_count) < 1 || id(gang_count) > 4) return 0; // default to 1-Gang
|
|
||||||
return static_cast<uint8_t>(id(gang_count)) - 1;
|
|
||||||
|
|
||||||
select:
|
select:
|
||||||
- id: sl_tx_model_format
|
- id: sl_tx_model_format
|
||||||
|
|||||||
@@ -25,11 +25,11 @@ substitutions:
|
|||||||
LIGHT_TRANSITION_TURN_OFF: '0' # Transition time in msec
|
LIGHT_TRANSITION_TURN_OFF: '0' # Transition time in msec
|
||||||
LIGHT_BRIGHTNESS_TURN_ON: '0' # Brightness (1 to 100%, 0 to not set it)
|
LIGHT_BRIGHTNESS_TURN_ON: '0' # Brightness (1 to 100%, 0 to not set it)
|
||||||
|
|
||||||
LIGHT_FULL_RESTORE_MODE: ALWAYS_OFF
|
LIGHT_FULL_RESTORE_MODE: RESTORE_DEFAULT_OFF
|
||||||
LIGHT_SIDES_RESTORE_MODE: ALWAYS_OFF
|
LIGHT_SIDES_RESTORE_MODE: RESTORE_DEFAULT_OFF
|
||||||
LIGHT_INDIVIDUAL_RESTORE_MODE: ALWAYS_OFF
|
LIGHT_INDIVIDUAL_RESTORE_MODE: RESTORE_DEFAULT_OFF
|
||||||
|
|
||||||
LIGHT_ATTRS_DEFAULT: '0x64FFFFFF' # brightness=100, RGB=255,255,255
|
LIGHT_ATTRS_DEFAULT: '0x64FFFFFF' # brightness=100, RGB=255,255,255
|
||||||
LIGHT_DUAL_ATTRS_DEFAULT: '0x64FFFFFF64FFFFFF' # Both lights: brightness=100, RGB=255,255,255
|
LIGHT_DUAL_ATTRS_DEFAULT: '0x64FFFFFF64FFFFFF' # Both lights: brightness=100, RGB=255,255,255
|
||||||
|
|
||||||
TAG_CORE_HW_LEDS: core.hw.leds
|
TAG_CORE_HW_LEDS: core.hw.leds
|
||||||
@@ -39,41 +39,6 @@ esphome:
|
|||||||
build_flags:
|
build_flags:
|
||||||
- -D TX_ULTIMATE_EASY_CORE_HW_LEDS
|
- -D TX_ULTIMATE_EASY_CORE_HW_LEDS
|
||||||
|
|
||||||
globals:
|
|
||||||
# light_full with effect support
|
|
||||||
- id: led_full_attrs
|
|
||||||
type: uint32_t
|
|
||||||
restore_value: true
|
|
||||||
initial_value: '${LIGHT_ATTRS_DEFAULT}'
|
|
||||||
# Basic attributes: brightness + RGB
|
|
||||||
|
|
||||||
# For light_full effects
|
|
||||||
- id: led_full_effect_packed
|
|
||||||
type: uint32_t
|
|
||||||
restore_value: true
|
|
||||||
initial_value: '0x00000000'
|
|
||||||
# Stores: effect_index(16 bits) + effect_speed(8 bits) + reserved(8 bits)
|
|
||||||
# 0 = no effect/solid color, 1-10 = effect indices
|
|
||||||
|
|
||||||
- id: led_main_packed_attrs
|
|
||||||
type: uint64_t
|
|
||||||
restore_value: true
|
|
||||||
initial_value: '${LIGHT_DUAL_ATTRS_DEFAULT}'
|
|
||||||
# light_eu(group1) + light_us(group2) - the main effect lights
|
|
||||||
|
|
||||||
- id: led_main_packed_effect
|
|
||||||
type: uint32_t
|
|
||||||
restore_value: true
|
|
||||||
initial_value: '0x00000000'
|
|
||||||
# Shared between light_eu and light_us
|
|
||||||
|
|
||||||
# Main user-facing LED lights only
|
|
||||||
- id: led_sides_packed_attrs
|
|
||||||
type: uint64_t
|
|
||||||
restore_value: true
|
|
||||||
initial_value: '${LIGHT_DUAL_ATTRS_DEFAULT}'
|
|
||||||
# EU: bottom(group1) + top(group2) OR US: left(group1) + right(group2)
|
|
||||||
|
|
||||||
light:
|
light:
|
||||||
# These lights are controlling the LEDs on the device
|
# These lights are controlling the LEDs on the device
|
||||||
- id: light_full
|
- id: light_full
|
||||||
@@ -143,17 +108,6 @@ light:
|
|||||||
- id: light_full
|
- id: light_full
|
||||||
from: 0
|
from: 0
|
||||||
to: 27
|
to: 27
|
||||||
on_state:
|
|
||||||
then:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_eu);
|
|
||||||
attr_global_ptr: !lambda return &id(led_main_packed_attrs);
|
|
||||||
group_index: 1
|
|
||||||
- script.execute:
|
|
||||||
id: light_effect_save
|
|
||||||
light_ptr: !lambda return id(light_eu);
|
|
||||||
effect_global_ptr: !lambda return &id(led_main_packed_effect);
|
|
||||||
|
|
||||||
- &light_partition_with_effects_us
|
- &light_partition_with_effects_us
|
||||||
id: light_us
|
id: light_us
|
||||||
@@ -206,17 +160,6 @@ light:
|
|||||||
- id: light_full
|
- id: light_full
|
||||||
from: 0
|
from: 0
|
||||||
to: 31
|
to: 31
|
||||||
on_state:
|
|
||||||
then:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_us);
|
|
||||||
attr_global_ptr: !lambda return &id(led_main_packed_attrs);
|
|
||||||
group_index: 2
|
|
||||||
- script.execute:
|
|
||||||
id: light_effect_save
|
|
||||||
light_ptr: !lambda return id(light_us);
|
|
||||||
effect_global_ptr: !lambda return &id(led_main_packed_effect);
|
|
||||||
|
|
||||||
- &light_partition_no_effects_disabled
|
- &light_partition_no_effects_disabled
|
||||||
id: light_eu_bottom
|
id: light_eu_bottom
|
||||||
@@ -231,13 +174,6 @@ light:
|
|||||||
from: 6
|
from: 6
|
||||||
to: 12
|
to: 12
|
||||||
reversed: true
|
reversed: true
|
||||||
on_state:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_eu_bottom);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 1
|
|
||||||
|
|
||||||
- id: light_eu_left
|
- id: light_eu_left
|
||||||
name: Light - Left EU
|
name: Light - Left EU
|
||||||
<<: *light_partition_no_effects_disabled
|
<<: *light_partition_no_effects_disabled
|
||||||
@@ -246,12 +182,6 @@ light:
|
|||||||
from: 13
|
from: 13
|
||||||
to: 19
|
to: 19
|
||||||
reversed: true
|
reversed: true
|
||||||
on_state:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_eu_left);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 1
|
|
||||||
- id: light_eu_right
|
- id: light_eu_right
|
||||||
name: Light - Right EU
|
name: Light - Right EU
|
||||||
<<: *light_partition_no_effects_disabled
|
<<: *light_partition_no_effects_disabled
|
||||||
@@ -264,12 +194,6 @@ light:
|
|||||||
from: 0
|
from: 0
|
||||||
to: 5
|
to: 5
|
||||||
reversed: false
|
reversed: false
|
||||||
on_state:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_eu_right);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 2
|
|
||||||
- id: light_eu_top
|
- id: light_eu_top
|
||||||
name: Light - Top EU
|
name: Light - Top EU
|
||||||
<<: *light_partition_no_effects_disabled
|
<<: *light_partition_no_effects_disabled
|
||||||
@@ -278,12 +202,6 @@ light:
|
|||||||
from: 20
|
from: 20
|
||||||
to: 26
|
to: 26
|
||||||
reversed: false
|
reversed: false
|
||||||
on_state:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_eu_top);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 2
|
|
||||||
- id: light_us_bottom
|
- id: light_us_bottom
|
||||||
name: Light - Bottom US
|
name: Light - Bottom US
|
||||||
<<: *light_partition_no_effects_disabled
|
<<: *light_partition_no_effects_disabled
|
||||||
@@ -292,12 +210,6 @@ light:
|
|||||||
from: 9
|
from: 9
|
||||||
to: 14
|
to: 14
|
||||||
reversed: true
|
reversed: true
|
||||||
on_state:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_us_bottom);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 1
|
|
||||||
- id: light_us_left
|
- id: light_us_left
|
||||||
name: Light - Left US
|
name: Light - Left US
|
||||||
<<: *light_partition_no_effects_disabled
|
<<: *light_partition_no_effects_disabled
|
||||||
@@ -306,12 +218,6 @@ light:
|
|||||||
from: 15
|
from: 15
|
||||||
to: 24
|
to: 24
|
||||||
reversed: true
|
reversed: true
|
||||||
on_state:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_us_left);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 1
|
|
||||||
- id: light_us_right
|
- id: light_us_right
|
||||||
name: Light - Right US
|
name: Light - Right US
|
||||||
<<: *light_partition_no_effects_disabled
|
<<: *light_partition_no_effects_disabled
|
||||||
@@ -324,12 +230,6 @@ light:
|
|||||||
from: 0
|
from: 0
|
||||||
to: 8
|
to: 8
|
||||||
reversed: false
|
reversed: false
|
||||||
on_state:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_us_right);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 2
|
|
||||||
- id: light_us_top
|
- id: light_us_top
|
||||||
name: Light - Top US
|
name: Light - Top US
|
||||||
<<: *light_partition_no_effects_disabled
|
<<: *light_partition_no_effects_disabled
|
||||||
@@ -338,12 +238,6 @@ light:
|
|||||||
from: 25
|
from: 25
|
||||||
to: 30
|
to: 30
|
||||||
reversed: false
|
reversed: false
|
||||||
on_state:
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_save_dual
|
|
||||||
light_ptr: !lambda return id(light_us_top);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 2
|
|
||||||
|
|
||||||
- &light_partition_individual_led
|
- &light_partition_individual_led
|
||||||
id: light_00
|
id: light_00
|
||||||
@@ -600,6 +494,27 @@ script:
|
|||||||
- id: !extend dump_config
|
- id: !extend dump_config
|
||||||
then:
|
then:
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
|
std::string gang_count_plural_suffix = id(gang_count) > 1 ? "s" : "";
|
||||||
|
// Relay's LEDs modes
|
||||||
|
ESP_LOGCONFIG("${TAG_CORE_HW_LEDS}", "Relay%s LEDs mode%s:",
|
||||||
|
gang_count_plural_suffix.c_str(),
|
||||||
|
gang_count_plural_suffix.c_str());
|
||||||
|
ESP_LOGCONFIG("${TAG_CORE_HW_LEDS}", " Relay 1: %s", id(is_us_model) ?
|
||||||
|
sl_relay_1_light_mode_us->state.c_str() :
|
||||||
|
sl_relay_1_light_mode_eu->state.c_str());
|
||||||
|
if (id(gang_count) >= 2)
|
||||||
|
ESP_LOGCONFIG("${TAG_CORE_HW_LEDS}", " Relay 2: %s", id(is_us_model) ?
|
||||||
|
sl_relay_2_light_mode_us->state.c_str() :
|
||||||
|
sl_relay_2_light_mode_eu->state.c_str());
|
||||||
|
if (id(gang_count) >= 3)
|
||||||
|
ESP_LOGCONFIG("${TAG_CORE_HW_LEDS}", " Relay 3: %s", id(is_us_model) ?
|
||||||
|
sl_relay_3_light_mode_us->state.c_str() :
|
||||||
|
sl_relay_3_light_mode_eu->state.c_str());
|
||||||
|
if (id(gang_count) >= 4)
|
||||||
|
ESP_LOGCONFIG("${TAG_CORE_HW_LEDS}", " Relay 4: %s", id(is_us_model) ?
|
||||||
|
sl_relay_4_light_mode_us->state.c_str() :
|
||||||
|
sl_relay_4_light_mode_eu->state.c_str());
|
||||||
|
|
||||||
// Transition times
|
// Transition times
|
||||||
ESP_LOGCONFIG("${TAG_CORE_HW_LEDS}", "Transition times:");
|
ESP_LOGCONFIG("${TAG_CORE_HW_LEDS}", "Transition times:");
|
||||||
ESP_LOGCONFIG("${TAG_CORE_HW_LEDS}", " Default: ${default_transition_length}");
|
ESP_LOGCONFIG("${TAG_CORE_HW_LEDS}", " Default: ${default_transition_length}");
|
||||||
@@ -637,14 +552,6 @@ script:
|
|||||||
attr_global_ptr: uint32_t*
|
attr_global_ptr: uint32_t*
|
||||||
then:
|
then:
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
if (!light_ptr) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid light pointer");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!attr_global_ptr) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid attributes pointer");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
tx_ultimate_easy::LightAttributes attrs = tx_ultimate_easy::unpack_light_attributes(*attr_global_ptr);
|
tx_ultimate_easy::LightAttributes attrs = tx_ultimate_easy::unpack_light_attributes(*attr_global_ptr);
|
||||||
auto call = light_ptr->make_call();
|
auto call = light_ptr->make_call();
|
||||||
call.set_brightness(attrs.brightness / 100.0f);
|
call.set_brightness(attrs.brightness / 100.0f);
|
||||||
@@ -661,18 +568,6 @@ script:
|
|||||||
group_index: uint8_t # 1 or 2
|
group_index: uint8_t # 1 or 2
|
||||||
then:
|
then:
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
if (!light_ptr) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid light pointer");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!attr_global_ptr) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid attributes pointer");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (group_index != 1 && group_index != 2) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid group_index=%d (expected 1 or 2)", group_index);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto attrs_pair = tx_ultimate_easy::unpack_dual_light_attributes(*attr_global_ptr);
|
auto attrs_pair = tx_ultimate_easy::unpack_dual_light_attributes(*attr_global_ptr);
|
||||||
tx_ultimate_easy::LightAttributes attrs = (group_index == 1) ? attrs_pair.first : attrs_pair.second;
|
tx_ultimate_easy::LightAttributes attrs = (group_index == 1) ? attrs_pair.first : attrs_pair.second;
|
||||||
|
|
||||||
@@ -680,8 +575,6 @@ script:
|
|||||||
call.set_brightness(attrs.brightness / 100.0f);
|
call.set_brightness(attrs.brightness / 100.0f);
|
||||||
call.set_rgb(attrs.red / 255.0f, attrs.green / 255.0f, attrs.blue / 255.0f);
|
call.set_rgb(attrs.red / 255.0f, attrs.green / 255.0f, attrs.blue / 255.0f);
|
||||||
call.perform();
|
call.perform();
|
||||||
ESP_LOGI("${TAG_CORE_HW_LEDS}", "Restored (group=%d) attributes: brightness=%d%%, RGB=(%d,%d,%d)",
|
|
||||||
group_index, attrs.brightness, attrs.red, attrs.green, attrs.blue);
|
|
||||||
|
|
||||||
- id: light_attributes_save
|
- id: light_attributes_save
|
||||||
mode: parallel
|
mode: parallel
|
||||||
@@ -690,14 +583,6 @@ script:
|
|||||||
attr_global_ptr: uint32_t*
|
attr_global_ptr: uint32_t*
|
||||||
then:
|
then:
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
if (!light_ptr) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid light pointer");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!attr_global_ptr) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid attributes pointer");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto current = light_ptr->current_values;
|
auto current = light_ptr->current_values;
|
||||||
tx_ultimate_easy::LightAttributes attrs = {
|
tx_ultimate_easy::LightAttributes attrs = {
|
||||||
.brightness = uint8_t(current.get_brightness() * 100.0f),
|
.brightness = uint8_t(current.get_brightness() * 100.0f),
|
||||||
@@ -711,25 +596,13 @@ script:
|
|||||||
attrs.brightness, attrs.red, attrs.green, attrs.blue);
|
attrs.brightness, attrs.red, attrs.green, attrs.blue);
|
||||||
|
|
||||||
- id: light_attributes_save_dual
|
- id: light_attributes_save_dual
|
||||||
mode: queued # To prevent two instances trying to change the same global
|
mode: parallel
|
||||||
parameters:
|
parameters:
|
||||||
light_ptr: light::LightState*
|
light_ptr: light::LightState*
|
||||||
attr_global_ptr: uint64_t*
|
attr_global_ptr: uint64_t*
|
||||||
group_index: uint8_t # 1 or 2 (which group within the dual pack)
|
group_index: uint8_t # 1 or 2 (which group within the dual pack)
|
||||||
then:
|
then:
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
if (!light_ptr) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid light pointer");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!attr_global_ptr) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid attributes pointer");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (group_index != 1 && group_index != 2) {
|
|
||||||
ESP_LOGE("${TAG_CORE_HW_LEDS}", "Invalid group_index=%d (expected 1 or 2)", group_index);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto current = light_ptr->current_values;
|
auto current = light_ptr->current_values;
|
||||||
tx_ultimate_easy::LightAttributes new_attrs = {
|
tx_ultimate_easy::LightAttributes new_attrs = {
|
||||||
.brightness = uint8_t(current.get_brightness() * 100.0f),
|
.brightness = uint8_t(current.get_brightness() * 100.0f),
|
||||||
@@ -748,98 +621,58 @@ script:
|
|||||||
*attr_global_ptr = tx_ultimate_easy::pack_dual_light_attributes(existing.first, new_attrs);
|
*attr_global_ptr = tx_ultimate_easy::pack_dual_light_attributes(existing.first, new_attrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
- id: light_effect_save
|
select:
|
||||||
mode: queued
|
# EU relay light mode template
|
||||||
parameters:
|
- &relay_light_mode_eu
|
||||||
light_ptr: light::LightState*
|
id: sl_relay_1_light_mode_eu
|
||||||
effect_global_ptr: uint32_t*
|
name: Relay 1 light mode EU
|
||||||
then:
|
platform: template
|
||||||
- lambda: |-
|
options:
|
||||||
if (!light_ptr || !effect_global_ptr) return;
|
- "${LIGHT_MODE_DISABLED_TEXT}"
|
||||||
|
- "${LIGHT_MODE_BOTTOM_TEXT}"
|
||||||
|
- "${LIGHT_MODE_TOP_TEXT}"
|
||||||
|
- "${LIGHT_MODE_BOTH_TEXT}"
|
||||||
|
initial_option: "${LIGHT_MODE_BOTTOM_TEXT}"
|
||||||
|
optimistic: true
|
||||||
|
restore_value: true
|
||||||
|
internal: true
|
||||||
|
entity_category: config
|
||||||
|
disabled_by_default: false
|
||||||
|
icon: mdi:dots-square
|
||||||
|
- id: sl_relay_2_light_mode_eu
|
||||||
|
name: Relay 2 light mode EU
|
||||||
|
<<: *relay_light_mode_eu
|
||||||
|
- id: sl_relay_3_light_mode_eu
|
||||||
|
name: Relay 3 light mode EU
|
||||||
|
<<: *relay_light_mode_eu
|
||||||
|
- id: sl_relay_4_light_mode_eu
|
||||||
|
name: Relay 4 light mode EU
|
||||||
|
<<: *relay_light_mode_eu
|
||||||
|
|
||||||
uint32_t effect_index = light_ptr->get_current_effect_index();
|
# US relay light mode template
|
||||||
// Store effect index (16 bits) + reserved space for future use
|
- &relay_light_mode_us
|
||||||
*effect_global_ptr = effect_index & 0xFFFF;
|
id: sl_relay_1_light_mode_us
|
||||||
|
name: Relay 1 light mode US
|
||||||
ESP_LOGD("${TAG_CORE_HW_LEDS}", "Saved effect index: %d", effect_index);
|
platform: template
|
||||||
|
options:
|
||||||
- id: light_effect_restore
|
- "${LIGHT_MODE_DISABLED_TEXT}"
|
||||||
mode: parallel
|
- "${LIGHT_MODE_LEFT_TEXT}"
|
||||||
parameters:
|
- "${LIGHT_MODE_RIGHT_TEXT}"
|
||||||
light_ptr: light::LightState*
|
- "${LIGHT_MODE_BOTH_TEXT}"
|
||||||
effect_global_ptr: uint32_t*
|
initial_option: "${LIGHT_MODE_RIGHT_TEXT}"
|
||||||
then:
|
optimistic: true
|
||||||
- lambda: |-
|
restore_value: true
|
||||||
if (!light_ptr || !effect_global_ptr) return;
|
internal: true
|
||||||
|
entity_category: config
|
||||||
uint32_t effect_index = *effect_global_ptr & 0xFFFF;
|
disabled_by_default: false
|
||||||
|
icon: mdi:dots-square
|
||||||
if (effect_index == 0) return; // No effect
|
- id: sl_relay_2_light_mode_us
|
||||||
if (effect_index > light_ptr->get_effect_count()) {
|
name: Relay 2 light mode US
|
||||||
ESP_LOGW("${TAG_CORE_HW_LEDS}", "Invalid effect index: %d (max: %d)",
|
<<: *relay_light_mode_us
|
||||||
effect_index, light_ptr->get_effect_count());
|
- id: sl_relay_3_light_mode_us
|
||||||
return;
|
name: Relay 3 light mode US
|
||||||
}
|
<<: *relay_light_mode_us
|
||||||
|
- id: sl_relay_4_light_mode_us
|
||||||
auto call = light_ptr->make_call();
|
name: Relay 4 light mode US
|
||||||
call.set_effect(effect_index);
|
<<: *relay_light_mode_us
|
||||||
call.perform();
|
|
||||||
|
|
||||||
ESP_LOGI("${TAG_CORE_HW_LEDS}", "Restored effect: %s (index=%d)",
|
|
||||||
light_ptr->get_effect_name_by_index(effect_index).c_str(), effect_index);
|
|
||||||
|
|
||||||
- id: !extend restore_from_nvs
|
|
||||||
then:
|
|
||||||
# LED restoration
|
|
||||||
- if:
|
|
||||||
condition:
|
|
||||||
lambda: return id(is_us_model);
|
|
||||||
then:
|
|
||||||
# US model restoration
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_restore_dual
|
|
||||||
light_ptr: !lambda return id(light_us);
|
|
||||||
attr_global_ptr: !lambda return &id(led_main_packed_attrs);
|
|
||||||
group_index: 2
|
|
||||||
- script.execute:
|
|
||||||
id: light_effect_restore
|
|
||||||
light_ptr: !lambda return id(light_us);
|
|
||||||
effect_global_ptr: !lambda return &id(led_main_packed_effect);
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_restore_dual
|
|
||||||
light_ptr: !lambda return id(light_us_left);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 1
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_restore_dual
|
|
||||||
light_ptr: !lambda return id(light_us_right);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 2
|
|
||||||
else:
|
|
||||||
# EU model restoration
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_restore_dual
|
|
||||||
light_ptr: !lambda return id(light_eu);
|
|
||||||
attr_global_ptr: !lambda return &id(led_main_packed_attrs);
|
|
||||||
group_index: 1
|
|
||||||
- script.execute:
|
|
||||||
id: light_effect_restore
|
|
||||||
light_ptr: !lambda return id(light_eu);
|
|
||||||
effect_global_ptr: !lambda return &id(led_main_packed_effect);
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_restore_dual
|
|
||||||
light_ptr: !lambda return id(light_eu_bottom);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 1
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_restore_dual
|
|
||||||
light_ptr: !lambda return id(light_eu_top);
|
|
||||||
attr_global_ptr: !lambda return &id(led_sides_packed_attrs);
|
|
||||||
group_index: 2
|
|
||||||
|
|
||||||
# Light full restoration
|
|
||||||
- script.execute:
|
|
||||||
id: light_attributes_restore
|
|
||||||
light_ptr: !lambda return id(light_full);
|
|
||||||
attr_global_ptr: !lambda return &id(led_full_attrs);
|
|
||||||
...
|
...
|
||||||
|
|||||||
@@ -16,12 +16,7 @@ substitutions:
|
|||||||
RELAY_MODE_TEXT_LIGHT: "Light"
|
RELAY_MODE_TEXT_LIGHT: "Light"
|
||||||
RELAY_MODE_TEXT_NOT_USED: "Not in use"
|
RELAY_MODE_TEXT_NOT_USED: "Not in use"
|
||||||
|
|
||||||
# You shouldn't change the restore mode as there is a custom restoring engine based on globals.
|
LIGHT_RELAYS_RESTORE_MODE: ALWAYS_OFF
|
||||||
# The reason of a custom engine is to address an issue where NVS space was exceeded causing saving/restoring issues
|
|
||||||
RELAYS_LIGHT_RESTORE_MODE: ALWAYS_OFF
|
|
||||||
RELAYS_LIGHT_PARTITION_RESTORE_MODE: ALWAYS_OFF
|
|
||||||
RELAYS_EXPOSE_LEDS_TO_HA_RESTORE_MODE: ALWAYS_OFF
|
|
||||||
RELAYS_SWITCH_RESTORE_MODE: ALWAYS_OFF
|
|
||||||
|
|
||||||
TAG_STD_HW_RELAYS: std.hw.relays
|
TAG_STD_HW_RELAYS: std.hw.relays
|
||||||
|
|
||||||
@@ -31,30 +26,6 @@ esphome:
|
|||||||
- -D TX_ULTIMATE_EASY_STANDARD_HW_RELAYS
|
- -D TX_ULTIMATE_EASY_STANDARD_HW_RELAYS
|
||||||
|
|
||||||
globals:
|
globals:
|
||||||
- &global_attr_dual_light
|
|
||||||
id: attr_light_rl_1_1_both # 1-gang: relay 1, both groups
|
|
||||||
type: uint64_t
|
|
||||||
restore_value: true
|
|
||||||
initial_value: '${LIGHT_DUAL_ATTRS_DEFAULT}'
|
|
||||||
- id: attr_light_rl_1_2_both # 2-gang: relay 1, both groups
|
|
||||||
<<: *global_attr_dual_light
|
|
||||||
- id: attr_light_rl_2_2_both # 2-gang: relay 2, both groups
|
|
||||||
<<: *global_attr_dual_light
|
|
||||||
- id: attr_light_rl_1_3_both # 3-gang: relay 1, both groups
|
|
||||||
<<: *global_attr_dual_light
|
|
||||||
- id: attr_light_rl_2_3_both # 3-gang: relay 2, both groups
|
|
||||||
<<: *global_attr_dual_light
|
|
||||||
- id: attr_light_rl_3_3_both # 3-gang: relay 3, both groups
|
|
||||||
<<: *global_attr_dual_light
|
|
||||||
- id: attr_light_rl_1_4_both # 4-gang: relay 1, both groups
|
|
||||||
<<: *global_attr_dual_light
|
|
||||||
- id: attr_light_rl_2_4_both # 4-gang: relay 2, both groups
|
|
||||||
<<: *global_attr_dual_light
|
|
||||||
- id: attr_light_rl_3_4_both # 4-gang: relay 3, both groups
|
|
||||||
<<: *global_attr_dual_light
|
|
||||||
- id: attr_light_rl_4_4_both # 4-gang: relay 4, both groups
|
|
||||||
<<: *global_attr_dual_light
|
|
||||||
|
|
||||||
- id: boot_initialization_relays
|
- id: boot_initialization_relays
|
||||||
type: bool
|
type: bool
|
||||||
restore_value: false
|
restore_value: false
|
||||||
@@ -83,20 +54,12 @@ globals:
|
|||||||
type: std::vector<light::LightState*>
|
type: std::vector<light::LightState*>
|
||||||
restore_value: false
|
restore_value: false
|
||||||
|
|
||||||
# Packed relay light modes - stores current model's 4 light modes
|
|
||||||
- id: relay_light_modes_packed
|
|
||||||
type: uint16_t
|
|
||||||
restore_value: true
|
|
||||||
initial_value: '0x1111' # All 4 relays set to option 1 (bottom/left)
|
|
||||||
# Bit layout: [relay4(4)][relay3(4)][relay2(4)][relay1(4)]
|
|
||||||
# 16-bit value with 4 bits per relay: 0=Disabled, 1=Bottom/Left, 2=Top/Right, 3=Both, 4-15=Reserved
|
|
||||||
|
|
||||||
# Packed relay modes - replaces 4 separate selects
|
# Packed relay modes - replaces 4 separate selects
|
||||||
- id: relay_modes_packed
|
- id: relay_modes_packed
|
||||||
type: uint16_t
|
type: uint16_t
|
||||||
restore_value: true
|
restore_value: true
|
||||||
initial_value: '0' # Binary: 0000000000000000 = all relay modes set to option 0 (default action - switch)
|
initial_value: '0' # Binary: 0000000000000000 = all relay modes set to option 0 (default action - switch)
|
||||||
# Bit layout: [relay4(4)][relay3(4)][relay2(4)][relay1(4)]
|
# Bit layout: [unused][relay4(4)][relay3(4)][relay2(4)][relay1(4)]
|
||||||
# 16-bit value with 4 bits per relay: 0=Switch, 1=Light, 2=Not in use, 3-15=Reserved
|
# 16-bit value with 4 bits per relay: 0=Switch, 1=Light, 2=Not in use, 3-15=Reserved
|
||||||
|
|
||||||
# Packed switch states - replaces 5 separate switches
|
# Packed switch states - replaces 5 separate switches
|
||||||
@@ -104,7 +67,31 @@ globals:
|
|||||||
type: uint8_t
|
type: uint8_t
|
||||||
restore_value: true
|
restore_value: true
|
||||||
initial_value: '0' # All switches default to OFF
|
initial_value: '0' # All switches default to OFF
|
||||||
# Bit layout: [sw_relay4][sw_relay3][sw_relay2][sw_relay1][sw_expose_leds]
|
# Bit layout: [unused(3)][sw_relay4][sw_relay3][sw_relay2][sw_relay1][sw_expose_leds]
|
||||||
|
|
||||||
|
- &global_attr_dual_light
|
||||||
|
id: attr_light_rl_1_1_both # 1-gang: relay 1, both groups
|
||||||
|
type: uint64_t
|
||||||
|
restore_value: true
|
||||||
|
initial_value: '${LIGHT_DUAL_ATTRS_DEFAULT}'
|
||||||
|
- id: attr_light_rl_1_2_both # 2-gang: relay 1, both groups
|
||||||
|
<<: *global_attr_dual_light
|
||||||
|
- id: attr_light_rl_2_2_both # 2-gang: relay 2, both groups
|
||||||
|
<<: *global_attr_dual_light
|
||||||
|
- id: attr_light_rl_1_3_both # 3-gang: relay 1, both groups
|
||||||
|
<<: *global_attr_dual_light
|
||||||
|
- id: attr_light_rl_2_3_both # 3-gang: relay 2, both groups
|
||||||
|
<<: *global_attr_dual_light
|
||||||
|
- id: attr_light_rl_3_3_both # 3-gang: relay 3, both groups
|
||||||
|
<<: *global_attr_dual_light
|
||||||
|
- id: attr_light_rl_1_4_both # 4-gang: relay 1, both groups
|
||||||
|
<<: *global_attr_dual_light
|
||||||
|
- id: attr_light_rl_2_4_both # 4-gang: relay 2, both groups
|
||||||
|
<<: *global_attr_dual_light
|
||||||
|
- id: attr_light_rl_3_4_both # 4-gang: relay 3, both groups
|
||||||
|
<<: *global_attr_dual_light
|
||||||
|
- id: attr_light_rl_4_4_both # 4-gang: relay 4, both groups
|
||||||
|
<<: *global_attr_dual_light
|
||||||
|
|
||||||
light:
|
light:
|
||||||
# These lights are used for the physical relays to be shown as lights
|
# These lights are used for the physical relays to be shown as lights
|
||||||
@@ -113,7 +100,7 @@ light:
|
|||||||
output: output_relay_1
|
output: output_relay_1
|
||||||
platform: binary
|
platform: binary
|
||||||
internal: true
|
internal: true
|
||||||
restore_mode: ${RELAYS_LIGHT_RESTORE_MODE}
|
restore_mode: ${LIGHT_RELAYS_RESTORE_MODE}
|
||||||
on_turn_on:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
- if:
|
- if:
|
||||||
@@ -133,7 +120,6 @@ light:
|
|||||||
output: output_relay_2
|
output: output_relay_2
|
||||||
platform: binary
|
platform: binary
|
||||||
internal: true
|
internal: true
|
||||||
restore_mode: ${RELAYS_LIGHT_RESTORE_MODE}
|
|
||||||
on_turn_on:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
- if:
|
- if:
|
||||||
@@ -153,7 +139,6 @@ light:
|
|||||||
output: output_relay_3
|
output: output_relay_3
|
||||||
platform: binary
|
platform: binary
|
||||||
internal: true
|
internal: true
|
||||||
restore_mode: ${RELAYS_LIGHT_RESTORE_MODE}
|
|
||||||
on_turn_on:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
- if:
|
- if:
|
||||||
@@ -173,7 +158,6 @@ light:
|
|||||||
output: output_relay_4
|
output: output_relay_4
|
||||||
platform: binary
|
platform: binary
|
||||||
internal: true
|
internal: true
|
||||||
restore_mode: ${RELAYS_LIGHT_RESTORE_MODE}
|
|
||||||
on_turn_on:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
- if:
|
- if:
|
||||||
@@ -197,7 +181,7 @@ light:
|
|||||||
internal: true
|
internal: true
|
||||||
disabled_by_default: false
|
disabled_by_default: false
|
||||||
default_transition_length: ${default_transition_length}
|
default_transition_length: ${default_transition_length}
|
||||||
restore_mode: ${RELAYS_LIGHT_PARTITION_RESTORE_MODE}
|
restore_mode: ${LIGHT_RELAYS_RESTORE_MODE}
|
||||||
segments:
|
segments:
|
||||||
- id: light_full
|
- id: light_full
|
||||||
from: 9
|
from: 9
|
||||||
@@ -913,8 +897,8 @@ script:
|
|||||||
// Set indicator (either switch or light) visible on Home Assistant
|
// Set indicator (either switch or light) visible on Home Assistant
|
||||||
auto relay_mode_index = sl_relay_1_mode->active_index();
|
auto relay_mode_index = sl_relay_1_mode->active_index();
|
||||||
if (relay_mode_index.has_value()) {
|
if (relay_mode_index.has_value()) {
|
||||||
light_output_1->set_internal(relay_mode_index.value() != 1);
|
light_output_1->set_internal(false or relay_mode_index.value() != 1);
|
||||||
sw_relay_1->set_internal(relay_mode_index.value() != 0);
|
sw_relay_1->set_internal(false or relay_mode_index.value() != 0);
|
||||||
}
|
}
|
||||||
relay_mode_index = sl_relay_2_mode->active_index();
|
relay_mode_index = sl_relay_2_mode->active_index();
|
||||||
if (relay_mode_index.has_value()) {
|
if (relay_mode_index.has_value()) {
|
||||||
@@ -1044,25 +1028,6 @@ script:
|
|||||||
ESP_LOGCONFIG("${TAG_STD_HW_RELAYS}", " Relay modes: %s", YESNO(id(boot_initialization_relays_relay_modes)));
|
ESP_LOGCONFIG("${TAG_STD_HW_RELAYS}", " Relay modes: %s", YESNO(id(boot_initialization_relays_relay_modes)));
|
||||||
ESP_LOGCONFIG("${TAG_STD_HW_RELAYS}", " Status LEDs: %s", YESNO(id(boot_initialization_relays_relay_leds)));
|
ESP_LOGCONFIG("${TAG_STD_HW_RELAYS}", " Status LEDs: %s", YESNO(id(boot_initialization_relays_relay_leds)));
|
||||||
|
|
||||||
// Relay's LEDs modes
|
|
||||||
ESP_LOGCONFIG("${TAG_STD_HW_RELAYS}", "Relay%s LEDs mode%s:", gang_count_plural_suffix.c_str(),
|
|
||||||
gang_count_plural_suffix.c_str());
|
|
||||||
ESP_LOGCONFIG("${TAG_STD_HW_RELAYS}", " Relay 1: %s", id(is_us_model) ?
|
|
||||||
sl_relay_1_light_mode_us->state.c_str() :
|
|
||||||
sl_relay_1_light_mode_eu->state.c_str());
|
|
||||||
if (id(gang_count) >= 2)
|
|
||||||
ESP_LOGCONFIG("${TAG_STD_HW_RELAYS}", " Relay 2: %s", id(is_us_model) ?
|
|
||||||
sl_relay_2_light_mode_us->state.c_str() :
|
|
||||||
sl_relay_2_light_mode_eu->state.c_str());
|
|
||||||
if (id(gang_count) >= 3)
|
|
||||||
ESP_LOGCONFIG("${TAG_STD_HW_RELAYS}", " Relay 3: %s", id(is_us_model) ?
|
|
||||||
sl_relay_3_light_mode_us->state.c_str() :
|
|
||||||
sl_relay_3_light_mode_eu->state.c_str());
|
|
||||||
if (id(gang_count) >= 4)
|
|
||||||
ESP_LOGCONFIG("${TAG_STD_HW_RELAYS}", " Relay 4: %s", id(is_us_model) ?
|
|
||||||
sl_relay_4_light_mode_us->state.c_str() :
|
|
||||||
sl_relay_4_light_mode_eu->state.c_str());
|
|
||||||
|
|
||||||
- id: !extend dump_config_list_packages
|
- id: !extend dump_config_list_packages
|
||||||
then:
|
then:
|
||||||
- script.wait: dump_config
|
- script.wait: dump_config
|
||||||
@@ -1122,13 +1087,11 @@ script:
|
|||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
if (light_index >= id(gb_lights_2).size()) {
|
if (light_index >= id(gb_lights_2).size()) {
|
||||||
ESP_LOGE("${TAG_STD_HW_RELAYS}",
|
ESP_LOGE("${TAG_STD_HW_RELAYS}", "Invalid set with %s light for Relay %" PRIu8, light_mode_group_2.c_str(), light_index+1);
|
||||||
"Invalid set with %s light for Relay %" PRIu8, light_mode_group_2.c_str(), light_index+1);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (state and !id(gb_lights_2)[light_index]->current_values.is_on()) {
|
if (state and !id(gb_lights_2)[light_index]->current_values.is_on()) {
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
ESP_LOGI("${TAG_STD_HW_RELAYS}", "Turn-on %s light for Relay %" PRIu8, light_mode_group_2.c_str(), light_index+1);
|
||||||
"Turn-on %s light for Relay %" PRIu8, light_mode_group_2.c_str(), light_index+1);
|
|
||||||
auto call = id(gb_lights_2)[light_index]->turn_on();
|
auto call = id(gb_lights_2)[light_index]->turn_on();
|
||||||
if (LIGHT_TRANSITION_TURN_ON > 0)
|
if (LIGHT_TRANSITION_TURN_ON > 0)
|
||||||
call.set_transition_length(LIGHT_TRANSITION_TURN_ON); // in ms
|
call.set_transition_length(LIGHT_TRANSITION_TURN_ON); // in ms
|
||||||
@@ -1136,17 +1099,13 @@ script:
|
|||||||
call.set_brightness(LIGHT_BRIGHTNESS_TURN_ON / 100.0f);
|
call.set_brightness(LIGHT_BRIGHTNESS_TURN_ON / 100.0f);
|
||||||
call.perform();
|
call.perform();
|
||||||
} else if (!state and id(gb_lights_2)[light_index]->current_values.is_on()) {
|
} else if (!state and id(gb_lights_2)[light_index]->current_values.is_on()) {
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
ESP_LOGI("${TAG_STD_HW_RELAYS}", "Turn-off %s light for Relay %" PRIu8, light_mode_group_2.c_str(), light_index+1);
|
||||||
"Turn-off %s light for Relay %" PRIu8, light_mode_group_2.c_str(), light_index+1);
|
|
||||||
auto call = id(gb_lights_2)[light_index]->turn_off();
|
auto call = id(gb_lights_2)[light_index]->turn_off();
|
||||||
if (LIGHT_TRANSITION_TURN_OFF > 0)
|
if (LIGHT_TRANSITION_TURN_OFF > 0)
|
||||||
call.set_transition_length(LIGHT_TRANSITION_TURN_OFF); // in ms
|
call.set_transition_length(LIGHT_TRANSITION_TURN_OFF); // in ms
|
||||||
call.perform();
|
call.perform();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
|
||||||
ESP_LOGE("${TAG_STD_HW_RELAYS}", "Invalid light_group=%" PRIu8 " (expected 1 or 2)", light_group);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- id: !extend restore_from_nvs
|
- id: !extend restore_from_nvs
|
||||||
@@ -1165,50 +1124,42 @@ script:
|
|||||||
id: sl_relay_4_mode
|
id: sl_relay_4_mode
|
||||||
index: !lambda return std::min((uint8_t)((id(relay_modes_packed) >> 12) & 0x0F), (uint8_t)2);
|
index: !lambda return std::min((uint8_t)((id(relay_modes_packed) >> 12) & 0x0F), (uint8_t)2);
|
||||||
|
|
||||||
# Light mode restoration - restore to active model's selects only
|
|
||||||
# Restore US light modes
|
|
||||||
- select.set_index:
|
|
||||||
id: sl_relay_1_light_mode_us
|
|
||||||
index: !lambda return std::min((uint8_t)(id(relay_light_modes_packed) & 0x0F), (uint8_t)3);
|
|
||||||
- select.set_index:
|
|
||||||
id: sl_relay_2_light_mode_us
|
|
||||||
index: !lambda return std::min((uint8_t)((id(relay_light_modes_packed) >> 4) & 0x0F), (uint8_t)3);
|
|
||||||
- select.set_index:
|
|
||||||
id: sl_relay_3_light_mode_us
|
|
||||||
index: !lambda return std::min((uint8_t)((id(relay_light_modes_packed) >> 8) & 0x0F), (uint8_t)3);
|
|
||||||
- select.set_index:
|
|
||||||
id: sl_relay_4_light_mode_us
|
|
||||||
index: !lambda return std::min((uint8_t)((id(relay_light_modes_packed) >> 12) & 0x0F), (uint8_t)3);
|
|
||||||
# Restore EU light modes
|
|
||||||
- select.set_index:
|
|
||||||
id: sl_relay_1_light_mode_eu
|
|
||||||
index: !lambda return std::min((uint8_t)(id(relay_light_modes_packed) & 0x0F), (uint8_t)3);
|
|
||||||
- select.set_index:
|
|
||||||
id: sl_relay_2_light_mode_eu
|
|
||||||
index: !lambda return std::min((uint8_t)((id(relay_light_modes_packed) >> 4) & 0x0F), (uint8_t)3);
|
|
||||||
- select.set_index:
|
|
||||||
id: sl_relay_3_light_mode_eu
|
|
||||||
index: !lambda return std::min((uint8_t)((id(relay_light_modes_packed) >> 8) & 0x0F), (uint8_t)3);
|
|
||||||
- select.set_index:
|
|
||||||
id: sl_relay_4_light_mode_eu
|
|
||||||
index: !lambda return std::min((uint8_t)((id(relay_light_modes_packed) >> 12) & 0x0F), (uint8_t)3);
|
|
||||||
|
|
||||||
# Switch states
|
# Switch states
|
||||||
- switch.control:
|
- if:
|
||||||
id: sw_expose_relays_leds_to_ha
|
condition:
|
||||||
state: !lambda return (id(relay_switches_packed) & 0x01);
|
lambda: return (id(relay_switches_packed) & 0x01) == 0;
|
||||||
- switch.control:
|
then:
|
||||||
id: sw_relay_1
|
- switch.turn_off: sw_expose_relays_leds_to_ha
|
||||||
state: !lambda return (id(relay_switches_packed) & 0x02);
|
else:
|
||||||
- switch.control:
|
- switch.turn_on: sw_expose_relays_leds_to_ha
|
||||||
id: sw_relay_2
|
- if:
|
||||||
state: !lambda return (id(relay_switches_packed) & 0x04);
|
condition:
|
||||||
- switch.control:
|
lambda: return (id(relay_switches_packed) & 0x02) == 0;
|
||||||
id: sw_relay_3
|
then:
|
||||||
state: !lambda return (id(relay_switches_packed) & 0x08);
|
- switch.turn_off: sw_relay_1
|
||||||
- switch.control:
|
else:
|
||||||
id: sw_relay_4
|
- switch.turn_on: sw_relay_1
|
||||||
state: !lambda return (id(relay_switches_packed) & 0x10);
|
- if:
|
||||||
|
condition:
|
||||||
|
lambda: return (id(relay_switches_packed) & 0x04) == 0;
|
||||||
|
then:
|
||||||
|
- switch.turn_off: sw_relay_2
|
||||||
|
else:
|
||||||
|
- switch.turn_on: sw_relay_2
|
||||||
|
- if:
|
||||||
|
condition:
|
||||||
|
lambda: return (id(relay_switches_packed) & 0x08) == 0;
|
||||||
|
then:
|
||||||
|
- switch.turn_off: sw_relay_3
|
||||||
|
else:
|
||||||
|
- switch.turn_on: sw_relay_3
|
||||||
|
- if:
|
||||||
|
condition:
|
||||||
|
lambda: return (id(relay_switches_packed) & 0x10) == 0;
|
||||||
|
then:
|
||||||
|
- switch.turn_off: sw_relay_4
|
||||||
|
else:
|
||||||
|
- switch.turn_on: sw_relay_4
|
||||||
|
|
||||||
# update lights based on new relay statuses (catch up, as this should be done when each relay is updated)
|
# update lights based on new relay statuses (catch up, as this should be done when each relay is updated)
|
||||||
- script.execute: show_relay_status
|
- script.execute: show_relay_status
|
||||||
@@ -1343,116 +1294,6 @@ script:
|
|||||||
}
|
}
|
||||||
|
|
||||||
select:
|
select:
|
||||||
# EU relay light mode template
|
|
||||||
- &relay_light_mode_eu
|
|
||||||
id: sl_relay_1_light_mode_eu
|
|
||||||
name: Relay 1 light mode EU
|
|
||||||
platform: template
|
|
||||||
options:
|
|
||||||
- "${LIGHT_MODE_DISABLED_TEXT}"
|
|
||||||
- "${LIGHT_MODE_BOTTOM_TEXT}"
|
|
||||||
- "${LIGHT_MODE_TOP_TEXT}"
|
|
||||||
- "${LIGHT_MODE_BOTH_TEXT}"
|
|
||||||
initial_option: "${LIGHT_MODE_BOTTOM_TEXT}"
|
|
||||||
optimistic: true
|
|
||||||
restore_value: false
|
|
||||||
internal: true
|
|
||||||
entity_category: config
|
|
||||||
disabled_by_default: false
|
|
||||||
icon: mdi:dots-square
|
|
||||||
on_value:
|
|
||||||
- lambda: |-
|
|
||||||
// Update packed value (existing code)
|
|
||||||
id(relay_light_modes_packed) = (id(relay_light_modes_packed) & ~(0x0F << 0)) |
|
|
||||||
((id(sl_relay_1_light_mode_eu).active_index().value_or(1) & 0x0F) << 0);
|
|
||||||
|
|
||||||
// Handle mode transitions (only after boot is complete)
|
|
||||||
if (!id(bs_boot_completed)->state) return; // Skip during boot
|
|
||||||
|
|
||||||
static std::string previous_mode = ""; // Static variable local to THIS lambda only
|
|
||||||
std::string current_mode = x;
|
|
||||||
|
|
||||||
if (previous_mode.empty()) {
|
|
||||||
previous_mode = current_mode; // Initialize on first run after boot
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previous_mode != "${LIGHT_MODE_DISABLED_TEXT}" && current_mode == "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning TO Disabled - turn off lights
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 1 light mode changed to ${LIGHT_MODE_DISABLED_TEXT} - turning off lights");
|
|
||||||
id(light_set_state)->execute(1, 0, false); // Group 1, relay index 0
|
|
||||||
id(light_set_state)->execute(2, 0, false); // Group 2, relay index 0
|
|
||||||
} else if (previous_mode == "${LIGHT_MODE_DISABLED_TEXT}" && current_mode != "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning FROM Disabled - update lights based on relay state
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 1 light mode changed from ${LIGHT_MODE_DISABLED_TEXT} - updating lights");
|
|
||||||
bool relay_state = id(sw_relay_1).state;
|
|
||||||
if (current_mode == "${LIGHT_MODE_BOTTOM_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(1, 0, relay_state);
|
|
||||||
}
|
|
||||||
if (current_mode == "${LIGHT_MODE_TOP_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(2, 0, relay_state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
previous_mode = current_mode;
|
|
||||||
|
|
||||||
# US relay light mode template
|
|
||||||
- &relay_light_mode_us
|
|
||||||
id: sl_relay_1_light_mode_us
|
|
||||||
name: Relay 1 light mode US
|
|
||||||
platform: template
|
|
||||||
options:
|
|
||||||
- "${LIGHT_MODE_DISABLED_TEXT}"
|
|
||||||
- "${LIGHT_MODE_LEFT_TEXT}"
|
|
||||||
- "${LIGHT_MODE_RIGHT_TEXT}"
|
|
||||||
- "${LIGHT_MODE_BOTH_TEXT}"
|
|
||||||
initial_option: "${LIGHT_MODE_RIGHT_TEXT}"
|
|
||||||
optimistic: true
|
|
||||||
restore_value: false
|
|
||||||
internal: true
|
|
||||||
entity_category: config
|
|
||||||
disabled_by_default: false
|
|
||||||
icon: mdi:dots-square
|
|
||||||
on_value:
|
|
||||||
- lambda: |-
|
|
||||||
// Update packed value
|
|
||||||
id(relay_light_modes_packed) = (id(relay_light_modes_packed) & ~(0x0F << 0)) |
|
|
||||||
((id(sl_relay_1_light_mode_us).active_index().value_or(1) & 0x0F) << 0);
|
|
||||||
|
|
||||||
// Handle mode transitions (only after boot is complete)
|
|
||||||
if (!id(bs_boot_completed)->state) return; // Skip during boot
|
|
||||||
|
|
||||||
static std::string previous_mode = "";
|
|
||||||
std::string current_mode = x;
|
|
||||||
|
|
||||||
if (previous_mode.empty()) {
|
|
||||||
previous_mode = current_mode; // Initialize on first run after boot
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previous_mode != "${LIGHT_MODE_DISABLED_TEXT}" && current_mode == "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning TO Disabled - turn off lights
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 1 light mode changed to ${LIGHT_MODE_DISABLED_TEXT} - turning off lights");
|
|
||||||
id(light_set_state)->execute(1, 0, false); // Group 1, relay index 0
|
|
||||||
id(light_set_state)->execute(2, 0, false); // Group 2, relay index 0
|
|
||||||
} else if (previous_mode == "${LIGHT_MODE_DISABLED_TEXT}" && current_mode != "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning FROM Disabled - update lights based on relay state
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 1 light mode changed from ${LIGHT_MODE_DISABLED_TEXT} - updating lights");
|
|
||||||
bool relay_state = id(sw_relay_1).state;
|
|
||||||
if (current_mode == "${LIGHT_MODE_LEFT_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(1, 0, relay_state);
|
|
||||||
}
|
|
||||||
if (current_mode == "${LIGHT_MODE_RIGHT_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(2, 0, relay_state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
previous_mode = current_mode;
|
|
||||||
|
|
||||||
- id: sl_relay_1_mode
|
- id: sl_relay_1_mode
|
||||||
name: Relay 1 display mode
|
name: Relay 1 display mode
|
||||||
platform: template
|
platform: template
|
||||||
@@ -1462,7 +1303,7 @@ select:
|
|||||||
- "${RELAY_MODE_TEXT_NOT_USED}"
|
- "${RELAY_MODE_TEXT_NOT_USED}"
|
||||||
initial_option: "${RELAY_MODE_TEXT_SWITCH}"
|
initial_option: "${RELAY_MODE_TEXT_SWITCH}"
|
||||||
optimistic: true
|
optimistic: true
|
||||||
restore_value: false
|
restore_value: true
|
||||||
internal: true
|
internal: true
|
||||||
entity_category: config
|
entity_category: config
|
||||||
disabled_by_default: false
|
disabled_by_default: false
|
||||||
@@ -1474,90 +1315,7 @@ select:
|
|||||||
state: true
|
state: true
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
id(relay_modes_packed) = (id(relay_modes_packed) & ~(0x0F << 0)) |
|
id(relay_modes_packed) = (id(relay_modes_packed) & ~(0x0F << 0)) |
|
||||||
((id(sl_relay_1_mode).active_index().value_or(0) & 0x0F) << 0);
|
((id(sl_relay_1_mode).active_index().value_or(1) & 0x0F) << 0);
|
||||||
|
|
||||||
- id: sl_relay_2_light_mode_eu
|
|
||||||
name: Relay 2 light mode EU
|
|
||||||
<<: *relay_light_mode_eu
|
|
||||||
on_value:
|
|
||||||
- lambda: |-
|
|
||||||
// Update packed value
|
|
||||||
id(relay_light_modes_packed) = (id(relay_light_modes_packed) & ~(0x0F << 4)) |
|
|
||||||
((id(sl_relay_2_light_mode_eu).active_index().value_or(1) & 0x0F) << 4);
|
|
||||||
|
|
||||||
// Handle mode transitions (only after boot is complete)
|
|
||||||
if (!id(bs_boot_completed)->state) return; // Skip during boot
|
|
||||||
|
|
||||||
static std::string previous_mode = "";
|
|
||||||
std::string current_mode = x;
|
|
||||||
|
|
||||||
if (previous_mode.empty()) {
|
|
||||||
previous_mode = current_mode; // Initialize on first run after boot
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previous_mode != "${LIGHT_MODE_DISABLED_TEXT}" && current_mode == "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning TO Disabled - turn off lights
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 2 light mode changed to ${LIGHT_MODE_DISABLED_TEXT} - turning off lights");
|
|
||||||
id(light_set_state)->execute(1, 1, false); // Group 1, relay index 1
|
|
||||||
id(light_set_state)->execute(2, 1, false); // Group 2, relay index 1
|
|
||||||
} else if (previous_mode == "${LIGHT_MODE_DISABLED_TEXT}" && current_mode != "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning FROM Disabled - update lights based on relay state
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 2 light mode changed from ${LIGHT_MODE_DISABLED_TEXT} - updating lights");
|
|
||||||
bool relay_state = id(sw_relay_2).state;
|
|
||||||
if (current_mode == "${LIGHT_MODE_BOTTOM_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(1, 1, relay_state);
|
|
||||||
}
|
|
||||||
if (current_mode == "${LIGHT_MODE_TOP_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(2, 1, relay_state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
previous_mode = current_mode;
|
|
||||||
|
|
||||||
- id: sl_relay_2_light_mode_us
|
|
||||||
name: Relay 2 light mode US
|
|
||||||
<<: *relay_light_mode_us
|
|
||||||
on_value:
|
|
||||||
- lambda: |-
|
|
||||||
// Update packed value
|
|
||||||
id(relay_light_modes_packed) = (id(relay_light_modes_packed) & ~(0x0F << 4)) |
|
|
||||||
((id(sl_relay_2_light_mode_us).active_index().value_or(1) & 0x0F) << 4);
|
|
||||||
|
|
||||||
// Handle mode transitions (only after boot is complete)
|
|
||||||
if (!id(bs_boot_completed)->state) return; // Skip during boot
|
|
||||||
|
|
||||||
static std::string previous_mode = "";
|
|
||||||
std::string current_mode = x;
|
|
||||||
|
|
||||||
if (previous_mode.empty()) {
|
|
||||||
previous_mode = current_mode; // Initialize on first run after boot
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previous_mode != "${LIGHT_MODE_DISABLED_TEXT}" && current_mode == "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning TO Disabled - turn off lights
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 2 light mode changed to ${LIGHT_MODE_DISABLED_TEXT} - turning off lights");
|
|
||||||
id(light_set_state)->execute(1, 1, false); // Group 1, relay index 1
|
|
||||||
id(light_set_state)->execute(2, 1, false); // Group 2, relay index 1
|
|
||||||
} else if (previous_mode == "${LIGHT_MODE_DISABLED_TEXT}" && current_mode != "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning FROM Disabled - update lights based on relay state
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 2 light mode changed from ${LIGHT_MODE_DISABLED_TEXT} - updating lights");
|
|
||||||
bool relay_state = id(sw_relay_2).state;
|
|
||||||
if (current_mode == "${LIGHT_MODE_LEFT_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(1, 1, relay_state);
|
|
||||||
}
|
|
||||||
if (current_mode == "${LIGHT_MODE_RIGHT_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(2, 1, relay_state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
previous_mode = current_mode;
|
|
||||||
|
|
||||||
- id: sl_relay_2_mode
|
- id: sl_relay_2_mode
|
||||||
name: Relay 2 display mode
|
name: Relay 2 display mode
|
||||||
platform: template
|
platform: template
|
||||||
@@ -1567,7 +1325,7 @@ select:
|
|||||||
- "${RELAY_MODE_TEXT_NOT_USED}"
|
- "${RELAY_MODE_TEXT_NOT_USED}"
|
||||||
initial_option: "${RELAY_MODE_TEXT_SWITCH}"
|
initial_option: "${RELAY_MODE_TEXT_SWITCH}"
|
||||||
optimistic: true
|
optimistic: true
|
||||||
restore_value: false
|
restore_value: true
|
||||||
internal: true
|
internal: true
|
||||||
entity_category: config
|
entity_category: config
|
||||||
disabled_by_default: false
|
disabled_by_default: false
|
||||||
@@ -1579,90 +1337,7 @@ select:
|
|||||||
state: true
|
state: true
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
id(relay_modes_packed) = (id(relay_modes_packed) & ~(0x0F << 4)) |
|
id(relay_modes_packed) = (id(relay_modes_packed) & ~(0x0F << 4)) |
|
||||||
((id(sl_relay_2_mode).active_index().value_or(0) & 0x0F) << 4);
|
((id(sl_relay_2_mode).active_index().value_or(1) & 0x0F) << 4);
|
||||||
|
|
||||||
- id: sl_relay_3_light_mode_eu
|
|
||||||
name: Relay 3 light mode EU
|
|
||||||
<<: *relay_light_mode_eu
|
|
||||||
on_value:
|
|
||||||
- lambda: |-
|
|
||||||
// Update packed value
|
|
||||||
id(relay_light_modes_packed) = (id(relay_light_modes_packed) & ~(0x0F << 8)) |
|
|
||||||
((id(sl_relay_3_light_mode_eu).active_index().value_or(1) & 0x0F) << 8);
|
|
||||||
|
|
||||||
// Handle mode transitions (only after boot is complete)
|
|
||||||
if (!id(bs_boot_completed)->state) return; // Skip during boot
|
|
||||||
|
|
||||||
static std::string previous_mode = "";
|
|
||||||
std::string current_mode = x;
|
|
||||||
|
|
||||||
if (previous_mode.empty()) {
|
|
||||||
previous_mode = current_mode; // Initialize on first run after boot
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previous_mode != "${LIGHT_MODE_DISABLED_TEXT}" && current_mode == "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning TO Disabled - turn off lights
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 3 light mode changed to ${LIGHT_MODE_DISABLED_TEXT} - turning off lights");
|
|
||||||
id(light_set_state)->execute(1, 2, false); // Group 1, relay index 2
|
|
||||||
id(light_set_state)->execute(2, 2, false); // Group 2, relay index 2
|
|
||||||
} else if (previous_mode == "${LIGHT_MODE_DISABLED_TEXT}" && current_mode != "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning FROM Disabled - update lights based on relay state
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 3 light mode changed from ${LIGHT_MODE_DISABLED_TEXT} - updating lights");
|
|
||||||
bool relay_state = id(sw_relay_3).state;
|
|
||||||
if (current_mode == "${LIGHT_MODE_BOTTOM_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(1, 2, relay_state);
|
|
||||||
}
|
|
||||||
if (current_mode == "${LIGHT_MODE_TOP_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(2, 2, relay_state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
previous_mode = current_mode;
|
|
||||||
|
|
||||||
- id: sl_relay_3_light_mode_us
|
|
||||||
name: Relay 3 light mode US
|
|
||||||
<<: *relay_light_mode_us
|
|
||||||
on_value:
|
|
||||||
- lambda: |-
|
|
||||||
// Update packed value
|
|
||||||
id(relay_light_modes_packed) = (id(relay_light_modes_packed) & ~(0x0F << 8)) |
|
|
||||||
((id(sl_relay_3_light_mode_us).active_index().value_or(1) & 0x0F) << 8);
|
|
||||||
|
|
||||||
// Handle mode transitions (only after boot is complete)
|
|
||||||
if (!id(bs_boot_completed)->state) return; // Skip during boot
|
|
||||||
|
|
||||||
static std::string previous_mode = "";
|
|
||||||
std::string current_mode = x;
|
|
||||||
|
|
||||||
if (previous_mode.empty()) {
|
|
||||||
previous_mode = current_mode; // Initialize on first run after boot
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previous_mode != "${LIGHT_MODE_DISABLED_TEXT}" && current_mode == "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning TO Disabled - turn off lights
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 3 light mode changed to ${LIGHT_MODE_DISABLED_TEXT} - turning off lights");
|
|
||||||
id(light_set_state)->execute(1, 2, false); // Group 1, relay index 2
|
|
||||||
id(light_set_state)->execute(2, 2, false); // Group 2, relay index 2
|
|
||||||
} else if (previous_mode == "${LIGHT_MODE_DISABLED_TEXT}" && current_mode != "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning FROM Disabled - update lights based on relay state
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}",
|
|
||||||
"Relay 3 light mode changed from ${LIGHT_MODE_DISABLED_TEXT} - updating lights");
|
|
||||||
bool relay_state = id(sw_relay_3).state;
|
|
||||||
if (current_mode == "${LIGHT_MODE_LEFT_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(1, 2, relay_state);
|
|
||||||
}
|
|
||||||
if (current_mode == "${LIGHT_MODE_RIGHT_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(2, 2, relay_state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
previous_mode = current_mode;
|
|
||||||
|
|
||||||
- id: sl_relay_3_mode
|
- id: sl_relay_3_mode
|
||||||
name: Relay 3 display mode
|
name: Relay 3 display mode
|
||||||
platform: template
|
platform: template
|
||||||
@@ -1672,7 +1347,7 @@ select:
|
|||||||
- "${RELAY_MODE_TEXT_NOT_USED}"
|
- "${RELAY_MODE_TEXT_NOT_USED}"
|
||||||
initial_option: "${RELAY_MODE_TEXT_SWITCH}"
|
initial_option: "${RELAY_MODE_TEXT_SWITCH}"
|
||||||
optimistic: true
|
optimistic: true
|
||||||
restore_value: false
|
restore_value: true
|
||||||
internal: true
|
internal: true
|
||||||
entity_category: config
|
entity_category: config
|
||||||
disabled_by_default: false
|
disabled_by_default: false
|
||||||
@@ -1684,86 +1359,7 @@ select:
|
|||||||
state: true
|
state: true
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
id(relay_modes_packed) = (id(relay_modes_packed) & ~(0x0F << 8)) |
|
id(relay_modes_packed) = (id(relay_modes_packed) & ~(0x0F << 8)) |
|
||||||
((id(sl_relay_3_mode).active_index().value_or(0) & 0x0F) << 8);
|
((id(sl_relay_3_mode).active_index().value_or(1) & 0x0F) << 8);
|
||||||
|
|
||||||
- id: sl_relay_4_light_mode_eu
|
|
||||||
name: Relay 4 light mode EU
|
|
||||||
<<: *relay_light_mode_eu
|
|
||||||
on_value:
|
|
||||||
- lambda: |-
|
|
||||||
// Update packed value
|
|
||||||
id(relay_light_modes_packed) = (id(relay_light_modes_packed) & ~(0x0F << 12)) |
|
|
||||||
((id(sl_relay_4_light_mode_eu).active_index().value_or(1) & 0x0F) << 12);
|
|
||||||
|
|
||||||
// Handle mode transitions (only after boot is complete)
|
|
||||||
if (!id(bs_boot_completed)->state) return; // Skip during boot
|
|
||||||
|
|
||||||
static std::string previous_mode = "";
|
|
||||||
std::string current_mode = x;
|
|
||||||
|
|
||||||
if (previous_mode.empty()) {
|
|
||||||
previous_mode = current_mode; // Initialize on first run after boot
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previous_mode != "${LIGHT_MODE_DISABLED_TEXT}" && current_mode == "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning TO Disabled - turn off lights
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}", "Relay 4 light mode changed to ${LIGHT_MODE_DISABLED_TEXT} - turning off lights");
|
|
||||||
id(light_set_state)->execute(1, 3, false); // Group 1, relay index 3
|
|
||||||
id(light_set_state)->execute(2, 3, false); // Group 2, relay index 3
|
|
||||||
} else if (previous_mode == "${LIGHT_MODE_DISABLED_TEXT}" && current_mode != "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning FROM Disabled - update lights based on relay state
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}", "Relay 4 light mode changed from ${LIGHT_MODE_DISABLED_TEXT} - updating lights");
|
|
||||||
bool relay_state = id(sw_relay_4).state;
|
|
||||||
if (current_mode == "${LIGHT_MODE_BOTTOM_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(1, 3, relay_state);
|
|
||||||
}
|
|
||||||
if (current_mode == "${LIGHT_MODE_TOP_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(2, 3, relay_state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
previous_mode = current_mode;
|
|
||||||
|
|
||||||
- id: sl_relay_4_light_mode_us
|
|
||||||
name: Relay 4 light mode US
|
|
||||||
<<: *relay_light_mode_us
|
|
||||||
on_value:
|
|
||||||
- lambda: |-
|
|
||||||
// Update packed value
|
|
||||||
id(relay_light_modes_packed) = (id(relay_light_modes_packed) & ~(0x0F << 12)) |
|
|
||||||
((id(sl_relay_4_light_mode_us).active_index().value_or(1) & 0x0F) << 12);
|
|
||||||
|
|
||||||
// Handle mode transitions (only after boot is complete)
|
|
||||||
if (!id(bs_boot_completed)->state) return; // Skip during boot
|
|
||||||
|
|
||||||
static std::string previous_mode = "";
|
|
||||||
std::string current_mode = x;
|
|
||||||
|
|
||||||
if (previous_mode.empty()) {
|
|
||||||
previous_mode = current_mode; // Initialize on first run after boot
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previous_mode != "${LIGHT_MODE_DISABLED_TEXT}" && current_mode == "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning TO Disabled - turn off lights
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}", "Relay 4 light mode changed to ${LIGHT_MODE_DISABLED_TEXT} - turning off lights");
|
|
||||||
id(light_set_state)->execute(1, 3, false); // Group 1, relay index 3
|
|
||||||
id(light_set_state)->execute(2, 3, false); // Group 2, relay index 3
|
|
||||||
} else if (previous_mode == "${LIGHT_MODE_DISABLED_TEXT}" && current_mode != "${LIGHT_MODE_DISABLED_TEXT}") {
|
|
||||||
// Transitioning FROM Disabled - update lights based on relay state
|
|
||||||
ESP_LOGI("${TAG_STD_HW_RELAYS}", "Relay 4 light mode changed from ${LIGHT_MODE_DISABLED_TEXT} - updating lights");
|
|
||||||
bool relay_state = id(sw_relay_4).state;
|
|
||||||
if (current_mode == "${LIGHT_MODE_LEFT_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(1, 3, relay_state);
|
|
||||||
}
|
|
||||||
if (current_mode == "${LIGHT_MODE_RIGHT_TEXT}" || current_mode == "${LIGHT_MODE_BOTH_TEXT}") {
|
|
||||||
id(light_set_state)->execute(2, 3, relay_state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
previous_mode = current_mode;
|
|
||||||
|
|
||||||
- id: sl_relay_4_mode
|
- id: sl_relay_4_mode
|
||||||
name: Relay 4 display mode
|
name: Relay 4 display mode
|
||||||
platform: template
|
platform: template
|
||||||
@@ -1773,7 +1369,7 @@ select:
|
|||||||
- "${RELAY_MODE_TEXT_NOT_USED}"
|
- "${RELAY_MODE_TEXT_NOT_USED}"
|
||||||
initial_option: "${RELAY_MODE_TEXT_SWITCH}"
|
initial_option: "${RELAY_MODE_TEXT_SWITCH}"
|
||||||
optimistic: true
|
optimistic: true
|
||||||
restore_value: false
|
restore_value: true
|
||||||
internal: true
|
internal: true
|
||||||
entity_category: config
|
entity_category: config
|
||||||
disabled_by_default: false
|
disabled_by_default: false
|
||||||
@@ -1785,128 +1381,133 @@ select:
|
|||||||
state: true
|
state: true
|
||||||
- lambda: |-
|
- lambda: |-
|
||||||
id(relay_modes_packed) = (id(relay_modes_packed) & ~(0x0F << 12)) |
|
id(relay_modes_packed) = (id(relay_modes_packed) & ~(0x0F << 12)) |
|
||||||
((id(sl_relay_4_mode).active_index().value_or(0) & 0x0F) << 12);
|
((id(sl_relay_4_mode).active_index().value_or(1) & 0x0F) << 12);
|
||||||
|
|
||||||
switch:
|
switch:
|
||||||
- id: sw_expose_relays_leds_to_ha
|
- id: sw_expose_relays_leds_to_ha
|
||||||
name: Expose Relay's LEDs to Home Assistant
|
name: Expose Relay's LEDs to Home Assistant
|
||||||
platform: template
|
platform: template
|
||||||
restore_mode: ${RELAYS_EXPOSE_LEDS_TO_HA_RESTORE_MODE}
|
restore_mode: ALWAYS_OFF
|
||||||
optimistic: true
|
optimistic: true
|
||||||
internal: false
|
internal: false
|
||||||
entity_category: config
|
entity_category: config
|
||||||
on_state:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
- binary_sensor.template.publish:
|
- binary_sensor.template.publish:
|
||||||
id: bs_pending_restart
|
id: bs_pending_restart
|
||||||
state: true
|
state: true
|
||||||
- if:
|
- lambda: |-
|
||||||
condition:
|
id(relay_switches_packed) |= 0x01; // Set bit 0
|
||||||
- lambda: return x; // Turned on?
|
on_turn_off:
|
||||||
then:
|
then:
|
||||||
- lambda: id(relay_switches_packed) |= 0x01; // Set bit 0
|
- binary_sensor.template.publish:
|
||||||
else:
|
id: bs_pending_restart
|
||||||
- lambda: id(relay_switches_packed) &= ~0x01; // Clear bit 0
|
state: true
|
||||||
|
- lambda: |-
|
||||||
|
id(relay_switches_packed) &= ~0x01; // Clear bit 0
|
||||||
|
|
||||||
- id: sw_relay_1
|
- id: sw_relay_1
|
||||||
name: Relay 1
|
name: Relay 1
|
||||||
output: output_relay_1
|
output: output_relay_1
|
||||||
platform: output
|
platform: output
|
||||||
restore_mode: ${RELAYS_SWITCH_RESTORE_MODE}
|
restore_mode: ALWAYS_OFF
|
||||||
internal: true
|
internal: true
|
||||||
on_state:
|
|
||||||
then:
|
|
||||||
- script.execute: show_relay_status
|
|
||||||
on_turn_on:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
|
- script.execute: show_relay_status
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- light.is_off: light_output_1
|
- light.is_off: light_output_1
|
||||||
then:
|
then:
|
||||||
light.turn_on: light_output_1
|
light.turn_on: light_output_1
|
||||||
- lambda: id(relay_switches_packed) |= 0x02; // Set bit 1
|
- lambda: |-
|
||||||
|
id(relay_switches_packed) |= 0x02; // Set bit 1
|
||||||
on_turn_off:
|
on_turn_off:
|
||||||
then:
|
then:
|
||||||
|
- script.execute: show_relay_status
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- light.is_on: light_output_1
|
- light.is_on: light_output_1
|
||||||
then:
|
then:
|
||||||
- light.turn_off: light_output_1
|
- light.turn_off: light_output_1
|
||||||
- lambda: id(relay_switches_packed) &= ~0x02; // Clear bit 1
|
- lambda: |-
|
||||||
|
id(relay_switches_packed) &= ~0x02; // Clear bit 1
|
||||||
- id: sw_relay_2
|
- id: sw_relay_2
|
||||||
name: Relay 2
|
name: Relay 2
|
||||||
output: output_relay_2
|
output: output_relay_2
|
||||||
platform: output
|
platform: output
|
||||||
restore_mode: ${RELAYS_SWITCH_RESTORE_MODE}
|
restore_mode: ALWAYS_OFF
|
||||||
internal: true
|
internal: true
|
||||||
on_state:
|
|
||||||
then:
|
|
||||||
- script.execute: show_relay_status
|
|
||||||
on_turn_on:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
|
- script.execute: show_relay_status
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- light.is_off: light_output_2
|
- light.is_off: light_output_2
|
||||||
then:
|
then:
|
||||||
light.turn_on: light_output_2
|
light.turn_on: light_output_2
|
||||||
- lambda: id(relay_switches_packed) |= 0x04; // Set bit 2
|
- lambda: |-
|
||||||
|
id(relay_switches_packed) |= 0x04; // Set bit 2
|
||||||
on_turn_off:
|
on_turn_off:
|
||||||
then:
|
then:
|
||||||
|
- script.execute: show_relay_status
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- light.is_on: light_output_2
|
- light.is_on: light_output_2
|
||||||
then:
|
then:
|
||||||
- light.turn_off: light_output_2
|
- light.turn_off: light_output_2
|
||||||
- lambda: id(relay_switches_packed) &= ~0x04; // Clear bit 2
|
- lambda: |-
|
||||||
|
id(relay_switches_packed) &= ~0x04; // Clear bit 2
|
||||||
- id: sw_relay_3
|
- id: sw_relay_3
|
||||||
name: Relay 3
|
name: Relay 3
|
||||||
output: output_relay_3
|
output: output_relay_3
|
||||||
platform: output
|
platform: output
|
||||||
restore_mode: ${RELAYS_SWITCH_RESTORE_MODE}
|
restore_mode: ALWAYS_OFF
|
||||||
internal: true
|
internal: true
|
||||||
on_state:
|
|
||||||
then:
|
|
||||||
- script.execute: show_relay_status
|
|
||||||
on_turn_on:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
|
- script.execute: show_relay_status
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- light.is_off: light_output_3
|
- light.is_off: light_output_3
|
||||||
then:
|
then:
|
||||||
- light.turn_on: light_output_3
|
- light.turn_on: light_output_3
|
||||||
- lambda: id(relay_switches_packed) |= 0x08; // Set bit 3
|
- lambda: |-
|
||||||
|
id(relay_switches_packed) |= 0x08; // Set bit 3
|
||||||
on_turn_off:
|
on_turn_off:
|
||||||
then:
|
then:
|
||||||
|
- script.execute: show_relay_status
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- light.is_on: light_output_3
|
- light.is_on: light_output_3
|
||||||
then:
|
then:
|
||||||
- light.turn_off: light_output_3
|
- light.turn_off: light_output_3
|
||||||
- lambda: id(relay_switches_packed) &= ~0x08; // Clear bit 3
|
- lambda: |-
|
||||||
|
id(relay_switches_packed) &= ~0x08; // Clear bit 3
|
||||||
- id: sw_relay_4
|
- id: sw_relay_4
|
||||||
name: Relay 4
|
name: Relay 4
|
||||||
output: output_relay_4
|
output: output_relay_4
|
||||||
platform: output
|
platform: output
|
||||||
restore_mode: ${RELAYS_SWITCH_RESTORE_MODE}
|
restore_mode: ALWAYS_OFF
|
||||||
internal: true
|
internal: true
|
||||||
on_state:
|
|
||||||
then:
|
|
||||||
- script.execute: show_relay_status
|
|
||||||
on_turn_on:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
|
- script.execute: show_relay_status
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- light.is_off: light_output_4
|
- light.is_off: light_output_4
|
||||||
then:
|
then:
|
||||||
- light.turn_on: light_output_4
|
- light.turn_on: light_output_4
|
||||||
- lambda: id(relay_switches_packed) |= 0x10; // Set bit 4
|
- lambda: |-
|
||||||
|
id(relay_switches_packed) |= 0x10; // Set bit 4
|
||||||
on_turn_off:
|
on_turn_off:
|
||||||
then:
|
then:
|
||||||
|
- script.execute: show_relay_status
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
- light.is_on: light_output_4
|
- light.is_on: light_output_4
|
||||||
then:
|
then:
|
||||||
- light.turn_off: light_output_4
|
- light.turn_off: light_output_4
|
||||||
- lambda: id(relay_switches_packed) &= ~0x10; // Clear bit 4
|
- lambda: |-
|
||||||
|
id(relay_switches_packed) &= ~0x10; // Clear bit 4
|
||||||
...
|
...
|
||||||
|
|||||||
@@ -151,17 +151,20 @@ switch:
|
|||||||
pin: GPIO21
|
pin: GPIO21
|
||||||
restore_mode: ALWAYS_OFF
|
restore_mode: ALWAYS_OFF
|
||||||
internal: true
|
internal: true
|
||||||
on_state:
|
on_turn_on:
|
||||||
then:
|
then:
|
||||||
- binary_sensor.template.publish:
|
- binary_sensor.template.publish:
|
||||||
id: bs_vibrating
|
id: bs_vibrating
|
||||||
state: !lambda return x;
|
state: ON # yamllint disable-line rule:truthy
|
||||||
on_turn_on:
|
|
||||||
then:
|
|
||||||
- delay: ${vibration_max_duration}
|
- delay: ${vibration_max_duration}
|
||||||
- if:
|
- if:
|
||||||
condition:
|
condition:
|
||||||
switch.is_on: sw_vibration_motor
|
switch.is_on: sw_vibration_motor
|
||||||
then:
|
then:
|
||||||
- switch.turn_off: sw_vibration_motor
|
- switch.turn_off: sw_vibration_motor
|
||||||
|
on_turn_off:
|
||||||
|
then:
|
||||||
|
- binary_sensor.template.publish:
|
||||||
|
id: bs_vibrating
|
||||||
|
state: OFF # yamllint disable-line rule:truthy
|
||||||
...
|
...
|
||||||
|
|||||||
@@ -27,9 +27,6 @@
|
|||||||
[buymeacoffee-shield]: https://img.shields.io/static/v1?label=Buy%20me%20an%20ice%20cream&message=❄&color=blue
|
[buymeacoffee-shield]: https://img.shields.io/static/v1?label=Buy%20me%20an%20ice%20cream&message=❄&color=blue
|
||||||
[buymeacoffee]: https://www.buymeacoffee.com/edwardfirmo
|
[buymeacoffee]: https://www.buymeacoffee.com/edwardfirmo
|
||||||
|
|
||||||
> [!WARNING]
|
|
||||||
> ESPHome builder v2025.8.0+ is required
|
|
||||||
|
|
||||||
## Framework Migration to ESP-IDF
|
## Framework Migration to ESP-IDF
|
||||||
|
|
||||||
> [!IMPORTANT]
|
> [!IMPORTANT]
|
||||||
|
|||||||
@@ -74,9 +74,8 @@ namespace esphome {
|
|||||||
if (this->gang_count_ == 1)
|
if (this->gang_count_ == 1)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
// Calculate button width (rounds up to ensure full coverage)
|
// Calculate button number Change to round up instead of truncate (integer division)
|
||||||
const uint8_t width =
|
const uint8_t width = (TOUCH_MAX_POSITION + gang_count_) / this->gang_count_; // Width of each button region
|
||||||
(TOUCH_MAX_POSITION + this->gang_count_) / this->gang_count_; // Width of each button region
|
|
||||||
if (width < 1) // Invalid width - and prevents division by zero
|
if (width < 1) // Invalid width - and prevents division by zero
|
||||||
return 0;
|
return 0;
|
||||||
const uint8_t button = std::min(
|
const uint8_t button = std::min(
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
2025.10.1
|
2025.8.2
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
version: 2025.10.1
|
version: 2025.8.2dev
|
||||||
|
|||||||
Reference in New Issue
Block a user