Merge pull request #895 from quartiq/bump

really bump menu, rm unused crates
quartiq · May 6, 2024 · 20e0808 · 20e0808
2 parents 71fb265 + 8e34181
commit 20e0808
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,7 +57,6 @@ mcp230xx = "1.0"
 mutex-trait = "0.2"
 fugit = "0.3"
 rtt-logger = "0.2"
-systick-monotonic = "1.0"
 mono-clock = "0.1"
 spin = { version = "0.9", default-features = false, features = ["spin_mutex"]}
 shared-bus = { version = "0.3", features = ["cortex-m"] }
@@ -73,7 +72,6 @@ miniconf = { version = "0.11", features = ["json-core", "derive", "postcard"] }
 miniconf_mqtt = "0.11"
 tca9539 = "0.2"
 smoltcp-nal = { version = "0.5", features = ["shared-stack"] }
-bbqueue = "0.5"
 postcard = "1"
 bit_field = "0.10.2"
 

diff --git a/serial-settings/Cargo.toml b/serial-settings/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 miniconf = {version = "0.11", features = ["json-core"]}
 
-menu = {git = "https://github.com/rust-embedded-community/menu", rev = "7ba884993fea57c3661d0f9d7c3cdca639a48701", features = ["echo"]}
+menu = {version = "0.5", features = ["echo"]}
 heapless = "0.8"
 embedded-io = "0.6"
 yafnv = "0.1"
diff --git a/serial-settings/src/lib.rs b/serial-settings/src/lib.rs
@@ -103,8 +103,8 @@ impl<'a, P: Platform<Y>, const Y: usize> Interface<'a, P, Y> {
         _menu: &menu::Menu<Self, P::Settings>,
         item: &menu::Item<Self, P::Settings>,
         args: &[&str],
-        _settings: &mut P::Settings,
         interface: &mut Self,
+        _settings: &mut P::Settings,
     ) {
         let key = menu::argument_finder(item, args, "cmd").unwrap().unwrap();
         interface.platform.cmd(key)
@@ -114,8 +114,8 @@ impl<'a, P: Platform<Y>, const Y: usize> Interface<'a, P, Y> {
         _menu: &menu::Menu<Self, P::Settings>,
         _item: &menu::Item<Self, P::Settings>,
         _args: &[&str],
-        settings: &mut P::Settings,
         interface: &mut Self,
+        settings: &mut P::Settings,
     ) {
         let mut defaults = settings.clone();
         defaults.reset();
@@ -191,8 +191,8 @@ impl<'a, P: Platform<Y>, const Y: usize> Interface<'a, P, Y> {
         _menu: &menu::Menu<Self, P::Settings>,
         item: &menu::Item<Self, P::Settings>,
         args: &[&str],
-        settings: &mut P::Settings,
         interface: &mut Self,
+        settings: &mut P::Settings,
     ) {
         if let Some(key) = menu::argument_finder(item, args, "item").unwrap() {
             let mut defaults = settings.clone();
@@ -236,8 +236,8 @@ impl<'a, P: Platform<Y>, const Y: usize> Interface<'a, P, Y> {
         _menu: &menu::Menu<Self, P::Settings>,
         item: &menu::Item<Self, P::Settings>,
         args: &[&str],
-        settings: &mut P::Settings,
         interface: &mut Self,
+        settings: &mut P::Settings,
     ) {
         let key = menu::argument_finder(item, args, "item").unwrap().unwrap();
         match settings.get_json(key, interface.buffer) {
@@ -259,8 +259,8 @@ impl<'a, P: Platform<Y>, const Y: usize> Interface<'a, P, Y> {
         _menu: &menu::Menu<Self, P::Settings>,
         item: &menu::Item<Self, P::Settings>,
         args: &[&str],
-        settings: &mut P::Settings,
         interface: &mut Self,
+        settings: &mut P::Settings,
     ) {
         let key = menu::argument_finder(item, args, "item").unwrap().unwrap();
         let value =