Skip to content

Commit cbd5cd7

Browse files
author
mariuste
committed
umstieg auf esp32
1 parent a5afcd8 commit cbd5cd7

22 files changed

Lines changed: 1237 additions & 1261 deletions

easyVerwaltung.code-workspace

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
},
2121
{
2222
"path": "firmware/projects/LASERSAUR_HMI_easyVerwaltung"
23+
},
24+
{
25+
"path": "firmware/projects/MachineNode_legacy"
2326
}
2427
],
2528
"settings": {}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
build
2-
!.vscode/*
3-
env.local.cmake
1+
.pio
2+
platformio.secrets.ini

firmware/projects/MachineNode_legacy/.vscode/c_cpp_properties.json

Lines changed: 526 additions & 12 deletions
Large diffs are not rendered by default.

firmware/projects/MachineNode_legacy/.vscode/cmake-kits.json

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
2+
// See http://go.microsoft.com/fwlink/?LinkId=827846
3+
// for the documentation about the extensions.json format
24
"recommendations": [
3-
"marus25.cortex-debug",
4-
"ms-vscode.cpptools",
5+
"platformio.platformio-ide"
6+
],
7+
"unwantedRecommendations": [
58
"ms-vscode.cpptools-extension-pack",
6-
"ms-vscode.vscode-serial-monitor",
79
"raspberry-pi.raspberry-pi-pico"
810
]
9-
}
11+
}
Lines changed: 30 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,44 @@
1+
// AUTOMATICALLY GENERATED FILE. PLEASE DO NOT MODIFY IT MANUALLY
2+
//
3+
// PlatformIO Debugging Solution
4+
//
5+
// Documentation: https://docs.platformio.org/en/latest/plus/debugging.html
6+
// Configuration: https://docs.platformio.org/en/latest/projectconf/sections/env/options/debug/index.html
7+
18
{
29
"version": "0.2.0",
310
"configurations": [
411
{
5-
"name": "Pico Debug (Cortex-Debug)",
6-
"cwd": "${userHome}/.pico-sdk/openocd/0.12.0+dev/scripts",
7-
"executable": "${command:raspberry-pi-pico.launchTargetPath}",
12+
"type": "platformio-debug",
813
"request": "launch",
9-
"type": "cortex-debug",
10-
"servertype": "openocd",
11-
"serverpath": "${userHome}/.pico-sdk/openocd/0.12.0+dev/openocd.exe",
12-
"gdbPath": "${command:raspberry-pi-pico.getGDBPath}",
13-
"debuggerArgs": ["-ex", "set debug-file-directory /debug"],
14-
"device": "${command:raspberry-pi-pico.getChipUppercase}",
15-
"configFiles": [
16-
"interface/cmsis-dap.cfg",
17-
"target/${command:raspberry-pi-pico.getTarget}.cfg"
18-
],
19-
"svdFile": "${userHome}/.pico-sdk/sdk/2.2.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd",
20-
"runToEntryPoint": "main",
21-
// Fix for no_flash binaries, where monitor reset halt doesn't do what is expected
22-
// Also works fine for flash binaries
23-
"overrideLaunchCommands": [
24-
"monitor reset init",
25-
"load \"${command:raspberry-pi-pico.launchTargetPath}\""
26-
],
27-
"openOCDLaunchCommands": [
28-
"adapter speed 5000"
29-
]
14+
"name": "PIO Debug",
15+
"executable": "/Users/marius/Github/easyVerwaltungHardware/firmware/projects/MachineNode_legacy/.pio/build/wood_bandsaw_usb/firmware.elf",
16+
"projectEnvName": "wood_bandsaw_usb",
17+
"toolchainBinDir": "/Users/marius/.platformio/packages/toolchain-xtensa-esp32s3/bin",
18+
"internalConsoleOptions": "openOnSessionStart",
19+
"preLaunchTask": {
20+
"type": "PlatformIO",
21+
"task": "Pre-Debug (wood_bandsaw_usb)"
22+
}
3023
},
3124
{
32-
"name": "Pico Debug (Cortex-Debug with external OpenOCD)",
33-
"cwd": "${workspaceRoot}",
34-
"executable": "${command:raspberry-pi-pico.launchTargetPath}",
25+
"type": "platformio-debug",
3526
"request": "launch",
36-
"type": "cortex-debug",
37-
"servertype": "external",
38-
"gdbTarget": "localhost:3333",
39-
"gdbPath": "${command:raspberry-pi-pico.getGDBPath}",
40-
"debuggerArgs": ["-ex", "set debug-file-directory /debug"],
41-
"device": "${command:raspberry-pi-pico.getChipUppercase}",
42-
"svdFile": "${userHome}/.pico-sdk/sdk/2.2.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd",
43-
"runToEntryPoint": "main",
44-
// Fix for no_flash binaries, where monitor reset halt doesn't do what is expected
45-
// Also works fine for flash binaries
46-
"overrideLaunchCommands": [
47-
"monitor reset init",
48-
"load \"${command:raspberry-pi-pico.launchTargetPath}\""
49-
]
27+
"name": "PIO Debug (skip Pre-Debug)",
28+
"executable": "/Users/marius/Github/easyVerwaltungHardware/firmware/projects/MachineNode_legacy/.pio/build/wood_bandsaw_usb/firmware.elf",
29+
"projectEnvName": "wood_bandsaw_usb",
30+
"toolchainBinDir": "/Users/marius/.platformio/packages/toolchain-xtensa-esp32s3/bin",
31+
"internalConsoleOptions": "openOnSessionStart"
5032
},
5133
{
52-
"name": "Compile (Task Button)",
53-
"type": "node-terminal",
34+
"type": "platformio-debug",
5435
"request": "launch",
55-
"command": "${userHome}/.pico-sdk/ninja/v1.12.1/ninja -C ${workspaceFolder}/build"
56-
},
57-
{
58-
"name": "Flash USB (Task Button)",
59-
"type": "node-terminal",
60-
"request": "launch",
61-
"command": "${env:HOME}/.pico-sdk/picotool/2.2.0-a4/picotool/picotool load ${command:raspberry-pi-pico.launchTargetPath} -fx"
36+
"name": "PIO Debug (without uploading)",
37+
"executable": "/Users/marius/Github/easyVerwaltungHardware/firmware/projects/MachineNode_legacy/.pio/build/wood_bandsaw_usb/firmware.elf",
38+
"projectEnvName": "wood_bandsaw_usb",
39+
"toolchainBinDir": "/Users/marius/.platformio/packages/toolchain-xtensa-esp32s3/bin",
40+
"internalConsoleOptions": "openOnSessionStart",
41+
"loadMode": "manual"
6242
}
6343
]
6444
}

firmware/projects/MachineNode_legacy/.vscode/settings.json

Lines changed: 0 additions & 46 deletions
This file was deleted.

firmware/projects/MachineNode_legacy/.vscode/tasks.json

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)