diff --git a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml index c641929..58ef207 100644 --- a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml +++ b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml @@ -113,7 +113,7 @@ globals: - id: tft_upload_result type: esphome::nextion::Nextion::TFTUploadResult restore_value: false - initial_value: 'esphome::nextion::Nextion::TFTUploadResult::Unknown' + initial_value: 'esphome::nextion::Nextion::TFTUploadResult::UNKNOWN' script: - id: nextion_uart_command @@ -150,7 +150,7 @@ script: static const char *const TAG = "addon_upload_tft.script.nextion_upload"; ESP_LOGD(TAG, "Starting TFT upload..."); id(tft_upload_result) = disp1->upload_tft(); - ESP_LOGD(TAG, "TFT upload: %s", esphome::nextion::Nextion::TFTUploadResultToString(id(tft_upload_result))); + ESP_LOGD(TAG, "TFT upload: %s", esphome::nextion::Nextion::tft_upload_result_to_string(id(tft_upload_result))); - id: open_upload_dialog mode: restart @@ -465,7 +465,7 @@ script: - lambda: |- char update_msg[128]; sprintf(update_msg, "Attempt #%d at %" PRIu32 " bps", id(tft_upload_attempt), tf_uart->get_baud_rate()); - id(tft_upload_result) = esphome::nextion::Nextion::TFTUploadResult::Unknown; + id(tft_upload_result) = esphome::nextion::Nextion::TFTUploadResult::UNKNOWN; report_upload_progress->execute(update_msg); - script.wait: report_upload_progress - wait_until: @@ -477,16 +477,16 @@ script: - lambda: |- char update_msg[128]; sprintf(update_msg, "Attempt #%d at %" PRIu32 " bps returned: %s", id(tft_upload_attempt), - tf_uart->get_baud_rate(), esphome::nextion::Nextion::TFTUploadResultToString(id(tft_upload_result))); + tf_uart->get_baud_rate(), esphome::nextion::Nextion::tft_upload_result_to_string(id(tft_upload_result))); report_upload_progress->execute(update_msg); - script.wait: report_upload_progress - if: condition: not: - - lambda: return id(tft_upload_result) == esphome::nextion::Nextion::TFTUploadResult::Unknown; - - lambda: return id(tft_upload_result) == esphome::nextion::Nextion::TFTUploadResult::UploadInProgress; - - lambda: return id(tft_upload_result) == esphome::nextion::Nextion::TFTUploadResult::NextionError_PreparationFailed; - - lambda: return id(tft_upload_result) == esphome::nextion::Nextion::TFTUploadResult::NextionError_InvalidResponse; + - lambda: return id(tft_upload_result) == esphome::nextion::Nextion::TFTUploadResult::UNKNOWN; + - lambda: return id(tft_upload_result) == esphome::nextion::Nextion::TFTUploadResult::UPLOAD_IN_PROGRESS; + - lambda: return id(tft_upload_result) == esphome::nextion::Nextion::TFTUploadResult::NEXTION_ERROR_PREPARATION_FAILED; + - lambda: return id(tft_upload_result) == esphome::nextion::Nextion::TFTUploadResult::NEXTION_ERROR_INVALID_RESPONSE; then: - delay: 5s - lambda: |-