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

Merge pull request #349 from klukonin/patch-3 

Update tmr.c
This commit is contained in:
zeroday 2015-04-12 23:30:13 +08:00
parent 7c759a6113 f19e24c7ac
commit 1ce5deff98
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/modules/tmr.c
View File

@ -71,6 +71,12 @@ static int tmr_delay( lua_State* L )
us = luaL_checkinteger( L, 1 ); us = luaL_checkinteger( L, 1 );
if ( us <= 0 ) if ( us <= 0 )
return luaL_error( L, "wrong arg range" ); return luaL_error( L, "wrong arg range" );
if(us<1000000)
{
os_delay_us( us );
WRITE_PERI_REG(0x60000914, 0x73);
return 0;
}
unsigned sec = (unsigned)us / 1000000; unsigned sec = (unsigned)us / 1000000;
unsigned remain = (unsigned)us % 1000000; unsigned remain = (unsigned)us % 1000000;
int i = 0; int i = 0;