From 8e4f938ae6ba079039908ac7507ebad873b7947a Mon Sep 17 00:00:00 2001
From: Dong Heng <dongheng@espressif.com>
Date: Tue, 23 Oct 2018 20:09:21 +0800
Subject: [PATCH 1/2] fix(freertos): Fix ets_printf lead to panic reenter
---
components/freertos/port/esp8266/panic.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/freertos/port/esp8266/panic.c b/components/freertos/port/esp8266/panic.c
index 6c505174..35062d44 100644
--- a/components/freertos/port/esp8266/panic.c
+++ b/components/freertos/port/esp8266/panic.c
@@ -150,7 +150,6 @@ static void panic_info(void *frame, int wdt)
if (wdt) {
panic_str("Task watchdog got triggered.\r\n\r\n");
- show_critical_info();
}
if (_chip_nmi_cnt) {
From 8c48a58bef7100a0395df26b5a5016bf26a2191f Mon Sep 17 00:00:00 2001
From: Dong Heng <dongheng@espressif.com>
Date: Tue, 23 Oct 2018 20:29:35 +0800
Subject: [PATCH 2/2] feat(freertos): When watch dog triggle, not check it is
ISR
---
components/freertos/port/esp8266/panic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/freertos/port/esp8266/panic.c b/components/freertos/port/esp8266/panic.c
index 35062d44..7b2dc39e 100644
--- a/components/freertos/port/esp8266/panic.c
+++ b/components/freertos/port/esp8266/panic.c
@@ -160,7 +160,7 @@ static void panic_info(void *frame, int wdt)
panic_stack(&_chip_nmi_stk, &LoadStoreErrorHandlerStack);
} else {
- if (xPortInIsrContext()) {
+ if (xPortInIsrContext() && !wdt) {
extern StackType_t _chip_interrupt_stk, _chip_interrupt_tmp;
panic_str("Core 0 was running in ISR context:\r\n\r\n");