From a10eeea15beea0f35c9918d88895b8a43408de64 Mon Sep 17 00:00:00 2001
From: cfif <cham-zod@mail.ru>
Date: Wed, 29 Apr 2026 18:06:45 +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

---
 CanSpamReceiver.c    |  8 +++++---
 CanSpamTransmitter.c |  8 +++++---
 CanSpamTransmitter.h | 20 ++++++++++----------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/CanSpamReceiver.c b/CanSpamReceiver.c
index 354a20f..c0600f5 100644
--- a/CanSpamReceiver.c
+++ b/CanSpamReceiver.c
@@ -6,6 +6,7 @@
 #include "CmsisRtosThreadUtils.h"
 #include "CanPorts.h"
 #include "string.h"
+#include "HVAC_model.h"
 
 #define LOG_SIGN "CAN_RECEIVED"
 #define LOGGER env->logger
@@ -30,7 +31,7 @@ static void ListenCanSpamReceiver(tCanSpamReceiver *env) {
     if (recv == 0)
         return;
 
-    if (osMutexAcquire(env->access, 1000) == osOK) {
+    if (osMutexAcquire(env->access, 5000) == osOK) {
 
         uint32_t id = env->canFrame.standard_id;
 
@@ -48,8 +49,9 @@ static void ListenCanSpamReceiver(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);
     } else {
         LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error get_CanSpamReceiver");
diff --git a/CanSpamTransmitter.c b/CanSpamTransmitter.c
index 9b5d922..74baaf0 100644
--- a/CanSpamTransmitter.c
+++ b/CanSpamTransmitter.c
@@ -6,6 +6,7 @@
 #include "CmsisRtosThreadUtils.h"
 #include "CanPorts.h"
 #include "memory.h"
+#include "HVAC_model.h"
 
 #define LOG_SIGN "CAN_TRANSMITTER"
 #define LOGGER env->logger
@@ -260,12 +261,13 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) {
     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) {
-        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);
     } else {
-        LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error set_CCU_Errors");
+        LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error set_CanSpamTransmitter");
     }
 }
 
diff --git a/CanSpamTransmitter.h b/CanSpamTransmitter.h
index ad3247a..df4ef95 100644
--- a/CanSpamTransmitter.h
+++ b/CanSpamTransmitter.h
@@ -11,17 +11,17 @@
 #include "LoggerInterface.h"
 
 #define CCU_Stat1_SEND 1
-#define CCU_Stat2_SEND 1
-#define CCU_Stat3_SEND 1
+#define CCU_Stat2_SEND 0
+#define CCU_Stat3_SEND 0
 #define CCU_Errors_SEND 1
 
-#define CCU_Requests_SEND 1
-#define CCU_HVC_Req_Msg_SEND 1
-#define CCU_VCU_Msg1_SEND 1
-#define CCU_VCU_Msg2_SEND 1
-#define CCU_Msg1_SEND 1
-#define CCU_Msg3_SEND 1
-#define CU_AC_Ctrl_SEND 1
+#define CCU_Requests_SEND 0
+#define CCU_HVC_Req_Msg_SEND 0
+#define CCU_VCU_Msg1_SEND 0
+#define CCU_VCU_Msg2_SEND 0
+#define CCU_Msg1_SEND 0
+#define CCU_Msg3_SEND 0
+#define CU_AC_Ctrl_SEND 0
 
 
 typedef enum {
@@ -79,7 +79,7 @@ void CanSpamTransmitter_Init(tCanSpamTransmitter *env, tSerialPortFrameIO *ioCan
 
 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);