From 3400d60fa347855376c7fc8c67a3ace721d59093 Mon Sep 17 00:00:00 2001 From: Paul Guenette Date: Sat, 16 Mar 2019 00:30:32 +0100 Subject: [PATCH 1/2] Fix intellisense includePath, add flylint paths to workspace settings --- Firmware/.vscode/c_cpp_properties.json | 7 ++++--- ODrive_Workspace.code-workspace | 10 +++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Firmware/.vscode/c_cpp_properties.json b/Firmware/.vscode/c_cpp_properties.json index 570c0f29..5e30003f 100644 --- a/Firmware/.vscode/c_cpp_properties.json +++ b/Firmware/.vscode/c_cpp_properties.json @@ -6,6 +6,7 @@ "${workspaceRoot}", "${workspaceRoot}/fibre/cpp/include/**", "${workspaceRoot}/MotorControl", + "${workspaceRoot}/communication", "${workspaceRoot}/Drivers/DRV8301", "${workspaceRoot}/Board/v3/Inc", "${workspaceRoot}/Board/v3/Drivers/CMSIS/Include", @@ -16,9 +17,7 @@ "${workspaceRoot}/Board/v3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc", "${workspaceRoot}/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS", "${workspaceRoot}/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/include", - "${workspaceRoot}/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F", - "${ARM_GCC_ROOT}/arm-none-eabi/include/**", - "${ARM_GCC_ROOT}/lib/gcc/arm-none-eabi/**" + "${workspaceRoot}/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F" ], "defines": [ "STM32F405xx", @@ -49,6 +48,7 @@ "${workspaceRoot}", "${workspaceRoot}/fibre/cpp/include/**", "${workspaceRoot}/MotorControl", + "${workspaceRoot}/communication", "${workspaceRoot}/Drivers/DRV8301", "${workspaceRoot}/Board/v3/Inc", "${workspaceRoot}/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F", @@ -92,6 +92,7 @@ "${workspaceRoot}", "${workspaceRoot}/fibre/cpp/include/**", "${workspaceRoot}/MotorControl", + "${workspaceRoot}/communication", "${workspaceRoot}/Drivers/DRV8301", "${workspaceRoot}/Board/v3/Inc", "${workspaceRoot}/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F", diff --git a/ODrive_Workspace.code-workspace b/ODrive_Workspace.code-workspace index d858dcc3..1670d342 100644 --- a/ODrive_Workspace.code-workspace +++ b/ODrive_Workspace.code-workspace @@ -11,6 +11,14 @@ } ], "settings": { + + "c-cpp-flylint.cppcheck.includePaths": [ + "${workspaceRoot}", + "${workspaceRoot}/fibre/cpp/include/fibre", + "${workspaceRoot}/communication", + "${workspaceRoot}/MotorControl", + ], + "files.associations": { "memory": "cpp", "utility": "cpp", @@ -47,5 +55,5 @@ "future": "cpp", "arm_math.h": "c" } - } + } From e7af78d2b02f0ae209bed453452f2e1a14a5318e Mon Sep 17 00:00:00 2001 From: Paul Guenette Date: Sat, 16 Mar 2019 00:35:08 +0100 Subject: [PATCH 2/2] Wrap gcc.exe in compilerPath with quotes --- Firmware/.vscode/c_cpp_properties.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/.vscode/c_cpp_properties.json b/Firmware/.vscode/c_cpp_properties.json index 5e30003f..98ddcaba 100644 --- a/Firmware/.vscode/c_cpp_properties.json +++ b/Firmware/.vscode/c_cpp_properties.json @@ -38,7 +38,7 @@ ], "limitSymbolsToIncludedHeaders": true }, - "compilerPath": "${ARM_GCC_ROOT}/bin/arm-none-eabi-gcc.exe -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -specs=nosys.specs -specs=nano.specs -u _printf_float -u _scanf_float", + "compilerPath": "\"${ARM_GCC_ROOT}/bin/arm-none-eabi-gcc.exe\" -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -specs=nosys.specs -specs=nano.specs -u _printf_float -u _scanf_float", "cStandard": "c11", "cppStandard": "c++14" },