deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improved shell banner / prompt customization.

Browse source 
Working with string-type macros on cmdlines is a pain in the nack so rather go for global string constants activated by simple flag-type macros.
This commit is contained in:
Oliver Schmidt 2011-05-21 11:48:50 +02:00
parent e00508472c
commit ff9dd0fce4
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/shell/shell.c
View file

@ -54,12 +54,18 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#ifndef SHELL_CONF_PROMPT #ifdef SHELL_CONF_PROMPT
#define SHELL_CONF_PROMPT "Contiki> " extern char *shell_prompt_text;
#define SHELL_PROMPT shell_prompt_text
#else
#define SHELL_PROMPT "Contiki> "
#endif #endif
#ifndef SHELL_CONF_BANNER #ifdef SHELL_CONF_BANNER
#define SHELL_CONF_BANNER "Contiki command shell" extern char *shell_banner_text;
#define SHELL_BANNER shell_banner_text
#else
#define SHELL_BANNER "Contiki command shell"
#endif #endif
LIST(commands); LIST(commands);
@ -438,7 +444,7 @@ PROCESS_THREAD(shell_process, ev, data)
PROCESS_PAUSE(); PROCESS_PAUSE();
while(1) { while(1) {
shell_prompt(SHELL_CONF_PROMPT); shell_prompt(SHELL_PROMPT);
PROCESS_WAIT_EVENT_UNTIL(ev == shell_event_input); PROCESS_WAIT_EVENT_UNTIL(ev == shell_event_input);
{ {
@ -558,9 +564,9 @@ shell_set_time(unsigned long seconds)
void void
shell_start(void) shell_start(void)
{ {
shell_output_str(NULL, SHELL_CONF_BANNER, ""); shell_output_str(NULL, SHELL_BANNER, "");
shell_output_str(NULL, "Type '?' and return for help", ""); shell_output_str(NULL, "Type '?' and return for help", "");
shell_prompt(SHELL_CONF_PROMPT); shell_prompt(SHELL_PROMPT);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void