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

TFT Upload routine clean-up

Browse Source 
Solves #1378
Solves #1383
This commit is contained in:
Edward Firmo
2023-12-05 16:58:54 +01:00
parent cf4d0f9393
commit cbdc47170f
1 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
View File

@@ -141,9 +141,9 @@ script:
ESP_LOGD(TAG, "Starting..."); ESP_LOGD(TAG, "Starting...");
nextion_init->publish_state(false); nextion_init->publish_state(false);
stop_all->execute();
disp1->set_backlight_brightness(1); disp1->set_backlight_brightness(1);
disp1->hide_component("255"); disp1->hide_component("255");
stop_all->execute();
std::vector<uint8_t> buffer_; std::vector<uint8_t> buffer_;
@@ -154,6 +154,17 @@ script:
int content_length_ = 0; int content_length_ = 0;
int tft_size_ = 0; int tft_size_ = 0;
auto set_baud_rate_ = [](int baud_rate) {
#ifdef USE_ARDUINO
auto *uart = reinterpret_cast<uart::ESP32ArduinoUARTComponent *>(tf_uart);
#endif
#ifdef USE_ESP_IDF
auto *uart = reinterpret_cast<uart::IDFUARTComponent *>(tf_uart);
#endif
uart->set_baud_rate(baud_rate);
uart->setup();
};
auto delay_seconds_ = [](int seconds) { auto delay_seconds_ = [](int seconds) {
ESP_LOGD(TAG, "Wait %i seconds", seconds); ESP_LOGD(TAG, "Wait %i seconds", seconds);
for (int i = 0; i < (seconds*4); i++) { for (int i = 0; i < (seconds*4); i++) {
@@ -365,8 +376,8 @@ script:
{ {
static const char *const TAG = "script.upload_tft.upload_tft_arduino"; static const char *const TAG = "script.upload_tft.upload_tft_arduino";
ESP_LOGD(TAG, "Nextion TFT upload requested"); ESP_LOGD(TAG, "Nextion TFT upload requested");
ESP_LOGD(TAG, "url: %s", url.c_str()); ESP_LOGD(TAG, " url: %s", url.c_str());
ESP_LOGD(TAG, "baud_rate: %i", update_baud_rate_); ESP_LOGD(TAG, " baud_rate: %i", update_baud_rate_);
if (is_updating_) { if (is_updating_) {
ESP_LOGD(TAG, "Currently updating"); ESP_LOGD(TAG, "Currently updating");
@@ -442,8 +453,9 @@ script:
// Tells the Nextion the content length of the tft file and baud rate it will be sent at // Tells the Nextion the content length of the tft file and baud rate it will be sent at
// Once the Nextion accepts the command it will wait until the file is successfully uploaded // Once the Nextion accepts the command it will wait until the file is successfully uploaded
// If it fails for any reason a power cycle of the display will be needed // If it fails for any reason a power cycle of the display will be needed
sprintf(command, "whmi-wris %d,%" PRIu32 ",1", content_length_, update_baud_rate_); sprintf(command, "whmi-wris %d,%d,1", content_length_, update_baud_rate_);
ESP_LOGD(TAG, "Clear serial receive buffer: %d", id(tf_uart).available());
// Clear serial receive buffer // Clear serial receive buffer
uint8_t d; uint8_t d;
while (id(tf_uart).available()) { while (id(tf_uart).available()) {
@@ -452,16 +464,16 @@ script:
send_nextion_command(command); send_nextion_command(command);
if (update_baud_rate_ != id(tf_uart).get_baud_rate()) if (update_baud_rate_ != id(tf_uart).get_baud_rate()) {
{ set_baud_rate_(update_baud_rate_);
id(tf_uart).set_baud_rate(update_baud_rate_); //id(tf_uart).set_baud_rate(update_baud_rate_);
id(tf_uart).setup(); //id(tf_uart).setup();
//delay_seconds_(2);
} }
std::string response;
ESP_LOGD(TAG, "Waiting for upgrade response"); ESP_LOGD(TAG, "Waiting for upgrade response");
recv_ret_string_(response, 2000, true); // This can take some time to return std::string response;
recv_ret_string_(response, 5000, true); // This can take some time to return
// The Nextion display will, if it's ready to accept data, send a 0x05 byte. // The Nextion display will, if it's ready to accept data, send a 0x05 byte.
ESP_LOGD(TAG, "Upgrade response is [%s]", ESP_LOGD(TAG, "Upgrade response is [%s]",
format_hex_pretty(reinterpret_cast<const uint8_t *>(response.data()), response.size()).c_str()); format_hex_pretty(reinterpret_cast<const uint8_t *>(response.data()), response.size()).c_str());
@@ -630,8 +642,8 @@ script:
auto upload_tft_ = [&](const std::string &url, unsigned int update_baud_rate_) -> bool { auto upload_tft_ = [&](const std::string &url, unsigned int update_baud_rate_) -> bool {
static const char *const TAG = "script.upload_tft.upload_tft_esp_idf"; static const char *const TAG = "script.upload_tft.upload_tft_esp_idf";
ESP_LOGD(TAG, "Nextion TFT upload requested"); ESP_LOGD(TAG, "Nextion TFT upload requested");
ESP_LOGD(TAG, "url: %s", url.c_str()); ESP_LOGD(TAG, " url: %s", url.c_str());
ESP_LOGD(TAG, "baud_rate: %i", update_baud_rate_); ESP_LOGD(TAG, " baud_rate: %i", update_baud_rate_);
if (is_updating_) { if (is_updating_) {
ESP_LOGW(TAG, "Currently updating"); ESP_LOGW(TAG, "Currently updating");
@@ -713,10 +725,10 @@ script:
send_nextion_command(command); send_nextion_command(command);
if (update_baud_rate_ != id(tf_uart).get_baud_rate()) if (update_baud_rate_ != id(tf_uart).get_baud_rate()) {
{ set_baud_rate_(update_baud_rate_);
id(tf_uart).set_baud_rate(update_baud_rate_); //id(tf_uart).set_baud_rate(update_baud_rate_);
id(tf_uart).setup(); //id(tf_uart).setup();
} }
std::string response; std::string response;
@@ -761,36 +773,33 @@ script:
}; };
#endif #endif
unsigned int upload_tries = 0; ESP_LOGD(TAG, "Try #1 at 921600 bps");
while (upload_tries < 5) { if (upload_tft_(url, 921600)) id(restart_nspanel).press();
upload_tries++; ESP_LOGW(TAG, "Try #1 failed");
ESP_LOGD(TAG, "Try #%i", upload_tries); delay_seconds_(5);
if (upload_tft_(url, 921600)) id(restart_nspanel).press(); ESP_LOGD(TAG, "Try #2 at 921600 bps");
ESP_LOGD(TAG, "Turn off Nextion"); if (upload_tft_(url, 921600)) id(restart_nspanel).press();
id(screen_power).turn_off(); ESP_LOGW(TAG, "Try #2 failed");
delay_seconds_(2); delay_seconds_(5);
ESP_LOGD(TAG, "Turn on Nextion"); ESP_LOGD(TAG, "Try #3 at 115200 bps");
id(screen_power).turn_on(); if (upload_tft_(url, 115200)) id(restart_nspanel).press();
delay_seconds_(5); ESP_LOGW(TAG, "Try #3 failed");
}
unsigned int new_baud_rate;
if (id(tf_uart).get_baud_rate() == 115200) {
new_baud_rate = 921600;
} else {
new_baud_rate = 115200;
}
ESP_LOGD(TAG, "Trying again at %i bps", new_baud_rate);
if (upload_tft_(url, new_baud_rate)) {
id(restart_nspanel).press();
}
ESP_LOGE(TAG, "TFT upload failed.");
ESP_LOGD(TAG, "Turn off Nextion"); ESP_LOGD(TAG, "Turn off Nextion");
id(screen_power).turn_off(); id(screen_power).turn_off();
delay_seconds_(2); delay_seconds_(2);
ESP_LOGD(TAG, "Turn on Nextion"); ESP_LOGD(TAG, "Turn on Nextion");
id(screen_power).turn_on(); id(screen_power).turn_on();
ESP_LOGD(TAG, "Restarting esphome"); delay_seconds_(10);
ESP_LOGD(TAG, "Try #4 at 115200 bps");
if (upload_tft_(url, 115200)) id(restart_nspanel).press();
ESP_LOGE(TAG, "TFT upload failed");
ESP_LOGD(TAG, "Turn off Nextion");
id(screen_power).turn_off();
delay_seconds_(2);
ESP_LOGD(TAG, "Turn on Nextion");
id(screen_power).turn_on();
ESP_LOGD(TAG, "Restarting ESPHome");
delay_seconds_(2); delay_seconds_(2);
id(restart_nspanel).press(); id(restart_nspanel).press();
ESP_LOGD(TAG, "Finished!"); ESP_LOGD(TAG, "Finished!");