From 0ede87fee66eeb773a94e3186d6fe8050bed4751 Mon Sep 17 00:00:00 2001 From: prosper00 <brad.roy@gmail.com> Date: Sat, 6 Apr 2024 13:24:21 -0600 Subject: [PATCH] fixed paths --- examples/template/.vscode/c_cpp_properties.json | 4 ++++ examples/template/.vscode/launch.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/template/.vscode/c_cpp_properties.json b/examples/template/.vscode/c_cpp_properties.json index ee34f28..90f1ef6 100644 --- a/examples/template/.vscode/c_cpp_properties.json +++ b/examples/template/.vscode/c_cpp_properties.json @@ -4,7 +4,11 @@ "name": "RISCV32EC", "includePath": [ "${workspaceFolder}/**", +<<<<<<< HEAD "${workspaceFolder}../../ch32v003fun", +======= + "${workspaceFolder}/../../ch32v003fun", +>>>>>>> 4f99049 (fixed paths) "/usr/include/newlib" //why? the configurationProvider ought to find this ], "defines": [ diff --git a/examples/template/.vscode/launch.json b/examples/template/.vscode/launch.json index 3ab61df..de280e4 100644 --- a/examples/template/.vscode/launch.json +++ b/examples/template/.vscode/launch.json @@ -18,7 +18,7 @@ }, { "type": "shell", - "command": "${workspaceFolder}/minichlink/minichlink -aG", + "command": "${workspaceFolder}/../../minichlink/minichlink -aG", "continueOn": "gdbserver running" }, ], @@ -29,7 +29,7 @@ "ignoreFailures": true, }, ], - "svdPath": "${workspaceFolder}/misc/CH32V003xx.svd", // extension 'Peripheral Viewer' by mcu-debug (cortex-debug) + "svdPath": "${workspaceFolder}/../../misc/CH32V003xx.svd", // extension 'Peripheral Viewer' by mcu-debug (cortex-debug) "miDebuggerPath": "gdb-multiarch", "miDebuggerServerAddress": "localhost:2000", "logging": { -- GitLab