diff --git a/Inc/CliCmd.h b/Inc/CliCmd.h index 9e6b2b7..8229bfb 100644 --- a/Inc/CliCmd.h +++ b/Inc/CliCmd.h @@ -8,6 +8,7 @@ #include "SerialPort.h" #include "stdbool.h" #include "stddef.h" +#include "LoggerToSerialPort.h" typedef struct { struct { @@ -19,12 +20,14 @@ typedef struct { tSerialPortIO *serialCommandPortIn; tSerialPortIO *serialCommandPortOut; + tLoggerToSerialPort *loggerToSerialPort; } tCliCmd; -void CliCmd_Init(tCliCmd *env, tSerialPortIO *io_in, tSerialPortIO *io_out, uint8_t *data, size_t dataLen); +void CliCmd_Init(tCliCmd *env, tLoggerToSerialPort *loggerToSerialPort, tSerialPortIO *io_in, tSerialPortIO *io_out, + uint8_t *data, size_t dataLen); -#define CliCmd_InitStatic(ENV, IO_IN, IO_OUT, DATA) CliCmd_Init(ENV,IO_IN,IO_OUT,DATA,sizeof(DATA)); +#define CliCmd_InitStatic(ENV, LOGGER, IO_IN, IO_OUT, DATA) CliCmd_Init(ENV, LOGGER, IO_IN,IO_OUT,DATA,sizeof(DATA)); void CliCmd_WaitLine(tCliCmd *env); diff --git a/Src/CliCmd.c b/Src/CliCmd.c index 854ccb3..5790d50 100644 --- a/Src/CliCmd.c +++ b/Src/CliCmd.c @@ -6,8 +6,11 @@ #include "AsciiStringParsingUtils.h" #include "AsciiStringAssmeblingUtils.h" #include "SystemDelayInterface.h" +#include "LoggerToSerialPort.h" -void CliCmd_Init(tCliCmd *env, tSerialPortIO *io_in, tSerialPortIO *io_out, uint8_t *data, size_t dataLen) { +void CliCmd_Init(tCliCmd *env, tLoggerToSerialPort *loggerToSerialPort, tSerialPortIO *io_in, tSerialPortIO *io_out, + uint8_t *data, size_t dataLen) { + env->loggerToSerialPort = loggerToSerialPort; env->serialCommandPortIn = io_in; env->serialCommandPortOut = io_out; env->rxLine.limit = dataLen; @@ -87,7 +90,10 @@ bool CliCmd_HasCompleteLine(tCliCmd *env) { } void CliCmd_Print(tCliCmd *cli, char *text, uint16_t len) { - SerialPortTransmit(cli->serialCommandPortOut, (uint8_t *) text, len, SystemWaitForever); + +// SerialPortTransmit(cli->serialCommandPortOut, (uint8_t *) text, len, SystemWaitForever); + LoggerToSerialPort_Cmd(cli->loggerToSerialPort, text, len); + } void CliCmd_PrintHex(tCliCmd *cli, uint8_t *data, uint16_t byteLen) {