From eea9e8890e9c84fd85bc6a63719afd4321bcaa2d Mon Sep 17 00:00:00 2001
From: Per <Per Lindgren>
Date: Tue, 17 Oct 2017 20:44:08 +0200
Subject: [PATCH] build tasks
---
.vscode/launch.json | 66 ---------------------------------------------
.vscode/tasks.json | 20 +++++++++++++-
src/main.rs | 4 +--
3 files changed, 21 insertions(+), 69 deletions(-)
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 57c0466..cf8d8a9 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 2fd2a59..e16c85b 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 6fbe6af..1c913db 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();
}
--
GitLab