h3n3/NSPanel_HA_Blueprint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tft url when nextion_update_url is selected

Browse Source
This commit is contained in:
Edward Firmo
2024-01-10 01:49:17 +01:00
parent 1078125b98
commit 948124927d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
View File

@@ -221,8 +221,8 @@ script:
std::string branch = tft_file_branch->state; std::string branch = tft_file_branch->state;
std::string model = tft_file_model->state; std::string model = tft_file_model->state;
ESP_LOGD(TAG, "TFT URL set:"); ESP_LOGD(TAG, "TFT URL set:");
ESP_LOGD(TAG, " Branch: %s", branch.c_str()); ESP_LOGD(TAG, " Branch: %s", branch.c_str());
ESP_LOGD(TAG, " Model: %s", model.c_str()); ESP_LOGD(TAG, " Model: %s", model.c_str());
if (id(is_restored_settings) and tft_file_branch->active_index().has_value()) if (id(is_restored_settings) and tft_file_branch->active_index().has_value())
id(tft_branch) = tft_file_branch->active_index().value(); id(tft_branch) = tft_file_branch->active_index().value();
if (id(is_restored_settings) and tft_file_model->active_index().has_value()) if (id(is_restored_settings) and tft_file_model->active_index().has_value())
@@ -250,11 +250,11 @@ script:
if (std::string::npos != endPos) { if (std::string::npos != endPos) {
url = url.substr(0, endPos + 1); url = url.substr(0, endPos + 1);
} }
ESP_LOGD(TAG, "Full URL: %s", url.c_str());
id(tft_url) = url;
disp1->set_tft_url(url.c_str());
} }
ESP_LOGD(TAG, " Full URL: %s", url.c_str());
id(tft_url) = url;
disp1->set_tft_url(url.c_str());
} }
- id: upload_tft # I've changed this to use ESPHome commands to avoid the parallelism from lambdas - id: upload_tft # I've changed this to use ESPHome commands to avoid the parallelism from lambdas

2
advanced/esphome/nspanel_esphome_core.yaml
View File

@@ -14,7 +14,7 @@ substitutions:
ota_password: ${wifi_password} ota_password: ${wifi_password}
ap_password: ${wifi_password} ap_password: ${wifi_password}
##### DON'T CHANGE THIS ###### ##### DON'T CHANGE THIS ######
version: "4.2beta.5" version: "4.2beta.6"
############################## ##############################
##### External components ##### ##### External components #####