oneil1987/TX-Ultimate-Easy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore_from_nvs for core_hw_buttons

Browse Source
This commit is contained in:
Edward Firmo
2025-08-05 08:11:50 +02:00
parent 42ae160217
commit 6d16d7d645
1 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
View File

@@ -63,6 +63,14 @@ esphome:
- -D TX_ULTIMATE_EASY_CORE_HW_BUTTONS - -D TX_ULTIMATE_EASY_CORE_HW_BUTTONS
globals: globals:
# Packed button actions - replaces 4 separate selects
- id: button_actions_packed
type: uint16_t
restore_value: true
initial_value: '4369' # Binary: 0001000100010001 = all buttons set to option 1 (default action)
# Bit layout: [button4(4)][button3(4)][button2(4)][button1(4)]
# Each button uses 4 bits: 0=None, 1=Toggle, 2=Failsafe, 3-15=Reserved for future options
- id: button_press_button - id: button_press_button
type: uint8_t type: uint8_t
restore_value: false restore_value: false
@@ -113,6 +121,8 @@ script:
count: uint8_t count: uint8_t
then: then:
- lambda: |- - lambda: |-
static const char *TAG = "script.button_action.core.hw.buttons";
// Send event to Home Assistant // Send event to Home Assistant
esphome::api::CustomAPIDevice ha_event; esphome::api::CustomAPIDevice ha_event;
ha_event.fire_homeassistant_event("${EVENT_NAME}", { ha_event.fire_homeassistant_event("${EVENT_NAME}", {
@@ -125,7 +135,7 @@ script:
{"count", std::to_string(count)}, {"count", std::to_string(count)},
{"position", std::to_string(id(button_press_position))} {"position", std::to_string(id(button_press_position))}
}); });
ESP_LOGI("core_hw_buttons", "Button %" PRIu8 " action: '%s'", button, action.c_str()); ESP_LOGI(TAG, "Button %" PRIu8 " action: '%s'", button, action.c_str());
if (action == "click") { if (action == "click") {
switch (button) { switch (button) {
case ${BUTTON_1_ID}: case ${BUTTON_1_ID}:
@@ -209,26 +219,24 @@ script:
- id: !extend dump_config - id: !extend dump_config
then: then:
- lambda: |- - lambda: |-
static const char *TAG = "script.dump_config.core.hw.buttons";
std::string gang_count_plural_suffix = id(gang_count) > 1 ? "s" : ""; std::string gang_count_plural_suffix = id(gang_count) > 1 ? "s" : "";
// Button's actions // Button's actions
ESP_LOGCONFIG("core_hw_buttons", "Button%s action%s:", ESP_LOGCONFIG(TAG, "Button%s action%s:",
gang_count_plural_suffix.c_str(), gang_count_plural_suffix.c_str(),
gang_count_plural_suffix.c_str()); gang_count_plural_suffix.c_str());
ESP_LOGCONFIG("core_hw_buttons", " Relay 1: %s", sl_button_1_action->has_state() ESP_LOGCONFIG(TAG, " Relay 1: %s", sl_button_1_action->has_state() ?
? sl_button_1_action->state.c_str() sl_button_1_action->state.c_str() : "Unknown");
: "Unknown");
if (id(gang_count) >= 2) if (id(gang_count) >= 2)
ESP_LOGCONFIG("core_hw_buttons", " Relay 2: %s", sl_button_2_action->has_state() ESP_LOGCONFIG(TAG, " Relay 2: %s", sl_button_2_action->has_state() ?
? sl_button_2_action->state.c_str() sl_button_2_action->state.c_str() : "Unknown");
: "Unknown");
if (id(gang_count) >= 3) if (id(gang_count) >= 3)
ESP_LOGCONFIG("core_hw_buttons", " Relay 3: %s", sl_button_3_action->has_state() ESP_LOGCONFIG(TAG, " Relay 3: %s", sl_button_3_action->has_state() ?
? sl_button_3_action->state.c_str() sl_button_3_action->state.c_str() : "Unknown");
: "Unknown");
if (id(gang_count) >= 4) if (id(gang_count) >= 4)
ESP_LOGCONFIG("core_hw_buttons", " Relay 4: %s", sl_button_4_action->has_state() ESP_LOGCONFIG(TAG, " Relay 4: %s", sl_button_4_action->has_state() ?
? sl_button_4_action->state.c_str() sl_button_4_action->state.c_str() : "Unknown");
: "Unknown");
- id: !extend dump_config_list_packages - id: !extend dump_config_list_packages
then: then:
@@ -242,6 +250,21 @@ script:
// Identify itself // Identify itself
ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, " - Core - Hardware - Buttons"); ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, " - Core - Hardware - Buttons");
- id: !extend restore_from_nvs
then:
- select.set_index:
id: sl_button_1_action
index: !lambda return std::min((uint8_t)(id(button_actions_packed) & 0x0F), (uint8_t)2);
- select.set_index:
id: sl_button_2_action
index: !lambda return std::min((uint8_t)((id(button_actions_packed) >> 4) & 0x0F), (uint8_t)2);
- select.set_index:
id: sl_button_3_action
index: !lambda return std::min((uint8_t)((id(button_actions_packed) >> 8) & 0x0F), (uint8_t)2);
- select.set_index:
id: sl_button_4_action
index: !lambda return std::min((uint8_t)((id(button_actions_packed) >> 12) & 0x0F), (uint8_t)2);
- id: !extend touch_on_multi_touch_release - id: !extend touch_on_multi_touch_release
then: then:
- script.execute: buttons_release - script.execute: buttons_release
@@ -288,25 +311,27 @@ script:
- id: !extend touch_on_release - id: !extend touch_on_release
then: then:
- lambda: |- - lambda: |-
static const char *TAG = "script.touch_on_release.core.hw.buttons";
uint32_t current_time = millis(); uint32_t current_time = millis();
buttons_release->execute(); buttons_release->execute();
if (id(button_press_start_time) > 0 and if (id(button_press_start_time) > 0 and
id(button_press_start_time) < current_time) { id(button_press_start_time) < current_time) {
uint32_t press_duration = current_time - id(button_press_start_time); uint32_t press_duration = current_time - id(button_press_start_time);
// Handle overflow (optional, since it's unlikely to happen here) // Handle overflow (optional, since it's unlikely to happen here)
ESP_LOGI("core_hw_buttons", "Button press duration: %" PRIu32 " ms", press_duration); ESP_LOGI(TAG, "Button press duration: %" PRIu32 " ms", press_duration);
if (press_duration < ${BUTTON_CLICK_MIN_LENGTH}) { if (press_duration < ${BUTTON_CLICK_MIN_LENGTH}) {
ESP_LOGW("core_hw_buttons", "Ignoring button press (too short)"); ESP_LOGW(TAG, "Ignoring button press (too short)");
} else if (press_duration >= ${BUTTON_CLICK_MIN_LENGTH} and } else if (press_duration >= ${BUTTON_CLICK_MIN_LENGTH} and
press_duration <= ${BUTTON_CLICK_MAX_LENGTH}) { // Short/normal click press_duration <= ${BUTTON_CLICK_MAX_LENGTH}) { // Short/normal click
button_click_event->execute(id(button_press_button), id(click_counter)); button_click_event->execute(id(button_press_button), id(click_counter));
} else if (press_duration >= ${BUTTON_LONG_PRESS_DELAY} and press_duration <= ${BUTTON_PRESS_TIMEOUT}) { } else if (press_duration >= ${BUTTON_LONG_PRESS_DELAY} and press_duration <= ${BUTTON_PRESS_TIMEOUT}) {
button_action->execute(id(button_press_button), "long_press", 1); button_action->execute(id(button_press_button), "long_press", 1);
} else if (press_duration > ${BUTTON_PRESS_TIMEOUT}) { // Timeout or invalid } else if (press_duration > ${BUTTON_PRESS_TIMEOUT}) { // Timeout or invalid
ESP_LOGW("core_hw_buttons", "Button press cancelled or timed out after ${BUTTON_PRESS_TIMEOUT} ms"); ESP_LOGW(TAG, "Button press cancelled or timed out after ${BUTTON_PRESS_TIMEOUT} ms");
} }
} else { } else {
ESP_LOGW("core_hw_buttons", "Press event timestamp not recorded yet"); ESP_LOGW(TAG, "Press event timestamp not recorded yet");
} }
id(button_press_start_time) = 0; id(button_press_start_time) = 0;
@@ -329,11 +354,16 @@ select:
- "${BUTTON_1_ACTION_FAILSAFE_TEXT}" - "${BUTTON_1_ACTION_FAILSAFE_TEXT}"
initial_option: "${BUTTON_1_ACTION_TEXT}" initial_option: "${BUTTON_1_ACTION_TEXT}"
optimistic: true optimistic: true
restore_value: true restore_value: false
internal: true internal: true
entity_category: config entity_category: config
disabled_by_default: false disabled_by_default: false
icon: mdi:dip-switch icon: mdi:dip-switch
on_value:
then:
- lambda: |-
id(button_actions_packed) = (id(button_actions_packed) & ~(0x07 << 0)) |
((id(sl_button_1_action).active_index().value_or(1) & 0x07) << 0);
- id: sl_button_2_action - id: sl_button_2_action
name: Button 2 action name: Button 2 action
@@ -344,6 +374,11 @@ select:
- "${BUTTON_2_ACTION_FAILSAFE_TEXT}" - "${BUTTON_2_ACTION_FAILSAFE_TEXT}"
initial_option: "${BUTTON_2_ACTION_TEXT}" initial_option: "${BUTTON_2_ACTION_TEXT}"
<<: *button_select_action_base <<: *button_select_action_base
on_value:
then:
- lambda: |-
id(button_actions_packed) = (id(button_actions_packed) & ~(0x07 << 4)) |
((id(sl_button_2_action).active_index().value_or(1) & 0x07) << 4);
- id: sl_button_3_action - id: sl_button_3_action
name: Button 3 action name: Button 3 action
@@ -354,6 +389,11 @@ select:
- "${BUTTON_3_ACTION_FAILSAFE_TEXT}" - "${BUTTON_3_ACTION_FAILSAFE_TEXT}"
initial_option: "${BUTTON_3_ACTION_TEXT}" initial_option: "${BUTTON_3_ACTION_TEXT}"
<<: *button_select_action_base <<: *button_select_action_base
on_value:
then:
- lambda: |-
id(button_actions_packed) = (id(button_actions_packed) & ~(0x07 << 8)) |
((id(sl_button_3_action).active_index().value_or(1) & 0x07) << 8);
- id: sl_button_4_action - id: sl_button_4_action
name: Button 4 action name: Button 4 action
@@ -364,4 +404,9 @@ select:
- "${BUTTON_4_ACTION_FAILSAFE_TEXT}" - "${BUTTON_4_ACTION_FAILSAFE_TEXT}"
initial_option: "${BUTTON_4_ACTION_TEXT}" initial_option: "${BUTTON_4_ACTION_TEXT}"
<<: *button_select_action_base <<: *button_select_action_base
on_value:
then:
- lambda: |-
id(button_actions_packed) = (id(button_actions_packed) & ~(0x07 << 12)) |
((id(sl_button_4_action).active_index().value_or(1) & 0x07) << 12);
... ...