Fisheye: Tag 361386ebb5d337f441ebded3417ae87c5fecf8ed refers to a dead (removed) revision in file `leahi_dialin/common/closed_loop_signals.py'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: leahi_dialin/common/dataclass/__init__.py
===================================================================
diff -u
--- leahi_dialin/common/dataclass/__init__.py	(revision 0)
+++ leahi_dialin/common/dataclass/__init__.py	(revision 361386ebb5d337f441ebded3417ae87c5fecf8ed)
@@ -0,0 +1 @@

\ No newline at end of file
Index: leahi_dialin/common/dataclass/closed_loop_signals.py
===================================================================
diff -u
--- leahi_dialin/common/dataclass/closed_loop_signals.py	(revision 0)
+++ leahi_dialin/common/dataclass/closed_loop_signals.py	(revision 361386ebb5d337f441ebded3417ae87c5fecf8ed)
@@ -0,0 +1,15 @@
+from dataclasses import dataclass
+
+@dataclass
+class ControllerSignals:
+    """Equivalent to PI_CONTROLLER_SIGNALS_DATA"""
+    control_signal_reference: float                 = 0.0       # ///< Reference value
+    control_signal_measured: float                  = 0.0       # ///< Measured value
+    control_signal_error: float                     = 0.0       # ///< Error value
+    control_signal_error_sum: float                 = 0.0       # ///< Error sum before anti-windup
+    control_signal_error_sum_after_windup: float    = 0.0       # ///< Error sum after anti-windup
+    control_signal_proportional_output: float       = 0.0       # ///< P portion
+    control_signal_integral_output: float           = 0.0       # ///< I portion
+    control_signal_feed_forward_output: float       = 0.0       # ///< Feed forward portion
+    control_signal_control: float                   = 0.0       # ///< Controller output signal
+
Index: leahi_dialin/dd/modules/drybicart.py
===================================================================
diff -u -r775f2d7ca9a4d1c86c02bc27130f8765dc4156ad -r361386ebb5d337f441ebded3417ae87c5fecf8ed
--- leahi_dialin/dd/modules/drybicart.py	(.../drybicart.py)	(revision 775f2d7ca9a4d1c86c02bc27130f8765dc4156ad)
+++ leahi_dialin/dd/modules/drybicart.py	(.../drybicart.py)	(revision 361386ebb5d337f441ebded3417ae87c5fecf8ed)
@@ -63,17 +63,16 @@
         self.dd_dry_bicart_current_fill_time = 0                #: The Dry Bicart current fill time
         self.dd_dryBiCartType = 0                               #: The Dry Bicart concentrate option index
         self.dd_dryBiCartDrainTimePeriod = 0                    #: The Dry Bicart drain time period in sec
-        self.dd_dry_bicart_timestamp                = 0         #: The timestamp of the last message
+        self.dd_dry_bicart_timestamp = 0                        #: The timestamp of the last message
 
-
-
     @publish(["msg_id_dd_dry_bicart_data",
               "dd_dry_bicart_fill_execution_state", "dd_bicarb_chamber_fill_execution_state", "dd_dry_bicart_drain_execution_state",
               "dd_dry_bicart_fill_cycle_counter", "dd_dry_bicart_max_fill_cycle_count",
               "dd_dry_bicart_fill_request", "dry_bicarb_chamber_fill_request", "dd_dry_bicart_drain_request",
               "dd_dry_bicart_last_fill_time", "dd_dry_bicart_current_fill_time", "dd_dryBiCartType", "dd_dryBiCartDrainTimePeriod",
               "dd_dry_bicart_timestamp"])
 
+
     def _handler_dry_bicart_sync(self, message, timestamp=0.0):
         """
         Handles published dry bicart data messages.
@@ -100,6 +99,7 @@
 
         self.dd_dry_bicart_timestamp = timestamp
 
+
     def cmd_dry_bicart_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart data broadcast interval override command
@@ -240,4 +240,3 @@
             override_text=str(small_large),
             logger=self.logger,
             can_interface=self.can_interface)
-
Index: leahi_dialin/dd/modules/mixing_cntrl.py
===================================================================
diff -u -rf30c7fc22184858502f33e3427e9549584c1a612 -r361386ebb5d337f441ebded3417ae87c5fecf8ed
--- leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision f30c7fc22184858502f33e3427e9549584c1a612)
+++ leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision 361386ebb5d337f441ebded3417ae87c5fecf8ed)
@@ -18,16 +18,15 @@
 from logging import Logger
 
 # Project imports
-from leahi_dialin.common.constants import NO_RESET , RESET
+from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from dataclasses import dataclass
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
-from leahi_dialin.common.closed_loop_signals import ControllerSignals
+from leahi_dialin.common.dataclass.closed_loop_signals import ControllerSignals
 
 
 class DDDialysateMixing(AbstractSubSystem):
@@ -56,8 +55,8 @@
 
         self.dd_dry_bicart_timestamp                = 0         #: The timestamp of the last message
 
-        self.dd_dry_bicart_bicarb_mix_vol          = 0.0
-        self.dd_dry_bicart_acid_mix_vol            = 0.0
+        self.dd_dry_bicart_bicarb_mix_vol           = 0.0
+        self.dd_dry_bicart_acid_mix_vol             = 0.0
 
         #TODO remove after final testing
         self.bcarb_ctlrl_signal.control_signal_reference                = 0.0