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

Fix namespace names

Browse Source
This commit is contained in:
Edward Firmo
2024-02-23 23:08:40 +01:00
parent 6467f666f3
commit 13a1822c6e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/nspanel_ha_blueprint_upload_tft/upload_tft.h
View File

@@ -3,7 +3,7 @@
#include <string> #include <string>
namespace nspanel_ha_blueprint { namespace nspanel_ha_blueprint_upload_tft {
/** /**
* Constructs the TFT file URL based on branch, model, default URL, and base URL. * Constructs the TFT file URL based on branch, model, default URL, and base URL.
@@ -42,4 +42,4 @@ namespace nspanel_ha_blueprint {
return url; // Return the constructed URL return url; // Return the constructed URL
} }
} // namespace nspanel_ha_blueprint } // namespace nspanel_ha_blueprint_upload_tft

10
esphome/nspanel_esphome_addon_upload_tft.yaml
View File

@@ -60,7 +60,10 @@ api:
// Trim trailing spaces // Trim trailing spaces
auto endPos = clean_url.find_last_not_of(" \t"); auto endPos = clean_url.find_last_not_of(" \t");
if (std::string::npos != endPos) clean_url = clean_url.substr(0, endPos + 1); if (std::string::npos != endPos) clean_url = clean_url.substr(0, endPos + 1);
if (clean_url.empty() or clean_url == "default") url = construct_tft_url("v${version}", tft_file_model->state, "${nextion_update_url}", "${nextion_update_base_url}"); if (clean_url.empty() or clean_url == "default") url = nspanel_ha_blueprint_upload_tft::construct_tft_url("v${version}",
tft_file_model->state,
"${nextion_update_url}",
"${nextion_update_base_url}");
upload_tft->execute(url.c_str()); upload_tft->execute(url.c_str());
# yamllint enable rule:comments-indentation # yamllint enable rule:comments-indentation
@@ -73,7 +76,10 @@ button:
entity_category: config entity_category: config
on_press: on_press:
- lambda: |- - lambda: |-
upload_tft->execute(construct_tft_url("v${version}", tft_file_model->state, "${nextion_update_url}", "${nextion_update_base_url}").c_str()); upload_tft->execute(nspanel_ha_blueprint_upload_tft::construct_tft_url("v${version}",
tft_file_model->state,
"${nextion_update_url}",
"${nextion_update_base_url}").c_str());
display: display:
- id: !extend disp1 - id: !extend disp1