Обновление
This commit is contained in:
parent
6df6ceea89
commit
ef27298538
|
|
@ -8,6 +8,7 @@
|
||||||
#include "SerialPort.h"
|
#include "SerialPort.h"
|
||||||
#include "stdbool.h"
|
#include "stdbool.h"
|
||||||
#include "stddef.h"
|
#include "stddef.h"
|
||||||
|
#include "LoggerToSerialPort.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
struct {
|
struct {
|
||||||
|
|
@ -19,12 +20,14 @@ typedef struct {
|
||||||
|
|
||||||
tSerialPortIO *serialCommandPortIn;
|
tSerialPortIO *serialCommandPortIn;
|
||||||
tSerialPortIO *serialCommandPortOut;
|
tSerialPortIO *serialCommandPortOut;
|
||||||
|
tLoggerToSerialPort *loggerToSerialPort;
|
||||||
|
|
||||||
} tCliCmd;
|
} 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);
|
void CliCmd_WaitLine(tCliCmd *env);
|
||||||
|
|
||||||
|
|
|
||||||
10
Src/CliCmd.c
10
Src/CliCmd.c
|
|
@ -6,8 +6,11 @@
|
||||||
#include "AsciiStringParsingUtils.h"
|
#include "AsciiStringParsingUtils.h"
|
||||||
#include "AsciiStringAssmeblingUtils.h"
|
#include "AsciiStringAssmeblingUtils.h"
|
||||||
#include "SystemDelayInterface.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->serialCommandPortIn = io_in;
|
||||||
env->serialCommandPortOut = io_out;
|
env->serialCommandPortOut = io_out;
|
||||||
env->rxLine.limit = dataLen;
|
env->rxLine.limit = dataLen;
|
||||||
|
|
@ -87,7 +90,10 @@ bool CliCmd_HasCompleteLine(tCliCmd *env) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void CliCmd_Print(tCliCmd *cli, char *text, uint16_t len) {
|
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) {
|
void CliCmd_PrintHex(tCliCmd *cli, uint8_t *data, uint16_t byteLen) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue