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

Merge branch 'master' into panic-led

This commit is contained in:
Robert Jördens 2021-03-04 15:17:15 +01:00 committed by GitHub
parent 059d4faf9f 6dd0a47bc9
commit e1247ec970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Cargo.lock generated
View File

@ -19,12 +19,12 @@ dependencies = [
[[package]]
name = "as-slice"
version = "0.1.4"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb4d1c23475b74e3672afa8c2be22040b8b7783ad9b461021144ed10a46bb0e6"
checksum = "45403b49e3954a4b8428a0ac21a4b7afadccf92bfd96273f1a58cd4812496ae0"
dependencies = [
"generic-array 0.12.3",
"generic-array 0.13.2",
"generic-array 0.12.4",
"generic-array 0.13.3",
"generic-array 0.14.4",
"stable_deref_trait",
]
@ -165,14 +165,14 @@ dependencies = [
[[package]]
name = "cortex-m-rtic"
version = "0.5.5"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b30efcb6b7920d9016182c485687f0012487032a14c415d2fce6e9862ef8260e"
checksum = "fa43f63284b363ac64f9ce5221a0f593b54f73258aba8e1a88c1feed8efdb664"
dependencies = [
"cortex-m 0.6.7",
"cortex-m-rt",
"cortex-m-rtic-macros",
"heapless",
"heapless 0.6.1",
"rtic-core",
"version_check",
]
@ -253,7 +253,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae46eb1b02de5a76d9d0ea21d657ff5b0ad2cc47f3a7723608227b1dd1b3eb18"
dependencies = [
"heapless",
"heapless 0.5.6",
"nb 1.0.0",
"no-std-net",
]
@ -280,18 +280,18 @@ dependencies = [
[[package]]
name = "generic-array"
version = "0.12.3"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
dependencies = [
"typenum",
]
[[package]]
name = "generic-array"
version = "0.13.2"
version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309"
dependencies = [
"typenum",
]
@ -339,12 +339,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1"
dependencies = [
"as-slice",
"generic-array 0.13.2",
"generic-array 0.13.3",
"hash32",
"serde",
"stable_deref_trait",
]
[[package]]
name = "heapless"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "634bd4d29cbf24424d0a4bfcbf80c6960129dc24424752a7d1d1390607023422"
dependencies = [
"as-slice",
"generic-array 0.14.4",
"hash32",
"stable_deref_trait",
]
[[package]]
name = "indexmap"
version = "1.6.1"
@ -405,7 +417,7 @@ version = "0.1.0"
source = "git+https://github.com/quartiq/miniconf.git?branch=develop#394d0634a9622e43a55850afc34eb4695ecababa"
dependencies = [
"derive_miniconf",
"heapless",
"heapless 0.5.6",
"minimq",
"serde",
"serde-json-core",
@ -420,7 +432,7 @@ dependencies = [
"embedded-nal",
"enum-iterator",
"generic-array 0.14.4",
"heapless",
"heapless 0.5.6",
]
[[package]]
@ -667,7 +679,7 @@ name = "serde-json-core"
version = "0.2.0"
source = "git+https://github.com/rust-embedded-community/serde-json-core.git?branch=master#ee06ac91bc43b72450a92198a00d9e5c5b9946d2"
dependencies = [
"heapless",
"heapless 0.5.6",
"serde",
]
@ -700,7 +712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e5aeb4818706fd74c35917692008d29a5314483c8180300a582253718ce57a"
dependencies = [
"embedded-nal",
"heapless",
"heapless 0.5.6",
"smoltcp",
]
@ -718,7 +730,7 @@ dependencies = [
"embedded-hal",
"enum-iterator",
"generic-array 0.14.4",
"heapless",
"heapless 0.5.6",
"log",
"mcp23017",
"miniconf",

2
Cargo.toml
View File

@ -35,7 +35,7 @@ log = "0.4"
panic-semihosting = { version = "0.5", optional = true }
serde = { version = "1.0", features = ["derive"], default-features = false }
heapless = { version = "0.5", features = ["serde"] }
cortex-m-rtic = "0.5.5"
cortex-m-rtic = "0.5.6"
embedded-hal = "0.2.4"
nb = "1.0.0"
asm-delay = "0.9.0"