@@ -971,6 +971,7 @@ void stopSong(){
971
971
***********************************************************************************************************************/
972
972
void setup (){
973
973
Serial.begin (115200 );
974
+ Serial.print (" \n\n " );
974
975
SPI.begin (SPI_SCK, SPI_MISO, SPI_MOSI); // VSPI
975
976
mutex_rtc = xSemaphoreCreateMutex ();
976
977
mutex_display = xSemaphoreCreateMutex ();
@@ -1395,7 +1396,7 @@ void processPlaylist(boolean first){
1395
1396
_playlistTime = millis ();
1396
1397
while (playlistFile.available () > 0 ){
1397
1398
f = playlistFile.readStringUntil (' \n ' );
1398
- if (f.startsWith (" #" )) SerialPrintfln (" Playlist: .. " ANSI_ESC_GREEN " %s" , f.c_str ());
1399
+ if (f.startsWith (" #" )) SerialPrintfln (" Playlist: " ANSI_ESC_GREEN " %s" , f.c_str ());
1399
1400
f.trim ();
1400
1401
if (f.length () < 5 ) continue ;
1401
1402
if (first){
@@ -1405,7 +1406,7 @@ void processPlaylist(boolean first){
1405
1406
continue ;
1406
1407
}
1407
1408
else {
1408
- SerialPrintfln (" Playlist: .. " ANSI_ESC_RED " %s is not a valid, #EXTM3U not found" , _afn);
1409
+ SerialPrintfln (" Playlist: " ANSI_ESC_RED " %s is not a valid, #EXTM3U not found" , _afn);
1409
1410
return ;
1410
1411
}
1411
1412
}
@@ -1419,7 +1420,7 @@ void processPlaylist(boolean first){
1419
1420
}
1420
1421
if (!f.startsWith (" #" )){
1421
1422
if (f.startsWith (" http" )){
1422
- SerialPrintflnCut (" Playlist: .. " , ANSI_ESC_YELLOW, f.c_str ());
1423
+ SerialPrintflnCut (" Playlist: " , ANSI_ESC_YELLOW, f.c_str ());
1423
1424
clearFName ();
1424
1425
showVolumeBar ();
1425
1426
if (t.length () > 0 ){
@@ -1434,7 +1435,7 @@ void processPlaylist(boolean first){
1434
1435
audioConnecttohost (f.c_str ());
1435
1436
}
1436
1437
else {
1437
- SerialPrintfln (" Playlist: .. " ANSI_ESC_YELLOW " %s" , f.c_str ());
1438
+ SerialPrintfln (" Playlist: " ANSI_ESC_YELLOW " %s" , f.c_str ());
1438
1439
webSrv.send (" audiotrack=" + f);
1439
1440
audiotrack (f.c_str ());
1440
1441
}
@@ -1767,14 +1768,16 @@ void vs1053_info(const char *info){
1767
1768
if (startsWith (info, " FLAC" )) {SerialPrintfln (" AUDIO_info: " ANSI_ESC_GREEN " %s" , info); return ;}
1768
1769
if (endsWith (info, " Stream lost" )) {SerialPrintfln (" AUDIO_info: " ANSI_ESC_RED " %s" , info); return ;}
1769
1770
if (startsWith (info, " authent" )) {SerialPrintfln (" AUDIO_info: " ANSI_ESC_GREEN " %s" , info); return ;}
1770
- if (CORE_DEBUG_LEVEL >= 2 ) {SerialPrintfln (" AUDIO_info: " ANSI_ESC_GREEN " %s" , info); return ;} // all other
1771
+ if (CORE_DEBUG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN)
1772
+ {SerialPrintfln (" AUDIO_info: " ANSI_ESC_GREEN " %s" , info); return ;} // all other
1771
1773
}
1772
1774
void audio_info (const char *info){
1773
1775
if (startsWith (info, " Request" )) {SerialPrintfln (" AUDIO_info: " ANSI_ESC_RED " %s" , info); return ;}
1774
1776
if (startsWith (info, " FLAC" )) {SerialPrintfln (" AUDIO_info: " ANSI_ESC_GREEN " %s" , info); return ;}
1775
1777
if (endsWith (info, " Stream lost" )) {SerialPrintfln (" AUDIO_info: " ANSI_ESC_RED " %s" , info); return ;}
1776
1778
if (startsWith (info, " authent" )) {SerialPrintfln (" AUDIO_info: " ANSI_ESC_GREEN " %s" , info); return ;}
1777
- if (CORE_DEBUG_LEVEL >= 2 ) {SerialPrintfln (" AUDIO_info: " ANSI_ESC_GREEN " %s" , info); return ;} // all other
1779
+ if (CORE_DEBUG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN)
1780
+ {SerialPrintfln (" AUDIO_info: " ANSI_ESC_GREEN " %s" , info); return ;} // all other
1778
1781
}
1779
1782
// ----------------------------------------------------------------------------------------
1780
1783
void vs1053_showstation (const char *info){
@@ -2181,7 +2184,7 @@ void tp_released(){
2181
2184
// Events from websrv
2182
2185
void WEBSRV_onCommand (const String cmd, const String param, const String arg){ // called from html
2183
2186
2184
- if (CORE_DEBUG_LEVEL >= 2 ){
2187
+ if (CORE_DEBUG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN ){
2185
2188
SerialPrintfln (" WS_onCmd: " ANSI_ESC_YELLOW " cmd=\" %s\" , params=\" %s\" , arg=\" %s\" " ,
2186
2189
cmd.c_str (),param.c_str (), arg.c_str ());
2187
2190
}
@@ -2307,7 +2310,7 @@ void WEBSRV_onCommand(const String cmd, const String param, const String arg){
2307
2310
}
2308
2311
void WEBSRV_onRequest (const String request, uint32_t contentLength){
2309
2312
2310
- if (CORE_DEBUG_LEVEL >= 2 ){
2313
+ if (CORE_DEBUG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN ){
2311
2314
SerialPrintfln (" WS_onReq: " ANSI_ESC_YELLOW " %s contentLength %d" , request.c_str (), contentLength);
2312
2315
}
2313
2316
@@ -2322,7 +2325,7 @@ void WEBSRV_onInfo(const char* info){
2322
2325
if (!strcmp (" to_listen" , info)) return ; // suppress to_isten
2323
2326
if (startsWith (info, " Command client" ))return ; // suppress Command client available
2324
2327
2325
- if (CORE_DEBUG_LEVEL >= 2 ) {
2328
+ if (CORE_DEBUG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN ) {
2326
2329
SerialPrintfln (" HTML_info: " ANSI_ESC_YELLOW " %s" , info); // infos for debug
2327
2330
}
2328
2331
}
0 commit comments