From c71e59ca53bb9b5e866c5e65a203c8c7775a783f Mon Sep 17 00:00:00 2001 From: philsson Date: Sat, 14 Oct 2017 15:10:58 +0200 Subject: [PATCH] Correction in submodules --- .gitmodules | 2 +- .vscode/launch.json | 4 ++-- include/zephyr-RC | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 160000 include/zephyr-RC diff --git a/.gitmodules b/.gitmodules index 55429fa..97ffa20 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "zephyr-RC"] +[submodule "include/zephyr-RC"] path = include/zephyr-RC url = https://github.com/philsson/zephyr-RC.git diff --git a/.vscode/launch.json b/.vscode/launch.json index 9ea2256..ffafef7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,12 +9,12 @@ "miDebuggerPath": "c:/dev/gcc-arm-6.2/bin/arm-none-eabi-gdb.exe" }, "linux": { - //"miDebuggerPath": "/usr/bin/gdb" "miDebuggerPath": "/usr/bin/arm-none-eabi-gdb" - //"debugServerPath": "/usr/bin/openocd" }, "targetArchitecture": "arm", "program": "${workspaceRoot}/outdir/nucleo_f411re/zephyr.elf", + // A delay is needed to start the debug_server here as the OCD server + // is not fully started when gdb tries to connect //"preLaunchTask": "debug_server", "debugServerArgs": "", "stopAtEntry": false, diff --git a/include/zephyr-RC b/include/zephyr-RC new file mode 160000 index 0000000..4b7fb70 --- /dev/null +++ b/include/zephyr-RC @@ -0,0 +1 @@ +Subproject commit 4b7fb7074b559b554740844e0a81e1f098ddec5c