From 31332d220e1cb09578dc41dfe64157676413045d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20J=C3=B6rdens?= <rj@quartiq.de>
Date: Wed, 12 May 2021 12:59:58 +0200
Subject: [PATCH 1/6] remove unused dependencies

---
 Cargo.lock          | 34 +++++++++++++++++++++++++++++++++-
 Cargo.toml          |  3 +--
 src/hardware/afe.rs | 24 ++++++------------------
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b72b0be..20f83ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -200,6 +200,17 @@ dependencies = [
  "cortex-m 0.7.2",
 ]
 
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "derive_miniconf"
 version = "0.1.0"
@@ -537,6 +548,27 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
+dependencies = [
+ "derivative",
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "panic-semihosting"
 version = "0.5.6"
@@ -752,13 +784,13 @@ dependencies = [
  "dsp",
  "embedded-hal",
  "enum-iterator",
- "generic-array 0.14.4",
  "heapless 0.6.1",
  "log",
  "mcp23017",
  "miniconf",
  "minimq",
  "nb 1.0.0",
+ "num_enum",
  "panic-semihosting",
  "paste",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 3d57a47..2f8054f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,11 +39,10 @@ cortex-m-rtic = "0.5.6"
 embedded-hal = "0.2.4"
 nb = "1.0.0"
 asm-delay = "0.9.0"
-enum-iterator = "0.6.0"
+num_enum = { version = "0.5.1", default-features = false }
 paste = "1"
 dsp = { path = "dsp" }
 ad9959 = { path = "ad9959" }
-generic-array = "0.14"
 miniconf = "0.1.0"
 shared-bus = {version = "0.2.2", features = ["cortex-m"] }
 serde-json-core = "0.3"
diff --git a/src/hardware/afe.rs b/src/hardware/afe.rs
index 962c417..35b7d66 100644
--- a/src/hardware/afe.rs
+++ b/src/hardware/afe.rs
@@ -2,11 +2,12 @@ use miniconf::Miniconf;
 use serde::{Deserialize, Serialize};
 
 use core::convert::TryFrom;
-use enum_iterator::IntoEnumIterator;
+use num_enum::TryFromPrimitive;
 
 #[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, IntoEnumIterator, Miniconf,
+    Copy, Clone, Debug, Serialize, Deserialize, TryFromPrimitive, Miniconf,
 )]
+#[repr(u8)]
 pub enum Gain {
     G1 = 0b00,
     G2 = 0b01,
@@ -32,20 +33,6 @@ impl Gain {
     }
 }
 
-impl TryFrom<u8> for Gain {
-    type Error = ();
-
-    fn try_from(value: u8) -> Result<Self, Self::Error> {
-        for gain in Gain::into_enum_iter() {
-            if value == gain as u8 {
-                return Ok(gain);
-            }
-        }
-
-        Err(())
-    }
-}
-
 impl<A0, A1> ProgrammableGainAmplifier<A0, A1>
 where
     A0: embedded_hal::digital::v2::StatefulOutputPin,
@@ -82,7 +69,7 @@ where
     }
 
     /// Get the programmed gain of the analog front-end.
-    pub fn get_gain(&self) -> Result<Gain, ()> {
+    pub fn get_gain(&self) -> Gain {
         let mut code: u8 = 0;
         if self.a0.is_set_high().unwrap() {
             code |= 0b1;
@@ -91,6 +78,7 @@ where
             code |= 0b10;
         }
 
-        Gain::try_from(code)
+        // NOTE(unwrap): All possibilities covered.
+        Gain::try_from(code).unwrap()
     }
 }

From 057f3dccf662e4902a14465e9a228e099cdff7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20J=C3=B6rdens?= <rj@quartiq.de>
Date: Wed, 12 May 2021 13:09:22 +0200
Subject: [PATCH 2/6] remove unused dependencies

---
 Cargo.lock     | 8 --------
 dsp/Cargo.toml | 1 -
 2 files changed, 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 20f83ae..0d0f666 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -226,7 +226,6 @@ name = "dsp"
 version = "0.1.0"
 dependencies = [
  "easybench",
- "libm",
  "miniconf",
  "ndarray",
  "num",
@@ -385,12 +384,6 @@ version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
 
-[[package]]
-name = "libm"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
-
 [[package]]
 name = "log"
 version = "0.4.14"
@@ -783,7 +776,6 @@ dependencies = [
  "cortex-m-rtic",
  "dsp",
  "embedded-hal",
- "enum-iterator",
  "heapless 0.6.1",
  "log",
  "mcp23017",
diff --git a/dsp/Cargo.toml b/dsp/Cargo.toml
index f9f680b..0f82bd2 100644
--- a/dsp/Cargo.toml
+++ b/dsp/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Robert Jördens <rj@quartiq.de>"]
 edition = "2018"
 
 [dependencies]
-libm = "0.2.1"
 serde = { version = "1.0", features = ["derive"], default-features = false }
 num = { version = "0.4.0", default-features = false }
 miniconf = "0.1"

From 0e2eaa3d1d080d1f849023108fbd0eb49796971d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 May 2021 16:35:43 +0000
Subject: [PATCH 3/6] Bump serde from 1.0.125 to 1.0.126

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.125 to 1.0.126.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.125...v1.0.126)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3cc8175..ac2a499 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -693,9 +693,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
@@ -713,9 +713,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2",
  "quote",

From d8469cac92a0a0202afc6fc498011b915ce41df7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 May 2021 16:53:07 +0000
Subject: [PATCH 4/6] Bump rtt-target from 0.2.2 to 0.3.1

Bumps [rtt-target](https://github.com/mvirkkunen/rtt-target) from 0.2.2 to 0.3.1.
- [Release notes](https://github.com/mvirkkunen/rtt-target/releases)
- [Commits](https://github.com/mvirkkunen/rtt-target/compare/v0.2.2...v0.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 14 ++++++++++++--
 Cargo.toml |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ac2a499..1fb61b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -648,7 +648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d082d3a20a5d4f69ad509720de1777fe5aa2092ea1af51b254ff79113d46d2ea"
 dependencies = [
  "log",
- "rtt-target",
+ "rtt-target 0.2.2",
 ]
 
 [[package]]
@@ -661,6 +661,16 @@ dependencies = [
  "ufmt-write",
 ]
 
+[[package]]
+name = "rtt-target"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "065d6058bb1204f51a562a67209e1817cf714759d5cf845aa45c75fa7b0b9d9b"
+dependencies = [
+ "cortex-m 0.7.2",
+ "ufmt-write",
+]
+
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -774,7 +784,7 @@ dependencies = [
  "num_enum",
  "paste",
  "rtt-logger",
- "rtt-target",
+ "rtt-target 0.3.1",
  "serde",
  "serde-json-core",
  "shared-bus",
diff --git a/Cargo.toml b/Cargo.toml
index d90f682..e7c751e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ members = ["ad9959", "dsp"]
 cortex-m = { version = "0.6", features = ["const-fn"] }
 cortex-m-rt = { version = "0.6", features = ["device"] }
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_info"] }
-rtt-target = { version = "0.2.1", features = ["cortex-m"] }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 rtt-logger = { version = "0.1" }
 serde = { version = "1.0", features = ["derive"], default-features = false }
 heapless = { version = "0.6", features = ["serde"] }

From 012c4fe3753532444830c1f37177137217bd678a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 May 2021 17:15:34 +0000
Subject: [PATCH 5/6] build(deps): bump embedded-hal from 0.2.4 to 0.2.5

Bumps [embedded-hal](https://github.com/rust-embedded/embedded-hal) from 0.2.4 to 0.2.5.
- [Release notes](https://github.com/rust-embedded/embedded-hal/releases)
- [Changelog](https://github.com/rust-embedded/embedded-hal/blob/v0.2.5/CHANGELOG.md)
- [Commits](https://github.com/rust-embedded/embedded-hal/compare/v0.2.4...v0.2.5)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock        | 4 ++--
 Cargo.toml        | 2 +-
 ad9959/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1fb61b0..eba8c98 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -230,9 +230,9 @@ dependencies = [
 
 [[package]]
 name = "embedded-hal"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa998ce59ec9765d15216393af37a58961ddcefb14c753b4816ba2191d865fcb"
+checksum = "db184d3fa27bc7a2344250394c0264144dfe0bc81a4401801dcb964b8dd172ad"
 dependencies = [
  "nb 0.1.3",
  "void",
diff --git a/Cargo.toml b/Cargo.toml
index e7c751e..7ea035a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,7 @@ rtt-logger = { version = "0.1" }
 serde = { version = "1.0", features = ["derive"], default-features = false }
 heapless = { version = "0.6", features = ["serde"] }
 cortex-m-rtic = "0.5.6"
-embedded-hal = "0.2.4"
+embedded-hal = "0.2.5"
 nb = "1.0.0"
 asm-delay = "0.9.0"
 num_enum = { version = "0.5.1", default-features = false }
diff --git a/ad9959/Cargo.toml b/ad9959/Cargo.toml
index f234470..708adf4 100644
--- a/ad9959/Cargo.toml
+++ b/ad9959/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-embedded-hal = {version = "0.2.3", features = ["unproven"]}
+embedded-hal = {version = "0.2.5", features = ["unproven"]}
 bit_field = "0.10.0"

From b9cee6345a658fdccbeeb627b83b03ee39b2d0e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20J=C3=B6rdens?= <rj@quartiq.de>
Date: Fri, 14 May 2021 07:16:47 +0200
Subject: [PATCH 6/6] deps: fix rtt-logger->rtt-target, cleanup, bump cortex-m

---
 Cargo.lock                    | 21 +++++----------------
 Cargo.toml                    | 10 ++++++----
 src/hardware/configuration.rs |  2 +-
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eba8c98..0621cca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -643,22 +643,11 @@ dependencies = [
 
 [[package]]
 name = "rtt-logger"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d082d3a20a5d4f69ad509720de1777fe5aa2092ea1af51b254ff79113d46d2ea"
+version = "0.1.1"
+source = "git+https://github.com/quartiq/rtt-logger.git?rev=70b0eb5#70b0eb587fa43902aaf58296fe866418a1f4e920"
 dependencies = [
  "log",
- "rtt-target 0.2.2",
-]
-
-[[package]]
-name = "rtt-target"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0869b4c5b6a6d8c5583fc473f9eb3423a170f77626b8c8a7fb18eddcda5770e2"
-dependencies = [
- "cortex-m 0.6.7",
- "ufmt-write",
+ "rtt-target",
 ]
 
 [[package]]
@@ -770,7 +759,7 @@ version = "0.5.0"
 dependencies = [
  "ad9959",
  "asm-delay",
- "cortex-m 0.6.7",
+ "cortex-m 0.7.2",
  "cortex-m-rt",
  "cortex-m-rtic",
  "dsp",
@@ -784,7 +773,7 @@ dependencies = [
  "num_enum",
  "paste",
  "rtt-logger",
- "rtt-target 0.3.1",
+ "rtt-target",
  "serde",
  "serde-json-core",
  "shared-bus",
diff --git a/Cargo.toml b/Cargo.toml
index 7ea035a..fbbb87b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,11 +28,10 @@ default-target = "thumbv7em-none-eabihf"
 members = ["ad9959", "dsp"]
 
 [dependencies]
-cortex-m = { version = "0.6", features = ["const-fn"] }
+cortex-m = { version = "0.7" }
 cortex-m-rt = { version = "0.6", features = ["device"] }
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_info"] }
-rtt-target = { version = "0.3.1", features = ["cortex-m"] }
-rtt-logger = { version = "0.1" }
+rtt-target = { version = "0.3", features = ["cortex-m"] }
 serde = { version = "1.0", features = ["derive"], default-features = false }
 heapless = { version = "0.6", features = ["serde"] }
 cortex-m-rtic = "0.5.6"
@@ -47,6 +46,10 @@ miniconf = "0.1.0"
 shared-bus = {version = "0.2.2", features = ["cortex-m"] }
 serde-json-core = "0.3"
 
+[dependencies.rtt-logger]
+git = "https://github.com/quartiq/rtt-logger.git"
+rev = "70b0eb5"
+
 [dependencies.mcp23017]
 git = "https://github.com/mrd0ll4r/mcp23017.git"
 rev = "61933f857a"
@@ -68,7 +71,6 @@ git = "https://github.com/quartiq/minimq.git"
 rev = "d2ec3e8"
 
 [features]
-bkpt = [ ]
 nightly = ["cortex-m/inline-asm", "dsp/nightly"]
 pounder_v1_1 = [ ]
 
diff --git a/src/hardware/configuration.rs b/src/hardware/configuration.rs
index 6efd576..f48b3d2 100644
--- a/src/hardware/configuration.rs
+++ b/src/hardware/configuration.rs
@@ -153,7 +153,7 @@ pub fn setup(
         use rtt_logger::RTTLogger;
 
         static LOGGER: RTTLogger = RTTLogger::new(log::LevelFilter::Info);
-        rtt_target::rtt_init_print!(NoBlockSkip, 1024);
+        rtt_target::rtt_init_print!();
         log::set_logger(&LOGGER)
             .map(|()| log::set_max_level(log::LevelFilter::Trace))
             .unwrap();