Index: dialin/dg/voltages.py =================================================================== diff -u -r3a70bfb451b74106348c064c34f19934aadd9119 -rb1ffba07a82b4e99156a07b09762d33205300050 --- dialin/dg/voltages.py (.../voltages.py) (revision 3a70bfb451b74106348c064c34f19934aadd9119) +++ dialin/dg/voltages.py (.../voltages.py) (revision b1ffba07a82b4e99156a07b09762d33205300050) @@ -42,9 +42,11 @@ MONITORED_LINE_EXT_ADC_1_REF_V = 10 # External ADC 1 reference voltage (3V) MONITORED_LINE_EXT_ADC_2_REF_V = 11 # External ADC 2 reference voltage (3V) MONITORED_LINE_PS_GATE_DRIVER_V = 12 # P/S gate driver (5V) - MONITORED_LINE_24V_PRIM_HTR_V = 13 # Primary heater, secondary element voltage (0..24V) - MONITORED_LINE_24V_TRIM_HTR_V = 14 # Trimmer heater voltage (0..24V) - NUM_OF_MONITORED_LINES = 15 # Number of monitored voltages + MONITORED_LINE_24V_PRIM_HTR_V = 13 # Primary heater (0..24V) + MONITORED_LINE_24V_PRIM_HTR_GND_V = 14 # Primary heater ground (0..24V) + MONITORED_LINE_24V_SEC_HTR_V = 15 # Secondary element voltage (0..24V) + MONITORED_LINE_24V_TRIM_HTR_V = 16 # Trimmer heater voltage (0..24V) + NUM_OF_MONITORED_LINES = 17 # Number of monitored voltages class DGVoltages(AbstractSubSystem): @@ -116,8 +118,12 @@ message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])) v24p = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])) - v24t = struct.unpack('f', bytearray( + v24pg = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15])) + v24s = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16])) + v24t = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17])) self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_1V_FPGA.value] = v1[0] self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_1_2V_PROC.value] = v12[0] @@ -133,6 +139,8 @@ self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_PS_GATE_DRIVER_V.value] = v5g[0] self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_MAIN.value] = v24[0] self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value] = v24p[0] + self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_GND_V.value] = v24pg[0] + self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_SEC_HTR_V.value] = v24s[0] self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value] = v24t[0] def cmd_monitored_voltage_override(self, signal: int = 0, volts: float = 0.0, reset: int = NO_RESET) -> int: