Merge pull request #349 from klukonin/patch-3

Update tmr.c
2015-04-12 23:30:13 +08:00 · 2015-04-12 23:30:13 +08:00 · 1ce5deff98
parent 7c759a6113 f19e24c7ac
commit 1ce5deff98
1 changed files with 6 additions and 0 deletions
--- a/app/modules/tmr.c
+++ b/app/modules/tmr.c
@ -71,6 +71,12 @@ static int tmr_delay( lua_State* L )
  us = luaL_checkinteger( L, 1 );
  if ( us <= 0 )
    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 remain = (unsigned)us % 1000000;
  int i = 0;