Index: dialin/dg/voltages.py =================================================================== diff -u -raec9aca2a0feee1672bb35ce3bfe2b77dae8c494 -r68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8 --- dialin/dg/voltages.py (.../voltages.py) (revision aec9aca2a0feee1672bb35ce3bfe2b77dae8c494) +++ dialin/dg/voltages.py (.../voltages.py) (revision 68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8) @@ -61,7 +61,7 @@ self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.hd_sync_broadcast_ch_id + channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_DG_VOLTAGES_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_monitored_voltages_sync) Index: dialin/hd/syringe_pump.py =================================================================== diff -u -rcd3313bfafed2f2a1e43cf2591f1248db23d0b88 -r68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8 --- dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision cd3313bfafed2f2a1e43cf2591f1248db23d0b88) +++ dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision 68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8) @@ -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,10 +234,10 @@ 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): """ Index: tests/test_voltages.py =================================================================== diff -u -r2a9294e72f995e2800d7303f6cc2a67d1839654b -r68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8 --- tests/test_voltages.py (.../test_voltages.py) (revision 2a9294e72f995e2800d7303f6cc2a67d1839654b) +++ tests/test_voltages.py (.../test_voltages.py) (revision 68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8) @@ -21,7 +21,7 @@ from time import sleep from dialin.hd.voltages import HDMonitoredVoltages from dialin.dg.voltages import DGMonitoredVoltages -from dialin.hd.constants import RESET, NO_RESET +#from dialin.hd.constants import RESET, NO_RESET if __name__ == "__main__": # create an HD object called hd @@ -46,14 +46,16 @@ with open("/home/fw/projects/dialin/tests/v_test.log", "w") as f: # write column header labels to log file header = "HD1.2V, HD3.3V, HD5V Logic, HD5V Sensors, HD24V, HD24V Regen, HDFPGA RefV, HDPBA RefV, HDAlmCurrHg, HDAlmCurrLg, HDAlmBckpCurr," + \ - "DG1V FPGA, DG1.2V, DG1.8V Proc, DG1.8V FPGA, DGVRef, DGRef1, DGRef2, DG3.3V, DG3.3V Sensors, DG5V Logic, DG5V Sensors, DG24V, DG24V Htr, DG24V Trim\n" + "DG1V FPGA, DG1.2V, DG1.8V Proc, DG1.8V FPGA, DGVRef, DGRef1, DGRef2, DG3.3V, DG3.3V Sensors, DG5V Logic, DG5V Sensors, DG5V P/S Gate Drvr, DG24V, DG24V Htr, DG24V Trim\n" f.write(header) # write monitored voltages related data from HD to log file while True: sleep(0.1) vHd = hd.voltages.get_monitored_voltages() vDg = dg.voltages.get_monitored_voltages() + x = DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value + y = vDg[x] hdVoltageData = '{:11.6f}'.format(vHd[HDMonitoredVoltages.MONITORED_LINE_1_2V.value]) + \ ", " + '{:11.6f}'.format(vHd[HDMonitoredVoltages.MONITORED_LINE_3_3V.value]) + \ ", " + '{:11.6f}'.format(vHd[HDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value]) + \ @@ -65,18 +67,18 @@ ", " + '{:11.6f}'.format(hd.alarms.alarm_audio_curr_hg) + \ ", " + '{:11.6f}'.format(hd.alarms.alarm_audio_curr_lg) + \ ", " + '{:11.6f}'.format(hd.alarms.alarm_backup_audio_curr) - "DG1V FPGA, DG1.2V, DG1.8V Proc, DG1.8V FPGA, DGVRef, DGRef1, DGRef2, DG3.3V, DG3.3V Sensors, DG5V Logic, DG5V Sensors, DG24V, DG24V Htr, DG24V Trim\n" dgVoltageData = ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_1V_FPGA.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_1_2V_PROC.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_1_8V_PROC.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_1_8V_FPGA.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_V_REF.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_EXT_ADC_1_REF_V.value]) + \ - ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_EXT_ADC_2_REF_V].value) + \ + ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_EXT_ADC_2_REF_V.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_3_3V.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_3_3V_SENSORS.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_5V_SENSORS.value]) + \ + ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_PS_GATE_DRIVER_V.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_24V_MAIN.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value]) + \ ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value])