Index: dialin/hd/temperatures.py =================================================================== diff -u -radae506afce35a0063c6c2baf7e8580986f3bee7 -ra7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b --- dialin/hd/temperatures.py (.../temperatures.py) (revision adae506afce35a0063c6c2baf7e8580986f3bee7) +++ dialin/hd/temperatures.py (.../temperatures.py) (revision a7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b) @@ -35,6 +35,7 @@ TEMPSENSOR_FPGA_BOARD = 2 TEMPSENSOR_VENOUS_PRESS_TEMP = 3 TEMPSENSOR_PBA_ADC_SENSOR = 4 + TEMPSENSOR_ARTERIAL_PRESS_TEMP = 5 class HDTemperatures(AbstractSubSystem): @@ -62,7 +63,8 @@ HDTemperaturesNames.THERMISTOR_POWER_SUPPLY_1.name: 0.0, HDTemperaturesNames.TEMPSENSOR_FPGA_BOARD.name: 0.0, HDTemperaturesNames.TEMPSENSOR_VENOUS_PRESS_TEMP.name: 0.0, - HDTemperaturesNames.TEMPSENSOR_PBA_ADC_SENSOR.name: 0.0} + HDTemperaturesNames.TEMPSENSOR_PBA_ADC_SENSOR.name: 0.0, + HDTemperaturesNames.TEMPSENSOR_ARTERIAL_PRESS_TEMP.name: 0.0} def get_hd_temperatures_values(self) -> dict: """ @@ -90,12 +92,15 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] pba_adc_sensor = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + arterial_sensor = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.hd_temperatures[HDTemperaturesNames.THERMISTOR_ONBOARD_NTC.name] = onboard_thermistor self.hd_temperatures[HDTemperaturesNames.THERMISTOR_POWER_SUPPLY_1.name] = power_supply_thermistor self.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_FPGA_BOARD.name] = fpga_board_sensor self.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_VENOUS_PRESS_TEMP.name] = venous_pressure_sensor_temp self.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_PBA_ADC_SENSOR.name] = pba_adc_sensor + self.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_ARTERIAL_PRESS_TEMP.name] = arterial_sensor def cmd_temperatures_value_override(self, sensor: int, value: float, reset: int = NO_RESET) -> int: """ Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r7c47b3d1b3c4b685999c0f0a8b402b692391d633 -ra7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 7c47b3d1b3c4b685999c0f0a8b402b692391d633) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision a7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b) @@ -21,8 +21,8 @@ # Use cmd_set_dg_calibration_excel_to_fw() set the changes back to firmware # This function requires an address for the excel report. Use the absolute address of your excel report like the # example below - dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-02-10-DG-Record.xlsx') + #dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-02-14-DG-Record.xlsx') # For resetting the calibration record to benign values, use the function below - dg.calibration_record.cmd_reset_dg_calibration_record() + #dg.calibration_record.cmd_reset_dg_calibration_record() Index: tests/dg_tests.py =================================================================== diff -u -rddf8a289ffc27f86d69a60922ce71d1681b668ce -ra7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b --- tests/dg_tests.py (.../dg_tests.py) (revision ddf8a289ffc27f86d69a60922ce71d1681b668ce) +++ tests/dg_tests.py (.../dg_tests.py) (revision a7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b) @@ -212,12 +212,14 @@ def get_hd_fans_info(): info = ('HD_Fan_DC, {:5.3f}, Target_HD_RPM, {:5.3f}, Inlet1_RPM, {:5.3f}, HD_Board_temp, {:5.3f}, ' 'HD_Power_supply, {:5.3f}, HD_FPGA_temp, {:5.3f}, PBA_ADC_temp, {:5.3f}, Venous_temp, {:5.3f}, ' + 'Arterial_temp, {:5.3f}, ' .format(hd.fans.duty_cycle, hd.fans.target_rpm, hd.fans.inlet_1_rpm, hd.temperatures.hd_temperatures[HDTemperaturesNames.THERMISTOR_ONBOARD_NTC.name], hd.temperatures.hd_temperatures[HDTemperaturesNames.THERMISTOR_POWER_SUPPLY_1.name], hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_FPGA_BOARD.name], hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_PBA_ADC_SENSOR.name], - hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_VENOUS_PRESS_TEMP.name])) + hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_VENOUS_PRESS_TEMP.name], + hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_ARTERIAL_PRESS_TEMP.name])) return info @@ -577,5 +579,5 @@ # test_dg_fans_alarms() while True: - print(get_hd_occlusion_pressures_info()) + print(get_hd_occlusion_pressures_info(), get_hd_fans_info()) sleep(1)