add mutex to log utils

Author: lekangwang

Boardfiles/nucleol552zeq/Core/Src/main.cpp

@@ -41,6 +41,7 @@
 
 extern "C" {
   #include "app_fatfs.h"
+  #include "log_util.h"
 }
 /* USER CODE END Includes */
 
@@ -79,7 +80,6 @@ extern "C" {
 void SMTask(void *pvParameters) {
     SystemManager SM;
     SM.flyManually();
-
 }
 /* USER CODE END 0 */
 
@@ -136,14 +136,11 @@ int main(void)
     Error_Handler();
   }
   /* USER CODE BEGIN 2 */
-
-
-
+  logInit();
 
   TaskHandle_t hSM = NULL;
   xTaskCreate(SMTask, "SM", 500U, NULL, osPriorityNormal, &hSM);
 
-
   /* USER CODE END 2 */
 
   /* Init scheduler */

Boardfiles/nucleol552zeq/Core/Src/usart.c

@@ -44,7 +44,7 @@ void MX_LPUART1_UART_Init(void)
 
   /* USER CODE END LPUART1_Init 1 */
   hlpuart1.Instance = LPUART1;
-  hlpuart1.Init.BaudRate = 230400;
+  hlpuart1.Init.BaudRate = 209700;
   hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
   hlpuart1.Init.StopBits = UART_STOPBITS_1;
   hlpuart1.Init.Parity = UART_PARITY_NONE;

Boardfiles/nucleol552zeq/FATFS/Target/log_util.c

@@ -1,5 +1,18 @@
 #include "log_util.h"
 
+static SemaphoreHandle_t log_mutex = NULL;
+
+/**
+  * @brief  Create mutex for logging utilities
+  * @retval FRESULT: result status 
+  */
+FRESULT logInit() {
+  if (log_mutex == NULL) {
+    log_mutex = xSemaphoreCreateMutex();
+  }
+  return FR_OK;
+}
+
 /**
   * @brief  Write/append bytes into a file, creates file if does not exist
   * @param  fileName: file name as a string
@@ -12,22 +25,33 @@ FRESULT logWrite(char* fileName, void* buff, UINT buffSize, UINT* bytesWritten)
   FATFS fs;
   FIL fil;
   FRESULT res;
-
-  if (res = f_mount(&fs, "", 0) != FR_OK)
-    return res;
-  
-  if (res = f_open(&fil, fileName, FA_WRITE | FA_OPEN_APPEND) != FR_OK)
-    return res;
-  
-  if (res = f_write(&fil, buff, buffSize, bytesWritten) != FR_OK)
-    return res;
-  
-  if (res = f_close(&fil) != FR_OK)
-    return res;
-  
-  if (res = f_mount(0, "", 0) != FR_OK)
-    return res;
-
+  if (xSemaphoreTake(log_mutex, (TickType_t) portMAX_DELAY) == pdPASS) {
+    if (res = f_mount(&fs, "", 0) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
+    
+    if (res = f_open(&fil, fileName, FA_WRITE | FA_OPEN_APPEND) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
+    
+    if (res = f_write(&fil, buff, buffSize, bytesWritten) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
+    
+    if (res = f_close(&fil) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
+    
+    if (res = f_mount(0, "", 0) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
+    xSemaphoreGive(log_mutex);
+  }
   return FR_OK;
 }
 
@@ -43,21 +67,32 @@ FRESULT logRead(char* fileName, void* buff, UINT buffSize, UINT* bytesRead) {
   FATFS fs;
   FIL fil;
   FRESULT res;
+  if (xSemaphoreTake(log_mutex, (TickType_t) portMAX_DELAY) == pdPASS) {
+    if (res = f_mount(&fs, "", 0) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
+    
+    if (res = f_open(&fil, fileName, FA_READ) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
+    
+    if (res = f_read(&fil, buff, buffSize, bytesRead) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
+    
+    if (res = f_close(&fil) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
 
-  if (res = f_mount(&fs, "", 0) != FR_OK)
-    return res;
-  
-  if (res = f_open(&fil, fileName, FA_READ) != FR_OK)
-    return res;
-  
-  if (res = f_read(&fil, buff, buffSize, bytesRead) != FR_OK)
-    return res;
-  
-  if (res = f_close(&fil) != FR_OK)
-    return res;
-
-  if (res = f_mount(0, "", 0) != FR_OK)
-    return res;
-
+    if (res = f_mount(0, "", 0) != FR_OK) {
+      xSemaphoreGive(log_mutex);
+      return res;
+    }
+    xSemaphoreGive(log_mutex);
+  }
   return FR_OK;
 }

Boardfiles/nucleol552zeq/FATFS/Target/log_util.h

@@ -3,7 +3,10 @@
 
 #include "stddef.h"
 #include "ff.h"
+#include "FreeRTOS.h"
+#include "semphr.h"
 
+FRESULT logInit();
 FRESULT logWrite(char*, void*, UINT, UINT*); 
 FRESULT logRead(char*, void*, UINT, UINT*);