diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf594279..47e83c39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install target - run: rustup target add thumbv7em-none-eabihf + run: rustup target add thumbv7em-none-eabihf thumbv6m-none-eabi - name: Build run: cargo build --verbose - name: Build rp2040 diff --git a/.vscode/launch.json b/.vscode/launch.json index 464755f4..1bbc3196 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -40,7 +40,7 @@ "name": "Cortex-Debug - rp2040", "type": "cortex-debug", "request": "launch", - "gdbPath" : "gdb-multiarch", + "gdbPath": "gdb-multiarch", // "preLaunchTask": "flash rp2040", "cwd": "${workspaceFolder}/boards/rp2040", "device": "RP2040", @@ -52,6 +52,57 @@ "openocd.cfg" ] }, + { + "name": "Probe-rs - stm32h7", + "preLaunchTask": "build stm32h7 --debug", + "type": "probe-rs-debug", + "request": "launch", + "cwd": "${workspaceFolder}/boards/stm32h7", + "chip": "STM32H7B0VBTx", + "speed": 24000, + "runtimeExecutable": "probe-rs", + "runtimeArgs": [ + "dap-server" + ], + "flashingConfig": { + "flashingEnabled": true, + "resetAfterFlashing": true, + "haltAfterReset": true, + }, + "coreConfigs": [ + { + "coreIndex": 0, + "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/debug/rmk-stm32h7", + "chip": "STM32H7B0VBTx", + "svdFile": "${workspaceFolder}/boards/stm32h7/STM32H7B0x.svd", + "rttEnabled": true, + "rttChannelFormats": [ + { + "channelNumber": 0, + // Format RTT data as String data + "dataFormat": "String", + // Include host-side timestamps for every line of data transferred from the target RTT output + "showTimestamps": true + }, + { + "channelNumber": 1, + // Treat data as raw binary data, and do not format in any way + "dataFormat": "BinaryLE" + } + ], + "options": { + "env": { + "DEFMT_LOG": "debug" + } + }, + } + ], + "consoleLogLevel": "Debug", //Error, Warn, Info, Debug, Trace + "wireProtocol": "Swd", + "env": { + "RUST_LOG": "debug" + } + }, { "name": "Probe-rs - rp2040", "preLaunchTask": "Build Debug",