Index: dialin/dg/voltages.py =================================================================== diff -u -r68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8 -ra6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547 --- dialin/dg/voltages.py (.../voltages.py) (revision 68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8) +++ dialin/dg/voltages.py (.../voltages.py) (revision a6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547) @@ -134,7 +134,7 @@ self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value] = v24p[0] self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value] = v24t[0] - def cmd_monitored_voltage_override(self, signal:int=0, volts:float=0.0, reset:int=NO_RESET): + def cmd_monitored_voltage_override(self, signal:int=0, volts:float=0.0, reset:int=NO_RESET) -> int: """ Constructs and sends the DG monitored voltage override command Constraints: @@ -175,7 +175,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_monitored_voltages_broadcast_interval_override(self, ms:int=1000, reset:int=NO_RESET): + def cmd_monitored_voltages_broadcast_interval_override(self, ms:int=1000, reset:int=NO_RESET) -> int: """ Constructs and sends the monitored DG voltages broadcast interval override command Constraints: Index: dialin/hd/fluid_leak.py =================================================================== diff -u -rf89093ee0f0b9159df2ae4e0b86971f0e0e1b448 -ra6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547 --- dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision f89093ee0f0b9159df2ae4e0b86971f0e0e1b448) +++ dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision a6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547) @@ -73,7 +73,7 @@ self.fluid_leak_state = state[0] - def cmd_fluid_leak_detector_override(self, detected, reset=NO_RESET): + def cmd_fluid_leak_detector_override(self, detected:int, reset=NO_RESET) -> int: """ Constructs and sends the fluid leak detector state override command Constraints: @@ -106,7 +106,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_fluid_leak_state_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_fluid_leak_state_broadcast_interval_override(self, ms:int, reset=NO_RESET) -> int: """ Constructs and sends the fluid leak state broadcast interval override command Constraints: Index: dialin/hd/syringe_pump.py =================================================================== diff -u -r68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8 -ra6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547 --- dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision 68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8) +++ dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision a6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547) @@ -221,8 +221,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) saf = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) -# sts = struct.unpack('f', bytearray( -# message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) + sts = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) self.syringe_pump_state = sta[0] self.heparin_state = hep[0] @@ -234,12 +234,12 @@ self.syringe_pump_switch_v = det[0] self.syringe_pump_force_v = frc[0] self.syringe_pump_safety_volume_ml = saf[0] -# self.syringe_pump_status = (sts[0] & 0xFF000000) >> 24 -# self.syringe_pump_encoder_status = (sts[0] & 0x00FF0000) >> 16 -# self.syringe_pump_adc_dac_status = (sts[0] & 0x0000FF00) >> 8 -# self.syringe_pump_adc_read_counter = (sts[0] & 0x000000FF) + self.syringe_pump_status = (sts[0] & 0xFF000000) >> 24 + self.syringe_pump_encoder_status = (sts[0] & 0x00FF0000) >> 16 + self.syringe_pump_adc_dac_status = (sts[0] & 0x0000FF00) >> 8 + self.syringe_pump_adc_read_counter = (sts[0] & 0x000000FF) - def cmd_syringe_pump_operation(self, operation=SyringePumpOperations.SYRINGE_PUMP_OP_STOP.value, rate=0.0, volume=0.0): + def cmd_syringe_pump_operation(self, operation: int = SyringePumpOperations.SYRINGE_PUMP_OP_STOP.value, rate: float = 0.0, volume: float = 0.0) -> int: """ Constructs and sends the syringe pump operation command Constraints: @@ -285,7 +285,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_data_broadcast_interval_override(self, ms=1000, reset=NO_RESET): + def cmd_syringe_pump_data_broadcast_interval_override(self, ms: int = 1000, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump data broadcast interval override command Constraints: @@ -324,7 +324,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_meas_position_override(self, position=0, reset=NO_RESET): + def cmd_syringe_pump_meas_position_override(self, position: int = 0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump measured position override command Constraints: @@ -362,7 +362,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_meas_rate_override(self, rate=0.0, reset=NO_RESET): + def cmd_syringe_pump_meas_rate_override(self, rate: float = 0.0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump measured rate override command Constraints: @@ -400,7 +400,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_meas_force_override(self, volts=0.0, reset=NO_RESET): + def cmd_syringe_pump_meas_force_override(self, volts: float = 0.0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump measured force override command Constraints: @@ -438,7 +438,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_meas_detect_override(self, volts=0.0, reset=NO_RESET): + def cmd_syringe_pump_meas_detect_override(self, volts: float = 0.0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump measured syringe detect override command Constraints: @@ -476,7 +476,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_meas_home_override(self, volts=0.0, reset=NO_RESET): + def cmd_syringe_pump_meas_home_override(self, volts: float = 0.0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump measured home override command Constraints: @@ -514,7 +514,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_meas_volume_override(self, volume=0.0, reset=NO_RESET): + def cmd_syringe_pump_meas_volume_override(self, volume: float = 0.0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump measured volume override command Constraints: @@ -552,7 +552,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_status_override(self, status:int=0, reset:int=NO_RESET): + def cmd_syringe_pump_status_override(self, status: int = 0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump status override command Constraints: @@ -590,7 +590,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_encoder_status_override(self, status:int=0, reset:int=NO_RESET): + def cmd_syringe_pump_encoder_status_override(self, status: int = 0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump encoder status override command Constraints: @@ -628,7 +628,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_adc_dac_status_override(self, status:int=0, reset:int=NO_RESET): + def cmd_syringe_pump_adc_dac_status_override(self, status: int = 0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump ADC & DAC status override command Constraints: @@ -666,7 +666,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_syringe_pump_adc_read_counter_override(self, counter:int=0, reset:int=NO_RESET): + def cmd_syringe_pump_adc_read_counter_override(self, counter: int = 0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump ADC read counter override command Constraints: Index: dialin/hd/voltages.py =================================================================== diff -u -r2fb3be9a2925e440db33f993d5964d0439c4bd42 -ra6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547 --- dialin/hd/voltages.py (.../voltages.py) (revision 2fb3be9a2925e440db33f993d5964d0439c4bd42) +++ dialin/hd/voltages.py (.../voltages.py) (revision a6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547) @@ -106,7 +106,7 @@ self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_FPGA_REF_V.value] = vfr[0] self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_PBA_REF_V.value] = vpr[0] - def cmd_monitored_voltage_override(self, signal:int=0, volts:float=0.0, reset:int=NO_RESET): + def cmd_monitored_voltage_override(self, signal:int=0, volts:float=0.0, reset:int=NO_RESET) -> int: """ Constructs and sends the HD monitored voltage override command Constraints: @@ -147,7 +147,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_monitored_voltages_broadcast_interval_override(self, ms:int=1000, reset:int=NO_RESET): + def cmd_monitored_voltages_broadcast_interval_override(self, ms:int=1000, reset:int=NO_RESET) -> int: """ Constructs and sends the monitored HD voltages broadcast interval override command Constraints: