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

Fix start-up race between UART & start_lua. (#1522) 

Input during startup (especially while doing initial filesystem format)
ran the risk of filling up the task queue, preventing the start_lua task
from being queued, and hence NodeMCU would not start up that time.
This commit is contained in:
Johny Mattsson 2016-10-03 19:19:20 +11:00 committed by Arnim Läuger
parent a86fb74c34
commit 90c6e86872
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/driver/uart.c
View File

@ -330,7 +330,6 @@ uart_init(UartBautRate uart0_br, UartBautRate uart1_br, os_signal_t sig_input)
uart_config(UART0); uart_config(UART0);
UartDev.baut_rate = uart1_br; UartDev.baut_rate = uart1_br;
uart_config(UART1); uart_config(UART1);
ETS_UART_INTR_ENABLE();
#ifdef BIT_RATE_AUTOBAUD #ifdef BIT_RATE_AUTOBAUD
uart_init_autobaud(0); uart_init_autobaud(0);
#endif #endif

20
app/user/user_main.c
View File

@ -29,11 +29,8 @@
#include "rtc/rtctime.h" #include "rtc/rtctime.h"
#endif #endif
#define SIG_LUA 0 static task_handle_t input_sig;
#define SIG_UARTINPUT 1
#define TASK_QUEUE_LEN 4
static os_event_t *taskQueue;
/* Note: the trampoline *must* be explicitly put into the .text segment, since /* Note: the trampoline *must* be explicitly put into the .text segment, since
* by the time it is invoked the irom has not yet been mapped. This naturally * by the time it is invoked the irom has not yet been mapped. This naturally
@ -58,19 +55,17 @@ static void start_lua(task_param_t param, uint8 priority) {
char* lua_argv[] = { (char *)"lua", (char *)"-i", NULL }; char* lua_argv[] = { (char *)"lua", (char *)"-i", NULL };
NODE_DBG("Task task_lua started.\n"); NODE_DBG("Task task_lua started.\n");
lua_main( 2, lua_argv ); lua_main( 2, lua_argv );
// Only enable UART interrupts once we've successfully started up,
// otherwise the task queue might fill up with input events and prevent
// the start_lua task from being posted.
ETS_UART_INTR_ENABLE();
} }
static void handle_input(task_param_t flag, uint8 priority) { static void handle_input(task_param_t flag, uint8 priority) {
// c_printf("HANDLE_INPUT: %u %u\n", flag, priority); REMOVE (void)priority;
lua_handle_input (flag); lua_handle_input (flag);
} }
static task_handle_t input_sig;
task_handle_t user_get_input_sig(void) {
return input_sig;
}
bool user_process_input(bool force) { bool user_process_input(bool force) {
return task_post_low(input_sig, force); return task_post_low(input_sig, force);
} }
@ -118,7 +113,8 @@ void nodemcu_init(void)
#endif #endif
// endpoint_setup(); // endpoint_setup();
task_post_low(task_get_id(start_lua),'s'); if (!task_post_low(task_get_id(start_lua),'s'))
NODE_ERR("Failed to post the start_lua task!\n");
} }
#ifdef LUA_USE_MODULES_WIFI #ifdef LUA_USE_MODULES_WIFI