From c81ca008cf42b017dd9fadd9dd6d11458f4d14f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Fri, 6 Jun 2025 12:58:18 +0200 Subject: [PATCH] logging --- src/audio.cpp | 38 +++++++++++++++++++------------------- src/http.cpp | 26 +++++++++++++------------- src/player.cpp | 4 ++-- src/playlist.cpp | 20 ++++++++++---------- src/wifi.cpp | 8 ++++---- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/audio.cpp b/src/audio.cpp index fc128ac..94670bf 100644 --- a/src/audio.cpp +++ b/src/audio.cpp @@ -43,7 +43,7 @@ bool running = false; void audioStop() { if (running) { running = false; - Serial.println("[AUDIO ] STOP"); + Serial.println("[AUDIO ] STOP"); } copyErrors = 0; copier.end(); @@ -58,12 +58,12 @@ void audioStop() { bool audioPlayInit(const Entry &entry) { audioStop(); - Serial.printf("[AUDIO ] [%-4s] Start: %s\n", entry.type.c_str(), entry.url.c_str()); + Serial.printf("[AUDIO ] [%-4s] Start: %s\n", entry.type.c_str(), entry.url.c_str()); running = true; if (entry.type == "ICY" || entry.type == "SNAP") { if (!isWifiConnected()) { - Serial.printf("[AUDIO ] [%-4s] WiFi not connected.\n", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] WiFi not connected.\n", entry.type.c_str()); audioStop(); return false; } @@ -71,7 +71,7 @@ bool audioPlayInit(const Entry &entry) { if (entry.type == "SD") { if (!SD.begin(PIN_AUDIO_KIT_SD_CARD_CS)) { - Serial.printf("[AUDIO ] [%-4s] Failed to mount SD-card.\n", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to mount SD-card.\n", entry.type.c_str()); audioStop(); return false; } @@ -82,13 +82,13 @@ bool audioPlayInit(const Entry &entry) { bool audioBeginMP3Stream(const Entry &entry, Stream &source) { if (!mp3Decoder.begin()) { - Serial.printf("[AUDIO ] [%-4s] Failed to start MP3DecoderHelix.", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to start MP3DecoderHelix.", entry.type.c_str()); audioStop(); return false; } if (!mp3Stream.begin()) { - Serial.printf("[AUDIO ] [%-4s] Failed to start EncodedAudioStream.", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to start EncodedAudioStream.", entry.type.c_str()); audioStop(); return false; } @@ -96,7 +96,7 @@ bool audioBeginMP3Stream(const Entry &entry, Stream &source) { copier.begin(mp3Stream, source); if (copier.copy() == 0) { - Serial.printf("[AUDIO ] [%-4s] Failed to copy initial data.", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to copy initial data.", entry.type.c_str()); audioStop(); return false; } @@ -110,7 +110,7 @@ bool audioPlayICY(const Entry &entry) { } if (!icy.begin(entry.url.c_str())) { - Serial.printf("[AUDIO ] [%-4s] Failed to start ICYStream.\n", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to start ICYStream.\n", entry.type.c_str()); audioStop(); return false; } @@ -125,26 +125,26 @@ bool audioPlaySNAP(const Entry &entry) { IPAddress ip; if (!WiFiClass::hostByName(entry.url.c_str(), ip)) { - Serial.printf("[AUDIO ] [%-4s] Failed to resolve host.\n", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to resolve host.\n", entry.type.c_str()); audioStop(); return false; } snap.setServerIP(ip); if (!snap.begin()) { - Serial.printf("[AUDIO ] [%-4s] Failed to connect.\n", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to connect.\n", entry.type.c_str()); audioStop(); return false; } if (!opusDecoder.begin()) { - Serial.printf("[AUDIO ] [%-4s] Failed to start OpusAudioDecoder.\n", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to start OpusAudioDecoder.\n", entry.type.c_str()); audioStop(); return false; } if (!snap.doLoop()) { - Serial.printf("[AUDIO ] [%-4s] Failed to copy initial data.\n", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to copy initial data.\n", entry.type.c_str()); audioStop(); return false; } @@ -158,14 +158,14 @@ bool audioPlaySD(const Entry &entry) { } if (!SD.exists(entry.url.c_str())) { - Serial.printf("[AUDIO ] [%-4s] File not found.\n", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] File not found.\n", entry.type.c_str()); audioStop(); return false; } file = SD.open(entry.url.c_str(), FILE_READ); if (!file) { - Serial.printf("[AUDIO ] [%-4s] Failed to open file.\n", entry.type.c_str()); + Serial.printf("[AUDIO ] [%-4s] Failed to open file.\n", entry.type.c_str()); audioStop(); return false; } @@ -187,25 +187,25 @@ bool audioPlay(const Entry &entry) { if (entry.type == "SNAP") { return audioPlaySNAP(entry); } - Serial.printf("[AUDIO ] Unknown type: %s\n", entry.type.c_str()); + Serial.printf("[AUDIO ] Unknown type: %s\n", entry.type.c_str()); return false; } void audioSetup() { AudioToolsLogger.setLogLevel(AudioToolsLogLevel::Error); - Serial.println("[AUDIO ] Initializing board..."); + Serial.println("[AUDIO ] Initializing board..."); board.begin(); } bool audioLoop() { if (abs(board.volume() - audioVolume) >= 0.01f) { - Serial.printf("[AUDIO ] volume = %.2f\n", audioVolume); + Serial.printf("[AUDIO ] volume = %.2f\n", audioVolume); board.setVolume(audioVolume); stateBufferUpdateRequest(); } if (audioMute2 != audioMute) { audioMute2 = audioMute; - Serial.printf("[AUDIO ] mute = %s\n", audioMute ? "MUTED" : "no"); + Serial.printf("[AUDIO ] mute = %s\n", audioMute ? "MUTED" : "no"); board.setMute(audioMute); stateBufferUpdateRequest(); } @@ -218,7 +218,7 @@ bool audioLoop() { if (copyErrors < 100) { return true; } - Serial.println("[AUDIO ] Stream ended!"); + Serial.println("[AUDIO ] Stream ended!"); audioStop(); } return false; diff --git a/src/http.cpp b/src/http.cpp index 23afe37..0804210 100644 --- a/src/http.cpp +++ b/src/http.cpp @@ -12,15 +12,15 @@ AsyncWebSocket ws("/ws"); void onWebSocketEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, const AwsEventType type, void *arg, const uint8_t *data, const size_t len) { if (type == WS_EVT_CONNECT) { - Serial.printf("[%-8s] Connected: %s\n", "WEBSOCKET", client->remoteIP().toString().c_str()); + Serial.printf("[%-9s] Connected: %s\n", "WEBSOCKET", client->remoteIP().toString().c_str()); client->text(stateBuffer); } else if (type == WS_EVT_DISCONNECT) { - Serial.printf("[%-8s] Disconnected: %s\n", "WEBSOCKET", client->remoteIP().toString().c_str()); + Serial.printf("[%-9s] Disconnected: %s\n", "WEBSOCKET", client->remoteIP().toString().c_str()); } } void httpSetup() { - Serial.println("[HTTP ] Starting HTTP server"); + Serial.println("[HTTP ] Starting HTTP server"); DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin", "*"); server.onNotFound([](AsyncWebServerRequest *request) { const auto path = request->url(); @@ -31,51 +31,51 @@ void httpSetup() { } }); server.on("/state", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); request->send(200, "application/json", stateBuffer); }); server.on("/stop", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); playerState = PLAYER_STOP; request->send(200); }); server.on("/play", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); playerState = PLAYER_PLAY; request->send(200); }); server.on("/pause", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); playerState = PLAYER_PAUSE; request->send(200); }); server.on("/mute", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); audioMute = true; request->send(200); }); server.on("/unmute", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); audioMute = false; request->send(200); }); server.on("/up", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); audioVolume = max(0.0f, min(audioVolume + 0.05f, 1.0f)); request->send(200); }); server.on("/down", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); audioVolume = max(0.0f, min(audioVolume - 0.05f, 1.0f)); request->send(200); }); server.on("/next", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); playerSkip += 1; request->send(200); }); server.on("/back", [](AsyncWebServerRequest *request) { - Serial.println("[HTTP ] " + request->url()); + Serial.println("[HTTP ] " + request->url()); playerSkip -= 1; request->send(200); }); diff --git a/src/player.cpp b/src/player.cpp index a6ddb68..7f7892f 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -69,7 +69,7 @@ void updateStateBufferIfNeeded() { void playerStart(const Entry &entry) { if (entry.type == "") { - Serial.println("[PLAYER ] Not playing empty Entry => STOP"); + Serial.println("[PLAYER ] Not playing empty Entry => STOP"); playerState = PLAYER_STOP; } else if (audioPlay(entry)) { errorMs = 0; @@ -77,7 +77,7 @@ void playerStart(const Entry &entry) { } else { errorMs = max(1UL, millis()); delayMs = min(DELAY_MS_MAX, delayMs + DELAY_MS_ADD); - Serial.printf("[PLAYER ] Retry delay: %d ms\n", delayMs); + Serial.printf("[PLAYER ] Retry delay: %d ms\n", delayMs); } stateBufferUpdateRequest(); } diff --git a/src/playlist.cpp b/src/playlist.cpp index 6f96ef8..2d79064 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -20,7 +20,7 @@ size_t playlistIndex = 0; std::vector playlistEntries; void playlistClear() { - Serial.println("[PLAYLIST] clear"); + Serial.println("[PLAYLIST ] clear"); playlistTitle = ""; playlistIndex = 0; playlistEntries.clear(); @@ -29,17 +29,17 @@ void playlistClear() { void playlistAdd(String entry) { entry.trim(); - Serial.println("[PLAYLIST] [ADD] " + entry); + Serial.println("[PLAYLIST ] [ADD] " + entry); const auto index_type_url = entry.indexOf('|'); if (index_type_url < 0) { - Serial.println("[PLAYLIST] type/url-delimiter not found: " + entry); + Serial.println("[PLAYLIST ] type/url-delimiter not found: " + entry); return; } auto type = entry.substring(0, index_type_url); type.trim(); if (type != "TITLE" && type != "ICY" && type != "SD" && type != "SNAP") { - Serial.println("[PLAYLIST] Unknown type: " + type); + Serial.println("[PLAYLIST ] Unknown type: " + type); } entry = entry.substring(index_type_url + 1); @@ -52,13 +52,13 @@ void playlistAdd(String entry) { const auto index_url_title = entry.indexOf('|'); if (index_url_title < 0) { - Serial.println("[PLAYLIST] url/title-delimiter not found: " + entry); + Serial.println("[PLAYLIST ] url/title-delimiter not found: " + entry); return; } auto url = entry.substring(0, index_url_title); url.trim(); if (url.isEmpty()) { - Serial.println("[PLAYLIST] url is empty."); + Serial.println("[PLAYLIST ] url is empty."); return; } @@ -70,18 +70,18 @@ void playlistAdd(String entry) { void playlistLoad(const String &path) { playlistClear(); - Serial.println("[PLAYLIST] Loading playlist: " + path); + Serial.println("[PLAYLIST ] Loading playlist: " + path); if (!SD.begin(PIN_AUDIO_KIT_SD_CARD_CS)) { - Serial.println("[PLAYLIST] Failed to initialize SD card."); + Serial.println("[PLAYLIST ] Failed to initialize SD card."); return; } if (!SD.exists(path)) { - Serial.println("[PLAYLIST] File not found."); + Serial.println("[PLAYLIST ] File not found."); return; } auto file = SD.open(path, FILE_READ); if (!file) { - Serial.println("[PLAYLIST] Failed to open file."); + Serial.println("[PLAYLIST ] Failed to open file."); } while (file.available() > 0) { diff --git a/src/wifi.cpp b/src/wifi.cpp index 26ed78e..dfe721f 100644 --- a/src/wifi.cpp +++ b/src/wifi.cpp @@ -12,21 +12,21 @@ void wifiLoop() { if (connected) { // still connected } else { - Serial.printf("[WIFI ] Disconnected!\n"); + Serial.printf("[WIFI ] Disconnected!\n"); } } else { if (connected) { wifiLastMillis = 0; - Serial.printf("[WIFI ] Connected: %s\n", WiFi.localIP().toString().c_str()); + Serial.printf("[WIFI ] Connected: %s\n", WiFi.localIP().toString().c_str()); } else if (wifiLastMillis == 0 || millis() - wifiLastMillis > 10000) { WiFi.disconnect(); yield(); if (wifiLastMillis != 0) { - Serial.printf("[WIFI ] Connect timeout!\n"); + Serial.printf("[WIFI ] Connect timeout!\n"); } wifiLastMillis = max(1UL, millis()); const auto ssid = "HappyNet"; - Serial.printf("[WIFI ] Connecting: %s\n", ssid); + Serial.printf("[WIFI ] Connecting: %s\n", ssid); WiFi.begin(ssid, "1Grausame!Sackratte7"); yield(); } else {