From 62714714dbd67356b09399d0eb779b94c783a731 Mon Sep 17 00:00:00 2001
From: Oskar Weigl <oskar.weigl@gmail.com>
Date: Sun, 26 Nov 2017 14:52:08 -0800
Subject: [PATCH] fix some merge errors

---
 Firmware/.vscode/c_cpp_properties.json | 44 ++++++++++++++++++++++++++
 Firmware/.vscode/launch.json           |  2 +-
 Firmware/.vscode/settings.json         |  2 +-
 Firmware/.vscode/tasks.json            |  4 +--
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/Firmware/.vscode/c_cpp_properties.json b/Firmware/.vscode/c_cpp_properties.json
index 2fb3414a..2ebf2d39 100644
--- a/Firmware/.vscode/c_cpp_properties.json
+++ b/Firmware/.vscode/c_cpp_properties.json
@@ -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
diff --git a/Firmware/.vscode/launch.json b/Firmware/.vscode/launch.json
index d4141bd1..f6e36562 100644
--- a/Firmware/.vscode/launch.json
+++ b/Firmware/.vscode/launch.json
@@ -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": [
diff --git a/Firmware/.vscode/settings.json b/Firmware/.vscode/settings.json
index 1089a45c..8f45c82a 100644
--- a/Firmware/.vscode/settings.json
+++ b/Firmware/.vscode/settings.json
@@ -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",
diff --git a/Firmware/.vscode/tasks.json b/Firmware/.vscode/tasks.json
index 3dfa660a..33956da9 100644
--- a/Firmware/.vscode/tasks.json
+++ b/Firmware/.vscode/tasks.json
@@ -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": []
         },
         {