merge master and fix conflicts

This commit is contained in:
fslongjin
2022-08-14 21:43:39 +08:00
parent daf8732bbd
commit f3cd2b7777
4 changed files with 38 additions and 6 deletions

View File

@ -121,7 +121,8 @@
"textui.h": "c",
"atomic.h": "c",
"uart.h": "c",
"fat_ent.h": "c"
"fat_ent.h": "c",
"semaphore.h": "c"
},
"C_Cpp.errorSquiggles": "Enabled",
"esbonio.sphinx.confDir": ""