From 92b34b103b1fc7679d597382693144d158495252 Mon Sep 17 00:00:00 2001
From: atse <atse@m-labs.hk>
Date: Fri, 9 Aug 2024 12:46:30 +0800
Subject: [PATCH] channels: Show i_set machine value in PWM command

Get the machine PWM value to display in the `pwm` command, but leave it
as the user set value in reports.

For showing what i_set is actually set as, after all the DAC code and
centerpoint calculations.
---
 src/channels.rs        | 13 ++++++++-----
 src/command_handler.rs |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/channels.rs b/src/channels.rs
index a428dd1..93fa1f8 100644
--- a/src/channels.rs
+++ b/src/channels.rs
@@ -134,9 +134,12 @@ impl Channels {
         voltage
     }
 
-    pub fn get_i(&mut self, channel: usize) -> ElectricCurrent {
-        let i_set = self.channel_state(channel).i_set;
-        i_set
+    pub fn get_i(&mut self, channel: usize) -> (ElectricCurrent, ElectricCurrent) {
+        let center_point = self.get_center(channel);
+        let r_sense = ElectricalResistance::new::<ohm>(R_SENSE);
+        let voltage = self.get_dac(channel);
+        let i_set = (voltage - center_point) / (10.0 * r_sense);
+        (i_set, MAX_TEC_I)
     }
 
     /// i_set DAC
@@ -464,7 +467,7 @@ impl Channels {
     }
 
     fn report(&mut self, channel: usize) -> Report {
-        let i_set = self.get_i(channel);
+        let i_set = self.channel_state(channel).i_set;
         let i_tec = self.adc_read(channel, PinsAdcReadTarget::ITec, 16);
         let tec_i = self.get_tec_i(channel);
         let dac_value = self.get_dac(channel);
@@ -518,7 +521,7 @@ impl Channels {
         PwmSummary {
             channel,
             center: CenterPointJson(self.channel_state(channel).center.clone()),
-            i_set: (self.get_i(channel), MAX_TEC_I).into(),
+            i_set: self.get_i(channel).into(),
             max_v: self.get_max_v(channel).into(),
             max_i_pos: self.get_max_i_pos(channel).into(),
             max_i_neg: self.get_max_i_neg(channel).into(),
diff --git a/src/command_handler.rs b/src/command_handler.rs
index 3f30083..7ba4750 100644
--- a/src/command_handler.rs
+++ b/src/command_handler.rs
@@ -207,8 +207,8 @@ impl Handler {
     }
 
     fn set_center_point(socket: &mut TcpSocket, channels: &mut Channels, channel: usize, center: CenterPoint) -> Result<Handler, Error> {
-        let i_set = channels.get_i(channel);
         let state = channels.channel_state(channel);
+        let i_set = state.i_set;
         state.center = center;
         if !state.pid_engaged {
             channels.set_i(channel, i_set);