Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -25,6 +25,7 @@ DenaliMessage, DenaliChannels) + class DG: """ Dialysate Generator (DG) Dialin object API. It provides the basic interface to communicate with @@ -90,10 +91,10 @@ channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = self.MSG_ID_DG_OPERATION_MODE_BROADCAST self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_dg_op_mode_sync) + self._handler_dg_op_mode_sync) self.can_interface.register_receiving_publication_function(DenaliChannels.dg_to_dialin_ch_id, self.MSG_ID_DG_DG_VERSION_RESPONSE, - self.handler_dg_version) + self._handler_dg_version) # initialize variables that will be populated by DG version response self.dg_version = None @@ -110,7 +111,7 @@ self.ro_pump = DGROPump(self.can_interface) self.drain_pump = DGDrainPump(self.can_interface) - def handler_dg_version(self, message): + def _handler_dg_version(self, message): """ Handler for response from DG regarding its version. @@ -136,7 +137,7 @@ print(self.dg_version) return self.dg_version - def handler_dg_op_mode_sync(self, message): + def _handler_dg_op_mode_sync(self, message): """ Handles published DG operation mode messages. Current DG operation mode is captured for reference. Index: dialin/dg/drain_pump.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -20,6 +20,7 @@ from ..protocols.CAN import (DenaliMessage, DenaliChannels) + class DGDrainPump: """ Dialysate Generator (DG) Dialin API sub-class for drain pump related commands. @@ -48,12 +49,12 @@ channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = self.MSG_ID_DG_DRAIN_PUMP_PUBLISHED_DATA self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_drain_pump_sync) + self._handler_drain_pump_sync) self.target_drain_pump_speed_RPM = 0 self.dac_value = 0 - def handler_drain_pump_sync(self, message): + def _handler_drain_pump_sync(self, message): """ Handles published drain pump data messages. Drain pump data are captured for reference. Index: dialin/dg/load_cells.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/dg/load_cells.py (.../load_cells.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -62,14 +62,14 @@ channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = self.MSG_ID_DG_LOAD_CELL_DATA self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_load_cells_sync) + self._handler_load_cells_sync) self.load_cell_A1 = 0.0 self.load_cell_A2 = 0.0 self.load_cell_B1 = 0.0 self.load_cell_B2 = 0.0 - def handler_load_cells_sync(self, message): + def _handler_load_cells_sync(self, message): """ Handles published load cell data messages. Load cell data are captured for reference. Index: dialin/dg/pressures.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/dg/pressures.py (.../pressures.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/dg/pressures.py (.../pressures.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -22,9 +22,7 @@ class DGPressures: """ - \class DGPressures - - \brief Dialysate Generator (DG) Dialin API sub-class for pressure related commands. + DG interface containing pressure related commands. """ # Pressure message IDs @@ -50,26 +48,23 @@ def __init__(self, can_interface=None): """ - DGPressures constructor - @param outer_instance: reference to the DG (outer) class. - - @return: HDPressureOcclusion object. + @param can_interface: The DenaliCANMessenger object """ self.can_interface = can_interface if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = self.MSG_ID_DG_PRESSURES_DATA self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_pressures_sync) + self._handler_pressures_sync) self.ro_pump_inlet_pressure = 0.0 self.ro_pump_outlet_pressure = 0.0 self.drain_pump_inlet_pressure = 0.0 self.drain_pump_outlet_pressure = 0.0 - def handler_pressures_sync(self, message): + def _handler_pressures_sync(self, message): """ Handles published pressure data messages. Pressure data are captured for reference. Index: dialin/dg/reservoirs.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/dg/reservoirs.py (.../reservoirs.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/dg/reservoirs.py (.../reservoirs.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -18,11 +18,10 @@ from ..protocols.CAN import (DenaliMessage, DenaliChannels) + class DGReservoirs: """ - DGReservoirs - - Dialysate Generator (DG) Dialin API sub-class for reservoir related commands. + DG interface containing reservoir related commands. """ # Reservoir message IDs @@ -54,13 +53,13 @@ channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = self.MSG_ID_DG_RESERVOIR_DATA self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_reservoirs_sync) + self._handler_reservoirs_sync) self.active_reservoir = self.RESERVOIR1 self.fill_to_vol_ml = 0 self.drain_to_vol_ml = 0 - def handler_reservoirs_sync(self, message): + def _handler_reservoirs_sync(self, message): """ Handles published reservoir data messages. Reservoir data are captured for reference. Index: dialin/dg/ro_pump.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -20,6 +20,7 @@ from ..protocols.CAN import (DenaliMessage, DenaliChannels) + class DGROPump: """ DGROPump @@ -44,22 +45,20 @@ def __init__(self, can_interface=None): """ DGROPump constructor - - @param outer_instance: reference to the DG (outer) class. """ self.can_interface = can_interface if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = self.MSG_ID_DG_RO_PUMP_PUBLISHED_DATA self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_ro_pump_sync) + self._handler_ro_pump_sync) self.target_pressure_psi = 0 self.measured_flow_rate_lpm = 0.0 self.pwm_duty_cycle_pct = 0.0 - def handler_ro_pump_sync(self, message): + def _handler_ro_pump_sync(self, message): """ Handles published ro pump data messages. RO pump data are captured for reference. Index: dialin/dg/valves.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/dg/valves.py (.../valves.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/dg/valves.py (.../valves.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -24,11 +24,10 @@ ENERGIZED = True DEENERGIZED = False + class DGValves: """ - \class DGValves - - \brief Dialysate Generation (DG) Device Dialin API sub-class for valve related commands. + Dialysate Generation (DG) interface for valve related commands. """ # Valve state message IDs @@ -57,18 +56,16 @@ def __init__(self, can_interface=None): """ - DGValves constructor - @param outer_instance: reference to the DG (outer) class. - - @return: DGValvesStates object. + @param can_interface: Denali CAN Messenger object """ + self.can_interface = can_interface if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = self.MSG_ID_DG_VALVES_STATES - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self.handler_valves_sync) + self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) self.valve_states_all = 0x0000 self.valve_state_VRF = DEENERGIZED @@ -91,7 +88,7 @@ else: return DEENERGIZED - def handler_valves_sync(self, message): + def _handler_valves_sync(self, message): """ Handles published valves states message. @@ -125,7 +122,7 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - \details valve IDs: \n + valve IDs: 0 = Valve Reservoir Fill 1 = Valve Reservoir Inlet 2 = Valve Reservoir Drain Index: dialin/hd/alarms.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/hd/alarms.py (.../alarms.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/hd/alarms.py (.../alarms.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -22,9 +22,7 @@ class HDAlarms: """ - \class HD_Alarms - - \brief Hemodialysis Device (HD) Dialin API sub-class for alarm related commands. + HD interface containing alarm related commands. """ # alarms message IDs @@ -67,28 +65,24 @@ def __init__(self, can_interface): """ - HD_Alarms constructor - - @param outer_instance: reference to the HD (outer) class. - - @return: HD_Alarms object. + @param can_interface: Denali Can Messenger object """ self.can_interface = can_interface if self.can_interface is not None: channel_id = DenaliChannels.hd_alarm_broadcast_ch_id msg_id = self.MSG_ID_HD_ALARMS_PUBLISHED_STATUS self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_alarms_status_sync) + self._handler_alarms_status_sync) channel_id = DenaliChannels.hd_alarm_broadcast_ch_id msg_id = self.MSG_ID_HD_ALARM_ACTIVATE self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_alarm_activate) + self._handler_alarm_activate) channel_id = DenaliChannels.hd_alarm_broadcast_ch_id msg_id = self.MSG_ID_HD_ALARM_CLEAR self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_alarm_clear) + self._handler_alarm_clear) # composite alarm status based on latest HD alarm status broadcast message self.alarms_state = 0 @@ -100,7 +94,7 @@ # alarm states based on received HD alarm activation and alarm clear messages self.alarm_states = [False] * 500 - def handler_alarms_status_sync(self, message): + def _handler_alarms_status_sync(self, message): """ Handles published alarms status messages. alarms status data are captured for reference. @@ -125,7 +119,7 @@ message['message'][self.START_POS_ALARMS_FLAGS:self.END_POS_ALARMS_FLAGS]), byteorder=DenaliMessage.BYTE_ORDER) - def handler_alarm_activate(self, message): + def _handler_alarm_activate(self, message): """ Handles published HD alarm activation messages. @@ -136,7 +130,7 @@ alarm_id = struct.unpack('> hd_object = HD(can_interface='can0') + >> hd_object = HD('can0') + """ # Create listener self.can_interface = DenaliCanMessenger(can_interface=can_interface, log_level=log_level) @@ -82,7 +79,7 @@ channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_HD_OPERATION_MODE_BROADCAST self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_hd_op_mode_sync) + self._handler_hd_op_mode_sync) # create properties self.hd_operation_mode = self.HD_OP_MODE_INIT_POST @@ -99,13 +96,13 @@ self.treatment = HDTreatment(self.can_interface) self.pressure_occlusion = HDPressureOcclusion(self.can_interface) - def handler_hd_op_mode_sync(self, message): + def _handler_hd_op_mode_sync(self, message): """ Handles published HD operation mode messages. Current HD operation mode is captured for reference. @param message: published HD operation mode broadcast message - @return: none + @return: None """ mode = struct.unpack('i', bytearray( message['message'][self.START_POS_HD_OP_MODE:self.END_POS_HD_OP_MODE])) @@ -124,19 +121,19 @@ message_id=self.MSG_ID_LOGIN_TO_HD, payload=list(map(int, map(ord, self.HD_LOGIN_PASSWORD)))) - print("login") + print("Logging in...") # Send message received_message = self.can_interface.send(message) if received_message is not None: if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - print("Logged In") + print("Success: Logged In") else: - print("Log In Failed.") + print("Failure: Log In Failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + print("Login Timeout!!!!") return False def cmd_hd_message_insert(self, msg): @@ -168,13 +165,3 @@ return False -if __name__ == "__main__": - # create an HD object called hd - hd = HD() - - # wait 2 seconds and then login to HD as a tester - sleep(2) - hd.cmd_log_in_to_hd() - - # add test code below - Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -20,11 +20,10 @@ from ..utils.conversions import integer_to_bytearray, float_to_bytearray from .constants import RESET, NO_RESET + class HDPressureOcclusion: """ - \class HDPressureOcclusion - - \brief Hemodialysis Device (HD) Dialin API sub-class for pressure related commands. + Hemodialysis Device (HD) Dialin API sub-class for pressure related commands. """ # Pressure/Occlusion message IDs @@ -60,15 +59,15 @@ channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_HD_PRESSURE_OCCLUSION_DATA self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_pressure_occlusion_sync) + self._handler_pressure_occlusion_sync) self.arterialPressure = 0 self.venousPressure = 0.0 self.bloodPumpOcclusion = 0.0 self.dialysateInletPumpOcclusion = 0.0 self.dialysateOutletPumpOcclusion = 0.0 - def handler_pressure_occlusion_sync(self, message): + def _handler_pressure_occlusion_sync(self, message): """ Handles published pressure & occlusion data messages. Pressure data are captured for reference. @@ -169,11 +168,11 @@ def cmd_blood_pump_measured_occlusion_override(self, occl, reset=NO_RESET): """ - Constructs and sends the measured blood pump occlusion pressure override command + Constructs and sends the measured blood pump occlusion pressure override command - @param occl: float - pressure (in mmHg) to override with - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise + @param occl: float - pressure (in mmHg) to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(reset) @@ -279,11 +278,11 @@ def cmd_pressure_occlusion_broadcast_interval_override(self, ms, reset=NO_RESET): """ - Constructs and sends the pressure/occlusion broadcast interval override command + Constructs and sends the pressure/occlusion broadcast interval override command - @param ms: integer - interval (in ms) to override with - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise + @param ms: integer - interval (in ms) to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(reset) Index: dialin/hd/rtc.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/hd/rtc.py (.../rtc.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/hd/rtc.py (.../rtc.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -46,10 +46,10 @@ channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_RTC_EPOCH self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_rtc_epoch) + self._handler_rtc_epoch) self.rtc_epoch = 0 - def handler_rtc_epoch(self, message): + def _handler_rtc_epoch(self, message): """ Publishes the rtc time in epoch Index: dialin/hd/treatment.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/hd/treatment.py (.../treatment.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/hd/treatment.py (.../treatment.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -56,10 +56,10 @@ channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_HD_TREATMENT_TIME_PUBLISHED_DATA self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_treatment_time_sync) + self._handler_treatment_time_sync) msg_id = self.MSG_ID_HD_TREATMENT_STATE_PUBLISHED_DATA self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handler_treatment_state_sync) + self._handler_treatment_state_sync) self.treatment_time_prescribed = 0 self.treatment_time_elapsed = 0 @@ -68,7 +68,7 @@ self.treatment_uf_state = 0 self.saline_bolus_in_progress = False - def handler_treatment_time_sync(self, message): + def _handler_treatment_time_sync(self, message): """ Handles published treatment time data messages. treatment time data are captured for reference. @@ -88,7 +88,7 @@ self.treatment_time_elapsed = ela[0] self.treatment_time_remaining = rem[0] - def handler_treatment_state_sync(self, message): + def _handler_treatment_state_sync(self, message): """ Handles published treatment state data messages. treatment state data are captured for reference. Index: dialin/hd/ui_proxy.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -19,6 +19,7 @@ from ..utils.conversions import integer_to_bytearray, float_to_bytearray import struct + class HDUIProxy: """ \class HDUIProxy @@ -121,17 +122,17 @@ channel_id = DenaliChannels.hd_to_ui_ch_id self.can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_UF_SETTINGS_CHANGE_RESPONSE_FROM_HD, - self.handler_uf_change_response) + self._handler_uf_change_response) self.can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_RESPONSE_FROM_HD, - self.handler_treatment_duration_change_response) + self._handler_treatment_duration_change_response) self.can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_RESPONSE_FROM_HD, - self.handler_blood_and_dialysate_change_response) + self._handler_blood_and_dialysate_change_response) self.can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_HD_TREATMENT_PARAMS_RANGES, - self.handler_treatment_@param_ranges) + self._handler_treatment_param_ranges) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, self.MSG_ID_UI_HD_VERSION_RESPONSE, - self.handler_hd_version) + self._handler_hd_version) # initialize variables that will be populated by HD version response self.hd_version = None @@ -161,7 +162,7 @@ self.target_blood_flow_rate = 0 self.target_dialysate_flow_rate = 0 - def handler_hd_version(self, message): + def _handler_hd_version(self, message): """ Handler for response from HD regarding its version. @@ -187,7 +188,7 @@ print(self.hd_version) return self.hd_version - def handler_treatment_param_ranges(self, message): + def _handler_treatment_param_ranges(self, message): """ Handler for response from HD regarding valid treatment parameter ranges. @@ -221,7 +222,7 @@ self.min_dialysate_flow_rate_ml_min = mindialrt[0] self.max_dialysate_flow_rate_ml_min = maxdialrt[0] - def handler_treatment_duration_change_response(self, message): + def _handler_treatment_duration_change_response(self, message): """ Handler for response from HD regarding treatment duration change request. @@ -247,7 +248,7 @@ self.duration_change_time_min = tim[0] self.duration_change_uf_vol_ml = vol[0] - def handler_blood_and_dialysate_change_response(self, message): + def _handler_blood_and_dialysate_change_response(self, message): """ Handler for response from HD regarding blood & dialysate flow rate change request. @@ -277,7 +278,7 @@ self.target_blood_flow_rate = bld[0] self.target_dialysate_flow_rate = dil[0] - def handler_uf_change_response(self, message): + def _handler_uf_change_response(self, message): """ Handler for response from HD regarding UF change request. Index: dialin/hd/watchdog.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/hd/watchdog.py (.../watchdog.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/hd/watchdog.py (.../watchdog.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -19,6 +19,7 @@ from ..utils.conversions import integer_to_bytearray from .constants import RESET, NO_RESET + class HDWatchdog: """ \class HD_Watchdog Index: dialin/protocols/CAN.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r02e6bbf85f0699488317daa135d2530bc5b19507 --- dialin/protocols/CAN.py (.../CAN.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/protocols/CAN.py (.../CAN.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -23,6 +23,7 @@ import logging import os + class DenaliMessage: BYTE_ORDER = 'little' START_BYTE = 0xA5 Index: tests/uf_test.py =================================================================== diff -u -r42f9e1c68d750dd5a412aeb23120a57771277417 -r02e6bbf85f0699488317daa135d2530bc5b19507 --- tests/uf_test.py (.../uf_test.py) (revision 42f9e1c68d750dd5a412aeb23120a57771277417) +++ tests/uf_test.py (.../uf_test.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) @@ -72,8 +72,8 @@ dgPres = ", ROi, " + '{:9.2f}'.format(dg.pressures.ro_pump_inlet_pressure) + \ ", ROo, " + '{:9.2f}'.format(dg.pressures.ro_pump_outlet_pressure) + \ ", DRi, " + '{:9.2f}'.format(dg.pressures.drain_pump_inlet_pressure) + \ - ", DRo, " + '{:9.2f}'.format(dg.pressures.drain_pump_outlet_pressure) - alarms = ", AL.s, " + hd.alarms.getCurrentAlarmsState() + \ + ", DRo, " + '{:9.2f}'.format(dg.pressures.drain_pump_outlet_pressure) + alarms = ", AL.s, " + hd.alarms.get_current_alarms_state() + \ ", AL.t, " + '{:4d}'.format(hd.alarms.alarm_top) # log data