diff --git a/components/cplusplus/SConscript b/components/cplusplus/SConscript index b41537a52bf968fc489f501bdc910991a8a03b10..63f68ec3d8ad0d1f5b15fe4f58b8533936332bd4 100644 --- a/components/cplusplus/SConscript +++ b/components/cplusplus/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = Glob('*.cpp') + Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('CPlusPlus', src, depend = ['RT_USING_CPLUSPLUS', 'RT_USING_LIBC'], CPPPATH = CPPPATH) +group = DefineGroup('CPlusPlus', src, depend = ['RT_USING_CPLUSPLUS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/finsh/shell.c b/components/finsh/shell.c index 8962a7333f7a682acee9003af71e8cd31fae9e31..a04214b727f3ec92d0d98ecdd05238efa6aee307 100644 --- a/components/finsh/shell.c +++ b/components/finsh/shell.c @@ -200,7 +200,8 @@ void finsh_run_line(struct finsh_parser *parser, const char *line) { const char *err_str; - rt_kprintf("\n"); + if(shell->echo_mode) + rt_kprintf("\n"); finsh_parser_run(parser, (unsigned char *)line); /* compile node root */ @@ -489,7 +490,8 @@ void finsh_thread_entry(void *parameter) #ifdef FINSH_USING_MSH if (msh_is_used() == RT_TRUE) { - rt_kprintf("\n"); + if (shell->echo_mode) + rt_kprintf("\n"); msh_exec(shell->line, shell->line_position); } else @@ -500,7 +502,8 @@ void finsh_thread_entry(void *parameter) shell->line[shell->line_position] = ';'; if (shell->line_position != 0) finsh_run_line(&shell->parser, shell->line); - else rt_kprintf("\n"); + else + if (shell->echo_mode) rt_kprintf("\n"); #endif }