Index: leahi_dialin/ui/common.py =================================================================== diff -u -r71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a -r22edb3e32e00966918269e87c949b87496a718ea --- leahi_dialin/ui/common.py (.../common.py) (revision 71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a) +++ leahi_dialin/ui/common.py (.../common.py) (revision 22edb3e32e00966918269e87c949b87496a718ea) @@ -2,7 +2,7 @@ PRESSURE_STEPS = 10 ARTERIAL_PRESSURE_MINIMUM = -400 - ARTERIAL_PRESSURE_MAXIMUM = +600 + ARTERIAL_PRESSURE_MAXIMUM = +200 ARTERIAL_PRESSURE_LOW_MIN = -300 ARTERIAL_PRESSURE_LOW_DEF = -300 ARTERIAL_PRESSURE_LOW_MAX = +200 @@ -11,19 +11,19 @@ ARTERIAL_PRESSURE_HIGH_MAX = +200 VENOUS_PRESSURE_MINIMUM = -100 - VENOUS_PRESSURE_MAXIMUM = +700 + VENOUS_PRESSURE_MAXIMUM = +500 VENOUS_PRESSURE_LOW_MIN = -100 VENOUS_PRESSURE_LOW_DEF = -100 - VENOUS_PRESSURE_LOW_MAX = +600 + VENOUS_PRESSURE_LOW_MAX = +400 VENOUS_PRESSURE_HIGH_MIN = +100 - VENOUS_PRESSURE_HIGH_DEF = +400 - VENOUS_PRESSURE_HIGH_MAX = +600 + VENOUS_PRESSURE_HIGH_DEF = +200 + VENOUS_PRESSURE_HIGH_MAX = +400 - TMP_PRESSURE_MINIMUM = -400 - TMP_PRESSURE_MAXIMUM = +100 - TMP_PRESSURE_LOW_MIN = -300 - TMP_PRESSURE_LOW_DEF = -300 - TMP_PRESSURE_LOW_MAX = -100 - TMP_PRESSURE_HIGH_MIN = -200 + TMP_PRESSURE_MINIMUM = -650 + TMP_PRESSURE_MAXIMUM = +250 + TMP_PRESSURE_LOW_MIN = -500 + TMP_PRESSURE_LOW_DEF = -500 + TMP_PRESSURE_LOW_MAX = +100 + TMP_PRESSURE_HIGH_MIN = -500 TMP_PRESSURE_HIGH_DEF = +100 - TMP_PRESSURE_HIGH_MAX = +0 \ No newline at end of file + TMP_PRESSURE_HIGH_MAX = +200 \ No newline at end of file Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r5a50ff3c3ba355fffc616bfc85eb7b312b58b702 -r22edb3e32e00966918269e87c949b87496a718ea --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 5a50ff3c3ba355fffc616bfc85eb7b312b58b702) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 22edb3e32e00966918269e87c949b87496a718ea) @@ -59,37 +59,37 @@ self.can_interface.send(message, 0) def dd_gen_dialysate(self, - gen_dialysate_exec : int , - dd_in_progress : int , - D6_level : int , - D63_level : int , - D46_level : int , - D9_pressure : float , - D18_pressure : float , - D51_pressure : float , - is_dial_good : int ): + gen_dialysate_exec : int , + dd_in_progress : int , + D6_floater_level_1 : int , + D63_bicarb_level : int , + D46_spent_level : int , + D9_hyd_negative_press : float , + D18_hyd_positive_press : float , + D51_spend_pressure : float , + is_dial_good : int ): """ Broadcasts DD generate dialysate data - @param gen_dialysate_exec (int ): Generate dialysate execution state - @param dd_in_progress (int ): Dialysate Delivery in Progress Bool - @param D6_level (int ): Floater level (low, medium and high) - @param D63_level (int ): BiCarb Chamber level - @param D46_level (int ): Spent dialysate chamber level - @param D9_pressure (float): Hydraulics chamber negative pressure - @param D18_pressure (float): Hydraulics chamber positive pressure - @param D51_pressure (float): Spent Dialysate positive pressure - @param is_dial_good (int ): Ready to deliver dialysate or not + @param gen_dialysate_exec (int ): Generate dialysate execution state + @param dd_in_progress (int ): Dialysate Delivery in Progress Bool + @param D6_floater_level_1 (int ): Floater level (low, medium and high) + @param D63_bicarb_level (int ): BiCarb Chamber level + @param D46_spent_level (int ): Spent dialysate chamber level + @param D9_hyd_negative_press (float): Hydraulics chamber negative pressure + @param D18_hyd_positive_press (float): Hydraulics chamber positive pressure + @param D51_spend_pressure (float): Spent Dialysate positive pressure + @param is_dial_good (int ): Ready to deliver dialysate or not @return: None """ - payload = conversions.unsigned_integer_to_bytearray(gen_dialysate_exec ) - payload += conversions.unsigned_integer_to_bytearray(dd_in_progress ) - payload += conversions.unsigned_integer_to_bytearray(D6_level ) - payload += conversions.unsigned_integer_to_bytearray(D63_level ) - payload += conversions.unsigned_integer_to_bytearray(D46_level ) - payload += conversions.float_to_bytearray (D9_pressure ) - payload += conversions.float_to_bytearray (D18_pressure ) - payload += conversions.float_to_bytearray (D51_pressure ) - payload += conversions.unsigned_integer_to_bytearray(is_dial_good ) + payload = conversions.unsigned_integer_to_bytearray(gen_dialysate_exec ) + payload += conversions.unsigned_integer_to_bytearray(dd_in_progress ) + payload += conversions.unsigned_integer_to_bytearray(D6_floater_level_1 ) + payload += conversions.unsigned_integer_to_bytearray(D63_bicarb_level ) + payload += conversions.unsigned_integer_to_bytearray(D46_spent_level ) + payload += conversions.float_to_bytearray (D9_hyd_negative_press ) + payload += conversions.float_to_bytearray (D18_hyd_positive_press ) + payload += conversions.float_to_bytearray (D51_spend_pressure ) + payload += conversions.unsigned_integer_to_bytearray(is_dial_good ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r0be6cfc8a7360df173e2b54a4e54382df6611c8d -r22edb3e32e00966918269e87c949b87496a718ea --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 0be6cfc8a7360df173e2b54a4e54382df6611c8d) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 22edb3e32e00966918269e87c949b87496a718ea) @@ -72,7 +72,7 @@ self.can_interface.send(message, 0) - def td_blood_pump(self, + def td_blood_flow(self, H4_set_flow : int, H4_meas_flow : float, H4_rot_speed : float, @@ -84,15 +84,15 @@ H6_rot_hall_state : int): """ Broadcasts the current TD Blood Pump Data - @param H4_set_flow : set flow rate - @param H4_meas_flow : meaured speed - @param H4_rot_speed : measured rotor speed - @param H4_mot_speed : measured blood pump speed - @param H4_curr_motor : current motor - @param H4_set_rpm : set rpm - @param H4_rot_count : pres_flow - @param H4_pres_flow : rotation count - @param H6_rot_hall_state : rotor hall state + @param H4_set_flow : Set flow rate in mL/min. + @param H4_meas_flow : Measured flow rate in mL/min. + @param H4_rot_speed : Measured rotor speed in RPM. + @param H4_mot_speed : Measured pump speed in RPM. + @param H4_curr_motor : Measure motor current in Amps. + @param H4_set_rpm : Set motor speed in RPM. + @param H4_rot_count : Rotor count. + @param H4_pres_flow : Prescribed blood flow in mL/min. + @param H6_rot_hall_state : Rotor hall state (1=home, 0=not home) @return: None """