Skip to content

Commit cd5cbae

Browse files
Merge branch 'master' into wmath_map
2 parents 5882902 + 50a491b commit cd5cbae

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

cores/esp8266/core_esp8266_postmortem.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static void ets_printf_P(const char *str, ...) {
8989
vsnprintf(destStr, sizeof(destStr), str, argPtr);
9090
va_end(argPtr);
9191
while (*c) {
92-
ets_putc(*(c++));
92+
ets_uart_putc1(*(c++));
9393
}
9494
}
9595

@@ -147,10 +147,10 @@ void __wrap_system_restart_local() {
147147
// (determined empirically, might break)
148148
uint32_t offset = 0;
149149
if (rst_info.reason == REASON_SOFT_WDT_RST) {
150-
offset = 0x1b0;
150+
offset = 0x1a0;
151151
}
152152
else if (rst_info.reason == REASON_EXCEPTION_RST) {
153-
offset = 0x1a0;
153+
offset = 0x190;
154154
}
155155
else if (rst_info.reason == REASON_WDT_RST) {
156156
offset = 0x10;

libraries/ESP8266mDNS/src/LEAmDNS.cpp

+7-20
Original file line numberDiff line numberDiff line change
@@ -114,33 +114,20 @@ bool MDNSResponder::begin(const char* p_pcHostname, const IPAddress& p_IPAddress
114114
IPAddress sta = WiFi.localIP();
115115
IPAddress ap = WiFi.softAPIP();
116116

117-
if (!sta.isSet() && !ap.isSet())
117+
if (sta.isSet())
118118
{
119-
120-
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] internal interfaces (STA, AP) are not set (none was specified)\n")));
121-
return false;
119+
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] STA interface selected\n")));
120+
ipAddress = sta;
122121
}
123-
124-
if (ap.isSet())
122+
else if (ap.isSet())
125123
{
126-
127-
if (sta.isSet())
128-
{
129-
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] default interface AP selected over STA (none was specified)\n")));
130-
}
131-
else
132-
{
133-
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] default interface AP selected\n")));
134-
}
124+
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] AP interface selected\n")));
135125
ipAddress = ap;
136-
137126
}
138127
else
139128
{
140-
141-
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] default interface STA selected (none was specified)\n")));
142-
ipAddress = sta;
143-
129+
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] standard interfaces are not up, please specify one in ::begin()\n")));
130+
return false;
144131
}
145132

146133
// continue to ensure interface is UP

0 commit comments

Comments
 (0)