diff --git a/.vscode/launch.json b/.vscode/launch.json index 57c046669468b3a7b0984d724f16c0729810a13e..cf8d8a9187784c49dd1448daaf6bb7a1cd0da899 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -47,71 +47,5 @@ ], "cwd": "${workspaceRoot}" } - // { - // "name": "(gdb) Launch", - // "type": "cppdbg", - // "request": "launch", - // "miDebuggerPath": "/usr/bin/arm-none-eabi-gdb", - // //"MIMode": "gdb", - // "targetArchitecture": "arm", - // "program": "${workspaceRoot}/target/thumbv7em-none-eabihf/release/bluepill", - // //"args": [], - // //"stopAtEntry": false, - // //"environment": [], - // "setupCommands": [ - // //"description": "Enable pretty-printing for gdb", - // // { - // // "text": "-enable-pretty-printing" - // // }, - // { - // "text": "file ${workspaceRoot}/target/thumbv7em-none-eabihf/release/bluepill" - // }, - // { - // "text": "set remotetimeout 30" - // }, - // { - // "text": "target remote localhost:3333" - // }, - // { - // "text": "monitor halt" - // }, - // { - // "text": "monitor reset init" - // }, - // { - // "text": "load" - // }, - // { - // "text": "info target" - // } - // //"ignoreFailures": true - // ], - // "externalConsole": false, - // "cwd": "${workspaceRoot}" - // } - // { - // "name": "Rust", - // "type": "gdb", - // "request": "attach", - // "cwd": "${workspaceRoot}", - // "gdbpath": "/usr/bin/arm-none-eabi-gdb", - // //"target": ":3333", - // "executable": "./target/thumbv7em-none-eabihf/release/bluepill", - // "autorun": [ - // "monitor reset halt", - // //"set target-async off", - // "load ./target/thumbv7em-none-eabihf/release/bluepill", - // "monitor reset" - // ] - // } - // { - // "name": "Rust Launch", - // "type": "gdb", - // "request": "launch", - // "target": "./target/thumbv7em-none-eabihf/release/bluepill", - // "executable": "./target/thumbv7em-none-eabihf/release/bluepill", - // "cwd": "${workspaceRoot}", - // "gdbpath": "/usr/bin/arm-none-eabi-gdb" - // } ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2fd2a59e88f16f9c39aadefa1011f3a01fbf0e9b..e16c85b372e3fe77d44e3e1cf1464d000e18fb60 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,25 @@ { "taskName": "xargo build --release", "type": "shell", - "command": "xargo build --release" + "command": "xargo build --release", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [ + "$rustc" + ] + }, + { + "taskName": "xargo build", + "type": "shell", + "command": "xargo build", + "group": { + "kind": "build", + }, + "problemMatcher": [ + "$rustc" + ] } ] } \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 6fbe6afb7194587f3bede3e6d946f938d417dae3..1c913dbd42df9523d3910f5f82851dbd855eccf1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -238,9 +238,9 @@ fn main() { (*DWT.get()).enable_cycle_counter(); (*DWT.get()).cyccnt.write(0); } - asm::bkpt(); + //asm::bkpt(); decode(&ABC, unsafe { &mut PLAIN }, &mut seed); - asm::bkpt(); + //asm::bkpt(); writeln!(stdout, "string {}", from_utf8(unsafe { &PLAIN }).unwrap()) .unwrap(); }