iot/yoradio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

espcoreversion

Browse Source
This commit is contained in:
e2002
2022-12-08 18:31:26 +03:00
parent 1081cae041
commit 122bbec5f0
7 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yoRadio/src/core/config.cpp
View File

@@ -542,9 +542,12 @@ void Config::sleepForAfter(uint16_t sf, uint16_t sa){
} }
void Config::bootInfo() { void Config::bootInfo() {
BOOTLOG("******************************************"); BOOTLOG("************************************************");
BOOTLOG("* ёPadio v%s *", VERSION); BOOTLOG("* ёPadio v%s *", VERSION);
BOOTLOG("******************************************"); 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); BOOTLOG("display:\t%d", DSP_MODEL);
if(VS1053_CS==255) { if(VS1053_CS==255) {
BOOTLOG("audio:\t\t%s (%d, %d, %d)", "I2S", I2S_DOUT, I2S_BCLK, I2S_LRC); BOOTLOG("audio:\t\t%s (%d, %d, %d)", "I2S", I2S_DOUT, I2S_BCLK, I2S_LRC);

4
yoRadio/src/core/display.cpp
View File

@@ -47,7 +47,7 @@ void loopDspTask(void * pvParameters){
} }
void Display::init() { void Display::init() {
BOOTLOG("display.init"); Serial.print("##[BOOT]#\tdisplay.init\t");
#ifdef USE_NEXTION #ifdef USE_NEXTION
nextion.begin(); nextion.begin();
#endif #endif
@@ -63,7 +63,7 @@ void Display::init() {
while(!_bootStep==0) { delay(10); } while(!_bootStep==0) { delay(10); }
//_pager.begin(); //_pager.begin();
//_bootScreen(); //_bootScreen();
BOOTLOG("done"); Serial.println("done");
} }
void Display::_bootScreen(){ void Display::_bootScreen(){

4
yoRadio/src/core/netserver.cpp
View File

@@ -48,7 +48,7 @@ char* updateError() {
} }
bool NetServer::begin() { bool NetServer::begin() {
BOOTLOG("netserver.begin"); Serial.print("##[BOOT]#\tnetserver.begin\t");
importRequest = IMDONE; importRequest = IMDONE;
irRecordEnable = false; irRecordEnable = false;
webserver.on("/", HTTP_ANY, handleHTTPArgs); webserver.on("/", HTTP_ANY, handleHTTPArgs);
@@ -76,7 +76,7 @@ bool NetServer::begin() {
packet.println(WiFi.localIP()); packet.println(WiFi.localIP());
}); });
} }
BOOTLOG("done"); Serial.println("done");
return true; return true;
} }

1
yoRadio/src/core/network.cpp
View File

@@ -90,6 +90,7 @@ void Network::begin() {
} }
} }
Serial.println("."); Serial.println(".");
Serial.println("##[BOOT]#\tdone");
if(LED_BUILTIN!=255) digitalWrite(LED_BUILTIN, LOW); if(LED_BUILTIN!=255) digitalWrite(LED_BUILTIN, LOW);
status = CONNECTED; status = CONNECTED;
WiFi.setSleep(false); WiFi.setSleep(false);

2
yoRadio/src/core/options.h
View File

@@ -1,7 +1,7 @@
#ifndef options_h #ifndef options_h
#define options_h #define options_h
#define VERSION "0.8.151" #define VERSION "0.8.157"
/******************************************************* /*******************************************************
DO NOT EDIT THIS FILE. DO NOT EDIT THIS FILE.

4
yoRadio/src/core/player.cpp
View File

@@ -33,7 +33,7 @@ Player player;
void Player::init() { void Player::init() {
BOOTLOG("player.init"); Serial.print("##[BOOT]#\tplayer.init\t");
if(MUTE_PIN!=255) pinMode(MUTE_PIN, OUTPUT); if(MUTE_PIN!=255) pinMode(MUTE_PIN, OUTPUT);
#if I2S_DOUT!=255 #if I2S_DOUT!=255
#if !I2S_INTERNAL #if !I2S_INTERNAL
@@ -53,7 +53,7 @@ void Player::init() {
volTimer=false; volTimer=false;
zeroRequest(); zeroRequest();
playmutex = xSemaphoreCreateMutex(); playmutex = xSemaphoreCreateMutex();
BOOTLOG("done"); Serial.println("done");
} }
void Player::stopInfo() { void Player::stopInfo() {

7
yoRadio/src/core/telnet.cpp
View File

@@ -13,12 +13,15 @@ bool Telnet::_isIPSet(IPAddress ip) {
} }
bool Telnet::begin() { bool Telnet::begin() {
BOOTLOG("telnet.begin"); Serial.print("##[BOOT]#\ttelnet.begin\t");
if (WiFi.status() == WL_CONNECTED || _isIPSet(WiFi.softAPIP())) { if (WiFi.status() == WL_CONNECTED || _isIPSet(WiFi.softAPIP())) {
server.begin(); server.begin();
server.setNoDelay(true); server.setNoDelay(true);
Serial.println("done");
Serial.println();
BOOTLOG("************************************************");
BOOTLOG("Ready! Go to http:/%s/ to configure.", WiFi.localIP().toString().c_str()); BOOTLOG("Ready! Go to http:/%s/ to configure.", WiFi.localIP().toString().c_str());
BOOTLOG("******************************************\n"); BOOTLOG("************************************************");
Serial.println(); Serial.println();
return true; return true;
} else { } else {