Index: leahi_dialin/td/modules/syringe_pump.py =================================================================== diff -u -r37b10a13237bfde8838547a83f8dcc3f8818bf0d -rd0dedd8e720be5de357176ffb095484ec082c830 --- leahi_dialin/td/modules/syringe_pump.py (.../syringe_pump.py) (revision 37b10a13237bfde8838547a83f8dcc3f8818bf0d) +++ leahi_dialin/td/modules/syringe_pump.py (.../syringe_pump.py) (revision d0dedd8e720be5de357176ffb095484ec082c830) @@ -49,38 +49,38 @@ message_id = MsgIds.MSG_ID_TD_SYRINGE_PUMP_DATA.value, function = self._handler_syringe_pump_data) - self.syringe_pump_state = TDTreaSyringePumpStates.SYRINGE_PUMP_INIT_STATE - self.heparin_state = TDTreaHeparinStates.HEPARIN_STATE_OFF - self.syringe_pump_set_rate_ml_hr = 0.0 - self.syringe_pump_meas_rate_ml_hr = 0.0 - self.syringe_pump_position = 0 - self.syringe_pump_volume_ml = 0.0 - self.syringe_pump_safety_volume_ml = 0.0 - self.syringe_pump_home_v = 0.0 - self.syringe_pump_switch_v = 0.0 - self.syringe_pump_force_v = 0.0 - self.syringe_pump_status = TDSyringePumpStates.STOP - self.syringe_pump_encoder_status = 0 - self.syringe_pump_adc_dac_status = 0 - self.syringe_pump_adc_read_counter = 0 + self.h10_pump_state = TDTreaSyringePumpStates.INIT_STATE + self.heparin_state = TDTreaHeparinStates.OFF + self.h10_pump_set_rate_ml_hr = 0.0 + self.h10_pump_meas_rate_ml_hr = 0.0 + self.h10_pump_position = 0 + self.h10_pump_volume_ml = 0.0 + self.h10_pump_safety_volume_ml = 0.0 + self.h10_pump_home_v = 0.0 + self.h10_pump_switch_v = 0.0 + self.h10_pump_force_v = 0.0 + self.h10_pump_status = TDSyringePumpStates.STOP + self.h10_pump_encoder_status = 0 + self.h10_pump_adc_dac_status = 0 + self.h10_pump_adc_read_counter = 0 self.td_syringe_pump_timestamp = 0.0 #: The timestamp of the syringe pump message # ============================================================ Properties ============================================================ @property - def syringe_pump_state(self) -> TDTreaSyringePumpStates: + def h10_pump_state(self) -> TDTreaSyringePumpStates: """ The Srynge Pump State """ - return self._syringe_pump_state + return self._h10_pump_state - @syringe_pump_state.setter - def syringe_pump_state(self, value: Union[int, DialinEnum]): + @h10_pump_state.setter + def h10_pump_state(self, value: Union[int, DialinEnum]): if isinstance(value, int): - self._syringe_pump_state = TDTreaSyringePumpStates(value) + self._h10_pump_state = TDTreaSyringePumpStates(value) else: - self._syringe_pump_state = value + self._h10_pump_state = value @property @@ -99,162 +99,163 @@ @property - def syringe_pump_set_rate_ml_hr(self) -> float: + def h10_pump_set_rate_ml_hr(self) -> float: """ The Set Syringe Pump rate """ - return self._syringe_pump_set_rate_ml_hr + return self._h10_pump_set_rate_ml_hr - @syringe_pump_set_rate_ml_hr.setter - def syringe_pump_set_rate_ml_hr(self, value): - self._syringe_pump_set_rate_ml_hr = value + @h10_pump_set_rate_ml_hr.setter + def h10_pump_set_rate_ml_hr(self, value): + self._h10_pump_set_rate_ml_hr = value @property - def syringe_pump_meas_rate_ml_hr(self) -> float: + def h10_pump_meas_rate_ml_hr(self) -> float: """ The Measured Syringe Pump rate """ - return self._syringe_pump_meas_rate_ml_hr + return self._h10_pump_meas_rate_ml_hr - @syringe_pump_meas_rate_ml_hr.setter - def syringe_pump_meas_rate_ml_hr(self, value): - self._syringe_pump_meas_rate_ml_hr = value + @h10_pump_meas_rate_ml_hr.setter + def h10_pump_meas_rate_ml_hr(self, value): + self._h10_pump_meas_rate_ml_hr = value @property - def syringe_pump_position(self) -> int: + def h10_pump_position(self) -> int: """ The Syringe Pump position """ - return self._syringe_pump_position + return self._h10_pump_position - @syringe_pump_position.setter - def syringe_pump_position(self, value): - self._syringe_pump_position = value + @h10_pump_position.setter + def h10_pump_position(self, value): + self._h10_pump_position = value @property - def syringe_pump_volume_ml(self) -> float: + def h10_pump_volume_ml(self) -> float: """ The Syringe Pump volume delivered in ml """ - return self._syringe_pump_volume_ml + return self._h10_pump_volume_ml - @syringe_pump_volume_ml.setter - def syringe_pump_volume_ml(self, value): - self._syringe_pump_volume_ml = value + @h10_pump_volume_ml.setter + def h10_pump_volume_ml(self, value): + self._h10_pump_volume_ml = value @property - def syringe_pump_safety_volume_ml(self) -> float: + def h10_pump_safety_volume_ml(self) -> float: """ The Syringe Pump safety volume reading """ - return self._syringe_pump_safety_volume_ml + return self._h10_pump_safety_volume_ml - @syringe_pump_safety_volume_ml.setter - def syringe_pump_safety_volume_ml(self, value): - self._syringe_pump_safety_volume_ml = value + @h10_pump_safety_volume_ml.setter + def h10_pump_safety_volume_ml(self, value): + self._h10_pump_safety_volume_ml = value @property - def syringe_pump_home_v(self) -> float: + def h10_pump_home_v(self) -> float: """ The Syringe Pump home voltage reading """ - return self._syringe_pump_home_v + return self._h10_pump_home_v - @syringe_pump_home_v.setter - def syringe_pump_home_v(self, value): - self._syringe_pump_home_v = value + @h10_pump_home_v.setter + def h10_pump_home_v(self, value): + self._h10_pump_home_v = value @property - def syringe_pump_switch_v(self) -> float: + def h10_pump_switch_v(self) -> float: """ The Syringe Pump switch voltage reading """ - return self._syringe_pump_switch_v + return self._h10_pump_switch_v - @syringe_pump_switch_v.setter - def syringe_pump_switch_v(self, value): - self._syringe_pump_switch_v = value + @h10_pump_switch_v.setter + def h10_pump_switch_v(self, value): + self._h10_pump_switch_v = value @property - def syringe_pump_force_v(self) -> float: + def h10_pump_force_v(self) -> float: """ The Syringe Pump force voltage reading """ - return self._syringe_pump_force_v + return self._h10_pump_force_v - @syringe_pump_force_v.setter - def syringe_pump_force_v(self, value): - self._syringe_pump_force_v = value + @h10_pump_force_v.setter + def h10_pump_force_v(self, value): + self._h10_pump_force_v = value @property - def syringe_pump_status(self) -> TDSyringePumpStates: + def h10_pump_status(self) -> TDSyringePumpStates: """ The Syringe Pump status """ - return self._syringe_pump_status + return self._h10_pump_status - @syringe_pump_status.setter - def syringe_pump_status(self, value: Union[int, DialinEnum]): + @h10_pump_status.setter + def h10_pump_status(self, value: Union[int, DialinEnum]): if isinstance(value, int): - self._syringe_pump_status = TDSyringePumpStates(value) + self._h10_pump_status = TDSyringePumpStates(value) else: - self._syringe_pump_status = value + self._h10_pump_status = value @property - def syringe_pump_encoder_status(self) -> int: + def h10_pump_encoder_status(self) -> int: """ The Syringe Pump encoder status """ - return self._syringe_pump_encoder_status + return self._h10_pump_encoder_status - @syringe_pump_encoder_status.setter - def syringe_pump_encoder_status(self, value): - self._syringe_pump_encoder_status = value + @h10_pump_encoder_status.setter + def h10_pump_encoder_status(self, value): + self._h10_pump_encoder_status = value @property - def syringe_pump_adc_dac_status(self) -> int: + def h10_pump_adc_dac_status(self) -> int: """ The Syringe Pump ADC & DAC status """ - return self._syringe_pump_adc_dac_status + return self._h10_pump_adc_dac_status - @syringe_pump_adc_dac_status.setter - def syringe_pump_adc_dac_status(self, value): - self._syringe_pump_adc_dac_status = value + @h10_pump_adc_dac_status.setter + def h10_pump_adc_dac_status(self, value): + self._h10_pump_adc_dac_status = value @property - def syringe_pump_adc_read_counter(self) -> int: + def h10_pump_adc_read_counter(self) -> int: """ The Syringe Pump ADC read counter """ - return self._syringe_pump_adc_read_counter + return self._h10_pump_adc_read_counter - @syringe_pump_adc_read_counter.setter - def syringe_pump_adc_read_counter(self, value): - self._syringe_pump_adc_read_counter = value + @h10_pump_adc_read_counter.setter + def h10_pump_adc_read_counter(self, value): + self._h10_pump_adc_read_counter = value # ============================================================ Handlers ============================================================ - @publish(["td_syringe_pump_timestamp", - "syringe_pump_state", "syringe_pump_set_rate_ml_hr", - "syringe_pump_meas_rate_ml_hr", "syringe_pump_position", - "syringe_pump_volume_ml", "syringe_pump_home_v", - "syringe_pump_switch_v", "syringe_pump_force_v", - "heparin_state", "syringe_pump_safety_volume_ml", - "syringe_pump_status", "syringe_pump_encoder_status", - "syringe_pump_adc_dac_status", "syringe_pump_adc_read_counter"]) + @publish([MsgIds.MSG_ID_TD_SYRINGE_PUMP_DATA.name, + "h10_pump_state", "h10_pump_set_rate_ml_hr", + "h10_pump_meas_rate_ml_hr", "h10_pump_position", + "h10_pump_volume_ml", "h10_pump_home_v", + "h10_pump_switch_v", "h10_pump_force_v", + "heparin_state", "h10_pump_safety_volume_ml", + "h10_pump_status", "h10_pump_encoder_status", + "h10_pump_adc_dac_status", "h10_pump_adc_read_counter", + "td_syringe_pump_timestamp"]) def _handler_syringe_pump_data(self, message, timestamp=0.0): """ Handles published syringe pump data messages. Syringe pump data are captured @@ -264,20 +265,20 @@ @return: None """ msg_list = [] - msg_list.append((type(self).syringe_pump_state, DataTypes.U32)) - msg_list.append((type(self).heparin_state, DataTypes.U32)) - msg_list.append((type(self).syringe_pump_set_rate_ml_hr, DataTypes.F32)) - msg_list.append((type(self).syringe_pump_meas_rate_ml_hr, DataTypes.F32)) - msg_list.append((type(self).syringe_pump_position, DataTypes.U32)) - msg_list.append((type(self).syringe_pump_volume_ml, DataTypes.F32)) - msg_list.append((type(self).syringe_pump_home_v, DataTypes.F32)) - msg_list.append((type(self).syringe_pump_switch_v, DataTypes.F32)) - msg_list.append((type(self).syringe_pump_force_v, DataTypes.F32)) - msg_list.append((type(self).syringe_pump_safety_volume_ml, DataTypes.F32)) - msg_list.append((type(self).syringe_pump_status, DataTypes.U08)) - msg_list.append((type(self).syringe_pump_encoder_status, DataTypes.U08)) - msg_list.append((type(self).syringe_pump_adc_dac_status, DataTypes.U08)) - msg_list.append((type(self).syringe_pump_adc_read_counter, DataTypes.U08)) + msg_list.append((type(self).h10_pump_state, DataTypes.U32)) + msg_list.append((type(self).heparin_state, DataTypes.U32)) + msg_list.append((type(self).h10_pump_set_rate_ml_hr, DataTypes.F32)) + msg_list.append((type(self).h10_pump_meas_rate_ml_hr, DataTypes.F32)) + msg_list.append((type(self).h10_pump_position, DataTypes.U32)) + msg_list.append((type(self).h10_pump_volume_ml, DataTypes.F32)) + msg_list.append((type(self).h10_pump_home_v, DataTypes.F32)) + msg_list.append((type(self).h10_pump_switch_v, DataTypes.F32)) + msg_list.append((type(self).h10_pump_force_v, DataTypes.F32)) + msg_list.append((type(self).h10_pump_safety_volume_ml, DataTypes.F32)) + msg_list.append((type(self).h10_pump_status, DataTypes.U08)) + msg_list.append((type(self).h10_pump_encoder_status, DataTypes.U08)) + msg_list.append((type(self).h10_pump_adc_dac_status, DataTypes.U08)) + msg_list.append((type(self).h10_pump_adc_read_counter, DataTypes.U08)) self.process_into_vars(decoder_list = msg_list, message = message) self.td_syringe_pump_timestamp = timestamp @@ -307,12 +308,12 @@ @return: 1 if successful, zero otherwise Syringe pump operation IDs: - SYRINGE_PUMP_OP_STOP = 0 - SYRINGE_PUMP_OP_RETRACT = 1 - SYRINGE_PUMP_OP_SEEK = 2 - SYRINGE_PUMP_OP_PRIME = 3 - SYRINGE_PUMP_OP_BOLUS = 4 - SYRINGE_PUMP_OP_CONTINUOUS = 5 + STOP = 0 + RETRACT = 1 + SEEK = 2 + PRIME = 3 + BOLUS = 4 + CONTINUOUS = 5 """ op = integer_to_bytearray(operation) rat = float_to_bytearray(rate)