From 122bbec5f0b87c3c6bb49f036006a2803d84d4f6 Mon Sep 17 00:00:00 2001
From: e2002 <e2002@bk.ru>
Date: Thu, 8 Dec 2022 18:31:26 +0300
Subject: [PATCH] espcoreversion

---
 yoRadio/src/core/config.cpp    | 9 ++++++---
 yoRadio/src/core/display.cpp   | 4 ++--
 yoRadio/src/core/netserver.cpp | 4 ++--
 yoRadio/src/core/network.cpp   | 1 +
 yoRadio/src/core/options.h     | 2 +-
 yoRadio/src/core/player.cpp    | 4 ++--
 yoRadio/src/core/telnet.cpp    | 7 +++++--
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/yoRadio/src/core/config.cpp b/yoRadio/src/core/config.cpp
index 3bc8958..5bac1fb 100644
--- a/yoRadio/src/core/config.cpp
+++ b/yoRadio/src/core/config.cpp
@@ -542,9 +542,12 @@ void Config::sleepForAfter(uint16_t sf, uint16_t sa){
 }
 
 void Config::bootInfo() {
-  BOOTLOG("******************************************");
-  BOOTLOG("*            ёPadio v%s             *", VERSION);
-  BOOTLOG("******************************************");
+  BOOTLOG("************************************************");
+  BOOTLOG("*               ёPadio v%s                *", VERSION);
+  BOOTLOG("************************************************");
+  BOOTLOG("arduino:\t%d", ARDUINO);
+  BOOTLOG("compiler:\t%s", __VERSION__);
+  BOOTLOG("esp:\t\t%d.%d.%d", ESP_ARDUINO_VERSION_MAJOR, ESP_ARDUINO_VERSION_MINOR, ESP_ARDUINO_VERSION_PATCH);
   BOOTLOG("display:\t%d", DSP_MODEL);
   if(VS1053_CS==255) {
     BOOTLOG("audio:\t\t%s (%d, %d, %d)", "I2S", I2S_DOUT, I2S_BCLK, I2S_LRC);
diff --git a/yoRadio/src/core/display.cpp b/yoRadio/src/core/display.cpp
index 47bce73..def32e2 100644
--- a/yoRadio/src/core/display.cpp
+++ b/yoRadio/src/core/display.cpp
@@ -47,7 +47,7 @@ void loopDspTask(void * pvParameters){
 }
 
 void Display::init() {
-  BOOTLOG("display.init");
+  Serial.print("##[BOOT]#\tdisplay.init\t");
 #ifdef USE_NEXTION
   nextion.begin();
 #endif
@@ -63,7 +63,7 @@ void Display::init() {
   while(!_bootStep==0) { delay(10); }
   //_pager.begin();
   //_bootScreen();
-  BOOTLOG("done");
+  Serial.println("done");
 }
 
 void Display::_bootScreen(){
diff --git a/yoRadio/src/core/netserver.cpp b/yoRadio/src/core/netserver.cpp
index 8e5c8db..69b3cf2 100644
--- a/yoRadio/src/core/netserver.cpp
+++ b/yoRadio/src/core/netserver.cpp
@@ -48,7 +48,7 @@ char* updateError() {
 }
 
 bool NetServer::begin() {
-  BOOTLOG("netserver.begin");
+  Serial.print("##[BOOT]#\tnetserver.begin\t");
   importRequest = IMDONE;
   irRecordEnable = false;
   webserver.on("/", HTTP_ANY, handleHTTPArgs);
@@ -76,7 +76,7 @@ bool NetServer::begin() {
         packet.println(WiFi.localIP());
     });
   }
-  BOOTLOG("done");
+  Serial.println("done");
   return true;
 }
 
diff --git a/yoRadio/src/core/network.cpp b/yoRadio/src/core/network.cpp
index 93412e3..bb45ae2 100644
--- a/yoRadio/src/core/network.cpp
+++ b/yoRadio/src/core/network.cpp
@@ -90,6 +90,7 @@ void Network::begin() {
     }
   }
   Serial.println(".");
+  Serial.println("##[BOOT]#\tdone");
   if(LED_BUILTIN!=255) digitalWrite(LED_BUILTIN, LOW);
   status = CONNECTED;
   WiFi.setSleep(false);
diff --git a/yoRadio/src/core/options.h b/yoRadio/src/core/options.h
index 834e9ed..dc792fb 100644
--- a/yoRadio/src/core/options.h
+++ b/yoRadio/src/core/options.h
@@ -1,7 +1,7 @@
 #ifndef options_h
 #define options_h
 
-#define VERSION "0.8.151"
+#define VERSION "0.8.157"
 
 /*******************************************************
 DO NOT EDIT THIS FILE. 
diff --git a/yoRadio/src/core/player.cpp b/yoRadio/src/core/player.cpp
index dc1d263..d8c56db 100644
--- a/yoRadio/src/core/player.cpp
+++ b/yoRadio/src/core/player.cpp
@@ -33,7 +33,7 @@ Player player;
 
 
 void Player::init() {
-  BOOTLOG("player.init");
+  Serial.print("##[BOOT]#\tplayer.init\t");
   if(MUTE_PIN!=255) pinMode(MUTE_PIN, OUTPUT);
   #if I2S_DOUT!=255
     #if !I2S_INTERNAL
@@ -53,7 +53,7 @@ void Player::init() {
   volTimer=false;
   zeroRequest();
   playmutex = xSemaphoreCreateMutex();
-  BOOTLOG("done");
+  Serial.println("done");
 }
 
 void Player::stopInfo() {
diff --git a/yoRadio/src/core/telnet.cpp b/yoRadio/src/core/telnet.cpp
index 7ac1e42..5f9ba7a 100644
--- a/yoRadio/src/core/telnet.cpp
+++ b/yoRadio/src/core/telnet.cpp
@@ -13,12 +13,15 @@ bool Telnet::_isIPSet(IPAddress ip) {
 }
 
 bool Telnet::begin() {
-  BOOTLOG("telnet.begin");
+  Serial.print("##[BOOT]#\ttelnet.begin\t");
   if (WiFi.status() == WL_CONNECTED || _isIPSet(WiFi.softAPIP())) {
     server.begin();
     server.setNoDelay(true);
+    Serial.println("done");
+    Serial.println();
+    BOOTLOG("************************************************");
     BOOTLOG("Ready! Go to http:/%s/ to configure.", WiFi.localIP().toString().c_str());
-    BOOTLOG("******************************************\n");
+    BOOTLOG("************************************************");
     Serial.println();
     return true;
   } else {