Обновление

CanPorts.c

@@ -7,6 +7,9 @@
 #include "fc7xxx_driver_gpio.h"
 #include "candb.h"
 
+#define LOG_SIGN "INIT"
+#define LOGGER logger
+
 tCanPorts CAN_PORTS;
 
 typedef struct {
@@ -146,7 +149,7 @@ const FLEXCAN_RxMbFilterType IdCanFilterFifoCan0[countIdCanFilterFifoCan0] = {
 };
  */
 
-static void vCanPort_InitCan0() {
+static bool vCanPort_InitCan0() {
     vCanPort_InitCAN0RxTxPin();
 
 /*
@@ -157,7 +160,7 @@ static void vCanPort_InitCan0() {
         mask |= z[i];
     }
 */
-    vCanSerialPortFrameDMAInit(
+    bool result = vCanSerialPortFrameDMAInit(
             &CAN_PORTS.Can0,
 
             FLEXCAN0,
@@ -194,6 +197,7 @@ static void vCanPort_InitCan0() {
             NULL
     );
 
+    return result;
 }
 
 
@@ -231,10 +235,10 @@ static void vCanPort_InitCAN1RxTxPin() {
     GPIO_InitPins(GPIO_A, &tGpioInitStruct);
 }
 
-static void vCanPort_InitCan1() {
+static bool vCanPort_InitCan1() {
     vCanPort_InitCAN1RxTxPin();
 
-    vCanSerialPortFrameDMAInit(
+    bool result = vCanSerialPortFrameDMAInit(
             &CAN_PORTS.Can1,
 
             FLEXCAN0,
@@ -271,16 +275,27 @@ static void vCanPort_InitCan1() {
             NULL
     );
 
+    return result;
 }
 
 
-void CanPorts_Init() {
+void CanPorts_Init(tLoggerInterface *logger) {
     CAN_PORTS.Can0.reInit = false;
-    vCanPort_InitCan0();
+    bool result = vCanPort_InitCan0();
+    if (result) {
+        LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN0 - OK")
+    } else {
+        LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN0 - ERROR")
+    }
     CAN_PORTS.Can0_IO = CanPortFrame_GetIo(&CAN_PORTS.Can0);
 
     CAN_PORTS.Can1.reInit = false;
-    vCanPort_InitCan1();
+    result = vCanPort_InitCan1();
+    if (result) {
+        LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN1 - OK")
+    } else {
+        LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN1 - ERROR")
+    }
     CAN_PORTS.Can1_IO = CanPortFrame_GetIo(&CAN_PORTS.Can1);
 }
 

CanPorts.h

@@ -6,6 +6,7 @@
 #define SMART_COMPONENTS_CANPORTS_H
 
 #include "CanSerialPortFrame.h"
+#include "LoggerInterface.h"
 
 #define PROTOCOL_CAN_RAW 0
 
@@ -27,6 +28,6 @@ typedef struct {
 
 extern tCanPorts CAN_PORTS;
 
-void CanPorts_Init();
+void CanPorts_Init(tLoggerInterface *logger);
 
 #endif //SMART_COMPONENTS_CANPORTS_H