HVAC_M7
/
LoggerToSerialPort
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: HVAC_M7:c7a6895cb631bee393b58ed9d49010e75cc94075
Branches Tags
HVAC_M7:master
..
compare: HVAC_M7:ec940eb3cfffd2888b880cb070cdeb11bc16bd62
Branches Tags
HVAC_M7:master

No commits in common. "c7a6895cb631bee393b58ed9d49010e75cc94075" and "ec940eb3cfffd2888b880cb070cdeb11bc16bd62" have entirely different histories.
c7a6895cb6 ... ec940eb3cf

2 changed files with 2 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
Inc/LoggerToSerialPort.h
View File

@ -41,7 +41,7 @@ typedef struct {
uint16_t flags; uint16_t flags;
int32_t greenwichOffset; int32_t greenwichOffset;
uint8_t buf_LOG[1024]; uint8_t buf_LOG[256];
tLoggerDataBuf bufLogger[MAX_COUNT_BUF_LOG]; tLoggerDataBuf bufLogger[MAX_COUNT_BUF_LOG];
uint8_t bufLoggerNames[MAX_COUNT_BUF_LOG][MAX_LEN_BUF_NAME_LOG]; uint8_t bufLoggerNames[MAX_COUNT_BUF_LOG][MAX_LEN_BUF_NAME_LOG];

6
Src/LoggerToSerialPort.c
View File

@ -178,7 +178,7 @@ static void LoggerCanToSerialPort_Logging(
size_t pkt_size = data_size + 2; // данные + CRC + 0x03 size_t pkt_size = data_size + 2; // данные + CRC + 0x03
// Отправка // Отправка
SerialPortTransmit(env->serialPortIo_VIRT, env->bufLoggerCan, pkt_size, env->timeout); // SerialPortTransmit(env->serialPortIo_VIRT, env->bufLoggerCan, pkt_size, env->timeout);
osMutexRelease(env->access); osMutexRelease(env->access);
} }
@ -281,10 +281,6 @@ static _Noreturn void LogTransmitter_Thread(tLoggerToSerialPort *env) {
uint16_t len = env->serialPortIo_VIRT->receive(env->serialPortIo_VIRT->env, env->buf_LOG, uint16_t len = env->serialPortIo_VIRT->receive(env->serialPortIo_VIRT->env, env->buf_LOG,
sizeof(env->buf_LOG), env->timeoutTransmittedLog); sizeof(env->buf_LOG), env->timeoutTransmittedLog);
if (len == 1024) {
asm("nop");
}
if (len > 0) { if (len > 0) {
len = env->serialPortIo_PHYSIC->transmit(env->serialPortIo_PHYSIC->env, env->buf_LOG, len = env->serialPortIo_PHYSIC->transmit(env->serialPortIo_PHYSIC->env, env->buf_LOG,
len, env->timeoutTransmittedLog); len, env->timeoutTransmittedLog);