Index: dialin/dg/voltages.py =================================================================== diff -u -rf89093ee0f0b9159df2ae4e0b86971f0e0e1b448 -raec9aca2a0feee1672bb35ce3bfe2b77dae8c494 --- dialin/dg/voltages.py (.../voltages.py) (revision f89093ee0f0b9159df2ae4e0b86971f0e0e1b448) +++ dialin/dg/voltages.py (.../voltages.py) (revision aec9aca2a0feee1672bb35ce3bfe2b77dae8c494) @@ -40,9 +40,10 @@ MONITORED_LINE_V_REF = 9 # Reference voltage (3V) 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_24V_PRIM_HTR_V = 12 # Primary heater voltage (24V) - MONITORED_LINE_24V_TRIM_HTR_V = 13 # Trimmer heater voltage (24V) - NUM_OF_MONITORED_LINES = 14 # Number of monitored voltages + 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 class DGVoltages(_AbstractSubSystem): @@ -108,12 +109,14 @@ message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) v5s = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) - v24 = struct.unpack('f', bytearray( + v5g = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])) - v24p = struct.unpack('f', bytearray( + v24 = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])) - v24t = struct.unpack('f', bytearray( + v24p = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])) + v24t = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15])) self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_1V_FPGA.value] = v1[0] self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_1_2V_PROC.value] = v12[0] @@ -126,6 +129,7 @@ self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_3_3V_SENSORS.value] = v33s[0] self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value] = v5l[0] self.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_5V_SENSORS.value] = v5s[0] + 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_TRIM_HTR_V.value] = v24t[0]