From d517dd75fe76bc52dbf1a4b2652000798dfbfab7 Mon Sep 17 00:00:00 2001 From: Astro Date: Fri, 30 Oct 2020 15:03:57 +0100 Subject: [PATCH] update dependencies --- Cargo.lock | 89 ++++++++++++++++++++++++++++++++---------------------- Cargo.toml | 12 ++++---- src/net.rs | 3 +- 3 files changed, 60 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 43583fe..0720694 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,12 +11,13 @@ dependencies = [ [[package]] name = "as-slice" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37dfb65bc03b2bc85ee827004f14a6817e04160e3b1a28931986a666a9290e70" +checksum = "bb4d1c23475b74e3672afa8c2be22040b8b7783ad9b461021144ed10a46bb0e6" dependencies = [ "generic-array 0.12.3", "generic-array 0.13.2", + "generic-array 0.14.4", "stable_deref_trait", ] @@ -35,6 +36,12 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "bare-metal" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603" + [[package]] name = "bit_field" version = "0.10.1" @@ -76,12 +83,12 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "cortex-m" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be99930c99669a74d986f7fd2162085498b322e6daae8ef63a97cc9ac1dc73c" +checksum = "88cdafeafba636c00c467ded7f1587210725a1adfab0c24028a7844b87738263" dependencies = [ "aligned", - "bare-metal", + "bare-metal 0.2.5", "bitfield", "volatile-register", ] @@ -99,9 +106,9 @@ dependencies = [ [[package]] name = "cortex-m-rt" -version = "0.6.12" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d518da72bba39496024b62607c1d8e37bcece44b2536664f1132a73a499a28" +checksum = "980c9d0233a909f355ed297ef122f257942de5e0a2cb1c39f60684b65bcb90fb" dependencies = [ "cortex-m-rt-macros", "r0", @@ -138,9 +145,9 @@ dependencies = [ [[package]] name = "embedded-dma" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce25093adf4f2a76d429644c1f6f0abc10b79d00784a13e5d0cfabcd52b55b76" +checksum = "46c8c02e4347a0267ca60813c952017f4c5948c232474c6010a381a337f1bda4" dependencies = [ "stable_deref_trait", ] @@ -173,6 +180,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "hash32" version = "0.1.1" @@ -218,9 +235,9 @@ checksum = "c75de51135344a4f8ed3cfe2720dc27736f7711989703a0b43aadf3753c55577" [[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "nb" @@ -249,9 +266,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg", "libm", @@ -265,9 +282,9 @@ checksum = "4e20e6499bbbc412f280b04a42346b356c6fa0753d5fd22b7bd752ff34c778ee" [[package]] name = "panic-semihosting" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03864ac862876c16a308f5286f4aa217f1a69ac45df87ad3cd2847f818a642c" +checksum = "aed16eb761d0ee9161dd1319cb38c8007813b20f9720a5a682b283e7b8cdfe58" dependencies = [ "cortex-m", "cortex-m-semihosting", @@ -292,9 +309,9 @@ checksum = "7c68cb38ed13fd7bc9dd5db8f165b7c8d9c1a315104083a2b10f11354c2af97f" [[package]] name = "proc-macro2" -version = "1.0.20" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid", ] @@ -346,9 +363,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" +checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" dependencies = [ "serde_derive", ] @@ -365,9 +382,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" +checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" dependencies = [ "proc-macro2", "quote", @@ -410,7 +427,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11460b4de3a84f072e2cf6e76306c64d27f405a0e83bace0a726f555ddf4bf33" dependencies = [ - "bare-metal", + "bare-metal 0.2.5", "cortex-m", "cortex-m-rt", "vcell", @@ -419,9 +436,9 @@ dependencies = [ [[package]] name = "stm32f4xx-hal" version = "0.8.3" -source = "git+https://github.com/stm32-rs/stm32f4xx-hal.git#4a1a019f8e6e81a69c726bcab1f7caadefdbd32e" +source = "git+https://github.com/stm32-rs/stm32f4xx-hal.git#e80925770d2fe72f0f01a7b46147f4e31d512689" dependencies = [ - "bare-metal", + "bare-metal 0.2.5", "cast", "cortex-m", "cortex-m-rt", @@ -436,9 +453,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350" +checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" dependencies = [ "proc-macro2", "quote", @@ -447,9 +464,9 @@ dependencies = [ [[package]] name = "synopsys-usb-otg" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25c7f146100fd844a8bbd4ecf9e825f40e5ddfbf5a6c8af9e15e8623a72c6255" +checksum = "461676dcf123675b3d3b02e2390e6a690cd186aacf2f439af7673c79e2561d53" dependencies = [ "cortex-m", "usb-device", @@ -460,7 +477,7 @@ dependencies = [ name = "thermostat" version = "0.0.0" dependencies = [ - "bare-metal", + "bare-metal 1.0.0", "bit_field", "byteorder", "cortex-m", @@ -469,7 +486,7 @@ dependencies = [ "eeprom24x", "heapless", "log", - "nb 0.1.3", + "nb 1.0.0", "nom", "num-traits", "panic-abort", @@ -499,9 +516,9 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "uom" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb593f5252356bfb829112f8fca2d0982d48588d2d6bb5a92553b0dfc4c9aba" +checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" dependencies = [ "num-traits", "serde", @@ -510,15 +527,15 @@ dependencies = [ [[package]] name = "usb-device" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e5e2b9ba23f0d9ef7a34e498b6581c9d67944a1916542bfc7238bf1dc0d6acd" +checksum = "849eed9b4dc61a1f17ba1d7a5078ceb095b9410caa38a506eb281ed5eff12fbd" [[package]] name = "usbd-serial" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45051be4bc25e6f85caacb1d3f45ace644fcc6e662b3d976330912542b7f69e" +checksum = "db75519b86287f12dcf0d171c7cf4ecc839149fe9f3b720ac4cfce52959e1dfe" dependencies = [ "embedded-hal", "nb 0.1.3", diff --git a/Cargo.toml b/Cargo.toml index a818298..c85c3fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,10 +14,10 @@ features = [] default-target = "thumbv7em-none-eabihf" [dependencies] -panic-abort = "0.3.1" -panic-semihosting = { version = "0.5.1", optional = true } +panic-abort = "0.3" +panic-semihosting = { version = "0.5", optional = true } log = "0.4" -bare-metal = "0.2" +bare-metal = "1" cortex-m = "0.6" cortex-m-rt = { version = "0.6", features = ["device"] } cortex-m-log = { version = "0.6", features = ["log-integration"] } @@ -30,11 +30,11 @@ nom = { version = "5", default-features = false } num-traits = { version = "0.2", default-features = false, features = ["libm"] } usb-device = "0.2" usbd-serial = "0.1" -nb = "0.1" -uom = { version = "0.29", default-features = false, features = ["autoconvert", "si", "f64", "use_serde"] } +nb = "1" +uom = { version = "0.30", default-features = false, features = ["autoconvert", "si", "f64", "use_serde"] } eeprom24x = "0.3" serde = { version = "1.0", default-features = false, features = ["derive"] } -postcard = "0.5.1" +postcard = "0.5" heapless = "0.5" serde-json-core = "0.1" diff --git a/src/net.rs b/src/net.rs index 031eee4..01f69c6 100644 --- a/src/net.rs +++ b/src/net.rs @@ -2,8 +2,7 @@ //! declared once and globally. use core::cell::RefCell; -use cortex_m::interrupt::Mutex; -use bare_metal::CriticalSection; +use cortex_m::interrupt::{CriticalSection, Mutex}; use stm32f4xx_hal::{ rcc::Clocks, stm32::{interrupt, Peripherals, ETHERNET_MAC, ETHERNET_DMA},