From e4ae53dd3e417a6be4566f60f8f28ae1b1c2716c Mon Sep 17 00:00:00 2001 From: Oskar Weigl Date: Wed, 6 Jun 2018 23:29:10 -0700 Subject: [PATCH] update vscode file --- Firmware/.vscode/c_cpp_properties.json | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Firmware/.vscode/c_cpp_properties.json b/Firmware/.vscode/c_cpp_properties.json index 3e925aa9..7f70edfe 100644 --- a/Firmware/.vscode/c_cpp_properties.json +++ b/Firmware/.vscode/c_cpp_properties.json @@ -26,7 +26,9 @@ "defines": [ "STM32F405xx", "USE_HAL_DRIVER", - "HW_VERSION_MAJOR=3", "HW_VERSION_MINOR=4", "HW_VERSION_VOLTAGE=24", + "HW_VERSION_MAJOR=3", + "HW_VERSION_MINOR=5", + "HW_VERSION_VOLTAGE=48", "__weak=\"__attribute__((weak))\"", "__packed=\"__attribute__((__packed__))\"", "__GNUC__" @@ -38,7 +40,9 @@ "C:/Program Files (x86)/GNU Tools ARM Embedded" ], "limitSymbolsToIncludedHeaders": true - } + }, + "cStandard": "c11", + "cppStandard": "c++14" }, { "name": "Linux", @@ -62,7 +66,9 @@ "defines": [ "STM32F405xx", "USE_HAL_DRIVER", - "HW_VERSION_MAJOR=3", "HW_VERSION_MINOR=4", "HW_VERSION_VOLTAGE=24", + "HW_VERSION_MAJOR=3", + "HW_VERSION_MINOR=4", + "HW_VERSION_VOLTAGE=24", "__weak=\"__attribute__((weak))\"", "__packed=\"__attribute__((__packed__))\"", "__GNUC__" @@ -105,7 +111,9 @@ "defines": [ "STM32F405xx", "USE_HAL_DRIVER", - "HW_VERSION_MAJOR=3", "HW_VERSION_MINOR=4", "HW_VERSION_VOLTAGE=24", + "HW_VERSION_MAJOR=3", + "HW_VERSION_MINOR=4", + "HW_VERSION_VOLTAGE=24", "__weak=\"__attribute__((weak))\"", "__packed=\"__attribute__((__packed__))\"", "__GNUC__" @@ -118,8 +126,10 @@ ], "limitSymbolsToIncludedHeaders": true, "databaseFilename": "" - } + }, + "cStandard": "c11", + "cppStandard": "c++17" } ], - "version": 3 + "version": 4 } \ No newline at end of file