Index: dialin/hd/voltages.py =================================================================== diff -u -ra2d44432a913537ca0627cd7dde7dcb1154f2156 -r4304dd7449eee937f9a7f1f9687a616258c2c0bc --- dialin/hd/voltages.py (.../voltages.py) (revision a2d44432a913537ca0627cd7dde7dcb1154f2156) +++ dialin/hd/voltages.py (.../voltages.py) (revision 4304dd7449eee937f9a7f1f9687a616258c2c0bc) @@ -37,9 +37,11 @@ MONITORED_LINE_24V_REGEN = 5 # Actuators regen voltage (24V) MONITORED_LINE_FPGA_REF_V = 6 # FPGA ADC reference voltage (1V) MONITORED_LINE_PBA_REF_V = 7 # PBA ADC reference voltage (3V) - NUM_OF_MONITORED_VOLTAGE_LINES = 8 # Number of HD operation modes + MONITORED_LINE_FPGA_VCC_V = 8 # FPGA Vcc (3V) + MONITORED_LINE_FPGA_AUX_V = 9 # FPGA Vaux (3V) + MONITORED_LINE_FPGA_PVN_V = 10 # FPGA Vpvn (1V) + NUM_OF_MONITORED_VOLTAGE_LINES = 11 # Number of HD operation modes - class HDVoltages(_AbstractSubSystem): """ Hemodialysis Delivery (HD) Dialin API sub-class for voltage monitor related commands and data. @@ -97,6 +99,12 @@ message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) vpr = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) + vfc = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) + vfa = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) + vfp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_1_2V.value] = v12[0] self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_3_3V.value] = v33[0] @@ -106,6 +114,9 @@ self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_24V_REGEN.value] = v24g[0] self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_FPGA_REF_V.value] = vfr[0] self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_PBA_REF_V.value] = vpr[0] + self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.value] = vfc[0] + self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.value] = vfa[0] + self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.value] = vfp[0] def cmd_monitored_voltage_override(self, signal:int=0, volts:float=0.0, reset:int=NO_RESET) -> int: """