arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

Merge branch 'master' into wmath_map

Browse Source
This commit is contained in:
Earle F. Philhower, III 2020-02-08 13:51:48 -08:00 committed by GitHub
commit cd5cbae1f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cores/esp8266/core_esp8266_postmortem.cpp
View File

@ -89,7 +89,7 @@ static void ets_printf_P(const char *str, ...) {
vsnprintf(destStr, sizeof(destStr), str, argPtr); vsnprintf(destStr, sizeof(destStr), str, argPtr);
va_end(argPtr); va_end(argPtr);
while (*c) { while (*c) {
ets_putc(*(c++)); ets_uart_putc1(*(c++));
} }
} }
@ -147,10 +147,10 @@ void __wrap_system_restart_local() {
// (determined empirically, might break) // (determined empirically, might break)
uint32_t offset = 0; uint32_t offset = 0;
if (rst_info.reason == REASON_SOFT_WDT_RST) { if (rst_info.reason == REASON_SOFT_WDT_RST) {
offset = 0x1b0; offset = 0x1a0;
} }
else if (rst_info.reason == REASON_EXCEPTION_RST) { else if (rst_info.reason == REASON_EXCEPTION_RST) {
offset = 0x1a0; offset = 0x190;
} }
else if (rst_info.reason == REASON_WDT_RST) { else if (rst_info.reason == REASON_WDT_RST) {
offset = 0x10; offset = 0x10;

27
libraries/ESP8266mDNS/src/LEAmDNS.cpp
View File

@ -114,33 +114,20 @@ bool MDNSResponder::begin(const char* p_pcHostname, const IPAddress& p_IPAddress
IPAddress sta = WiFi.localIP(); IPAddress sta = WiFi.localIP();
IPAddress ap = WiFi.softAPIP(); IPAddress ap = WiFi.softAPIP();
if (!sta.isSet() && !ap.isSet()) if (sta.isSet())
{ {
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] STA interface selected\n")));
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] internal interfaces (STA, AP) are not set (none was specified)\n"))); ipAddress = sta;
return false;
} }
else if (ap.isSet())
if (ap.isSet())
{ {
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] AP interface selected\n")));
if (sta.isSet())
{
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] default interface AP selected over STA (none was specified)\n")));
}
else
{
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] default interface AP selected\n")));
}
ipAddress = ap; ipAddress = ap;
} }
else else
{ {
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] standard interfaces are not up, please specify one in ::begin()\n")));
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] default interface STA selected (none was specified)\n"))); return false;
ipAddress = sta;
} }
// continue to ensure interface is UP // continue to ensure interface is UP