Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r79b09049832200d2adde2efd7d79a2407b57d09d -r71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 79b09049832200d2adde2efd7d79a2407b57d09d) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a) @@ -98,6 +98,7 @@ MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x4B MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x4C MSG_ID_TD_EJECTOR_DATA = 0x4E + MSG_ID_TD_TREATMENT_SET_POINTS_DATA = 0x4F MSG_ID_DD_SERIAL_RESPONSE = 0x88 MSG_ID_TD_TEMPERATURE_DATA = 0x91 MSG_ID_TD_BATTERY_DATA = 0x94 Index: leahi_dialin/ui/common.py =================================================================== diff -u --- leahi_dialin/ui/common.py (revision 0) +++ leahi_dialin/ui/common.py (revision 71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a) @@ -0,0 +1,29 @@ +class Ranges: + PRESSURE_STEPS = 10 + + ARTERIAL_PRESSURE_MINIMUM = -400 + ARTERIAL_PRESSURE_MAXIMUM = +600 + ARTERIAL_PRESSURE_LOW_MIN = -300 + ARTERIAL_PRESSURE_LOW_DEF = -300 + ARTERIAL_PRESSURE_LOW_MAX = +200 + ARTERIAL_PRESSURE_HIGH_MIN = -300 + ARTERIAL_PRESSURE_HIGH_DEF = +100 + ARTERIAL_PRESSURE_HIGH_MAX = +200 + + VENOUS_PRESSURE_MINIMUM = -100 + VENOUS_PRESSURE_MAXIMUM = +700 + VENOUS_PRESSURE_LOW_MIN = -100 + VENOUS_PRESSURE_LOW_DEF = -100 + VENOUS_PRESSURE_LOW_MAX = +600 + VENOUS_PRESSURE_HIGH_MIN = +100 + VENOUS_PRESSURE_HIGH_DEF = +400 + VENOUS_PRESSURE_HIGH_MAX = +600 + + 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_HIGH_DEF = +100 + TMP_PRESSURE_HIGH_MAX = +0 \ No newline at end of file Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -rb40b6d73d23cb6c3520ad06b98c1198ef70fd24e -r71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision b40b6d73d23cb6c3520ad06b98c1198ef70fd24e) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a) @@ -81,15 +81,15 @@ @param IsDialGood (int ): Ready to deliver dialysate or not @return: None """ - payload = conversions.unsigned_byte_to_bytearray(GenDExec ) - payload += conversions.unsigned_byte_to_bytearray(isDDInPrg ) - payload += conversions.unsigned_byte_to_bytearray(FltLevel1 ) - payload += conversions.unsigned_byte_to_bytearray(BiCarbLvl ) - payload += conversions.unsigned_byte_to_bytearray(SpentLvl ) - payload += conversions.float_to_bytearray (HydNegPres ) - payload += conversions.float_to_bytearray (HydPosPres ) - payload += conversions.float_to_bytearray (SpentPress ) - payload += conversions.unsigned_byte_to_bytearray(IsDialGood ) + payload = conversions.unsigned_integer_to_bytearray(GenDExec ) + payload += conversions.unsigned_integer_to_bytearray(isDDInPrg ) + payload += conversions.unsigned_integer_to_bytearray(FltLevel1 ) + payload += conversions.unsigned_integer_to_bytearray(BiCarbLvl ) + payload += conversions.unsigned_integer_to_bytearray(SpentLvl ) + payload += conversions.float_to_bytearray (HydNegPres ) + payload += conversions.float_to_bytearray (HydPosPres ) + payload += conversions.float_to_bytearray (SpentPress ) + payload += conversions.unsigned_integer_to_bytearray(IsDialGood ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -rb40b6d73d23cb6c3520ad06b98c1198ef70fd24e -r71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision b40b6d73d23cb6c3520ad06b98c1198ef70fd24e) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a) @@ -430,14 +430,14 @@ self.can_interface.send(message, 0) def td_treatment_time( self, - tx_duration_s : float , - tx_elapsed_s : float , - tx_remaining_s : float ): + tx_duration_s : int , + tx_elapsed_s : int , + tx_remaining_s : int ): """ Broadcasts the current TD vpressures data - @param tx_duration_s (float) : Treatment set duration (s) - @param tx_elapsed_s (float) : Treatment elaspsed time (s) - @param tx_remaining_s (float) : Treatment time remaining (s) + @param tx_duration_s (int) : Treatment set duration (s) + @param tx_elapsed_s (int) : Treatment elaspsed time (s) + @param tx_remaining_s (int) : Treatment time remaining (s) @return: None """ @@ -446,8 +446,8 @@ payload = conversions.unsigned_integer_to_bytearray(tx_duration_s ) - payload += conversions.float_to_bytearray (tx_elapsed_s ) - payload += conversions.float_to_bytearray (tx_remaining_s ) + payload += conversions.unsigned_integer_to_bytearray(tx_elapsed_s ) + payload += conversions.unsigned_integer_to_bytearray(tx_remaining_s ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, @@ -472,13 +472,13 @@ raise ValueError("CAN Interface is not enabled") - payload = conversions.float_to_bytearray (blood_flow ) - payload += conversions.float_to_bytearray (dialysate_flow ) + payload = conversions.unsigned_integer_to_bytearray(blood_flow ) + payload += conversions.unsigned_integer_to_bytearray(dialysate_flow ) payload += conversions.float_to_bytearray (dialysate_temp ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, - message_id=msg_ids.MsgIds.MSG_ID_TD_ULTRAFILTRATION_DATA.value, + message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_SET_POINTS_DATA.value, payload=payload) self.can_interface.send(message, 0)