diff --git a/firmware/esp32-s3-dashboard/dashboard_config.h b/firmware/esp32-s3-dashboard/dashboard_config.h index fd16e07..2eef843 100644 --- a/firmware/esp32-s3-dashboard/dashboard_config.h +++ b/firmware/esp32-s3-dashboard/dashboard_config.h @@ -1,20 +1,20 @@ #pragma once -static const char *DASHBOARD_VERSION = "0.1.125-equal-main-side-cards"; +static const char *DASHBOARD_VERSION = "0.1.126-restore-boot-screen"; // Update these if your Cargo ESP AP credentials are different. -//static const char *CARGO_WIFI_SSID = "OverlandController"; -//static const char *CARGO_WIFI_PASSWORD = "overland1234"; +static const char *CARGO_WIFI_SSID = "OverlandController"; +static const char *CARGO_WIFI_PASSWORD = "overland1234"; -static const char *CARGO_WIFI_SSID = "WardAP"; -static const char *CARGO_WIFI_PASSWORD = "Ward5213"; +//static const char *CARGO_WIFI_SSID = "WardAP"; +//static const char *CARGO_WIFI_PASSWORD = "Ward5213"; -//static const char *CARGO_API_STATUS_URL = "http://192.168.4.1/api/v1/status"; -//static const char *CARGO_API_FAST_STATUS_URL = "http://192.168.4.1/api/v1/status?fields=battery,temps,relays"; -//static const char *CARGO_API_SLOW_STATUS_URL = "http://192.168.4.1/api/v1/status?fields=network,system,config"; -//static const char *CARGO_API_RELAY_SET_URL = "http://192.168.4.1/api/v1/relay/set"; +static const char *CARGO_API_STATUS_URL = "http://192.168.4.1/api/v1/status"; +static const char *CARGO_API_FAST_STATUS_URL = "http://192.168.4.1/api/v1/status?fields=battery,temps,relays"; +static const char *CARGO_API_SLOW_STATUS_URL = "http://192.168.4.1/api/v1/status?fields=network,system,config"; +static const char *CARGO_API_RELAY_SET_URL = "http://192.168.4.1/api/v1/relay/set"; -static const char *CARGO_API_STATUS_URL = "http://192.168.88.108/api/v1/status"; -static const char *CARGO_API_FAST_STATUS_URL = "http://192.168.88.108/api/v1/status?fields=battery,temps,relays"; -static const char *CARGO_API_SLOW_STATUS_URL = "http://192.168.88.108/api/v1/status?fields=network,system,config"; -static const char *CARGO_API_RELAY_SET_URL = "http://192.168.88.108/api/v1/relay/set"; +//static const char *CARGO_API_STATUS_URL = "http://192.168.88.108/api/v1/status"; +//static const char *CARGO_API_FAST_STATUS_URL = "http://192.168.88.108/api/v1/status?fields=battery,temps,relays"; +//static const char *CARGO_API_SLOW_STATUS_URL = "http://192.168.88.108/api/v1/status?fields=network,system,config"; +//static const char *CARGO_API_RELAY_SET_URL = "http://192.168.88.108/api/v1/relay/set"; diff --git a/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino b/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino index ee2208e..5c7be52 100644 --- a/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino +++ b/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino @@ -2200,9 +2200,7 @@ void setup() lvgl_port_init(board->getLCD(), board->getTouch()); lvgl_port_lock(-1); - // TEMP DEBUG: bypass blocking Cargo ESP WiFi screen while troubleshooting pages. - create_overland_overview_screen(); - overview_screen_created = true; + show_boot_screen(); lvgl_port_unlock(); Serial.println("Dashboard boot screen ready");