Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r5cf53a76ece49a71f1844ba5d75baa4b30282e25 -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 5cf53a76ece49a71f1844ba5d75baa4b30282e25) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -258,41 +258,37 @@ @unique class DDPressureNames(DialinEnum): # Pressure Sensor IDs - 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 # Number of pressure sensors + D9_PRES = 0 # Hydraulics outlet pressure (PHo/Pn) + D66_PRES = 1 # Dry Bicarb pressure (PDB/PCb) + D51_PRES = 2 # Spent Dialysate pressure (PDs) + D18_PRES = 3 # Fresh Dialysate pressure (PDf) + D41_PRES = 4 # Transmembrane pressure (Ptm) + NUM_OF_PRESSURE_SENSORS = 5 # Number of pressure sensors -@unique -class DDPressureAttributesEnum (DialinEnum): - PRES = 0 # Pressure Attribute for Pressure Sensors - TEMP = 1 # Temperature Attribute for Pressure Sensors - NUM_OF_PRES_SENSOR_ATTRIBUTES = 2 # Number of Pressure Sensor Attributes - COND_SENSOR_INDEX_OFFSET = 6 # Conductivity Sensor Index Offset for the Temperature Sensors @unique class DDTemperaturesNames(DialinEnum): - D1_TEMP = 0 # Heat exchanger Inlet temperature sensor - X6_TEMP = 1 # Heat exchanger Outlet temperature sensor - D4_TEMP = 2 # Hydraulics primary heater temperature sensor - D50_TEMP = 3 # Trimmer heater temperature sensor - BRD_TEMP = 4 # Barometric temperature sensor - BARO_TEMP = 5 # DD board temperature sensor ( thermistor ) - D16_TEMP = 6 # D16 temperature value - D28_TEMP = 7 # D28 temperature value - D30_TEMP = 8 # D30 temperature value - D44_TEMP = 9 # D44 temperature value - D75_TEMP = 10 # D75 temperature value - D4_AVG_TEMP = 11 # D4 Filtered value - D50_AVG_TEMP = 12 # D50 Filtered value - D28_AVG_TEMP = 13 # D28 Filtered value - D30_AVG_TEMP = 14 # D30 Filtered value + D1_TEMP = 0 # Heat exchanger Inlet temperature sensor + D78_TEMP = 1 # Heat exchanger Outlet temperature sensor + D4_TEMP = 2 # Hydraulics primary heater temperature sensor + D50_TEMP = 3 # Trimmer heater temperature sensor + BRD_TEMP = 4 # Barometric temperature sensor + BARO_TEMP = 5 # DD board temperature sensor ( thermistor ) + D16_TEMP = 6 # D16 Conductivity sensor temperature value + D28_TEMP = 7 # D28 Conductivity sensor temperature value + D30_TEMP = 8 # D30 Conductivity sensor temperature value + D44_TEMP = 9 # D44 Conductivity sensor temperature value + D75_TEMP = 10 # D75 Conductivity sensor temperature value + D4_AVG_TEMP = 11 # D4 Filtered value + D50_AVG_TEMP = 12 # D50 Filtered value + D28_AVG_TEMP = 13 # D28 Filtered value + D30_AVG_TEMP = 14 # D30 Filtered value + D66_TEMP = 15 # D66 Pressure sensor temperature value + D51_TEMP = 16 # D51 Pressure sensor temperature value + D18_TEMP = 17 # D18 Pressure sensor temperature value + D41_TEMP = 18 # D41 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 19 # Number of Temperature Sensors @unique class DDValveStates(DialinEnum): @@ -301,32 +297,40 @@ @unique class DDValveNames(DialinEnum): - D14_VALV = 0 # Valve Hydraulics Outlet (D14) - D52_VALV = 1 # Valve Thermal Disinfect (D52) - D8_VALV = 2 # Valve Hydraulics Bypass (D8) - D54_VALV = 3 # Valve Rinse Port (D54) - D53_VALV = 4 # Valve Drain (D53) - D34_VALV = 5 # Valve Dialyzer Bypass (D34) - D64_VALV = 6 # Valve Purge 1 (D64) - D31_VALV = 7 # Valve Pressure Test (D31) - D65_VALV = 8 # Valve DryBcarb Inlet (D65) - D35_VALV = 9 # Valve Dialyzer Inlet (D35) - D40_VALV = 10 # Valve Dialyzer Outlet (D40) - D47_VALV = 11 # Valve Dialysate Out Purge 2 (D47) - D3_VALV = 12 # Valve Hydraulics Inlet (D3) - M4_VALV = 13 # Valve Water Inlet (M4) - RSRVD_SPACE1 = 14 # This space has been reserved - RSRVD_SPACE2 = 15 # This space has been reserved - D23_VALV = 16 # Balancing chamber Valve 1 (D23) - D19_VALV = 17 # Balancing chamber Valve 2 (D19) - D25_VALV = 18 # Balancing chamber Valve 3 (D25) - D26_VALV = 19 # Balancing chamber Valve 7 (D26) - D24_VALV = 20 # Balancing chamber Valve 5 (D24) - D20_VALV = 21 # Balancing chamber Valve 6 (D20) - D21_VALV = 22 # Balancing chamber Valve 4 (D21) - D22_VALV = 23 # Balancing chamber Valve 8 (D22) - D69_VALV = 24 # Ultrafiltration Valve 1 Inlet (D69) - D71_VALV = 25 # Ultrafiltration Valve 2 Inlet (D71) - D70_VALV = 26 # Ultrafiltration Valve 1 Outlet (D70) - D72_VALV = 27 # Ultrafiltration Valve 2 Outlet (D72) - NUM_OF_DD_VALVES = 28 # Number of Valves for the DD + D14_VALV = 0 # Valve Hydraulics Outlet (D14) + D52_VALV = 1 # Valve Thermal Disinfect (D52) + D8_VALV = 2 # Valve Hydraulics Bypass (D8) + D54_VALV = 3 # Valve Rinse Port (D54) + D53_VALV = 4 # Valve Drain (D53) + D34_VALV = 5 # Valve Dialyzer Bypass (D34) + D64_VALV = 6 # Valve Purge 1 (D64) + D31_VALV = 7 # Valve Pressure Test (D31) + D65_VALV = 8 # Valve DryBcarb Inlet (D65) + D35_VALV = 9 # Valve Dialyzer Inlet (D35) + D40_VALV = 10 # Valve Dialyzer Outlet (D40) + D47_VALV = 11 # Valve Dialysate Out Purge 2 (D47) + D3_VALV = 12 # Valve Hydraulics Inlet (D3) + D80_VALV = 13 # Valve Dry Bicarb (D80) + D81_VALV = 14 # Valve De-scaler (D81) + RSRVD_SPACE1 = 15 # This space has been reserved + D23_VALV = 16 # Balancing chamber Valve 1 (D23) + D19_VALV = 17 # Balancing chamber Valve 2 (D19) + D25_VALV = 18 # Balancing chamber Valve 3 (D25) + D26_VALV = 19 # Balancing chamber Valve 7 (D26) + D24_VALV = 20 # Balancing chamber Valve 5 (D24) + D20_VALV = 21 # Balancing chamber Valve 6 (D20) + D21_VALV = 22 # Balancing chamber Valve 4 (D21) + D22_VALV = 23 # Balancing chamber Valve 8 (D22) + NUM_OF_DD_VALVES = 24 # Number of Valves for the DD + +@unique +class DDMonitoredVoltages(DialinEnum): + MONITORED_LINE_1_2V = 0 # Processor voltage (1.2V) + MONITORED_LINE_3_3V = 1 # Logic voltage (3.3V) + MONITORED_LINE_5V_LOGIC = 2 # Logic voltage (5V) + MONITORED_LINE_24V_1 = 3 # Actuators voltage (24V) + MONITORED_LINE_24V_2 = 4 # Actuators regen voltage (24V) + MONITORED_LINE_FPGA_VCC_V = 5 # FPGA Vcc (3V) + MONITORED_LINE_FPGA_AUX_V = 6 # FPGA Vaux (3V) + MONITORED_LINE_FPGA_PVN_V = 7 # FPGA Vpvn (1V) + NUM_OF_MONITORED_VOLTAGE_LINES = 8 # Number of TD operation modes \ No newline at end of file Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -95,16 +95,12 @@ @unique class FPPressureSensorNames(DialinEnum): - M1_PRES = 0 # Water inlet pressure before regulator - M3_PRES = 1 # Water inlet pressure after regulator - P8_PRES = 2 # Water inlet pressure before the conductivity sensor - P13_PRES = 3 # Pressure before the RO filter - P17_PRES = 4 # Pressure after the RO filter - X1_PRES = 5 # Pressure before RO pump - X2_PRES = 6 # Pressure of RO Concentrate - X3_PRES = 7 # Pressure after P32, concentrate drop - X4_PRES = 8 # Pressure Drain Drop - NUM_OF_FP_PRES_SENSORS = 9 # Number of Pressure Sensors + M1_PRES = 0 # Water inlet pressure before regulator + M3_PRES = 1 # Water inlet pressure after regulator + P8_PRES = 2 # Water inlet pressure before the conductivity sensor + P13_PRES = 3 # Pressure before the RO filter + P17_PRES = 4 # Pressure after the RO filter + NUM_OF_FP_PRES_SENSORS = 5 # Number of Pressure Sensors @unique class ROPumpNames(DialinEnum): @@ -126,20 +122,16 @@ @unique class FPTemperaturesNames(DialinEnum): - P10_TEMP = 0 # P10 temperature from inlet conductivity sensor. - P19_TEMP = 1 # P19 temperature from outlet conductivity sensor. - M1_TEMP = 2 # Temperature before pressure regulator (M1) - M3_TEMP = 3 # Temperature after pressure regulator (M3) - P8_TEMP = 4 # Temperature before inlet conductivity sensor (P8) - P13_TEMP = 5 # Temperature before RO filter (P13) - P17_TEMP = 6 # Temperature after RO filter (P17) - X1_TEMP = 7 # Temperature before RO pump (X1) - X2_TEMP = 8 # Temperature RO Concentrate - X3_TEMP = 9 # Temperature RO Concentrate drop - X4_TEMP = 10 # Temperature drain drop - P7_TEMP = 11 # Temperature at p7 flow meter - P16_TEMP = 12 # Temperature at p16 flow meter - NUM_OF_TEMPERATURE_SENSORS = 13 # Number of Temperature Sensors + M1_TEMP = 0 # Temperature before pressure regulator (M1) + M3_TEMP = 1 # Temperature after pressure regulator (M3) + P10_TEMP = 2 # P10 temperature from inlet conductivity sensor. + P19_TEMP = 3 # P19 temperature from outlet conductivity sensor. + P8_TEMP = 4 # Temperature before inlet conductivity sensor (P8) + P13_TEMP = 5 # Temperature before RO filter (P13) + P17_TEMP = 6 # Temperature after RO filter (P17) + P7_TEMP = 7 # Temperature at p7 flow meter + P16_TEMP = 8 # Temperature at p16 flow meter + NUM_OF_TEMPERATURE_SENSORS = 9 # Number of Temperature Sensors @unique class FPValveStates(DialinEnum): @@ -148,17 +140,15 @@ @unique class FPValveNames(DialinEnum): - M4_VALV = 0 # Valve (M4 VWi) - P39_VALV = 1 # Valve (P39 VROd) - P6_VALV = 2 # Valve (P6 VFF) - P11_VALV = 3 # Valve (P11 VPi) - P33_VALV = 4 # Valve (P33 VCr) - P34_VALV = 5 # Valve (P34 VCb) - P37_VALV = 6 # Valve (P37 VCd) - M7_VALV = 7 # Valve (M7) - P20_VALV = 8 # Valve (P20) - P43_VALV = 9 # Valve (P43) - NUM_OF_VALVES = 10 # Number of valves + M4_VALV = 0 # Valve (M4 VWi) + P11_VALV = 1 # Valve (P11 VPi) + P33_VALV = 2 # Valve (P33 VCr) + P34_VALV = 3 # Valve (P34 VCb) + P37_VALV = 4 # Valve (P37 VCd) + P39_VALV = 5 # Valve (P39 VROd) + P43_VALV = 6 # Valve (P43) + P6_VALV = 7 # Valve (P6 VFF) + NUM_OF_FP_VALVES = 8 # Number of valves @unique class FPPumpNames(DialinEnum): Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rba2793fd2b970fc89af085f1dfe4e8b6fe408353 -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision ba2793fd2b970fc89af085f1dfe4e8b6fe408353) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -117,6 +117,8 @@ MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60 MSG_ID_DD_BLOOD_LEAK_DATA = 0x61 + MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x62 + MSG_ID_DD_VOLTAGES_DATA = 0x63 MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -261,6 +263,10 @@ MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E + MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA04F + MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA050 + MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA051 + MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST = 0xA052 MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00 MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01 Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -rba2793fd2b970fc89af085f1dfe4e8b6fe408353 -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision ba2793fd2b970fc89af085f1dfe4e8b6fe408353) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -34,6 +34,7 @@ from .modules.dd_test_configs import DDTestConfig from .modules.ultrafiltration import DDUltrafiltration from .modules.valves import DDValves +from .modules.voltages import DDVoltages from .proxies.ro_proxy import ROProxy from .proxies.td_proxy import TDProxy @@ -130,6 +131,7 @@ self.test_configs = DDTestConfig(self.can_interface, self.logger) self.ultrafiltration = DDUltrafiltration(self.can_interface, self.logger) self.valves = DDValves(self.can_interface, self.logger) + self.voltages = DDVoltages(self.can_interface, self.logger) self.ro_proxy = ROProxy(self.can_interface, self.logger) self.td_proxy = TDProxy(self.can_interface, self.logger) Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -19,7 +19,7 @@ from .constants import NO_RESET, RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import DDPressureNames, DDPressureAttributesEnum +from leahi_dialin.common.dd_defs import DDPressureNames from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -49,34 +49,11 @@ self._handler_pressures_sync) self.dd_pressures = { - DDPressureNames.M1_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.M3_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D9_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D66_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D51_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D18_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D41_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - } + DDPressureNames.D9_PRES.name: 0.0, + DDPressureNames.D66_PRES.name: 0.0, + DDPressureNames.D51_PRES.name: 0.0, + DDPressureNames.D18_PRES.name: 0.0, + DDPressureNames.D41_PRES.name: 0.0 } self.dd_pressures_timestamp = 0 @@ -90,34 +67,16 @@ @param message: published DD pressure data message @return: none """ - self.dd_pressures[DDPressureNames.M1_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.dd_pressures[DDPressureNames.M3_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.dd_pressures[DDPressureNames.D9_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D9_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.dd_pressures[DDPressureNames.D66_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D66_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.dd_pressures[DDPressureNames.D51_PRES.name][DDPressureAttributesEnum.PRES.name]= struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D51_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.dd_pressures[DDPressureNames.D18_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D18_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.dd_pressures[DDPressureNames.D41_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D41_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.dd_pressures[DDPressureNames.M1_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.dd_pressures[DDPressureNames.M3_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.dd_pressures[DDPressureNames.D9_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.dd_pressures[DDPressureNames.D66_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.dd_pressures[DDPressureNames.D51_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - self.dd_pressures[DDPressureNames.D18_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.dd_pressures[DDPressureNames.D41_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] self.dd_pressures_timestamp = timestamp Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r8652ceb8c5807e317feb1b846f9c0292f842cfbe -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 8652ceb8c5807e317feb1b846f9c0292f842cfbe) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -38,21 +38,27 @@ self.logger = logger # Dictionary of the temperature sensors self.dd_temperatures_timestamp = 0.0 - self.dd_temperatures = {DDTemperaturesNames.D1_TEMP.name: 0.0, - DDTemperaturesNames.X6_TEMP.name: 0.0, - DDTemperaturesNames.D4_TEMP.name: 0.0, - DDTemperaturesNames.D50_TEMP.name: 0.0, - DDTemperaturesNames.BARO_TEMP.name: 0.0, - DDTemperaturesNames.BRD_TEMP.name: 0.0, - DDTemperaturesNames.D16_TEMP.name: 0.0, - DDTemperaturesNames.D28_TEMP.name: 0.0, - DDTemperaturesNames.D30_TEMP.name: 0.0, - DDTemperaturesNames.D44_TEMP.name: 0.0, - DDTemperaturesNames.D75_TEMP.name: 0.0, - DDTemperaturesNames.D4_AVG_TEMP.name: 0.0, - DDTemperaturesNames.D50_AVG_TEMP.name: 0.0, - DDTemperaturesNames.D28_AVG_TEMP.name: 0.0, - DDTemperaturesNames.D30_AVG_TEMP.name: 0.0} + self.dd_temperatures = { + DDTemperaturesNames.D1_TEMP.name: 0.0, + DDTemperaturesNames.D78_TEMP.name: 0.0, + DDTemperaturesNames.D4_TEMP.name: 0.0, + DDTemperaturesNames.D50_TEMP.name: 0.0, + DDTemperaturesNames.BARO_TEMP.name: 0.0, + DDTemperaturesNames.BRD_TEMP.name: 0.0, + DDTemperaturesNames.D16_TEMP.name: 0.0, + DDTemperaturesNames.D28_TEMP.name: 0.0, + DDTemperaturesNames.D30_TEMP.name: 0.0, + DDTemperaturesNames.D44_TEMP.name: 0.0, + DDTemperaturesNames.D75_TEMP.name: 0.0, + DDTemperaturesNames.D4_AVG_TEMP.name: 0.0, + DDTemperaturesNames.D50_AVG_TEMP.name: 0.0, + DDTemperaturesNames.D28_AVG_TEMP.name: 0.0, + DDTemperaturesNames.D30_AVG_TEMP.name: 0.0, + DDTemperaturesNames.D66_TEMP.name: 0.0, + DDTemperaturesNames.D51_TEMP.name: 0.0, + DDTemperaturesNames.D18_TEMP.name: 0.0, + DDTemperaturesNames.D41_TEMP.name: 0.0 + } if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id @@ -71,7 +77,7 @@ self.dd_temperatures[DDTemperaturesNames.D1_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.dd_temperatures[DDTemperaturesNames.X6_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D78_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] self.dd_temperatures[DDTemperaturesNames.D4_TEMP.name] = struct.unpack('f', bytearray( @@ -113,6 +119,18 @@ self.dd_temperatures[DDTemperaturesNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] + self.dd_temperatures[DDTemperaturesNames.D66_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] + + self.dd_temperatures[DDTemperaturesNames.D51_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] + + self.dd_temperatures[DDTemperaturesNames.D18_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] + + self.dd_temperatures[DDTemperaturesNames.D41_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] + self.dd_temperatures_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -43,8 +43,6 @@ END_POS_VALVES_STATES = START_POS_VALVES_STATES + 2 # Valves States come in as a U16 value (2 bytes) START_POS_BCV_VALVES_STATES = END_POS_VALVES_STATES END_POS_BCV_VALVES_STATES = START_POS_BCV_VALVES_STATES + 1 - START_POS_UFI_VALVES_STATES = END_POS_BCV_VALVES_STATES - END_POS_UFI_VALVES_STATES = START_POS_UFI_VALVES_STATES + 1 END_POS_ALL_VALVES = START_POS_VALVES_STATES + 4 def __init__(self, can_interface, logger: Logger): @@ -70,17 +68,17 @@ self.d8_valv = {"id": DDValveNames.D8_VALV.value, "state": DEENERGIZED} self.d54_valv = {"id": DDValveNames.D54_VALV.value, "state": DEENERGIZED} self.d53_valv = {"id": DDValveNames.D53_VALV.value, "state": DEENERGIZED} - self.d65_valv = {"id": DDValveNames.D65_VALV.value, "state": DEENERGIZED} + self.d34_valv = {"id": DDValveNames.D34_VALV.value, "state": DEENERGIZED} self.d64_valv = {"id": DDValveNames.D64_VALV.value, "state": DEENERGIZED} self.d31_valv = {"id": DDValveNames.D31_VALV.value, "state": DEENERGIZED} - self.d34_valv = {"id": DDValveNames.D34_VALV.value, "state": DEENERGIZED} + self.d65_valv = {"id": DDValveNames.D65_VALV.value, "state": DEENERGIZED} self.d35_valv = {"id": DDValveNames.D35_VALV.value, "state": DEENERGIZED} self.d40_valv = {"id": DDValveNames.D40_VALV.value, "state": DEENERGIZED} self.d47_valv = {"id": DDValveNames.D47_VALV.value, "state": DEENERGIZED} self.d3_valv = {"id": DDValveNames.D3_VALV.value, "state": DEENERGIZED} - self.m4_valv = {"id": DDValveNames.M4_VALV.value, "state": DEENERGIZED} + self.d80_valv = {"id": DDValveNames.D80_VALV.value, "state": DEENERGIZED} + self.d81_valv = {"id": DDValveNames.D81_VALV.value, "state": DEENERGIZED} self.rsvrd1 = {"id": DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} - self.rsvrd2 = {"id": DDValveNames.RSRVD_SPACE2.value, "state": DEENERGIZED} self.d23_valv = {"id": DDValveNames.D23_VALV.value, "state": DEENERGIZED} self.d19_valv = {"id": DDValveNames.D19_VALV.value, "state": DEENERGIZED} @@ -91,12 +89,6 @@ self.d21_valv = {"id": DDValveNames.D21_VALV.value, "state": DEENERGIZED} self.d22_valv = {"id": DDValveNames.D22_VALV.value, "state": DEENERGIZED} - self.d69_valv = {"id": DDValveNames.D69_VALV.value, "state": DEENERGIZED} - self.d71_valv = {"id": DDValveNames.D71_VALV.value, "state": DEENERGIZED} - self.d70_valv = {"id": DDValveNames.D70_VALV.value, "state": DEENERGIZED} - self.d72_valv = {"id": DDValveNames.D72_VALV.value, "state": DEENERGIZED} - - # NOTE: The len function counts the enums with the same number only once. This is not the case in the DD valves # class because each valve must have a unique ID. self.valve_states_enum = [0 for _ in range(len(DDValveNames))] @@ -116,29 +108,26 @@ self.d8_valv.get("state", None), self.d54_valv.get("state", None), self.d53_valv.get("state", None), - self.d65_valv.get("state", None), + self.d34_valv.get("state", None), self.d64_valv.get("state", None), self.d31_valv.get("state", None), - self.d34_valv.get("state", None), + self.d65_valv.get("state", None), self.d35_valv.get("state", None), self.d40_valv.get("state", None), self.d47_valv.get("state", None), self.d3_valv.get("state", None), - self.m4_valv.get("state", None), + self.d80_valv.get("state", None), + self.d81_valv.get("state", None), self.rsvrd1.get("state", None), - self.rsvrd2.get("state", None), + self.d23_valv.get("state", None), self.d19_valv.get("state", None), self.d25_valv.get("state", None), self.d26_valv.get("state", None), self.d24_valv.get("state", None), self.d20_valv.get("state", None), self.d21_valv.get("state", None), - self.d22_valv.get("state", None), - self.d69_valv.get("state", None), - self.d71_valv.get("state", None), - self.d70_valv.get("state", None), - self.d72_valv.get("state", None) + self.d22_valv.get("state", None) ] @staticmethod @@ -179,17 +168,17 @@ "d8_valv", "d54_valv", "d53_valv", - "d65_valv", + "d34_valv", "d64_valv", "d31_valv", - "d34_valv", + "d65_valv", "d35_valv", "d40_valv", "d47_valv", "d3_valv", - "m4_valv", + "d80_valv", + "d81_valv", "rsvrd1", - "rsvrd2", "d23_valv", "d19_valv", "d25_valv", @@ -198,10 +187,6 @@ "d20_valv", "d21_valv", "d22_valv", - "d69_valv", - "d71_valv", - "d70_valv", - "d72_valv", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): @@ -230,9 +215,9 @@ self.d40_valv["state"] = self._binary_to_valve_state(vst[0] & 1024) self.d47_valv["state"] = self._binary_to_valve_state(vst[0] & 2048) self.d3_valv["state"] = self._binary_to_valve_state(vst[0] & 4096) - self.m4_valv["state"] = self._binary_to_valve_state(vst[0] & 8192) - self.rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 16384) - self.rsvrd2["state"] = self._binary_to_valve_state(vst[0] & 32768) + self.d80_valv["state"] = self._binary_to_valve_state(vst[0] & 8192) + self.d81_valv["state"] = self._binary_to_valve_state(vst[0] & 16384) + self.rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 32768) bcv = struct.unpack('B', bytearray(message['message'][self.START_POS_BCV_VALVES_STATES:self.END_POS_BCV_VALVES_STATES])) self.d23_valv["state"] = self._binary_to_valve_state(bcv[0] & 1) @@ -244,13 +229,7 @@ self.d21_valv["state"] = self._binary_to_valve_state(bcv[0] & 64) self.d22_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) - ufi = struct.unpack('B', bytearray(message['message'][self.START_POS_UFI_VALVES_STATES:self.END_POS_UFI_VALVES_STATES])) - self.d69_valv["state"] = self._binary_to_valve_state(ufi[0] & 1) - self.d69_valv["state"] = self._binary_to_valve_state(ufi[0] & 2) - self.d70_valv["state"] = self._binary_to_valve_state(ufi[0] & 4) - self.d72_valv["state"] = self._binary_to_valve_state(ufi[0] & 8) - - start = self.END_POS_UFI_VALVES_STATES + start = self.END_POS_BCV_VALVES_STATES end = start + 1 for valve_id in self.valves_sensed_states: valve_state_number = struct.unpack('B', bytearray(message['message'][start:end]))[0] Index: leahi_dialin/dd/modules/voltages.py =================================================================== diff -u --- leahi_dialin/dd/modules/voltages.py (revision 0) +++ leahi_dialin/dd/modules/voltages.py (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -0,0 +1,170 @@ +########################################################################### +# +# Copyright (c) 2021-2025 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file voltages.py +# +# @author (last) Jonny Paguio +# @date (last) 23-Sep-2025 +# @author (original) Sean Nash +# @date (original) 15-Apr-2021 +# +############################################################################ +import struct +from logging import Logger + +from .constants import RESET, NO_RESET +from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels +from leahi_dialin.utils.base import AbstractSubSystem, publish +from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray +from leahi_dialin.utils.checks import check_broadcast_interval_override_ms +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.dd_defs import DDMonitoredVoltages + + +class DDVoltages(AbstractSubSystem): + """ + Dialysate Delivery (dD) Dialin API sub-class for voltage monitor related commands and data. + """ + + def __init__(self, can_interface, logger: Logger): + """ + DDVoltages constructor + + """ + super().__init__() + self.can_interface = can_interface + self.logger = logger + + if self.can_interface is not None: + channel_id = DenaliChannels.dd_sync_broadcast_ch_id + self.msg_id_dd_voltages_data = MsgIds.MSG_ID_DD_VOLTAGES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_voltages_data, + self._handler_monitored_voltages_sync) + self.monitored_voltages = [0.0] * DDMonitoredVoltages.NUM_OF_MONITORED_VOLTAGE_LINES.value + self.dd_voltages_timestamp = 0.0 + + + @publish(["dd_voltages_timestamp","monitored_voltages"]) + def _handler_monitored_voltages_sync(self, message, timestamp=0.0): + """ + Handles published DD monitored voltages data messages. Voltage data are captured + for reference. + + @param message: published monitored voltages data message + @return: none + """ + + v12 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + v33 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) + v5l = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) + v24_1 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) + v24_2 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + vfc = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) + vfa = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) + vfp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) + + self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_1_2V.value] = v12[0] + self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_3_3V.value] = v33[0] + self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value] = v5l[0] + self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_24V_1.value] = v24_1[0] + self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_24V_2.value] = v24_2[0] + self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.value] = vfc[0] + self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.value] = vfa[0] + self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.value] = vfp[0] + + self.dd_voltages_timestamp = timestamp + + def cmd_monitored_voltage_override(self, signal: int = 0, volts: float = 0.0, reset: int = NO_RESET) -> int: + """ + Constructs and sends the DD monitored voltage override command + Constraints: + Must be logged into DD. + Given signal must be valid member of DDMonitoredVoltages enum + + @param signal: integer - ID of signal to override + @param volts: float - value (in volts) to override signal with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + + rst = integer_to_bytearray(reset) + vlt = float_to_bytearray(volts) + idx = integer_to_bytearray(signal) + payload = rst + vlt + idx + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message_id=MsgIds.MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override monitored DD voltage for signal " + str(signal)) + + # Send message + received_message = self.can_interface.send(message) + + # If there is content... + if received_message is not None: + if reset == RESET: + str_res = "reset back to normal. " + else: + str_res = str(volts) + " V. " + self.logger.debug("Monitored DD voltage overridden to " + str_res + + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") + return False + + def cmd_monitored_voltages_broadcast_interval_override(self, ms: int = 1000, reset: int = NO_RESET) -> int: + """ + Constructs and sends the monitored DD voltages broadcast interval override command + Constraints: + Must be logged into DD. + Given interval must be non-zero and a multiple of the DD general task interval (50 ms). + + @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 + """ + + if not check_broadcast_interval_override_ms(ms): + return False + + rst = integer_to_bytearray(reset) + mis = integer_to_bytearray(ms) + payload = rst + mis + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message_id=MsgIds.MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override monitored DD voltages broadcast interval") + + # Send message + received_message = self.can_interface.send(message) + + # If there is content... + if received_message is not None: + if reset == RESET: + str_res = "reset back to normal: " + else: + str_res = str(ms) + " ms: " + self.logger.debug("DD monitored voltages broadcast interval overridden to " + str_res + + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") + return False \ No newline at end of file Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -51,11 +51,7 @@ FPPressureSensorNames.M3_PRES.name: 0.0, FPPressureSensorNames.P8_PRES.name: 0.0, FPPressureSensorNames.P13_PRES.name: 0.0, - FPPressureSensorNames.P17_PRES.name: 0.0, - FPPressureSensorNames.X1_PRES.name: 0.0, - FPPressureSensorNames.X2_PRES.name: 0.0, - FPPressureSensorNames.X3_PRES.name: 0.0, - FPPressureSensorNames.X4_PRES.name: 0.0 + FPPressureSensorNames.P17_PRES.name: 0.0 } self.fp_pressure_timestamp = 0.0 @@ -80,14 +76,6 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.fp_pressures[FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.fp_pressures[FPPressureSensorNames.X1_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.fp_pressures[FPPressureSensorNames.X2_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.fp_pressures[FPPressureSensorNames.X3_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.fp_pressures[FPPressureSensorNames.X4_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] self.fp_pressure_timestamp = timestamp Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r77740bc2ccace473a471515cadd4bc1353360cd6 -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -42,20 +42,17 @@ self._handler_temperature_sensors_sync) self.fp_temperature_sensors_timestamp = 0 - self.fp_temperatures = {FPTemperaturesNames.P10_TEMP.name: 0.0, - FPTemperaturesNames.P19_TEMP.name: 0.0, - FPTemperaturesNames.M1_TEMP.name: 0.0, - FPTemperaturesNames.M3_TEMP.name: 0.0, - FPTemperaturesNames.P8_TEMP.name: 0.0, - FPTemperaturesNames.P13_TEMP.name: 0.0, - FPTemperaturesNames.P17_TEMP.name: 0.0, - FPTemperaturesNames.X1_TEMP.name: 0.0, - FPTemperaturesNames.X2_TEMP.name: 0.0, - FPTemperaturesNames.X3_TEMP.name: 0.0, - FPTemperaturesNames.X4_TEMP.name: 0.0, - FPTemperaturesNames.P7_TEMP.name: 0.0, - FPTemperaturesNames.P16_TEMP.name: 0.0, - } + self.fp_temperatures = { + FPTemperaturesNames.M1_TEMP.name: 0.0, + FPTemperaturesNames.M3_TEMP.name: 0.0, + FPTemperaturesNames.P10_TEMP.name: 0.0, + FPTemperaturesNames.P19_TEMP.name: 0.0, + FPTemperaturesNames.P8_TEMP.name: 0.0, + FPTemperaturesNames.P13_TEMP.name: 0.0, + FPTemperaturesNames.P17_TEMP.name: 0.0, + FPTemperaturesNames.P7_TEMP.name: 0.0, + FPTemperaturesNames.P16_TEMP.name: 0.0 + } @publish(["fp_temperatures_timestamp", "fp_temperatures"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): @@ -65,16 +62,16 @@ @param message: published FP temperature sensors data message @returns none """ - self.fp_temperatures[FPTemperaturesNames.P10_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.M1_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.fp_temperatures[FPTemperaturesNames.P19_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.M3_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.fp_temperatures[FPTemperaturesNames.M1_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.P10_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.fp_temperatures[FPTemperaturesNames.M3_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.P19_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.fp_temperatures[FPTemperaturesNames.P8_TEMP.name] = struct.unpack('f', bytearray( @@ -86,24 +83,12 @@ self.fp_temperatures[FPTemperaturesNames.P17_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.fp_temperatures[FPTemperaturesNames.X1_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.P7_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.fp_temperatures[FPTemperaturesNames.X2_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.P16_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.fp_temperatures[FPTemperaturesNames.X3_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - - self.fp_temperatures[FPTemperaturesNames.X4_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - - self.fp_temperatures[FPTemperaturesNames.X4_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - - self.fp_temperatures[FPTemperaturesNames.X4_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.fp_temperature_sensors_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -r77740bc2ccace473a471515cadd4bc1353360cd6 -r144020fa422bc5d0db1bd62647c29022a887206e --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) @@ -61,15 +61,13 @@ self.valve_states_all = 0x0000 self.m4_valv = {"id": FPValveNames.M4_VALV.value, "state": DEENERGIZED} - self.m7_valv = {"id": FPValveNames.M7_VALV.value, "state": DEENERGIZED} - self.p6_valv = {"id": FPValveNames.P6_VALV.value, "state": DEENERGIZED} self.p11_valv = {"id": FPValveNames.P11_VALV.value, "state": DEENERGIZED} self.p33_valv = {"id": FPValveNames.P33_VALV.value, "state": DEENERGIZED} self.p34_valv = {"id": FPValveNames.P34_VALV.value, "state": DEENERGIZED} self.p37_valv = {"id": FPValveNames.P37_VALV.value, "state": DEENERGIZED} self.p39_valv = {"id": FPValveNames.P39_VALV.value, "state": DEENERGIZED} - self.p20_valv = {"id": FPValveNames.P20_VALV.value, "state": DEENERGIZED} self.p43_valv = {"id": FPValveNames.P43_VALV.value, "state": DEENERGIZED} + self.p6_valv = {"id": FPValveNames.P6_VALV.value, "state": DEENERGIZED} # NOTE: The len function counts the enums with the same number only once. self.valve_states_enum = [0 for _ in range(len(FPValveNames))] @@ -85,15 +83,13 @@ """ return [ self.m4_valv.get("state"), - self.p39_valv.get("state"), - self.p6_valv.get("state"), self.p11_valv.get("state"), self.p33_valv.get("state"), self.p34_valv.get("state"), self.p37_valv.get("state"), - self.m7_valv.get("state"), - self.p20_valv.get("state"), - self.p43_valv.get("state") + self.p39_valv.get("state"), + self.p43_valv.get("state"), + self.p6_valv.get("state") ] @staticmethod @@ -130,15 +126,13 @@ "fp_valves_states_timestamp", "valve_states_all", "m4_valv", - "m7_valv", - "p6_valv", "p11_valv", "p33_valv", "p34_valv", "p37_valv", "p39_valv", - "p20_valv", "p43_valv", + "p6_valv", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): @@ -153,17 +147,14 @@ self.valve_states_all = vst[0] # Extract each valve state from U16 valves states using bit-masking self.m4_valv["state"] = self._binary_to_valve_state(vst[0] & 1) - self.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 2) - self.p6_valv["state"] = self._binary_to_valve_state(vst[0] & 4) - self.p11_valv["state"] = self._binary_to_valve_state(vst[0] & 8) - self.p33_valv["state"] = self._binary_to_valve_state(vst[0] & 16) - self.p34_valv["state"] = self._binary_to_valve_state(vst[0] & 32) - self.p37_valv["state"] = self._binary_to_valve_state(vst[0] & 64) - self.m7_valv["state"] = self._binary_to_valve_state(vst[0] & 128) - self.p20_valv["state"] = self._binary_to_valve_state(vst[0] & 256) - self.p43_valv["state"] = self._binary_to_valve_state(vst[0] & 512) + self.p11_valv["state"] = self._binary_to_valve_state(vst[0] & 2) + self.p33_valv["state"] = self._binary_to_valve_state(vst[0] & 4) + self.p34_valv["state"] = self._binary_to_valve_state(vst[0] & 8) + self.p37_valv["state"] = self._binary_to_valve_state(vst[0] & 16) + self.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 32) + self.p43_valv["state"] = self._binary_to_valve_state(vst[0] & 64) + self.p6_valv["state"] = self._binary_to_valve_state(vst[0] & 128) - start = self.END_POS_VALVES_STATES end = start + 1 for valve_id in self.valves_sensed_states: