espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-05 05:01:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_wdt_panic_lead_to_panic_reenter' into 'master'

Browse Source 
Fix ets_printf lead to panic reenter

See merge request sdk/ESP8266_RTOS_SDK!577
This commit is contained in:
Dong Heng
2018-10-23 20:39:43 +08:00
parent 25768d75e1 8c48a58bef
commit b45139e23d
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/freertos/port/esp8266/panic.c
View File

@ -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) {
@ -161,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");