From dc7d11912a8727455301fd8f062ce4b21a05769c Mon Sep 17 00:00:00 2001
From: atse <atse@m-labs.hk>
Date: Thu, 8 Aug 2024 16:48:29 +0800
Subject: [PATCH] PwmLimits: uom

---
 src/config.rs | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 1649dde..d9d220f 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,9 +1,7 @@
 use num_traits::Zero;
 use serde::{Serialize, Deserialize};
-use uom::si::{
-    electric_potential::volt,
-    electric_current::ampere,
-    f64::{ElectricCurrent, ElectricPotential},
+use uom::si::f64::{
+    ElectricCurrent, ElectricPotential,
 };
 use crate::{
     ad7172::PostFilter,
@@ -73,9 +71,9 @@ impl ChannelConfig {
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 struct PwmLimits {
-    max_v: f64,
-    max_i_pos: f64,
-    max_i_neg: f64,
+    max_v: ElectricPotential,
+    max_i_pos: ElectricCurrent,
+    max_i_neg: ElectricCurrent,
 }
 
 impl PwmLimits {
@@ -84,15 +82,15 @@ impl PwmLimits {
         let (max_i_pos, _) = channels.get_max_i_pos(channel);
         let (max_i_neg, _) = channels.get_max_i_neg(channel);
         PwmLimits {
-            max_v: max_v.get::<volt>(),
-            max_i_pos: max_i_pos.get::<ampere>(),
-            max_i_neg: max_i_neg.get::<ampere>(),
+            max_v,
+            max_i_pos,
+            max_i_neg,
         }
     }
 
     pub fn apply(&self, channels: &mut Channels, channel: usize) {
-        channels.set_max_v(channel, ElectricPotential::new::<volt>(self.max_v));
-        channels.set_max_i_pos(channel, ElectricCurrent::new::<ampere>(self.max_i_pos));
-        channels.set_max_i_neg(channel, ElectricCurrent::new::<ampere>(self.max_i_neg));
+        channels.set_max_v(channel, self.max_v);
+        channels.set_max_i_pos(channel, self.max_i_pos);
+        channels.set_max_i_neg(channel, self.max_i_neg);
     }
 }