Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-09-21 07:14:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some merge errors

Browse Source
This commit is contained in:
Oskar Weigl
2017-11-26 14:52:08 -08:00
parent 3c1aaa6670
commit 62714714db
4 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/.vscode/c_cpp_properties.json
Vendored
+44
View File
@@ -43,6 +43,50 @@
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": ""
}
},
{
"name": "Linux",
"includePath": [
"${workspaceRoot}",
"${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
"${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include",
"${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
"${workspaceRoot}/Drivers/DRV8301",
"${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
"${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
"${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc",
"${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
"${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
"${workspaceRoot}/Drivers/CMSIS/Include",
"${workspaceRoot}/Inc",
"${workspaceRoot}/MotorControl",
"/usr/lib/gcc/arm-none-eabi/4.9.3/include",
"/usr/lib/arm-none-eabi/include"
],
"defines": [
"_DEBUG",
"UNICODE"
],
"intelliSenseMode": "msvc-x64",
"browse": {
"path": [
"${workspaceRoot}",
"${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
"${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include",
"${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
"${workspaceRoot}/Drivers/DRV8301",
"${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
"${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
"${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc",
"${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
"${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
"${workspaceRoot}/Drivers/CMSIS/Include",
"${workspaceRoot}/Inc",
"${workspaceRoot}/MotorControl"
],
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": ""
}
}
],
"version": 3
Firmware/.vscode/launch.json
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@
"gdbpath": "arm-none-eabi-gdb",
"remote": true,
"executable": "./build/ODriveFirmware.elf",
"cwd": "${workspaceRoot}/Firmware",
"cwd": "${workspaceRoot}",
"printCalls": false,
//"preLaunchTask": "openocd", // This isn't working quite right.
"autorun": [
Firmware/.vscode/settings.json
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
{
"C_Cpp.clang_format_style": "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 0 }",
"files.exclude": {
"Firmware/build": true
"build": true
},
"files.associations": {
"memory": "cpp",
Firmware/.vscode/tasks.json
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@
{
"taskName": "build",
"type": "shell",
"command": "(cd Firmware && make -j4)",
"command": "make -j4",
"group": {
"kind": "build",
"isDefault": true
@@ -21,7 +21,7 @@
{
"taskName": "flash",
"type": "shell",
"command": "(cd Firmware && make flash)",
"command": "make flash",
"problemMatcher": []
},
{