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

Обновление 23.06.2026

This commit is contained in:
Дарья Бараева 2026-06-24 13:58:08 +03:00
parent acc0f69373
commit d5a8ab65d6
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CanSpamTransmitter.c
View File

@ -38,6 +38,7 @@ static void sendEventToCan(tCanSpamTransmitter *env) {
env->ioCanFrame->transmit(env->ioCanFrame->env, (uint8_t * ) & env->canFrame.data, env->canFrame.dlc, env->ioCanFrame->transmit(env->ioCanFrame->env, (uint8_t * ) & env->canFrame.data, env->canFrame.dlc,
env->can_id, env->canFrame.id_type, 100, SPAM_CAN_HANDLER); env->can_id, env->canFrame.id_type, 100, SPAM_CAN_HANDLER);
} }
static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) {
@ -73,7 +74,7 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) {
} }
#endif #endif
/*
#if (CCU_Errors_SEND == 1) #if (CCU_Errors_SEND == 1)
if (env->time_CCU_Errors_CYC <= env->timeMs) { if (env->time_CCU_Errors_CYC <= env->timeMs) {
env->time_CCU_Errors_CYC = env->timeMs + CCU_Errors_CYC; env->time_CCU_Errors_CYC = env->timeMs + CCU_Errors_CYC;
@ -85,7 +86,7 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) {
return event_CCU_Errors_CYC; return event_CCU_Errors_CYC;
} }
#endif #endif
*/
#if (CCU_Requests_SEND == 1) #if (CCU_Requests_SEND == 1)
if (env->time_CCU_Requests <= env->timeMs) { if (env->time_CCU_Requests <= env->timeMs) {
@ -219,7 +220,7 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) {
// начало--------------------------------------0x501 CCU_Msg3------------------------------------------------------- // начало--------------------------------------0x501 CCU_Msg3-------------------------------------------------------
// начало--------------------------------------0x501 CCU_Msg3------------------------------------------------------- // начало--------------------------------------0x501 CCU_Msg3-------------------------------------------------------
// начало--------------------------------------0x501 CCU_Msg3------------------------------------------------------- // начало--------------------------------------0x501 CCU_Msg3-------------------------------------------------------
/*
#if (CCU_Msg3_SEND == 1) #if (CCU_Msg3_SEND == 1)
if (env->time_CCU_Msg3 <= env->timeMs) { if (env->time_CCU_Msg3 <= env->timeMs) {
env->time_CCU_Msg3 = env->timeMs + CCU_Msg3_CYC; env->time_CCU_Msg3 = env->timeMs + CCU_Msg3_CYC;
@ -250,7 +251,7 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) {
return event_CCU_Msg3; return event_CCU_Msg3;
} }
#endif #endif
*/
// конец--------------------------------------0x501 CCU_Msg3------------------------------------------------------- // конец--------------------------------------0x501 CCU_Msg3-------------------------------------------------------
// конец--------------------------------------0x501 CCU_Msg3------------------------------------------------------- // конец--------------------------------------0x501 CCU_Msg3-------------------------------------------------------
// конец--------------------------------------0x501 CCU_Msg3------------------------------------------------------- // конец--------------------------------------0x501 CCU_Msg3-------------------------------------------------------
@ -277,11 +278,11 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) {
void set_CanSpamTransmitter(tCanSpamTransmitter *env) { void set_CanSpamTransmitter(tCanSpamTransmitter *env) {
if (osMutexAcquire(env->access, 5000) == osOK) { if (osMutexAcquire(env->access, 5000) == osOK) {
// memcpy(&ccu_candb_tx.CCU_Errors, &rtY.CCU_Errors_model, sizeof(ccu_candb_tx.CCU_Errors)); 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)); memcpy(&ccu_candb_tx.CCU_Stat1, &rtY.CCU_Stat1_model, sizeof(ccu_candb_tx.CCU_Stat1));
memcpy(&ccu_candb_tx.CCU_Stat2, &rtY.CCU_Stat2_model, sizeof(ccu_candb_tx.CCU_Stat2)); memcpy(&ccu_candb_tx.CCU_Stat2, &rtY.CCU_Stat2_model, sizeof(ccu_candb_tx.CCU_Stat2));
memcpy(&ccu_candb_tx.CCU_HVC_Req_Msg, &rtY.CCUCAN_HVC_REQ_MSG_MODEL, sizeof(ccu_candb_tx.CCU_HVC_Req_Msg)); memcpy(&ccu_candb_tx.CCU_HVC_Req_Msg, &rtY.CCUCAN_HVC_REQ_MSG_MODEL, sizeof(ccu_candb_tx.CCU_HVC_Req_Msg));
// memcpy(&ccu_candb_tx.CCU_Msg3, &rtY.CCU_Msg3_model, sizeof(ccu_candb_tx.CCU_Msg3)); memcpy(&ccu_candb_tx.CCU_Msg3, &rtY.CCU_Msg3_model, sizeof(ccu_candb_tx.CCU_Msg3));
osMutexRelease(env->access); osMutexRelease(env->access);
@ -347,7 +348,7 @@ void CanSpamTransmitter_StartThread(tCanSpamTransmitter *env) {
//-----------------------------------SLOW SLOW SLOW--------------------------------------------------------------------- //-----------------------------------SLOW SLOW SLOW---------------------------------------------------------------------
/*
void CanSpamSlowTransmitter_Init(tCanSpamSlowTransmitter *env, void CanSpamSlowTransmitter_Init(tCanSpamSlowTransmitter *env,
tSerialPortFrameIO *ioCanFrame, tSerialPortFrameIO *ioCanFrame,
@ -485,4 +486,4 @@ void CanSpamSlowTransmitter_StartThread(tCanSpamSlowTransmitter *env) {
env->thread.id = osThreadNew((osThreadFunc_t) (CanSpamSlowTransmitter_Thread), (void *) (env), &env->thread.attr); env->thread.id = osThreadNew((osThreadFunc_t) (CanSpamSlowTransmitter_Thread), (void *) (env), &env->thread.attr);
} }
} }
*/

13
CanSpamTransmitter.h
View File

@ -20,9 +20,12 @@
#define CCU_Requests_SEND 0 #define CCU_Requests_SEND 0
#define CCU_HVC_Req_Msg_SEND 1 #define CCU_HVC_Req_Msg_SEND 1
#define CCU_VCU_Msg1_SEND 0 #define CCU_VCU_Msg1_SEND 0
#define CCU_VCU_Msg2_SEND 0 #define CCU_VCU_Msg2_SEND 0
#define CCU_Msg1_SEND 0 #define CCU_Msg1_SEND 0
#define CCU_Msg3_SEND 1 #define CCU_Msg3_SEND 1
#define CU_AC_Ctrl_SEND 0 #define CU_AC_Ctrl_SEND 0
@ -55,18 +58,18 @@ typedef struct {
uint32_t time_CCU_Stat1_CYC; uint32_t time_CCU_Stat1_CYC;
uint32_t time_CCU_Stat2_CYC; uint32_t time_CCU_Stat2_CYC;
uint32_t time_CCU_Stat3_CYC; uint32_t time_CCU_Stat3_CYC;
// uint32_t time_CCU_Errors_CYC; // uint32_t time_CCU_Errors_CYC; //
uint32_t time_CCU_Requests; uint32_t time_CCU_Requests;
uint32_t time_CCU_HVC_Req_Msg; uint32_t time_CCU_HVC_Req_Msg;
uint32_t time_CCU_VCU_Msg1; uint32_t time_CCU_VCU_Msg1;
uint32_t time_CCU_VCU_Msg2; uint32_t time_CCU_VCU_Msg2;
uint32_t time_CCU_Msg1; uint32_t time_CCU_Msg1;
// uint32_t time_CCU_Msg3; // uint32_t time_CCU_Msg3; //
uint32_t time_CCU_AC_Ctrl; uint32_t time_CCU_AC_Ctrl;
uint8_t CCU_HVC_Req_Msg_CCU_HVC_Req_RC; uint8_t CCU_HVC_Req_Msg_CCU_HVC_Req_RC;
uint8_t CCU_Msg1_CCU_MSG1_RC; uint8_t CCU_Msg1_CCU_MSG1_RC;
// uint8_t CCU_Msg3_CCU_MSG3_RC; // uint8_t CCU_Msg3_CCU_MSG3_RC; //
bool isMute; bool isMute;
@ -93,7 +96,7 @@ void set_CanSpamTransmitter(tCanSpamTransmitter *env);
void set_CCU_Mute(tCanSpamTransmitter *env, bool mute); void set_CCU_Mute(tCanSpamTransmitter *env, bool mute);
/*
typedef struct { typedef struct {
tSerialPortFrameIO *ioCanFrame; tSerialPortFrameIO *ioCanFrame;
@ -134,6 +137,6 @@ void CanSpamSlowTransmitter_StartThread(tCanSpamSlowTransmitter *env);
void set_CanSpamSlowTransmitter(tCanSpamSlowTransmitter *env); void set_CanSpamSlowTransmitter(tCanSpamSlowTransmitter *env);
void set_CCU_Slow_Mute(tCanSpamSlowTransmitter *env, bool mute); void set_CCU_Slow_Mute(tCanSpamSlowTransmitter *env, bool mute);
*/
#endif //HVAC_M7_CANSPAMTRANSMITTER_H #endif //HVAC_M7_CANSPAMTRANSMITTER_H