diff --git a/test_src/main-test-common.c b/test_src/main-test-common.c index 4f9a6be..12ce7b6 100644 --- a/test_src/main-test-common.c +++ b/test_src/main-test-common.c @@ -19,18 +19,38 @@ #include "main-test-common.h" +static +int std_stream_put(char c, FILE* f){ + static uint8_t did_r = 0; + if(!did_r && c == '\n'){ + uart0_putc('\r'); + } + uart0_putc((char)c); + did_r = (c == '\r'); + return 0; +} + +static +int std_stream_get(FILE* f){ + return (int)uart0_getc(); +} + void main_setup(void){ DEBUG_INIT(); cli_rx = (cli_rx_fpt)uart0_getc; cli_tx = (cli_tx_fpt)uart0_putc; + fdevopen(std_stream_put, std_stream_get); } void welcome_msg(const char* algoname){ - cli_putstr_P(PSTR("\r\n\r\nAVR-Crypto-Lib VS (")); +/* + cli_putstr_P(PSTR("\r\n\r\nAVR-Crypto-Lib VS (")); cli_putstr(algoname); cli_putstr_P(PSTR("; ")); cli_putstr(__DATE__); cli_putc(' '); cli_putstr(__TIME__); cli_putstr_P(PSTR(")\r\nloaded and running\r\n")); +*/ + printf_P(PSTR("\n\nAVR-Crypto-Lib VS(%s; %s %s)\nloaded and running\n"), algoname, __DATE__, __TIME__); } diff --git a/test_src/main-test-common.h b/test_src/main-test-common.h index d2ae9c6..9c65523 100644 --- a/test_src/main-test-common.h +++ b/test_src/main-test-common.h @@ -24,6 +24,7 @@ #include #include #include +#include #include "config.h" #include "cli.h" #include "dump.h"