jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 20:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update strings

Browse Source
This commit is contained in:
fvanroie 2021-04-13 04:08:10 +02:00
parent 44cb84e6a7
commit 67ffc1e266
8 changed files with 260 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lang/en_US.h
View File

@ -128,4 +128,7 @@
#define D_OOBE_MSG "Tap the screen to setup WiFi or connect to this Access Point:"
#define D_OOBE_SCAN_TO_CONNECT "Scan to connect"
#define D_WIFI_CONNECTING_TO "Connecting to %s"
#define D_WIFI_CONNECTED_TO "Connected to %s, requesting IP..."
#endif

3
src/lang/hu_HU.h
View File

@ -128,4 +128,7 @@
#define D_OOBE_MSG "Koppintson a képernyőre a WiFi beállításához, vagy csatlakozzon az alábbi Access Point-hoz:"
#define D_OOBE_SCAN_TO_CONNECT "Szkennelje le a csatlakozáshoz:"
#define D_WIFI_CONNECTING_TO "$$$Connecting to %s"
#define D_WIFI_CONNECTED_TO "$$$Connected to %s, requesting IP..."
#endif

3
src/lang/nl_NL.h
View File

@ -127,4 +127,7 @@
#define D_OOBE_MSG "Raak het scherm aan om WiFi in te stellen of meld je aan op AP:"
#define D_OOBE_SCAN_TO_CONNECT "Scan code"
#define D_WIFI_CONNECTING_TO "Verbinden met %s"
#define D_WIFI_CONNECTED_TO "Verbonden met %s, IP aanvragen..."
#endif

3
src/lang/ro_RO.h
View File

@ -128,4 +128,7 @@
#define D_OOBE_MSG "Atingeți ecranul pentru a configura WiFi sau conectați-vă la acest punct de acces:"
#define D_OOBE_SCAN_TO_CONNECT "Scanați pentru a vă conecta:"
#define D_WIFI_CONNECTING_TO "$$$Connecting to %s"
#define D_WIFI_CONNECTED_TO "$$$Connected to %s, requesting IP..."
#endif

4
src/log/hasp_debug.cpp
View File

@ -67,7 +67,7 @@
// static StringStream debugStream((String &)debugOutput);
// extern char mqttNodeName[16];
const char* syslogAppName = APP_NAME;
// const char* syslogAppName = APP_NAME;
char debugSyslogHost[32] = SYSLOG_SERVER;
uint16_t debugSyslogPort = SYSLOG_PORT;
uint8_t debugSyslogFacility = 0;
@ -328,7 +328,7 @@ void debugPreSetup(JsonObject settings)
debugPrintHaspHeader(&Serial);
Serial.flush();
LOG_INFO(TAG_DEBG, F("Serial started at %u baud"), baudrate);
LOG_INFO(TAG_DEBG, F(D_SERVICE_STARTED " @ %u baud"), baudrate);
LOG_INFO(TAG_DEBG, F("Environment: " PIOENV));
}
}

10
src/sys/net/hasp_wifi.cpp
View File

@ -265,7 +265,7 @@ static void wifiDisconnected(const char* ssid, uint8_t reason)
#endif
default:
snprintf_P(buffer, sizeof(buffer), PSTR("unknown"));
snprintf_P(buffer, sizeof(buffer), PSTR(D_ERROR_UNKNOWN));
}
LOG_WARNING(TAG_WIFI, F("Disconnected from %s (Reason: %s [%d])"), ssid, buffer, reason);
@ -273,7 +273,7 @@ static void wifiDisconnected(const char* ssid, uint8_t reason)
static void wifiSsidConnected(const char* ssid)
{
LOG_TRACE(TAG_WIFI, F("Connected to SSID %s. Requesting IP..."), ssid);
LOG_TRACE(TAG_WIFI, F(D_WIFI_CONNECTED_TO), ssid);
wifiReconnectCounter = 0;
}
@ -402,7 +402,7 @@ void wifiSetup()
// int status = WL_IDLE_STATUS; // the Wifi radio's status
if(!wifiShowAP()) {
// while (status != WL_CONNECTED) {
LOG_TRACE(TAG_WIFI, F("Connecting to : %s"), wifiSsid);
LOG_TRACE(TAG_WIFI, F(D_WIFI_CONNECTING_TO), wifiSsid);
// Connect to WPA/WPA2 network
// status = WiFi.begin(wifiSsid, wifiPassword);
WiFi.begin(wifiSsid, wifiPassword);
@ -426,7 +426,7 @@ void wifiSetup()
#endif
wifiReconnect();
LOG_TRACE(TAG_WIFI, F("Connecting to : %s"), wifiSsid);
LOG_TRACE(TAG_WIFI, F(D_WIFI_CONNECTING_TO), wifiSsid);
}
#endif
}
@ -473,7 +473,7 @@ bool wifiValidateSsid(const char* ssid, const char* pass)
while(attempt < 15 && (WiFi.status() != WL_CONNECTED || WiFi.localIP().toString() == F("0.0.0.0"))) {
#endif
attempt++;
LOG_INFO(TAG_WIFI, F("Trying to connect to %s... %u"), wifiSsid, attempt);
LOG_INFO(TAG_WIFI, F(D_WIFI_CONNECTING_TO "... %u"), wifiSsid, attempt);
delay(500);
}
#if defined(STM32F4xx)

2
src/sys/svc/hasp_http.cpp
View File

@ -1875,7 +1875,7 @@ void httpHandleEspFirmware()
}
webSendFooter();
LOG_TRACE(TAG_HTTP, F("Attempting ESP firmware update from: %s"), webServer.arg(url).c_str());
LOG_TRACE(TAG_HTTP, F("Updating ESP firmware from: %s"), webServer.arg(url).c_str());
dispatch_web_update(NULL, webServer.arg(url).c_str());
}

23
src/sys/svc/hasp_ota.cpp
View File

@ -54,7 +54,6 @@ const char* rootCACertificate = "-----BEGIN CERTIFICATE-----\n"
"PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6\n"
"KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==\n"
"-----END CERTIFICATE-----\n";
#endif
static WiFiClient otaClient;
@ -106,8 +105,10 @@ bool otaUpdateCheck()
static inline void otaProgress(void)
{
LOG_VERBOSE(TAG_OTA, F("%s update in progress... %3u%"),
(ArduinoOTA.getCommand() == U_FLASH ? PSTR("Firmware") : PSTR("Filesystem")), otaPrecentageComplete);
LOG_VERBOSE(TAG_OTA, F("%s %3u%"),
(ArduinoOTA.getCommand() == U_FLASH ? PSTR("Firmware update in progress...")
: PSTR("Filesystem update in progress...")),
otaPrecentageComplete);
}
void otaOnProgress(unsigned int progress, unsigned int total)
@ -148,29 +149,29 @@ void otaSetup(void)
});
ArduinoOTA.onProgress(otaOnProgress);
ArduinoOTA.onError([](ota_error_t error) {
char buffer[16];
char buffer[32];
switch(error) {
case OTA_AUTH_ERROR:
snprintf_P(buffer, sizeof(buffer), PSTR("Auth"));
snprintf_P(buffer, sizeof(buffer), PSTR("Auth failed"));
break;
case OTA_BEGIN_ERROR:
snprintf_P(buffer, sizeof(buffer), PSTR("Begin"));
snprintf_P(buffer, sizeof(buffer), PSTR("Begin failed"));
break;
case OTA_CONNECT_ERROR:
snprintf_P(buffer, sizeof(buffer), PSTR("Connect"));
snprintf_P(buffer, sizeof(buffer), PSTR("Connect failed"));
break;
case OTA_RECEIVE_ERROR:
snprintf_P(buffer, sizeof(buffer), PSTR("Receive"));
snprintf_P(buffer, sizeof(buffer), PSTR("Receive failed"));
break;
case OTA_END_ERROR:
snprintf_P(buffer, sizeof(buffer), PSTR("End"));
snprintf_P(buffer, sizeof(buffer), PSTR("End failed"));
break;
default:
snprintf_P(buffer, sizeof(buffer), PSTR("Something"));
snprintf_P(buffer, sizeof(buffer), PSTR("Unknown Error"));
}
otaPrecentageComplete = -1;
LOG_ERROR(TAG_OTA, F("%s failed (%s)"), buffer, error);
LOG_ERROR(TAG_OTA, F("%s (%d)"), buffer, error);
haspProgressMsg(F(D_OTA_UPDATE_FAILED));
// delay(5000);
});