Embedded/elua
1
0
Fork 0
mirror of https://github.com/elua/elua.git synced 2025-01-08 20:56:17 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59 from linvinus/smart_cr_lf

Browse Source 
better handling of CR/LF
This commit is contained in:
Bogdan Marinescu 2015-03-12 09:49:06 +00:00
commit 0fe1e9f1db
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common.c
View File

@ -24,6 +24,8 @@ extern const elua_int_descriptor elua_int_table[ INT_ELUA_LAST ];
#define CON_BUF_SIZE 0
#endif // #ifndef CON_BUF_SIZE
static unsigned int skip_0A = 0;
// ****************************************************************************
// XMODEM support code
@ -55,10 +57,23 @@ static void term_out( u8 data )
static int term_in( int mode )
{
if( mode == TERM_INPUT_DONT_WAIT )
return platform_uart_recv( CON_UART_ID, CON_TIMER_ID, 0 );
else
return platform_uart_recv( CON_UART_ID, CON_TIMER_ID, PLATFORM_TIMER_INF_TIMEOUT );
int c;
do{
if( mode == TERM_INPUT_DONT_WAIT )
c = platform_uart_recv( CON_UART_ID, CON_TIMER_ID, 0 );
else
c = platform_uart_recv( CON_UART_ID, CON_TIMER_ID, PLATFORM_TIMER_INF_TIMEOUT );
// CR/LF sequence, skip the second char (LF) if applicable
if( skip_0A > 0 )
{
skip_0A=0;
if( c == 0x0A )
continue;
}
break;
}while( TRUE );
return c;
}
static int term_translate( int data )
@ -107,8 +122,11 @@ static int term_translate( int data )
}
else if( data == 0x0D )
{
// CR/LF sequence, read the second char (LF) if applicable
platform_uart_recv( CON_UART_ID, CON_TIMER_ID, TERM_TIMEOUT );
skip_0A=1;
return KC_ENTER;
}
else if( data == 0x0A )
{
return KC_ENTER;
}
else