kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge #56 

56: deps: rtfm release 0.5 r=jordens a=jordens

bors r+

Co-authored-by: Robert Jördens <rj@quartiq.de>
This commit is contained in:
bors[bot] 2019-11-19 11:28:05 +00:00 committed by GitHub
parent 8045c19f53 cc658a5c7b
commit cd6477e071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -88,11 +88,11 @@ dependencies = [
[[package]]
name = "cortex-m-rtfm"
version = "0.5.0"
source = "git+https://github.com/rtfm-rs/cortex-m-rtfm?rev=v0.5.0#6b0a2df41c024fa8e7da07f3b42a80f19840432e"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cortex-m 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-m-rt 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-m-rtfm-macros 0.5.0 (git+https://github.com/rtfm-rs/cortex-m-rtfm?rev=v0.5.0)",
"cortex-m-rtfm-macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapless 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rtfm-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -100,7 +100,7 @@ dependencies = [
[[package]]
name = "cortex-m-rtfm-macros"
version = "0.5.0"
source = "git+https://github.com/rtfm-rs/cortex-m-rtfm?rev=v0.5.0#6b0a2df41c024fa8e7da07f3b42a80f19840432e"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -323,7 +323,7 @@ dependencies = [
"cortex-m 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-m-log 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-m-rt 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-m-rtfm 0.5.0 (git+https://github.com/rtfm-rs/cortex-m-rtfm?rev=v0.5.0)",
"cortex-m-rtfm 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapless 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"panic-halt 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -410,8 +410,8 @@ dependencies = [
"checksum cortex-m-log 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "978caafe65d1023d38b00c76b83564788fc351d954a5005fb72cf992c0d61458"
"checksum cortex-m-rt 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17805910e3ecf029bdbfcc42b7384d9e3d9e5626153fa810002c1ef9839338ac"
"checksum cortex-m-rt-macros 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d7ae692573e0acccb1579fef1abf5a5bf1d2f3f0149a22b16870ec9309aee25f"
"checksum cortex-m-rtfm 0.5.0 (git+https://github.com/rtfm-rs/cortex-m-rtfm?rev=v0.5.0)" = "<none>"
"checksum cortex-m-rtfm-macros 0.5.0 (git+https://github.com/rtfm-rs/cortex-m-rtfm?rev=v0.5.0)" = "<none>"
"checksum cortex-m-rtfm 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b25283564e768f6e9cbb1372d94303efec0ea1b18ea5f733ed066ba6eb03040f"
"checksum cortex-m-rtfm-macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c62092f6ff344e9b0adb748f0302ed69889ba2fae1fce446e3788d4726ea73bb"
"checksum cortex-m-semihosting 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "113ef0ecffee2b62b58f9380f4469099b30e9f9cbee2804771b4203ba1762cfa"
"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
"checksum generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"

3
Cargo.toml
View File

@ -52,8 +52,7 @@ features = ["ethernet", "proto-ipv4", "socket-tcp"]
default-features = false
[dependencies.cortex-m-rtfm]
git = "https://github.com/rtfm-rs/cortex-m-rtfm"
rev = "v0.5.0"
version = "0.5"
[features]
semihosting = ["panic-semihosting", "cortex-m-log/semihosting"]