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

Обновление

This commit is contained in:
cfif 2026-04-29 18:06:45 +03:00
parent 945b0b8fa9
commit a10eeea15b
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CanSpamReceiver.c
View File

@ -6,6 +6,7 @@
#include "CmsisRtosThreadUtils.h" #include "CmsisRtosThreadUtils.h"
#include "CanPorts.h" #include "CanPorts.h"
#include "string.h" #include "string.h"
#include "HVAC_model.h"
#define LOG_SIGN "CAN_RECEIVED" #define LOG_SIGN "CAN_RECEIVED"
#define LOGGER env->logger #define LOGGER env->logger
@ -30,7 +31,7 @@ static void ListenCanSpamReceiver(tCanSpamReceiver *env) {
if (recv == 0) if (recv == 0)
return; return;
if (osMutexAcquire(env->access, 1000) == osOK) { if (osMutexAcquire(env->access, 5000) == osOK) {
uint32_t id = env->canFrame.standard_id; uint32_t id = env->canFrame.standard_id;
@ -48,8 +49,9 @@ static void ListenCanSpamReceiver(tCanSpamReceiver *env) {
} }
void get_CanSpamReceiver(tCanSpamReceiver *env) { void get_CanSpamReceiver(tCanSpamReceiver *env) {
if (osMutexAcquire(env->access, 1000) == osOK) { if (osMutexAcquire(env->access, 5000) == osOK) {
memcpy(&rtDW.FIU_CCU1_MODEL, &ccu_candb_rx.FIU_CCU1, sizeof(rtDW.FIU_CCU1_MODEL));
memcpy(&rtDW.FIU_CCU2_MODEL, &ccu_candb_rx.FIU_CCU2, sizeof(rtDW.FIU_CCU2_MODEL));
osMutexRelease(env->access); osMutexRelease(env->access);
} else { } else {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error get_CanSpamReceiver"); LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error get_CanSpamReceiver");

8
CanSpamTransmitter.c
View File

@ -6,6 +6,7 @@
#include "CmsisRtosThreadUtils.h" #include "CmsisRtosThreadUtils.h"
#include "CanPorts.h" #include "CanPorts.h"
#include "memory.h" #include "memory.h"
#include "HVAC_model.h"
#define LOG_SIGN "CAN_TRANSMITTER" #define LOG_SIGN "CAN_TRANSMITTER"
#define LOGGER env->logger #define LOGGER env->logger
@ -260,12 +261,13 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) {
return event_CCU_none; return event_CCU_none;
} }
void set_CCU_Errors(tCanSpamTransmitter *env, CCU_Errors_t *CCU_Errors) { void set_CanSpamTransmitter(tCanSpamTransmitter *env) {
if (osMutexAcquire(env->access, 5000) == osOK) { if (osMutexAcquire(env->access, 5000) == osOK) {
memcpy(&ccu_candb_tx.CCU_Errors, CCU_Errors, sizeof(CCU_Errors_t)); memcpy(&ccu_candb_tx.CCU_Errors, &rtY.CCU_Errors_model, sizeof(ccu_candb_tx.CCU_Errors));
memcpy(&ccu_candb_tx.CCU_Stat1, &rtY.CCU_Stat1_model, sizeof(ccu_candb_tx.CCU_Stat1));
osMutexRelease(env->access); osMutexRelease(env->access);
} else { } else {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error set_CCU_Errors"); LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error set_CanSpamTransmitter");
} }
} }

20
CanSpamTransmitter.h
View File

@ -11,17 +11,17 @@
#include "LoggerInterface.h" #include "LoggerInterface.h"
#define CCU_Stat1_SEND 1 #define CCU_Stat1_SEND 1
#define CCU_Stat2_SEND 1 #define CCU_Stat2_SEND 0
#define CCU_Stat3_SEND 1 #define CCU_Stat3_SEND 0
#define CCU_Errors_SEND 1 #define CCU_Errors_SEND 1
#define CCU_Requests_SEND 1 #define CCU_Requests_SEND 0
#define CCU_HVC_Req_Msg_SEND 1 #define CCU_HVC_Req_Msg_SEND 0
#define CCU_VCU_Msg1_SEND 1 #define CCU_VCU_Msg1_SEND 0
#define CCU_VCU_Msg2_SEND 1 #define CCU_VCU_Msg2_SEND 0
#define CCU_Msg1_SEND 1 #define CCU_Msg1_SEND 0
#define CCU_Msg3_SEND 1 #define CCU_Msg3_SEND 0
#define CU_AC_Ctrl_SEND 1 #define CU_AC_Ctrl_SEND 0
typedef enum { typedef enum {
@ -79,7 +79,7 @@ void CanSpamTransmitter_Init(tCanSpamTransmitter *env, tSerialPortFrameIO *ioCan
void CanSpamTransmitter_StartThread(tCanSpamTransmitter *env); void CanSpamTransmitter_StartThread(tCanSpamTransmitter *env);
void set_CCU_Errors(tCanSpamTransmitter *env, CCU_Errors_t *CCU_Errors); void set_CanSpamTransmitter(tCanSpamTransmitter *env);
void set_CCU_Mute(tCanSpamTransmitter *env, bool mute); void set_CCU_Mute(tCanSpamTransmitter *env, bool mute);