diff --git a/src/drv/tft_driver_tftespi.cpp b/src/drv/tft_driver_tftespi.cpp index 5713ee85..ac418422 100644 --- a/src/drv/tft_driver_tftespi.cpp +++ b/src/drv/tft_driver_tftespi.cpp @@ -27,11 +27,11 @@ void TftEspi::show_info() tft.getSetup(tftSetup); LOG_VERBOSE(TAG_TFT, F("TFT_eSPI : v%s"), tftSetup.version.c_str()); - LOG_VERBOSE(TAG_TFT, F("Transactns : %s"), (tftSetup.trans == 1) ? PSTR("Yes") : PSTR("No")); + LOG_VERBOSE(TAG_TFT, F("Transactns : %s"), (tftSetup.trans == 1) ? PSTR(D_YES) : PSTR(D_NO)); LOG_VERBOSE(TAG_TFT, F("Interface : %s"), (tftSetup.serial == 1) ? PSTR("SPI") : PSTR("Parallel")); #if defined(ARDUINO_ARCH_ESP8266) - LOG_VERBOSE(TAG_TFT, F("SPI overlap: %s"), (tftSetup.overlap == 1) ? PSTR("Yes") : PSTR("No")); + LOG_VERBOSE(TAG_TFT, F("SPI overlap: %s"), (tftSetup.overlap == 1) ? PSTR(D_YES) : PSTR(D_NO)); #endif if(tftSetup.tft_driver != 0xE9D) // For ePaper displays the size is defined in the sketch @@ -117,7 +117,7 @@ void TftEspi::set_rotation(uint8_t rotation) void TftEspi::set_invert(bool invert) { char buffer[4]; - memcpy_P(buffer, invert ? PSTR("yes") : PSTR("no"), sizeof(buffer)); + memcpy_P(buffer, invert ? PSTR(D_YES) : PSTR(D_NO), sizeof(buffer)); LOG_VERBOSE(TAG_TFT, F("Invert Disp: %s"), buffer); tft.invertDisplay(invert); diff --git a/src/hasp_gui.cpp b/src/hasp_gui.cpp index d65e32bd..36104edc 100644 --- a/src/hasp_gui.cpp +++ b/src/hasp_gui.cpp @@ -191,11 +191,11 @@ void guiSetup(void) /* Initialize Filesystems */ #if LV_USE_FS_IF != 0 // _lv_fs_init(); // lvgl File System -- not neaded, it done in lv_init() when LV_USE_FILESYSTEM is set - LOG_VERBOSE(TAG_LVGL, F("Filesystem : Enabled")); + LOG_VERBOSE(TAG_LVGL, F("Filesystem : " D_SETTING_ENABLED)); lv_fs_if_init(); // auxilary file system drivers filesystem_list_path("S:/fs/"); #else - LOG_VERBOSE(TAG_LVGL, F("Filesystem : Disabled")); + LOG_VERBOSE(TAG_LVGL, F("Filesystem : " D_SETTING_DISABLED)); #endif /* Initialize PNG decoder */ @@ -204,9 +204,9 @@ void guiSetup(void) #endif #ifdef USE_DMA_TO_TFT - LOG_VERBOSE(TAG_GUI, F("DMA : ENABLED")); + LOG_VERBOSE(TAG_GUI, F("DMA : " D_SETTING_ENABLED)); #else - LOG_VERBOSE(TAG_GUI, F("DMA : DISABLED")); + LOG_VERBOSE(TAG_GUI, F("DMA : " D_SETTING_DISABLED)); #endif /* Setup Backlight Control Pin */ @@ -575,7 +575,7 @@ void guiTakeScreenshot(const char* pFileName) pFileOut.close(); } else { - LOG_WARNING(TAG_GUI, F("%s cannot be opened"), pFileName); + LOG_WARNING(TAG_GUI, F(D_FILE_SAVE_FAILED), pFileName); } } #endif diff --git a/src/lang/en_US.h b/src/lang/en_US.h index 75749eac..704cbeb8 100644 --- a/src/lang/en_US.h +++ b/src/lang/en_US.h @@ -4,6 +4,8 @@ #define D_USERNAME "Username:" #define D_PASSWORD "Password:" #define D_SSID "Ssid:" +#define D_YES "Yes" // New +#define D_NO "No" // New #define D_ERROR_OUT_OF_MEMORY "Out of memory" #define D_ERROR_UNKNOWN "Unkown error" @@ -28,6 +30,9 @@ #define D_SERVICE_CONNECTED "Connected" #define D_SERVICE_DISCONNECTED "Disconnected" +#define D_SETTING_ENABLED "Enabled" // New +#define D_SETTING_DISABLED "Disabled" // New + #define D_NETWORK_IP_ADDRESS_RECEIVED "Received IP address %s" #define D_NETWORK_ONLINE "online" #define D_NETWORK_OFFLINE "offline" diff --git a/src/lang/hu_HU.h b/src/lang/hu_HU.h index 168c27f0..9ca9fcfe 100644 --- a/src/lang/hu_HU.h +++ b/src/lang/hu_HU.h @@ -4,6 +4,8 @@ #define D_USERNAME "Felhasználónév:" #define D_PASSWORD "Jelszó:" #define D_SSID "SSID:" +#define D_YES "Yes" // New +#define D_NO "No" // New #define D_ERROR_OUT_OF_MEMORY "Elfogyott a memória" #define D_ERROR_UNKNOWN "Ismeretlen hiba" @@ -28,6 +30,9 @@ #define D_SERVICE_CONNECTED "Csatlakoztatva" #define D_SERVICE_DISCONNECTED "Szétkapcsolva" +#define D_SETTING_ENABLED "Enabled" // New +#define D_SETTING_DISABLED "Disabled" // New + #define D_NETWORK_IP_ADDRESS_RECEIVED "Beállított IP-cím: %s" #define D_NETWORK_ONLINE "online" #define D_NETWORK_OFFLINE "offline" diff --git a/src/lang/nl_NL.h b/src/lang/nl_NL.h index c654aa14..7185cc9c 100644 --- a/src/lang/nl_NL.h +++ b/src/lang/nl_NL.h @@ -4,6 +4,8 @@ #define D_USERNAME "Gebruikersnaam:" #define D_PASSWORD "Wachtwoord:" #define D_SSID "Ssid:" +#define D_YES "Yes" // New +#define D_NO "No" // New #define D_ERROR_OUT_OF_MEMORY "Geen geheugen bechikbaar" #define D_ERROR_UNKNOWN "Onbekende fout" @@ -20,6 +22,9 @@ #define D_FILE_SAVED "%s bewaard" #define D_FILE_SAVE_FAILED "%s bewaren mislukt" +#define D_SETTING_ENABLED "Ingeschakeld" // New +#define D_SETTING_DISABLED "Uitgeschakeld" // New + #define D_SERVICE_STARTING "Starten..." #define D_SERVICE_STARTED "Gestart" #define D_SERVICE_START_FAILED "Starten mislukt" diff --git a/src/lang/ro_RO.h b/src/lang/ro_RO.h index a292c0e5..4557b752 100644 --- a/src/lang/ro_RO.h +++ b/src/lang/ro_RO.h @@ -4,6 +4,8 @@ #define D_USERNAME "Nume de utilizator:" #define D_PASSWORD "Parola:" #define D_SSID "SSID:" +#define D_YES "Yes" // New +#define D_NO "No" // New #define D_ERROR_OUT_OF_MEMORY "Memorie epuizată" #define D_ERROR_UNKNOWN "Eroare necunoscută" @@ -20,6 +22,9 @@ #define D_FILE_SAVED "S-a salvat %s" #define D_FILE_SAVE_FAILED "Salvarea %s a eșuat" +#define D_SETTING_ENABLED "Enabled" // New +#define D_SETTING_DISABLED "Disabled" // New + #define D_SERVICE_STARTING "Pornire..." #define D_SERVICE_STARTED "Pornit" #define D_SERVICE_START_FAILED "Pornirea a eșuat" diff --git a/src/log/hasp_debug.cpp b/src/log/hasp_debug.cpp index 593f0b3f..ffb977a9 100644 --- a/src/log/hasp_debug.cpp +++ b/src/log/hasp_debug.cpp @@ -386,7 +386,7 @@ void printLocalTime() } else { Serial.printf("%s ", sntp.toString().c_str()); } - Serial.printf("IPv6: %s Reachability: %o\n", sntp.isV6() ? "Yes" : "No", sntp_getreachability(i)); + Serial.printf("IPv6: %s Reachability: %o\n", sntp.isV6() ? D_YES : D_NO, sntp_getreachability(i)); } } #endif diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index b6783a4a..60803d50 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -1735,7 +1735,7 @@ void webHandleDebugConfig() uint16_t baudrate = settings[FPSTR(FP_CONFIG_BAUD)].as(); httpMessage += F("

Serial Port