chip_id
This commit is contained in:
@@ -545,10 +545,15 @@ void Config::bootInfo() {
|
||||
BOOTLOG("************************************************");
|
||||
BOOTLOG("* ёPadio v%s *", VERSION);
|
||||
BOOTLOG("************************************************");
|
||||
BOOTLOG("------------------------------------------------");
|
||||
BOOTLOG("arduino:\t%d", ARDUINO);
|
||||
BOOTLOG("compiler:\t%s", __VERSION__);
|
||||
BOOTLOG("esp32core:\t%d.%d.%d", ESP_ARDUINO_VERSION_MAJOR, ESP_ARDUINO_VERSION_MINOR, ESP_ARDUINO_VERSION_PATCH);
|
||||
BOOTLOG("esp chip:\tmodel: %s | rev: %d | cores: %d | psram: %d", ESP.getChipModel(), ESP.getChipRevision(), ESP.getChipCores(), ESP.getPsramSize());
|
||||
uint32_t chipId = 0;
|
||||
for(int i=0; i<17; i=i+8) {
|
||||
chipId |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
|
||||
}
|
||||
BOOTLOG("chip:\t\tmodel: %s | rev: %d | id: %d | cores: %d | psram: %d", ESP.getChipModel(), ESP.getChipRevision(), chipId, ESP.getChipCores(), ESP.getPsramSize());
|
||||
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);
|
||||
@@ -565,5 +570,6 @@ void Config::bootInfo() {
|
||||
BOOTLOG("buttons:\tleft=%d, center=%d, right=%d, up=%d, down=%d, pullup=%s", BTN_LEFT, BTN_CENTER, BTN_RIGHT, BTN_UP, BTN_DOWN, BTN_INTERNALPULLUP?"true":"false");
|
||||
BOOTLOG("encoders:\tl1=%d, b1=%d, r1=%d, pullup=%s, l2=%d, b2=%d, r2=%d, pullup=%s", ENC_BTNL, ENC_BTNB, ENC_BTNR, ENC_INTERNALPULLUP?"true":"false", ENC2_BTNL, ENC2_BTNB, ENC2_BTNR, ENC2_INTERNALPULLUP?"true":"false");
|
||||
BOOTLOG("ir:\t\t%d", IR_PIN);
|
||||
BOOTLOG("------------------------------------------------");
|
||||
}
|
||||
|
||||
|
||||
@@ -63,7 +63,6 @@ void Network::begin() {
|
||||
byte errcnt = 0;
|
||||
WiFi.mode(WIFI_STA);
|
||||
while (true) {
|
||||
//BOOTLOG("Attempt to connect to %s...\n", config.ssids[ls].ssid);
|
||||
Serial.printf("##[BOOT]#\tAttempt to connect to %s\n", config.ssids[ls].ssid);
|
||||
Serial.print("##[BOOT]#\t");
|
||||
display.putRequest(BOOTSTRING, ls);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef options_h
|
||||
#define options_h
|
||||
|
||||
#define VERSION "0.8.165"
|
||||
#define VERSION "0.8.170"
|
||||
|
||||
/*******************************************************
|
||||
DO NOT EDIT THIS FILE.
|
||||
|
||||
@@ -20,6 +20,7 @@ bool Telnet::begin() {
|
||||
Serial.println("done");
|
||||
Serial.println("##[BOOT]#");
|
||||
BOOTLOG("Ready! Go to http:/%s/ to configure", WiFi.localIP().toString().c_str());
|
||||
BOOTLOG("------------------------------------------------");
|
||||
Serial.println("##[BOOT]#");
|
||||
return true;
|
||||
} else {
|
||||
@@ -126,27 +127,6 @@ void Telnet::printf(const char *format, ...) {
|
||||
Serial.print(buf);
|
||||
}
|
||||
|
||||
/*void Telnet::printf(byte id, const char *format, ...) {
|
||||
va_list argptr;
|
||||
va_start(argptr, format);
|
||||
char *szBuffer = 0;
|
||||
const size_t nBufferLength = vsnprintf(szBuffer, 0, format, argptr) + 1;
|
||||
if (nBufferLength == 1) return;
|
||||
szBuffer = (char *) malloc(nBufferLength);
|
||||
if (! szBuffer) return;
|
||||
vsnprintf(szBuffer, nBufferLength, format, argptr);
|
||||
va_end(argptr);
|
||||
if(id>MAX_TLN_CLIENTS){
|
||||
Serial.print(szBuffer);
|
||||
free(szBuffer);
|
||||
return;
|
||||
}
|
||||
if (clients[id] && clients[id].connected()) {
|
||||
clients[id].print(szBuffer);
|
||||
free(szBuffer);
|
||||
}
|
||||
}*/
|
||||
|
||||
void Telnet::printf(byte id, const char *format, ...) {
|
||||
char buf[MAX_PRINTF_LEN];
|
||||
va_list argptr;
|
||||
@@ -202,7 +182,6 @@ void Telnet::on_input(const char* str, byte clientId) {
|
||||
}
|
||||
if (strcmp(str, "cli.stop") == 0 || strcmp(str, "stop") == 0) {
|
||||
player.mode = STOPPED;
|
||||
//display.title("[stopped]");
|
||||
info();
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user