From b84504c0a86618764c0762fa4a5d19685e7525de Mon Sep 17 00:00:00 2001 From: Torsten Stauder Date: Thu, 1 Jul 2021 21:21:21 +0200 Subject: [PATCH] Replace numeric language-code with DE/EN --- src/AudioPlayer.cpp | 12 ++++++------ src/Ftp.cpp | 2 +- src/LogMessages_DE.cpp | 2 +- src/LogMessages_EN.cpp | 2 +- src/Web.cpp | 12 ++++++------ src/Wlan.cpp | 2 +- src/settings.h | 2 +- src/values.h | 4 ++++ 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/AudioPlayer.cpp b/src/AudioPlayer.cpp index 3131e90..9830880 100644 --- a/src/AudioPlayer.cpp +++ b/src/AudioPlayer.cpp @@ -290,7 +290,7 @@ void AudioPlayer_Task(void *parameter) { gPlayProperties.pausePlay = !gPlayProperties.pausePlay; } audio->stopSong(); - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) snprintf(Log_Buffer, Log_BufferLength, "%s mit %d Titel(n)", (char *) FPSTR(newPlaylistReceived), gPlayProperties.numberOfTracks); #else snprintf(Log_Buffer, Log_BufferLength, "%s with %d track(s)", (char *) FPSTR(newPlaylistReceived), gPlayProperties.numberOfTracks); @@ -521,7 +521,7 @@ void AudioPlayer_Task(void *parameter) { AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, *(gPlayProperties.playlist + 0), 0, gPlayProperties.playMode, 0, gPlayProperties.numberOfTracks); } #ifdef MQTT_ENABLE - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) publishMqtt((char *) FPSTR(topicTrackState), "", false); #else publishMqtt((char *) FPSTR(topicTrackState), "", false); @@ -582,7 +582,7 @@ void AudioPlayer_Task(void *parameter) { #ifdef MQTT_ENABLE publishMqtt((char *) FPSTR(topicTrackState), buf, false); #endif - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) snprintf(Log_Buffer, Log_BufferLength, "'%s' wird abgespielt (%d von %d)", *(gPlayProperties.playlist + gPlayProperties.currentTrackNumber), (gPlayProperties.currentTrackNumber + 1), gPlayProperties.numberOfTracks); #else snprintf(Log_Buffer, Log_BufferLength, "'%s' is being played (%d of %d)", *(gPlayProperties.playlist + gPlayProperties.currentTrackNumber), (gPlayProperties.currentTrackNumber + 1), gPlayProperties.numberOfTracks); @@ -597,7 +597,7 @@ void AudioPlayer_Task(void *parameter) { if (gPlayProperties.seekmode != SEEK_NORMAL) { if (gPlayProperties.seekmode == SEEK_FORWARDS) { if (audio->setTimeOffset(jumpOffset)) { - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) Serial.printf("%d Sekunden nach vorne gesprungen\n", jumpOffset); #else Serial.printf("Jumped %d seconds forwards\n", jumpOffset); @@ -607,7 +607,7 @@ void AudioPlayer_Task(void *parameter) { } } else if (gPlayProperties.seekmode == SEEK_BACKWARDS) { if (audio->setTimeOffset(-(jumpOffset))) { - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) Serial.printf("%d Sekunden zurueck gesprungen\n", jumpOffset); #else Serial.printf("Jumped %d seconds backwards\n", jumpOffset); @@ -895,7 +895,7 @@ size_t AudioPlayer_NvsRfidWriteWrapper(const char *_rfidCardId, const char *_tra } snprintf(prefBuf, sizeof(prefBuf) / sizeof(prefBuf[0]), "%s%s%s%u%s%d%s%u", stringDelimiter, trackBuf, stringDelimiter, _playPosition, stringDelimiter, _playMode, stringDelimiter, _trackLastPlayed); - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) snprintf(Log_Buffer, Log_BufferLength, "Schreibe '%s' in NVS für RFID-Card-ID %s mit playmode %d und letzter Track %u\n", prefBuf, _rfidCardId, _playMode, _trackLastPlayed); #else snprintf(Log_Buffer, Log_BufferLength, "Write '%s' to NVS for RFID-Card-ID %s with playmode %d and last track %u\n", prefBuf, _rfidCardId, _playMode, _trackLastPlayed); diff --git a/src/Ftp.cpp b/src/Ftp.cpp index 16e065f..9ef46ce 100644 --- a/src/Ftp.cpp +++ b/src/Ftp.cpp @@ -94,7 +94,7 @@ void ftpManager(void) { ftpSrv->begin(gFSystem, Ftp_User, Ftp_Password); snprintf(Log_Buffer, Log_BufferLength, "%s: %u", (char *) FPSTR(freeHeapWithFtp), ESP.getFreeHeap()); Log_Println(Log_Buffer, LOGLEVEL_DEBUG); - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) Serial.println(F("FTP-Server gestartet")); #else Serial.println(F("FTP-server started")); diff --git a/src/LogMessages_DE.cpp b/src/LogMessages_DE.cpp index 4ff4da9..bcf9193 100644 --- a/src/LogMessages_DE.cpp +++ b/src/LogMessages_DE.cpp @@ -1,7 +1,7 @@ #include "settings.h" -#if (LANGUAGE == 1) +#if (LANGUAGE == DE) #include "Log.h" const char stillOnlineMqtt[] PROGMEM = "MQTT: Bin noch online."; diff --git a/src/LogMessages_EN.cpp b/src/LogMessages_EN.cpp index ec3e019..9d3c19e 100644 --- a/src/LogMessages_EN.cpp +++ b/src/LogMessages_EN.cpp @@ -1,7 +1,7 @@ #include "settings.h" -#if (LANGUAGE == 2) +#if (LANGUAGE == EN) #include "Log.h" const char stillOnlineMqtt[] PROGMEM = "MQTT: still online."; diff --git a/src/Web.cpp b/src/Web.cpp index 0764985..45a320d 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -21,12 +21,12 @@ #include "Web.h" #include "Wlan.h" -#if (LANGUAGE == 1) +#if (LANGUAGE == DE) #include "HTMLaccesspoint_DE.h" #include "HTMLmanagement_DE.h" #endif -#if (LANGUAGE == 2) +#if (LANGUAGE == EN) #include "HTMLaccesspoint_EN.h" #include "HTMLmanagement_EN.h" #endif @@ -95,7 +95,7 @@ void Web_Init(void) { }); wServer.on("/restart", HTTP_GET, [](AsyncWebServerRequest *request) { - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) request->send(200, "text/html", "ESPuino wird neu gestartet..."); #else request->send(200, "text/html", "ESPuino is being restarted..."); @@ -105,7 +105,7 @@ void Web_Init(void) { }); wServer.on("/shutdown", HTTP_GET, [](AsyncWebServerRequest *request) { - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) request->send(200, "text/html", "ESPuino wird ausgeschaltet..."); #else request->send(200, "text/html", "ESPuino is being shutdown..."); @@ -150,7 +150,7 @@ void webserverStart(void) { // heap/psram-info wServer.on( "/info", HTTP_GET, [](AsyncWebServerRequest *request) { - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) String info = "Freier heap: " + String(ESP.getFreeHeap()); info += "\nGroesster freier heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT)); info += "\nFreier PSRAM: "; @@ -300,7 +300,7 @@ bool processJsonRequest(char *_serialJson) { JsonObject object = doc.as(); if (error) { - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) Serial.print(F("deserializeJson() fehlgeschlagen: ")); #else Serial.print(F("deserializeJson() failed: ")); diff --git a/src/Wlan.cpp b/src/Wlan.cpp index 223b294..c12e373 100644 --- a/src/Wlan.cpp +++ b/src/Wlan.cpp @@ -85,7 +85,7 @@ void Wlan_Cyclic(void) { if (WiFi.status() == WL_CONNECTED) { IPAddress myIP = WiFi.localIP(); - #if (LANGUAGE == 1) + #if (LANGUAGE == DE) snprintf(Log_Buffer, Log_BufferLength, "Aktuelle IP: %d.%d.%d.%d", myIP[0], myIP[1], myIP[2], myIP[3]); #else snprintf(Log_Buffer, Log_BufferLength, "Current IP: %d.%d.%d.%d", myIP[0], myIP[1], myIP[2], myIP[3]); diff --git a/src/settings.h b/src/settings.h index 9887638..b640dc0 100644 --- a/src/settings.h +++ b/src/settings.h @@ -30,7 +30,7 @@ #define FTP_ENABLE // Enables FTP-server; DON'T FORGET TO ACTIVATE AFTER BOOT BY PRESSING PAUSE + NEXT-BUTTONS (IN PARALLEL)! #define NEOPIXEL_ENABLE // Don't forget configuration of NUM_LEDS if enabled //#define NEOPIXEL_REVERSE_ROTATION // Some Neopixels are adressed/soldered counter-clockwise. This can be configured here. - #define LANGUAGE 1 // 1 = deutsch; 2 = english + #define LANGUAGE EN // DE = deutsch; EN = english //#define STATIC_IP_ENABLE // Enables static IP-configuration (change static ip-section accordingly) //#define HEADPHONE_ADJUST_ENABLE // Used to adjust (lower) volume for optional headphone-pcb (refer maxVolumeSpeaker / maxVolumeHeadphone) and to enable stereo (if PLAY_MONO_SPEAKER is set) #define PLAY_MONO_SPEAKER // If only one speaker is used enabling mono should make sense. Please note: headphones is always stereo (if HEADPHONE_ADJUST_ENABLE is active) diff --git a/src/values.h b/src/values.h index 213ea17..a84dbe8 100644 --- a/src/values.h +++ b/src/values.h @@ -69,4 +69,8 @@ #define SEEK_FORWARDS 1 // Seek forwards #define SEEK_BACKWARDS 2 // Seek backwards + // supported languages + #define DE 1 + #define EN 2 + #endif \ No newline at end of file