From 7f2d395b679acfb986808376068b0767ffd08fef Mon Sep 17 00:00:00 2001 From: cfif Date: Tue, 9 Dec 2025 17:09:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inc/LoggerToSerialPort.h | 6 ++---- Src/LoggerToSerialPort.c | 14 ++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Inc/LoggerToSerialPort.h b/Inc/LoggerToSerialPort.h index d082e10..40ee5a7 100644 --- a/Inc/LoggerToSerialPort.h +++ b/Inc/LoggerToSerialPort.h @@ -12,8 +12,7 @@ typedef struct { - tSerialPortIO *serialPortIo_IN_VIRT; - tSerialPortIO *serialPortIo_OUT_VIRT; + tSerialPortIO *serialPortIo_VIRT; tSerialPortIO *serialPortIo_PHYSIC; tRtcIO *rtc; uint32_t timeout; @@ -41,8 +40,7 @@ typedef struct { void LoggerToSerialPort_Init( tLoggerToSerialPort *env, int32_t greenwichOffset, - tSerialPortIO *serialPortIo_IN_VIRT, - tSerialPortIO *serialPortIo_OUT_VIRT, + tSerialPortIO *serialPortIo_VIRT, tSerialPortIO *serialPortIo_PHYSIC, tRtcIO *rtc, uint16_t flags, diff --git a/Src/LoggerToSerialPort.c b/Src/LoggerToSerialPort.c index e27b422..d6fd65d 100644 --- a/Src/LoggerToSerialPort.c +++ b/Src/LoggerToSerialPort.c @@ -71,7 +71,7 @@ static void LoggerToSerialPort_PrintLegend( if (env->flags) vAsciiStringAdd(str, &strLen, ": ", 2); - SerialPortTransmit(env->serialPortIo_IN_VIRT, (uint8_t *) str, strLen, env->timeout); + SerialPortTransmit(env->serialPortIo_VIRT, (uint8_t *) str, strLen, env->timeout); env->open = true; } @@ -99,11 +99,11 @@ static void LoggerToSerialPort_Logging( } //выводим сообщение - SerialPortTransmit(env->serialPortIo_IN_VIRT, (uint8_t *) msg, msgLen, env->timeout); + SerialPortTransmit(env->serialPortIo_VIRT, (uint8_t *) msg, msgLen, env->timeout); if (complete) { //переводим строку - SerialPortTransmit(env->serialPortIo_IN_VIRT, (uint8_t *) "\r\n", 2, env->timeout); + SerialPortTransmit(env->serialPortIo_VIRT, (uint8_t *) "\r\n", 2, env->timeout); env->open = false; } else { env->open = true; @@ -116,15 +116,13 @@ static void LoggerToSerialPort_Logging( void LoggerToSerialPort_Init( tLoggerToSerialPort *env, int32_t greenwichOffset, - tSerialPortIO *serialPortIo_IN_VIRT, - tSerialPortIO *serialPortIo_OUT_VIRT, + tSerialPortIO *serialPortIo_VIRT, tSerialPortIO *serialPortIo_PHYSIC, tRtcIO *rtc, uint16_t flags, uint32_t timeoutTransmittedLog ) { - env->serialPortIo_IN_VIRT = serialPortIo_IN_VIRT; - env->serialPortIo_OUT_VIRT = serialPortIo_OUT_VIRT; + env->serialPortIo_VIRT = serialPortIo_VIRT; env->serialPortIo_PHYSIC = serialPortIo_PHYSIC; env->open = false; env->timeout = 0;// не ждем на каждой операции так как если порт исправен то все должно отрабатывать моментально @@ -149,7 +147,7 @@ extern uint8_t buf_USART2_TRANSMITTED[256]; static _Noreturn void LogTransmitter_Thread(tLoggerToSerialPort *env) { for (;;) { - uint16_t len = env->serialPortIo_OUT_VIRT->receive(env->serialPortIo_OUT_VIRT->env, buf_USART2_TRANSMITTED, + uint16_t len = env->serialPortIo_VIRT->receive(env->serialPortIo_VIRT->env, buf_USART2_TRANSMITTED, sizeof(buf_USART2_TRANSMITTED), env->timeoutTransmittedLog); if (len > 0) {