MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix WDT resets during file.format(). 

With the new SDK soft-wdt it is no longer sufficient to tickle the hardware
watchdog, so all (found) instances have been changed to system_soft_wdt_feed().
This commit is contained in:
Johny Mattsson 2015-10-27 14:31:17 +11:00
parent c223ecfe5f
commit b535be7ab8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/modules/tmr.c
View File

@ -121,11 +121,11 @@ static int tmr_delay( lua_State* L ){
while(us >= 1000000){ while(us >= 1000000){
us -= 1000000; us -= 1000000;
os_delay_us(1000000); os_delay_us(1000000);
WRITE_PERI_REG(0x60000914, 0x73); system_soft_wdt_feed ();
} }
if(us>0){ if(us>0){
os_delay_us(us); os_delay_us(us);
WRITE_PERI_REG(0x60000914, 0x73); system_soft_wdt_feed ();
} }
return 0; return 0;
} }
@ -256,7 +256,7 @@ why they are here*/
// extern void update_key_led(); // extern void update_key_led();
// Lua: tmr.wdclr() // Lua: tmr.wdclr()
static int tmr_wdclr( lua_State* L ){ static int tmr_wdclr( lua_State* L ){
WRITE_PERI_REG(0x60000914, 0x73); system_soft_wdt_feed ();
// update_key_led(); // update_key_led();
return 0; return 0;
} }

6
app/platform/platform.c
View File

@ -508,7 +508,7 @@ uint32_t platform_s_flash_write( const void *from, uint32_t toaddr, uint32_t siz
return 0; return 0;
c_memcpy(apbuf, from, size); c_memcpy(apbuf, from, size);
} }
WRITE_PERI_REG(0x60000914, 0x73); system_soft_wdt_feed ();
r = flash_write(toaddr, apbuf?(uint32 *)apbuf:(uint32 *)from, size); r = flash_write(toaddr, apbuf?(uint32 *)apbuf:(uint32 *)from, size);
if(apbuf) if(apbuf)
c_free(apbuf); c_free(apbuf);
@ -532,7 +532,7 @@ uint32_t platform_s_flash_read( void *to, uint32_t fromaddr, uint32_t size )
fromaddr -= INTERNAL_FLASH_START_ADDRESS; fromaddr -= INTERNAL_FLASH_START_ADDRESS;
SpiFlashOpResult r; SpiFlashOpResult r;
WRITE_PERI_REG(0x60000914, 0x73); system_soft_wdt_feed ();
const uint32_t blkmask = (INTERNAL_FLASH_READ_UNIT_SIZE - 1); const uint32_t blkmask = (INTERNAL_FLASH_READ_UNIT_SIZE - 1);
if( ((uint32_t)to) & blkmask ) if( ((uint32_t)to) & blkmask )
@ -561,6 +561,6 @@ uint32_t platform_s_flash_read( void *to, uint32_t fromaddr, uint32_t size )
int platform_flash_erase_sector( uint32_t sector_id ) int platform_flash_erase_sector( uint32_t sector_id )
{ {
WRITE_PERI_REG(0x60000914, 0x73); system_soft_wdt_feed ();
return flash_erase( sector_id ) == SPI_FLASH_RESULT_OK ? PLATFORM_OK : PLATFORM_ERR; return flash_erase( sector_id ) == SPI_FLASH_RESULT_OK ? PLATFORM_OK : PLATFORM_ERR;
} }