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

Update tmr.c

This commit is contained in:
Kirill 2015-04-09 16:53:13 +05:00
parent fcff045c52
commit c1a0d25ae0
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/modules/tmr.c
View File

@ -65,16 +65,53 @@ typedef void (*alarm_timer_callback)(void *arg);
static alarm_timer_callback alarm_timer_cb[NUM_TMR] = {alarm_timer_cb0,alarm_timer_cb1,alarm_timer_cb2,alarm_timer_cb3,alarm_timer_cb4,alarm_timer_cb5,alarm_timer_cb6}; static alarm_timer_callback alarm_timer_cb[NUM_TMR] = {alarm_timer_cb0,alarm_timer_cb1,alarm_timer_cb2,alarm_timer_cb3,alarm_timer_cb4,alarm_timer_cb5,alarm_timer_cb6};
// Lua: delay( us ) // Lua: delay( us )
static int tmr_delay( lua_State* L ) static int tmr_delay_us( lua_State* L )
{ {
s32 us; s32 us;
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" );
os_delay_us( us ); os_delay_us( us );
WRITE_PERI_REG(0x60000914, 0x73); //Watchdog clear to aviod system reboot
WRITE_PERI_REG(0x60000914, 0x73); //Watchdog clear to aviod system reboot
return 0;
}
// Lua: delay( ms )
static int tmr_delay_ms( lua_State* L )
{
s32 ms;
ms = luaL_checkinteger( L, 1 );
if ( ms <= 0 )
return luaL_error( L, "wrong arg range" );
int i = 0;
for(i=0;i<1000;i++) // 1ms == 1000us. Simple stupid and should work.
//May be later this will need some calibration or refactoring.
{
os_delay_us( ms );
WRITE_PERI_REG(0x60000914, 0x73); //Watchdog clear to aviod system reboot
}
return 0;
}
// Lua: delay( s )
static int tmr_delay_s( lua_State* L )
{
s32 ms;
ms = luaL_checkinteger( L, 1 );
if ( ms <= 0 )
return luaL_error( L, "wrong arg range" );
int i = 0;
for(i=0;i<1000000;i++) // 1s == 1000000us. Simple stupid and should work.
//May be later this will need some calibration or refactoring.
{
os_delay_us( ms );
WRITE_PERI_REG(0x60000914, 0x73); //Watchdog clear to aviod system reboot
}
return 0; return 0;
} }
@ -176,7 +213,9 @@ static int tmr_time( lua_State* L )
#include "lrodefs.h" #include "lrodefs.h"
const LUA_REG_TYPE tmr_map[] = const LUA_REG_TYPE tmr_map[] =
{ {
{ LSTRKEY( "delay" ), LFUNCVAL( tmr_delay ) }, { LSTRKEY( "delay.us" ), LFUNCVAL( tmr_delay_us ) },
{ LSTRKEY( "delay.ms" ), LFUNCVAL( tmr_delay_ms ) },
{ LSTRKEY( "delay.s" ), LFUNCVAL( tmr_delay_s ) },
{ LSTRKEY( "now" ), LFUNCVAL( tmr_now ) }, { LSTRKEY( "now" ), LFUNCVAL( tmr_now ) },
{ LSTRKEY( "alarm" ), LFUNCVAL( tmr_alarm ) }, { LSTRKEY( "alarm" ), LFUNCVAL( tmr_alarm ) },
{ LSTRKEY( "stop" ), LFUNCVAL( tmr_stop ) }, { LSTRKEY( "stop" ), LFUNCVAL( tmr_stop ) },