Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -re6f3a632890f96a5aa282922d11df148bdd06587 -r4790fb46181f78a19f0a557b0e9688cc03a74e97 --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision e6f3a632890f96a5aa282922d11df148bdd06587) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 4790fb46181f78a19f0a557b0e9688cc03a74e97) @@ -338,7 +338,7 @@ for ( sensorID = 0; sensorID < NUM_OF_PRESSURE_SENSORS; sensorID++ ) { - pressureReading = getMeasuredDGPressure( sensorID ); + pressureReading = getMeasuredDGPressure( sensorID ) + PUMP_PRESSURE_PSIA_TO_PSI_OFFSET; if ( ( pressureReading < MIN_VALID_PRESSURE_RANGE ) || ( pressureReading > MAX_VALID_PRESSURE_RANGE ) ) { SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRESSURE_SENSOR_FAULT, sensorID, pressureReading ); Index: firmware/App/Controllers/Voltages.c =================================================================== diff -u -r841991c3676107d8ae45d967c28e656d6b111506 -r4790fb46181f78a19f0a557b0e9688cc03a74e97 --- firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision 841991c3676107d8ae45d967c28e656d6b111506) +++ firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision 4790fb46181f78a19f0a557b0e9688cc03a74e97) @@ -56,8 +56,6 @@ 3.3, // MONITORED_LINE_EXT_ADC_1_REF_V 3.3, // MONITORED_LINE_EXT_ADC_2_REF_V 5.5, // MONITORED_LINE_PS_GATE_DRIVER_V - 11.11, // MONITORED_LINE_VM_CP1 - 11.11, // MONITORED_LINE_VM_CP2 26.4, // MONITORED_LINE_24V_PRIM_HTR_V 26.4 // MONITORED_LINE_24V_TRIM_HTR_V }; @@ -77,8 +75,6 @@ 2.7, // MONITORED_LINE_EXT_ADC_1_REF_V 2.7, // MONITORED_LINE_EXT_ADC_2_REF_V 4.5, // MONITORED_LINE_PS_GATE_DRIVER_V - 9.09, // MONITORED_LINE_VM_CP1 - 9.09, // MONITORED_LINE_VM_CP2 0.0, // MONITORED_LINE_24V_PRIM_HTR_V 0.0 // MONITORED_LINE_24V_TRIM_HTR_V }; @@ -196,8 +192,6 @@ voltages[ MONITORED_LINE_EXT_ADC_1_REF_V ].data = getIntADCVoltageConverted( INT_ADC_REF_IN1 ); voltages[ MONITORED_LINE_EXT_ADC_2_REF_V ].data = getIntADCVoltageConverted( INT_ADC_REF_IN2 ); voltages[ MONITORED_LINE_PS_GATE_DRIVER_V ].data = getIntADCVoltageConverted( INT_ADC_POWER_SUPPLY_GATE_DRIVER ); - voltages[ MONITORED_LINE_VM_CP1 ].data = getIntADCVoltageConverted( INT_ADC_CONCENTRATE_PUMP_1 ); - voltages[ MONITORED_LINE_VM_CP1 ].data = getIntADCVoltageConverted( INT_ADC_CONCENTRATE_PUMP_1 ); voltages[ MONITORED_LINE_24V_PRIM_HTR_V ].data = getIntADCVoltageConverted( INT_ADC_PRIMARY_HEATER_24_VOLTS ); voltages[ MONITORED_LINE_24V_TRIM_HTR_V ].data = getIntADCVoltageConverted( INT_ADC_TRIMMER_HEATER_24_VOLTS ); Index: firmware/App/Controllers/Voltages.h =================================================================== diff -u -re6f3a632890f96a5aa282922d11df148bdd06587 -r4790fb46181f78a19f0a557b0e9688cc03a74e97 --- firmware/App/Controllers/Voltages.h (.../Voltages.h) (revision e6f3a632890f96a5aa282922d11df148bdd06587) +++ firmware/App/Controllers/Voltages.h (.../Voltages.h) (revision 4790fb46181f78a19f0a557b0e9688cc03a74e97) @@ -34,25 +34,23 @@ /// Enumeration of voltages monitored by this module. typedef enum Voltages { - MONITORED_LINE_24V_MAIN = 0, ///< Main voltage (24V) - MONITORED_LINE_1_8V_FPGA, ///< FPGA logic voltage (1.8V) - MONITORED_LINE_1V_FPGA, ///< FPGA reference voltage (1V) - MONITORED_LINE_3_3V_SENSORS, ///< Sensors voltage (3.3V) - MONITORED_LINE_1_8V_PROC, ///< Processor voltage (1.8V) - MONITORED_LINE_5V_SENSORS, ///< Sensors voltage (5V) - MONITORED_LINE_5V_LOGIC, ///< Logic voltage (5V) - MONITORED_LINE_3_3V, ///< Logic voltage (3.3V) - MONITORED_LINE_1_2V_PROC, ///< Processor voltage (1.2V) - MONITORED_LINE_V_REF, ///< Reference voltage (3V) - MONITORED_LINE_EXT_ADC_1_REF_V, ///< External ADC 1 reference voltage (3V) - MONITORED_LINE_EXT_ADC_2_REF_V, ///< External ADC 2 reference voltage (3V) - MONITORED_LINE_PS_GATE_DRIVER_V, ///< P/S gate driver voltage (5V) - MONITORED_LINE_VM_CP1, ///< Concentrate pump CP1 voltage (10.1V) - MONITORED_LINE_VM_CP2, ///< Concentrate pump CP2 voltage (10.1V) - MONITORED_LINE_LAST_RANGE_CHECKED_LINE = MONITORED_LINE_VM_CP2, ///< The last monitored line that is checked per fixed range. - MONITORED_LINE_24V_PRIM_HTR_V, ///< Primary heater voltage (24V) - MONITORED_LINE_24V_TRIM_HTR_V, ///< Trimmer heater voltage (24V) - NUM_OF_MONITORED_LINES ///< Number of monitored voltages + MONITORED_LINE_24V_MAIN = 0, ///< Main voltage (24V) + MONITORED_LINE_1_8V_FPGA, ///< FPGA logic voltage (1.8V) + MONITORED_LINE_1V_FPGA, ///< FPGA reference voltage (1V) + MONITORED_LINE_3_3V_SENSORS, ///< Sensors voltage (3.3V) + MONITORED_LINE_1_8V_PROC, ///< Processor voltage (1.8V) + MONITORED_LINE_5V_SENSORS, ///< Sensors voltage (5V) + MONITORED_LINE_5V_LOGIC, ///< Logic voltage (5V) + MONITORED_LINE_3_3V, ///< Logic voltage (3.3V) + MONITORED_LINE_1_2V_PROC, ///< Processor voltage (1.2V) + MONITORED_LINE_V_REF, ///< Reference voltage (3V) + MONITORED_LINE_EXT_ADC_1_REF_V, ///< External ADC 1 reference voltage (3V) + MONITORED_LINE_EXT_ADC_2_REF_V, ///< External ADC 2 reference voltage (3V) + MONITORED_LINE_PS_GATE_DRIVER_V, ///< P/S gate driver voltage (5V) + MONITORED_LINE_LAST_RANGE_CHECKED_LINE = MONITORED_LINE_PS_GATE_DRIVER_V, ///< The last monitored line that is checked per fixed range. + MONITORED_LINE_24V_PRIM_HTR_V, ///< Primary heater voltage (24V) + MONITORED_LINE_24V_TRIM_HTR_V, ///< Trimmer heater voltage (24V) + NUM_OF_MONITORED_LINES ///< Number of monitored voltages } MONITORED_VOLTAGES_T; /// Payload record structure for the voltages data message. Index: firmware/App/DGCommon.h =================================================================== diff -u -re6f3a632890f96a5aa282922d11df148bdd06587 -r4790fb46181f78a19f0a557b0e9688cc03a74e97 --- firmware/App/DGCommon.h (.../DGCommon.h) (revision e6f3a632890f96a5aa282922d11df148bdd06587) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision 4790fb46181f78a19f0a557b0e9688cc03a74e97) @@ -46,7 +46,7 @@ #define IGNORE_DRAIN_PUMP_MONITOR 1 // #define IGNORE_HEATERS_MONITOR 1 #define IGNORE_RO_PUMP_MONITOR 1 -// #define DISABLE_RO_RATIO_CHECK 1 + #define DISABLE_RO_RATIO_CHECK 1 // #define DISABLE_COND_SENSOR_CHECK 1 // #define DISABLE_WATER_QUALITY_CHECK 1 #define DISABLE_RTC_CONFIG 1 Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r67021fbc633259e8e1bce76749dbef7d0cb51998 -r4790fb46181f78a19f0a557b0e9688cc03a74e97 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 67021fbc633259e8e1bce76749dbef7d0cb51998) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 4790fb46181f78a19f0a557b0e9688cc03a74e97) @@ -196,6 +196,11 @@ postState = handlePOSTStatus( testStatus ); break; + // TODO: Remove when merge to staging + case DG_POST_STATE_SAFETY_SHUTDOWN: + postState = DG_POST_STATE_LOAD_CELL; + break; + // Should be last POST (and last POST test must be a test that completes in a single call) case DG_POST_STATE_LOAD_CELL: testStatus = execLoadCellsSelfTest();