From 1e036a204c613f096c69652d9c747c33714fc035 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Thu, 8 Feb 2024 08:22:04 +0100
Subject: [PATCH] Unify set_tft_file

---
 .../nspanel_esphome_addon_upload_tft.yaml       | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
index b8e00a0..5371ec2 100644
--- a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
@@ -135,11 +135,8 @@ script:
           disp1->hide_component("bt_accept");
           disp1->hide_component("bt_clear");
           disp1->hide_component("bt_close");
-          #ifdef ARDUINO
-          disp1->set_component_text_printf("confirm.title", "Upload TFT\\rArduino");
-          #elif defined(ESP_PLATFORM)
-          disp1->set_component_text_printf("confirm.title", "Upload TFT\\rESP-IDF");
-          #endif
+          disp1->set_component_text_printf("confirm.title", "Upload TFT\\r%s",
+                  id(framework) == 1 ? "Arduino" : (id(framework) == 2 ? "ESP-IDF" : "Unknown"));
           page_id->update();
 
   - id: report_settings
@@ -176,11 +173,7 @@ script:
     then:
       - delay: 2s
       - lambda: |-
-          #ifdef ARDUINO
-          static const char *const TAG = "addon_upload_tft.script.set_tft_file.arduino";
-          #elif defined(ESP_PLATFORM)
-          static const char *const TAG = "addon_upload_tft.script.set_tft_file.esp_idf";
-          #endif
+          static const char *const TAG = "addon_upload_tft.script.set_tft_file";
           std::string branch = "v${version}";
           if (branch.find("beta") != std::string::npos) branch = "beta";
           else if (branch.find("dev") != std::string::npos) branch = "dev";
@@ -192,9 +185,6 @@ script:
           if (id(is_uploading_tft))
             ESP_LOGW(TAG, "  TFT Upload in progress.");
           else {
-            #ifdef ARDUINO
-            std::string url = "${nextion_update_url}";
-            #elif defined(ESP_PLATFORM)
             std::string url;
             std::string file_name;
             if (model == "NSPanel Blank") file_name = "nspanel_blank.tft";
@@ -215,7 +205,6 @@ script:
                   url = url.substr(0, endPos + 1);
               }
             }
-            #endif
 
             ESP_LOGD(TAG, "  Full URL: %s", url.c_str());
             id(tft_url) = url;