Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r9466b5c6b5867f392104a42608aa9542a7ff0358 -rf05ec51d7191e8f31f8c7074833af1c2a82ef280 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 9466b5c6b5867f392104a42608aa9542a7ff0358) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision f05ec51d7191e8f31f8c7074833af1c2a82ef280) @@ -27,14 +27,15 @@ @unique class PressureNames(DialinEnum): # Pressure Sensor IDs - M1_PRI = 0 # Water Inlet pressure before regulator (PRi) - M3_PRO = 1 # Water Inlet pressure after regulator (PRo) - D9_PHO = 2 # Hydraulics outlet pressure (PHo/Pn) - D66_PDB = 3 # Dry Bicarb pressure (PDB/PCb) - D51_PDS = 4 # Spent Dialysate pressure (PDs) - D18_PDF = 5 # Fresh Dialysate pressure (PDf) - D41_PTM = 6 # Transmembrane pressure (Ptm) - NUM_OF_PRESSURE_SENSORS = 7 + M1_PRES = 0 # Water Inlet pressure before regulator (PRi) + M3_PRES = 1 # Water Inlet pressure after regulator (PRo) + D9_PRES = 2 # Hydraulics outlet pressure (PHo/Pn) + D66_PRES = 3 # Dry Bicarb pressure (PDB/PCb) + D51_PRES = 4 # Spent Dialysate pressure (PDs) + D18_PRES = 5 # Fresh Dialysate pressure (PDf) + D41_PRES = 6 # Transmembrane pressure (Ptm) + BARO_PRES = 7 # Barometric pressure sensor + NUM_OF_PRESSURE_SENSORS = 8 class DDPressureSensors(AbstractSubSystem): @@ -59,39 +60,39 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_pressures_sync) - self.m1_pri = 0.0 - self.m3_pro = 0.0 - self.d9_pho = 0.0 - self.d66_pdb = 0.0 - self.d51_pds = 0.0 - self.d18_pdf = 0.0 - self.d41_ptm = 0.0 - self.m1_pri_temp = 0.0 - self.m3_pro_temp = 0.0 - self.d9_pho_temp = 0.0 - self.d66_pdb_temp = 0.0 - self.d51_pds_temp = 0.0 - self.d18_pdf_temp = 0.0 - self.d41_ptm_temp = 0.0 + self.m1_pres = 0.0 + self.m3_pres = 0.0 + self.d9_pres = 0.0 + self.d66_pres = 0.0 + self.d51_pres = 0.0 + self.d18_pres = 0.0 + self.d41_pres = 0.0 + self.m1_pres_temp = 0.0 + self.m3_pres_temp = 0.0 + self.d9_pres_temp = 0.0 + self.d66_pres_temp = 0.0 + self.d51_pres_temp = 0.0 + self.d18_pres_temp = 0.0 + self.d41_pres_temp = 0.0 self.dd_pressures_timestamp = 0 @publish([ "dd_pressures_timestamp", - "m1_pri", - "m3_pro", - "d9_pho", - "d66_pdb", - "d51_pds", - "d18_pdf", - "d41_ptm", - "m1_pri_temp", - "m3_pro_temp", - "d9_pho_temp", - "d66_pdb_temp", - "d51_pds_temp", - "d18_pdf_temp", - "d41_ptm_temp", + "m1_pres", + "m3_pres", + "d9_pres", + "d66_pres", + "d51_pres", + "d18_pres", + "d41_pres", + "m1_pres_temp", + "m3_pres_temp", + "d9_pres_temp", + "d66_pres_temp", + "d51_pres_temp", + "d18_pres_temp", + "d41_pres_temp", ]) def _handler_pressures_sync(self, message,timestamp=0.0): """ @@ -101,33 +102,33 @@ @param message: published DD pressure data message @return: none """ - self.m1_pri = struct.unpack('f', bytearray( + self.m1_pres = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.m3_pro = struct.unpack('f', bytearray( + self.m3_pres = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.d9_pho = struct.unpack('f', bytearray( + self.d9_pres = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.d66_pdb = struct.unpack('f', bytearray( + self.d66_pres = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.d51_pds = struct.unpack('f', bytearray( + self.d51_pres = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.d18_pdf = struct.unpack('f', bytearray( + self.d18_pres = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.d41_ptm = struct.unpack('f', bytearray( + self.d41_pres = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.m1_pri_temp = struct.unpack('f', bytearray( + self.m1_pres_temp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.m3_pro_temp = struct.unpack('f', bytearray( + self.m3_pres_temp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.d9_pho_temp = struct.unpack('f', bytearray( + self.d9_pres_temp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.d66_pdb_temp = struct.unpack('f', bytearray( + self.d66_pres_temp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.d51_pds_temp = struct.unpack('f', bytearray( + self.d51_pres_temp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - self.d18_pdf_temp = struct.unpack('f', bytearray( + self.d18_pres_temp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.d41_ptm_temp = struct.unpack('f', bytearray( + self.d41_pres_temp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] self.dd_pressures_timestamp = timestamp