Przeglądaj źródła

串口发送增加互斥锁

zhunk 7 miesięcy temu
rodzic
commit
4cb1d65a66
1 zmienionych plików z 9 dodań i 9 usunięć
  1. 9 9
      Application_CBD/applications/dtu_uart2.c

+ 9 - 9
Application_CBD/applications/dtu_uart2.c

@@ -52,6 +52,8 @@ struct rx_msg
 //static struct rt_messagequeue  rx_mq_dtu;
 //static struct rt_messagequeue  rx_mq_dtu;
 
 
 static struct rt_semaphore rx_sem;    /* 用于接收消息的信号量 */
 static struct rt_semaphore rx_sem;    /* 用于接收消息的信号量 */
+static struct rt_mutex dtu_write_mutex;  /* DTU写互斥锁,防止多线程串口*/
+
 rt_thread_t dtu_recv_data = RT_NULL;
 rt_thread_t dtu_recv_data = RT_NULL;
 rt_thread_t dtu_send_data = RT_NULL;
 rt_thread_t dtu_send_data = RT_NULL;
 
 
@@ -101,7 +103,9 @@ void DTU_Write(char *fmt, ...)
     va_end(ap);
     va_end(ap);
     if (str_length > 1024 - 1)
     if (str_length > 1024 - 1)
         str_length = 1024 - 1;
         str_length = 1024 - 1;
+    rt_mutex_take(&dtu_write_mutex, RT_WAITING_FOREVER);
     rt_device_write(dtuserial, 0, dtu_str, str_length);
     rt_device_write(dtuserial, 0, dtu_str, str_length);
+    rt_mutex_release(&dtu_write_mutex);
     system_status.uart2_tx_bytes +=str_length;
     system_status.uart2_tx_bytes +=str_length;
     LOG_D("DTU_Write:%s",dtu_str);
     LOG_D("DTU_Write:%s",dtu_str);
     rt_thread_delay(10);
     rt_thread_delay(10);
@@ -329,15 +333,11 @@ int dtu_data_play(void)
     lwjson_stream_init(&lwparser, NULL);
     lwjson_stream_init(&lwparser, NULL);
     rt_err_t rm_dtu_result;
     rt_err_t rm_dtu_result;
     DTU_uart2_init();
     DTU_uart2_init();
-    //初始化消息队列
-//    rm_dtu_result = rt_mq_init(&rx_mq_dtu, "dtu", &data_arry.msg_pool[0], 128 - sizeof(void*), sizeof(data_arry.msg_pool), RT_IPC_FLAG_FIFO);
-//    if(rm_dtu_result==RT_EOK)
-//    {
-//        rt_kprintf("消息队列创建成功!!");
-//    }
-//    else {
-//        rt_kprintf("消息队列创建失败!!");
-//    }
+    rm_dtu_result = rt_mutex_init(&dtu_write_mutex, "dtu_mtx", RT_IPC_FLAG_FIFO);
+    if (rm_dtu_result != RT_EOK)
+    {
+        LOG_E("dtu_write_mutex init failed!");
+    }
     /* 初始化信号量 */
     /* 初始化信号量 */
     rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO);
     rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO);
     /* 设置接收回调函数 */
     /* 设置接收回调函数 */