get it running in new dev environment

This commit is contained in:
Martin Brodbeck 2022-12-23 12:23:05 +01:00
parent 5dc8d5e76d
commit 7b56534fee
5 changed files with 15 additions and 18 deletions

18
.vscode/launch.json vendored
View file

@ -1,4 +1,4 @@
{ {
// Use IntelliSense to learn about possible attributes. // Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes. // Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
@ -11,21 +11,19 @@
"request": "launch", "request": "launch",
"type": "cortex-debug", "type": "cortex-debug",
"servertype": "openocd", "servertype": "openocd",
"gdbPath" : "arm-none-eabi-gdb", "gdbPath": "gdb-multiarch",
"device": "RP2040", "device": "RP2040",
//"showDevDebugOutput": "parsed",
"configFiles": [ "configFiles": [
"interface/picoprobe.cfg", "interface/raspberrypi-swd.cfg",
"target/rp2040.cfg" "target/rp2040.cfg"
], ],
"svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd", "svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
"runToEntryPoint": "main", "runToEntryPoint": "main",
// Give restart the same functionality as runToMain // Give restart the same functionality as runToEntryPoint - main
//"postRestartCommands": [ "postRestartCommands": [
// "break main", "break main",
// "continue" "continue"
//], ]
"searchDir": ["${env:HOME}/src/openocd/tcl"],
} }
] ]
} }

View file

@ -14,8 +14,6 @@
"visibility": "hidden" "visibility": "hidden"
}, },
}, },
"cortex-debug.openocdPath": "${env:HOME}/src/openocd/src/openocd",
"cmake.generator": "Unix Makefiles",
"C_Cpp.clang_format_fallbackStyle": "LLVM", "C_Cpp.clang_format_fallbackStyle": "LLVM",
"files.watcherExclude": { "files.watcherExclude": {
"**/.git/objects/**": true, "**/.git/objects/**": true,

View file

@ -3,11 +3,12 @@ cmake_minimum_required(VERSION 3.13)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-volatile") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fno-exceptions")
# Initialise pico_sdk from installed location # Initialise pico_sdk from installed location
# (note this can come from environment, CMake cache etc) # (note this can come from environment, CMake cache etc)
set(PICO_SDK_PATH "/usr/share/pico-sdk") #set(PICO_SDK_PATH "/usr/share/pico-sdk")
set(PICO_SDK_PATH "/home/martin/pico/pico-sdk")
# Pull in Raspberry Pi Pico SDK (must be before project) # Pull in Raspberry Pi Pico SDK (must be before project)
include("cmake/pico_sdk_import.cmake") include("cmake/pico_sdk_import.cmake")

@ -1 +1 @@
Subproject commit d5af2a1e1d81c3cb21805e332c8185607ee74b1d Subproject commit 6399467cf7687ecb7f8f4e4923303349e0ecf160

View file

@ -14,8 +14,8 @@ pico_set_program_name(${CMAKE_PROJECT_NAME} "gbmanager")
pico_set_program_version(${CMAKE_PROJECT_NAME} ${PROJECT_VERSION}) pico_set_program_version(${CMAKE_PROJECT_NAME} ${PROJECT_VERSION})
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
pico_enable_stdio_uart(${CMAKE_PROJECT_NAME} 1) pico_enable_stdio_uart(${CMAKE_PROJECT_NAME} 0)
pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 0) pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 1)
else() else()
pico_enable_stdio_uart(${CMAKE_PROJECT_NAME} 0) pico_enable_stdio_uart(${CMAKE_PROJECT_NAME} 0)
pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 0) pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 0)