andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

serial on as default and then off even in AP mode

Browse Source
This commit is contained in:
Paul
2019-07-05 12:17:34 +02:00
parent d190446f0f
commit daaed4d5f3
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/MyESP/MyESP.cpp
View File

@@ -221,6 +221,13 @@ void MyESP::_wifiCallback(justwifi_messages_t code, char * parameter) {
myDebug_P(PSTR("[WIFI] IP %s"), WiFi.softAPIP().toString().c_str()); myDebug_P(PSTR("[WIFI] IP %s"), WiFi.softAPIP().toString().c_str());
myDebug_P(PSTR("[WIFI] MAC %s"), WiFi.softAPmacAddress().c_str()); myDebug_P(PSTR("[WIFI] MAC %s"), WiFi.softAPmacAddress().c_str());
// finally if we don't want Serial anymore, turn it off
if (!_serial) {
myDebug_P(PSTR("[SYSTEM] Disabling serial port communication."));
SerialAndTelnet.flush(); // flush so all buffer is printed to serial
SerialAndTelnet.setSerial(NULL);
}
// call any final custom settings // call any final custom settings
if (_wifi_callback) { if (_wifi_callback) {
_wifi_callback(); _wifi_callback();
@@ -584,6 +591,13 @@ void MyESP::_telnet_setup() {
SerialAndTelnet.setDebugOutput(false); SerialAndTelnet.setDebugOutput(false);
SerialAndTelnet.begin(TELNET_SERIAL_BAUD); // default baud is 115200 SerialAndTelnet.begin(TELNET_SERIAL_BAUD); // default baud is 115200
// serial is only on when booting
#ifdef DEFAULT_NO_SERIAL
_serial_default = false;
#else
_serial_default = true;
#endif
// init command buffer for console commands // init command buffer for console commands
memset(_command, 0, TELNET_MAX_COMMAND_LENGTH); memset(_command, 0, TELNET_MAX_COMMAND_LENGTH);
} }
@@ -1567,7 +1581,6 @@ bool MyESP::_fs_loadConfig() {
myDebug_P(PSTR("[FS] Config file size is too large")); myDebug_P(PSTR("[FS] Config file size is too large"));
return false; return false;
} else if (size == 0) { } else if (size == 0) {
myDebug_P(PSTR("[FS] Failed to open config file"));
return false; return false;
} }
@@ -1683,7 +1696,7 @@ void MyESP::_fs_setup() {
// load the config file. if it doesn't exist (function returns false) create it // load the config file. if it doesn't exist (function returns false) create it
if (!_fs_loadConfig()) { if (!_fs_loadConfig()) {
//myDebug_P(PSTR("[FS] Re-creating config file")); myDebug_P(PSTR("[FS] Re-creating config file"));
fs_saveConfig(); fs_saveConfig();
_firstInstall = true; // flag as a first install _firstInstall = true; // flag as a first install
} }
@@ -2155,12 +2168,13 @@ void MyESP::begin(const char * app_hostname, const char * app_name, const char *
_app_name = strdup(app_name); _app_name = strdup(app_name);
_app_version = strdup(app_version); _app_version = strdup(app_version);
_telnet_setup(); // Telnet setup, called first to set Serial
// set up onboard LED // set up onboard LED
pinMode(LED_BUILTIN, OUTPUT); pinMode(LED_BUILTIN, OUTPUT);
digitalWrite(LED_BUILTIN, HIGH); digitalWrite(LED_BUILTIN, HIGH);
_getInitialFreeHeap(); // get initial free mem _getInitialFreeHeap(); // get initial free mem
_telnet_setup(); // Telnet setup, called first to set Serial
_rtcmemSetup(); // rtc internal mem setup _rtcmemSetup(); // rtc internal mem setup
if (getSystemBootStatus() == MYESP_BOOTSTATUS_RESETNEEDED) { if (getSystemBootStatus() == MYESP_BOOTSTATUS_RESETNEEDED) {