EWARM/Project.ewp

@@ -70,7 +70,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>9.40.1.63870</state>
+                    <state>9.40.2.67586</state>
                 </option>
                 <option>
                     <name>OGChipSelectEditMenu</name>
@@ -357,19 +357,9 @@
                     <state>$PROJ_DIR$\..\rtthread</state>
                     <state>$PROJ_DIR$\..\rtthread\include\libc</state>
                     <state>$PROJ_DIR$\..\rtthread\include</state>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    <state>C:\Users\dufresne\Documents\020Study\500Project\git\newPtz\drivers</state>
-=======
-                    <state>D:\git\newPtz\drivers</state>
-                    <state>D:\git\newPtz\drivers\tmp75</state>
-                    <state>D:\git\newPtz\drivers\mb85rc64</state>
->>>>>>> df00792cd493a7d5804a60e319aad67a31dc2ee1
-=======
                     <state>D:\newPtz\drivers</state>
                     <state>D:\newPtz\drivers\mb85rc64</state>
                     <state>D:\newPtz\drivers\tmp75</state>
->>>>>>> fb0726f7e9cf0aac37964e0815ddc0905f163227
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>

drivers/readme.md

@@ -107,17 +107,17 @@ GD32F4系列通常有多个ADC单元（如ADC0, ADC1, ADC2）。它们可以协
 
 ```mermaid
 flowchart TD
-subgraph A[任务内容(What)]
+subgraph A[任务内容（What）]
     direction LR
     A1[规则组<br>常规任务队列]
     A2[注入组<br>高优先级任务队列]
 end
 
-subgraph B[执行策略(How)]
+subgraph B[执行策略（How）]
     B1[操作模式<br>单次/连续/扫描/间断]
 end
 
-subgraph C[结果收集(What to do)]
+subgraph C[结果收集（What to do）]
     direction LR
     C1[数据转移方式<br>查询/中断/DMA]
 end

rtthread/board.c

@@ -9,13 +9,8 @@
  */
 #include <stdint.h>
 #include <rthw.h>
-<<<<<<< HEAD
 // #include <rtthread.h>
 #include "drv_usart.h"
-=======
-#include <rtthread.h>
-// #include "drv_usart.h"
->>>>>>> newPtz_/main
 #include <gd32f4xx.h>
 
 // <o> Internal SRAM memory size[Kbytes] <8-64>