diff --git a/.gitignore b/.gitignore index 36e30f3..1f7c879 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*tmp* EWARM/Debug/ EWARM/Release/ EWARM/settings/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index d693bc8..d10e987 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,6 +12,7 @@ "rtthread.h": "c", "rthw.h": "c", "delay_us.h": "c", - "core_cm4.h": "c" + "core_cm4.h": "c", + "gd32f4xx_usart.h": "c" } } \ No newline at end of file diff --git a/EWARM/Project.ewp b/EWARM/Project.ewp index 87e33fe..e11e7be 100644 --- a/EWARM/Project.ewp +++ b/EWARM/Project.ewp @@ -357,6 +357,7 @@ $PROJ_DIR$\..\rtthread $PROJ_DIR$\..\rtthread\include\libc $PROJ_DIR$\..\rtthread\include +<<<<<<< HEAD <<<<<<< HEAD C:\Users\dufresne\Documents\020Study\500Project\git\newPtz\drivers ======= @@ -364,6 +365,11 @@ D:\git\newPtz\drivers\tmp75 D:\git\newPtz\drivers\mb85rc64 >>>>>>> df00792cd493a7d5804a60e319aad67a31dc2ee1 +======= + D:\newPtz\drivers + D:\newPtz\drivers\mb85rc64 + D:\newPtz\drivers\tmp75 +>>>>>>> fb0726f7e9cf0aac37964e0815ddc0905f163227