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 #786 from devsaurus/fix-cr 

Re-add detection of CR as newline.
Fixes #784 and fixes #785.
This commit is contained in:
Arnim Läuger 2015-11-22 23:00:14 +01:00
parent b216e6a809 1c2fad5330
commit 6488c95476
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/lua/lua.c
View File

@ -541,6 +541,7 @@ extern bool uart0_echo;
extern bool run_input; extern bool run_input;
extern uint16_t need_len; extern uint16_t need_len;
extern int16_t end_char; extern int16_t end_char;
static char last_nl_char = '\0';
static bool readline(lua_Load *load){ static bool readline(lua_Load *load){
// NODE_DBG("readline() is called.\n"); // NODE_DBG("readline() is called.\n");
bool need_dojob = false; bool need_dojob = false;
@ -549,11 +550,18 @@ static bool readline(lua_Load *load){
{ {
if(run_input) if(run_input)
{ {
/* skip CR key */ char tmp_last_nl_char = last_nl_char;
if (ch == '\r') // reset marker, will be finally set below when newline is processed
last_nl_char = '\0';
/* handle CR & LF characters
filters second char of LF&CR (\n\r) or CR&LF (\r\n) sequences */
if ((ch == '\r' && tmp_last_nl_char == '\n') || // \n\r sequence -> skip \r
(ch == '\n' && tmp_last_nl_char == '\r')) // \r\n sequence -> skip \n
{ {
continue; continue;
} }
/* backspace key */ /* backspace key */
else if (ch == 0x7f || ch == 0x08) else if (ch == 0x7f || ch == 0x08)
{ {
@ -578,8 +586,10 @@ static bool readline(lua_Load *load){
// } // }
/* end of line */ /* end of line */
if (ch == '\n') if (ch == '\r' || ch == '\n')
{ {
last_nl_char = ch;
load->line[load->line_position] = 0; load->line[load->line_position] = 0;
if(uart0_echo) uart_putc('\n'); if(uart0_echo) uart_putc('\n');
uart_on_data_cb(load->line, load->line_position); uart_on_data_cb(load->line, load->line_position);