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

Introduce restore_from_nvs on core.common

Browse Source
This commit is contained in:
Edward Firmo
2025-08-04 23:50:06 +02:00
parent ecfc64d2f3
commit 42ae160217
1 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml
View File

@@ -48,9 +48,9 @@ binary_sensor:
then: then:
- lambda: |- - lambda: |-
if (x) if (x)
ESP_LOGW("core", "Pending restart: YES"); ESP_LOGW("binary_sensor.bs_pending_restart.core.common", "Pending restart: YES");
else else
ESP_LOGCONFIG("core", "Pending restart: No"); ESP_LOGCONFIG("binary_sensor.bs_pending_restart.core.common", "Pending restart: No");
- script.execute: dump_config_caller - script.execute: dump_config_caller
button: button:
@@ -77,6 +77,10 @@ esphome:
- -D TX_ULTIMATE_EASY_CORE - -D TX_ULTIMATE_EASY_CORE
on_boot: on_boot:
- priority: 750
then:
- script.execute: restore_from_nvs
- priority: 700 - priority: 700
then: then:
- script.execute: boot_initialize - script.execute: boot_initialize
@@ -149,7 +153,7 @@ script:
id(is_us_model) = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}"); id(is_us_model) = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}");
id(gang_count) = sl_tx_model_gang->active_index().value() + 1; id(gang_count) = sl_tx_model_gang->active_index().value() + 1;
if (id(gang_count) < 1 || id(gang_count) > 4) { if (id(gang_count) < 1 || id(gang_count) > 4) {
ESP_LOGE("core_hw_leds", "Invalid number of gangs: %" PRIu8, id(gang_count)); ESP_LOGE("script.boot_initialize.core.common", "Invalid number of gangs: %" PRIu8, id(gang_count));
} }
- id: boot_sequence - id: boot_sequence
@@ -166,33 +170,37 @@ script:
# Extended by all modules # Extended by all modules
- lambda: |- - lambda: |-
// Device identification // Device identification
ESP_LOGCONFIG("core", "Device friendly name: ${friendly_name}"); ESP_LOGCONFIG("script.dump_config.core.common", "Device friendly name: ${friendly_name}");
ESP_LOGCONFIG("core", "Device name: ${name}"); ESP_LOGCONFIG("script.dump_config.core.common", "Device name: ${name}");
ESP_LOGCONFIG("core", "Device name (HA): %s", tx_device_name->state.c_str()); ESP_LOGCONFIG("script.dump_config.core.common", "Device name (HA): %s", tx_device_name->state.c_str());
ESP_LOGCONFIG("core", "Device hostname: %s", App.get_name().c_str()); ESP_LOGCONFIG("script.dump_config.core.common", "Device hostname: %s", App.get_name().c_str());
dump_config_versions->execute(); dump_config_versions->execute();
// Framework detection // Framework detection
#ifdef USE_ARDUINO #ifdef USE_ARDUINO
ESP_LOGCONFIG("core", "Framework: Arduino"); ESP_LOGCONFIG("script.dump_config.core.common", "Framework: Arduino");
#elif defined(USE_ESP_IDF) #elif defined(USE_ESP_IDF)
ESP_LOGCONFIG("core", "Framework: ESP-IDF"); ESP_LOGCONFIG("script.dump_config.core.common", "Framework: ESP-IDF");
#else #else
ESP_LOGW("core", "Framework: UNKNOWN"); ESP_LOGW("script.dump_config.core.common", "Framework: UNKNOWN");
#endif #endif
// Model configuration // Model configuration
ESP_LOGCONFIG("core", "Model format (selected): %s", sl_tx_model_format->state.c_str()); ESP_LOGCONFIG("script.dump_config.core.common", "Model format (selected): %s",
ESP_LOGCONFIG("core", "Model format (detected): %s", id(is_us_model) ? "US" : "EU"); sl_tx_model_format->state.c_str());
ESP_LOGCONFIG("core", "Gangs (selected): %s", sl_tx_model_gang->state.c_str()); ESP_LOGCONFIG("script.dump_config.core.common", "Model format (detected): %s",
ESP_LOGCONFIG("core", "Gangs (detected): %" PRIu8 "-Gang%s", id(gang_count), id(gang_count) > 1 ? "s" : ""); id(is_us_model) ? "US" : "EU");
ESP_LOGCONFIG("script.dump_config.core.common", "Gangs (selected): %s",
sl_tx_model_gang->state.c_str());
ESP_LOGCONFIG("script.dump_config.core.common", "Gangs (detected): %" PRIu8 "-Gang%s",
id(gang_count), id(gang_count) > 1 ? "s" : "");
// System state // System state
if (bs_pending_restart->state) if (bs_pending_restart->state)
ESP_LOGW("core", "Pending restart: YES"); ESP_LOGW("script.dump_config.core.common", "Pending restart: YES");
else else
ESP_LOGCONFIG("core", "Pending restart: No"); ESP_LOGCONFIG("script.dump_config.core.common", "Pending restart: No");
- id: dump_config_caller - id: dump_config_caller
mode: restart mode: restart
@@ -229,6 +237,16 @@ script:
tx_fw_version->publish_state("${version}"); tx_fw_version->publish_state("${version}");
tx_device_name->publish_state(App.get_name().c_str()); tx_device_name->publish_state(App.get_name().c_str());
- id: restore_from_nvs
mode: single
then:
- select.set_index:
id: sl_tx_model_format
index: !lambda if (id(is_us_model)) return 1; else return 0;
- select.set_index:
id: sl_tx_model_gang
index: !lambda return (id(gang_count)-1);
select: select:
- id: sl_tx_model_format - id: sl_tx_model_format
name: Model (Format) name: Model (Format)
@@ -238,7 +256,7 @@ select:
- "${TX_MODEL_FORMAT_US_TEXT}" - "${TX_MODEL_FORMAT_US_TEXT}"
initial_option: "${TX_MODEL_FORMAT_EU_TEXT}" initial_option: "${TX_MODEL_FORMAT_EU_TEXT}"
optimistic: true optimistic: true
restore_value: true restore_value: false
internal: false internal: false
entity_category: config entity_category: config
disabled_by_default: false disabled_by_default: false
@@ -250,7 +268,7 @@ select:
state: true state: true
- lambda: |- - lambda: |-
id(is_us_model) = (x == "${TX_MODEL_FORMAT_US_TEXT}"); id(is_us_model) = (x == "${TX_MODEL_FORMAT_US_TEXT}");
ESP_LOGI("core", "New model selected: %s", id(is_us_model) ? "US" : "EU"); ESP_LOGI("select.sl_tx_model_gang.core.common", "New model selected: %s", id(is_us_model) ? "US" : "EU");
- id: sl_tx_model_gang - id: sl_tx_model_gang
name: Model (Gang) name: Model (Gang)
@@ -262,7 +280,7 @@ select:
- "${TX_MODEL_4_GANG_TEXT}" - "${TX_MODEL_4_GANG_TEXT}"
initial_option: "${TX_MODEL_1_GANG_TEXT}" initial_option: "${TX_MODEL_1_GANG_TEXT}"
optimistic: true optimistic: true
restore_value: true restore_value: false
internal: false internal: false
entity_category: config entity_category: config
disabled_by_default: false disabled_by_default: false
@@ -274,7 +292,8 @@ select:
state: true state: true
- lambda: |- - lambda: |-
id(gang_count) = static_cast<uint8_t>(i) + 1; id(gang_count) = static_cast<uint8_t>(i) + 1;
ESP_LOGI("core", "New model selected: %" PRIu8 "-%s", id(gang_count), id(gang_count) > 1 ? "Gangs" : "Gang"); ESP_LOGI("select.sl_tx_model_gang.core.common", "New model selected: %" PRIu8 "-%s",
id(gang_count), id(gang_count) > 1 ? "Gangs" : "Gang");
tx_ultimate->set_gang_count(id(gang_count)); tx_ultimate->set_gang_count(id(gang_count));
text_sensor: text_sensor: