j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into open-libmain

Browse source 
Conflicts:
	core/include/esp/rtc_regs.h
	include/espressif/spi_flash.h
This commit is contained in:
Alex Stewart 2016-03-22 16:24:50 -07:00
commit 769ca0d8f8
89 changed files with 4766 additions and 634 deletions
Download patch file Download diff file Expand all files Collapse all files

2
opensdk/libmain/misc.c
View file

@ -54,6 +54,6 @@ uint8_t sdk_rtc_get_reset_reason(void) {
}
}
}
RTC.RESET_REASON0 &= ~RTC_RESET_REASON0_SOMETHING;
RTC.RESET_REASON0 &= ~RTC_RESET_REASON0_BIT21;
return reason;
}