Merge pull request #208 from quartiq/bump

bump dependencies, miniconf, minimq, nal

Author: jordens

Cargo.lock

@@ -38,15 +38,15 @@ log = { version = "0.4", features = [
 	"release_max_level_info",
 ] }
 panic-probe = { version = "=0.3.0", features = ["print-rtt"] }
-smoltcp-nal = { version = "0.5", features = ["shared-stack"] }
+smoltcp-nal = { version = "0.6", features = ["shared-stack"] }
 rtic = { version = "2.1", features = ["thumbv7-backend"] }
 rtic-monotonics = { version = "2.0", features = ["cortex-m-systick"] }
 rtic-sync = { version = "1.0" }
 embedded-time = "0.12.1"
 fugit = "0.3"
 mono-clock = "0.1"
 heapless = { version = "0.8", features = ["serde"] }
-minimq = "0.9"
+minimq = "0.10"
 serde = { version = "1.0.217", features = ["derive"], default-features = false }
 serde-json-core = "0.6"
 rtt-logger = "0.2"
@@ -64,7 +64,7 @@ bytemuck = { version = "1.21.0", features = [
 ], default-features = false }
 miniconf = { version = "0.18", features = ["json-core", "derive", "postcard"] }
 miniconf_mqtt = { version = "0.18" }
-strum = { version = "0.26.1", default-features = false, features = ["derive"] }
+strum = { version = "0.27", default-features = false, features = ["derive"] }
 serial-settings = "0.2"
 postcard = "1"
 embedded-storage = "0.3"
@@ -97,3 +97,7 @@ built = { version = "0.7", features = ["git2"], default-features = false }
 [patch.crates-io]
 #idsp = { path = "../idsp" }
 idsp = { git = "https://github.com/quartiq/idsp.git" }
+miniconf = { git = "https://github.com/quartiq/miniconf.git" }
+miniconf_derive = { git = "https://github.com/quartiq/miniconf.git" }
+miniconf_mqtt = { git = "https://github.com/quartiq/miniconf.git" }
+serial-settings = { git = "https://github.com/quartiq/stabilizer.git" }

Cargo.toml

@@ -57,7 +57,7 @@ pub type SerialPort =
     usbd_serial::SerialPort<'static, crate::hardware::UsbBus, &'static mut [u8], &'static mut [u8]>;
 
 pub type SerialTerminal<C, const Y: usize> =
-    serial_settings::Runner<'static, crate::settings::SerialSettingsPlatform<C, Y>, Y>;
+    serial_settings::Runner<'static, crate::settings::SerialSettingsPlatform<C>, Y>;
 
 pub type UsbBus = stm32h7xx_hal::usb_hs::UsbBus<stm32h7xx_hal::usb_hs::USB2>;
 

src/hardware/mod.rs

@@ -472,7 +472,7 @@ where
         };
 
         let mut settings = C::new(crate::NetSettings::new(mac_addr));
-        crate::settings::SerialSettingsPlatform::<_, Y>::load(&mut settings, &mut flash);
+        crate::settings::SerialSettingsPlatform::load(&mut settings, &mut flash);
         (flash, settings)
     };