Skip to content

Commit

Permalink
Merge pull request #12 from blooo-io/fix/LDG-595-unblock-gdb-issue
Browse files Browse the repository at this point in the history
Fix/LDG-595-unblock-gdb-issue
  • Loading branch information
n4l5u0r authored Dec 2, 2024
2 parents a2594d8 + c84e32a commit c322c3c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"python.terminal.activateEnvironment": false,
"git.ignoreLimitWarning": true,
"ledgerDevTools.appSettings": {
"selectedUseCase": "release",
"selectedUseCase": "debug",
"selectedVariant": "CCD",
"selectedDevice": "Nano S Plus"
},
Expand All @@ -45,4 +45,5 @@
"titleBar.inactiveForeground": "#15202b99"
},
"peacock.color": "#47A2AF",
"codeQL.githubDatabase.update": "never",
}
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

services:
nanosp:
image: ghcr.io/blooo-io/speculos:latest-aarch64
image: ghcr.io/blooo-io/speculos:latest
volumes:
- ./bin:/speculos/apps
- ./src:/speculos/sources
Expand All @@ -12,5 +12,5 @@ services:
- "40000:40000" # apdu
environment:
- GDB_DIRECTORY_LIST="/speculos/sources:/speculos/sources/apdu:/speculos/sources/handler:/speculos/sources/helper:/speculos/sources/transaction:/speculos/sources/ui"
command: "-d --model nanox build/nanox/bin/app.elf --display headless --apdu-port 40000 "
command: "-d --model nanosp build/nanos2/bin/app.elf --display headless --apdu-port 40000"
# Add `--vnc-password "<password>"` for macos users to use built-in vnc client.
4 changes: 2 additions & 2 deletions gdb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

docker-compose up -d
docker compose up -d

# Wait for the container to start
until docker inspect -f '{{.State.Status}}' concordium-ledger-app-nanosp-1 | grep -q "running"; do
Expand All @@ -9,4 +9,4 @@ done

docker exec -it concordium-ledger-app-nanosp-1 ./tools/debug.sh apps/app.elf

docker-compose down
docker compose down

0 comments on commit c322c3c

Please sign in to comment.