From 8abc3c463f1e859b2bef705b0b67ca972bc0c525 Mon Sep 17 00:00:00 2001
From: Damiano Amatruda <damiano.amatruda@skywarder.eu>
Date: Wed, 17 Nov 2021 17:50:17 +0100
Subject: [PATCH] [VSCode] Add Visual Studio Code files for SBS v3.1
---
.gitignore | 1 -
{ide/vscode => .vscode}/c_cpp_properties.json | 0
.vscode/cmake-kits.json | 6 ++
{ide/vscode => .vscode}/launch.json | 0
.vscode/settings.json | 79 +++++++++++++++++++
{ide/vscode => .vscode}/tasks.json | 8 +-
skyward-boardcore | 2 +-
7 files changed, 90 insertions(+), 6 deletions(-)
rename {ide/vscode => .vscode}/c_cpp_properties.json (100%)
create mode 100644 .vscode/cmake-kits.json
rename {ide/vscode => .vscode}/launch.json (100%)
create mode 100644 .vscode/settings.json
rename {ide/vscode => .vscode}/tasks.json (93%)
diff --git a/.gitignore b/.gitignore
index 9df3b454f..151c17d1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ build
*.sublime-workspace
*.sublime-project
-.vscode/*
store.json
scripts/event_header_generator/generated/
scripts/event_header_generator/venv/
diff --git a/ide/vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
similarity index 100%
rename from ide/vscode/c_cpp_properties.json
rename to .vscode/c_cpp_properties.json
diff --git a/.vscode/cmake-kits.json b/.vscode/cmake-kits.json
new file mode 100644
index 000000000..2571df7c7
--- /dev/null
+++ b/.vscode/cmake-kits.json
@@ -0,0 +1,6 @@
+[
+ {
+ "name": "Miosix",
+ "toolchainFile": "libs/miosix-kernel/miosix/_tools/toolchain.cmake"
+ }
+]
diff --git a/ide/vscode/launch.json b/.vscode/launch.json
similarity index 100%
rename from ide/vscode/launch.json
rename to .vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..08432c713
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,79 @@
+{
+ "cmake.configureSettings": {
+ "CMAKE_C_COMPILER_LAUNCHER": "ccache",
+ "CMAKE_CXX_COMPILER_LAUNCHER": "ccache"
+ },
+ "cmake.parallelJobs": 1,
+ "files.associations": {
+ "sstream": "cpp",
+ "format": "cpp",
+ "any": "cpp",
+ "array": "cpp",
+ "atomic": "cpp",
+ "bit": "cpp",
+ "*.tcc": "cpp",
+ "bitset": "cpp",
+ "cctype": "cpp",
+ "chrono": "cpp",
+ "clocale": "cpp",
+ "cmath": "cpp",
+ "codecvt": "cpp",
+ "complex": "cpp",
+ "condition_variable": "cpp",
+ "cstdarg": "cpp",
+ "cstddef": "cpp",
+ "cstdint": "cpp",
+ "cstdio": "cpp",
+ "cstdlib": "cpp",
+ "cstring": "cpp",
+ "ctime": "cpp",
+ "cwchar": "cpp",
+ "cwctype": "cpp",
+ "deque": "cpp",
+ "list": "cpp",
+ "map": "cpp",
+ "set": "cpp",
+ "unordered_map": "cpp",
+ "vector": "cpp",
+ "exception": "cpp",
+ "algorithm": "cpp",
+ "functional": "cpp",
+ "iterator": "cpp",
+ "memory": "cpp",
+ "memory_resource": "cpp",
+ "numeric": "cpp",
+ "optional": "cpp",
+ "random": "cpp",
+ "ratio": "cpp",
+ "regex": "cpp",
+ "string": "cpp",
+ "string_view": "cpp",
+ "system_error": "cpp",
+ "tuple": "cpp",
+ "type_traits": "cpp",
+ "utility": "cpp",
+ "fstream": "cpp",
+ "future": "cpp",
+ "initializer_list": "cpp",
+ "iomanip": "cpp",
+ "iosfwd": "cpp",
+ "iostream": "cpp",
+ "istream": "cpp",
+ "limits": "cpp",
+ "mutex": "cpp",
+ "new": "cpp",
+ "ostream": "cpp",
+ "shared_mutex": "cpp",
+ "stdexcept": "cpp",
+ "streambuf": "cpp",
+ "thread": "cpp",
+ "cinttypes": "cpp",
+ "typeindex": "cpp",
+ "typeinfo": "cpp",
+ "variant": "cpp",
+ "dense": "cpp",
+ "unordered_set": "cpp",
+ "hash_map": "cpp",
+ "valarray": "cpp"
+ }
+}
diff --git a/ide/vscode/tasks.json b/.vscode/tasks.json
similarity index 93%
rename from ide/vscode/tasks.json
rename to .vscode/tasks.json
index 3afed1afb..86491abb4 100755
--- a/ide/vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -13,7 +13,7 @@
"label": "CLEAN",
"type": "shell",
"windows": {
- "command": "python sbs -c"
+ "command": "sh sbs -c"
},
"linux": {
"command": "./sbs -c"
@@ -24,7 +24,7 @@
"label": "BUILD all",
"type": "shell",
"windows": {
- "command": "python sbs"
+ "command": "sh sbs"
},
"linux": {
"command": "./sbs"
@@ -35,7 +35,7 @@
"label": "BUILD current-entrypoint",
"type": "shell",
"windows": {
- "command": "python sbs -v -n -b ${fileBasenameNoExtension}"
+ "command": "sh sbs -v -n -b ${fileBasenameNoExtension}"
},
"linux": {
"command": "./sbs -v -b ${fileBasenameNoExtension}"
@@ -75,7 +75,7 @@
"label": "BUILD tests-catch",
"type": "shell",
"windows": {
- "command": "python sbs -v -n -b tests-catch"
+ "command": "sh sbs -v -n -b tests-catch"
},
"linux": {
"command": "./sbs -v -b tests-catch"
diff --git a/skyward-boardcore b/skyward-boardcore
index b731f89ca..cbe970e7b 160000
--- a/skyward-boardcore
+++ b/skyward-boardcore
@@ -1 +1 @@
-Subproject commit b731f89cae858bda25e87516cb8c200036c474f1
+Subproject commit cbe970e7bdcc1c82447958afb700eae7d6fbd16b
--
GitLab