Index: firmware/App/Drivers/InternalADC.c
===================================================================
diff -u -rf7c714a1a09b10d85a8b013712532d37b4d7b97a -re7fe0454b5b2d39009dc784dc8c156856df8bc86
--- firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision f7c714a1a09b10d85a8b013712532d37b4d7b97a)
+++ firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision e7fe0454b5b2d39009dc784dc8c156856df8bc86)
@@ -33,60 +33,47 @@
 /// ADC channel number to ADC channel ID (enumeration) look-up table.
 const INT_ADC_CHANNEL_T adcChannelNum2ChannelId[ MAX_ADC_CHANNELS ] =
 {
-    INT_ADC_RO_PUMP_INLET_PRESSURE,       // 0
-    INT_ADC_RO_PUMP_OUTLET_PRESSURE,      // 1
-    INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE,   // 2
-    INT_ADC_DRAIN_PUMP_INLET_PRESSURE,    // 3
-    INT_ADC_MAIN_24_VOLTS,                // 4
-    INT_ADC_FPGA_1_8_VOLTS,               // 5
-    INT_ADC_FPGA_1_VOLT,                  // 6
-    INT_ADC_SENSORS_3_3_VOLTS,            // 7
-    INT_ADC_PROCESSOR_1_8_VOLTS,          // 8
-    INT_ADC_POWER_SUPPLY_GATE_DRIVER,     // 9
-    INT_ADC_SENSORS_5_VOLTS,              // 10
-    INT_ADC_LOGIC_5_VOLTS,                // 11
-    INT_ADC_3_3_VOLTS,                    // 12
-    INT_ADC_RO_PUMP_FEEDBACK_DUTY_CYCLE,  // 13
-    INT_ADC_AVAILABLE_CHANNEL,            // 14
-    INT_ADC_PROCESSOR_1_2_VOLTS,          // 15
-    INT_ADC_REFERENCE_VOLTAGE,            // 16
-    INT_ADC_TRIMMER_HEATER_24_VOLTS,      // 17
-    INT_ADC_SECONDARY_HEATER_24_VOLTS,    // 18
-    INT_ADC_REF_IN1,                      // 19
-    INT_ADC_REF_IN2,                      // 20
-    INT_ADC_BOARD_THERMISTOR,             // 21
-    INT_ADC_POWER_SUPPLY_1_THERMISTOR,    // 22
-    INT_ADC_MAIN_NON_ISOLATED_24_VOLTS,   // 23
+     INT_ADC_NOT_USED,                   // 0
+     INT_ADC_NOT_USED,                   // 1 - TD specific
+     INT_ADC_3_3V_SENSOR_ADC_REF,        // 2
+     INT_ADC_24V_ACTUATORS_REG,          // 3
+     INT_ADC_1_2V_PROCESSOR,             // 4
+     INT_ADC_5V_SENSORS,                 // 5
+     INT_ADC_NOT_USED,                   // 6
+     INT_ADC_NOT_USED,                   // 7
+     INT_ADC_NOT_USED,                   // 8  - TD specific
+     INT_ADC_NOT_USED,                   // 9
+     INT_ADC_BOARD_THERMISTOR,           // 10
+     INT_ADC_1_25_FPGA_ADC_REF,          // 11
+     INT_ADC_3_3V,                       // 12
+     INT_ADC_5V_LOGIC,                   // 13
+     INT_ADC_NOT_USED,                   // 14 - TD specific
+     INT_ADC_NOT_USED,                   // 15
+     INT_ADC_NOT_USED,                   // 16
+     INT_ADC_NOT_USED,                   // 17
+     INT_ADC_BACKUP_V,                   // 18
+     INT_ADC_NOT_USED,                   // 19
+     INT_ADC_NOT_USED,                   // 20
+     INT_ADC_NOT_USED,                   // 21
+     INT_ADC_24V_ACTUATORS,              // 22
+     INT_ADC_NOT_USED                    // 23
 };
 
 /// ADC channel read to units look-up table.
 const F32 ADC_CHANNEL_READ_TO_UNITS[ NUM_OF_INT_ADC_CHANNELS ] =
 {
-    0.0,        //     - INT_ADC_NOT_USED
-    0.06438104, // PSIA- INT_ADC_RO_PUMP_INLET_PRESSURE
-    0.06438104, // PSIA- INT_ADC_RO_PUMP_OUTLET_PRESSURE
-    0.06438104, // PSIA- INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE
-    0.06438104, // PSIA- INT_ADC_DRAIN_PUMP_INLET_PRESSURE
-    0.00073242, // V   - INT_ADC_RO_PUMP_FEEDBACK_DUTY_CYCLE
-    1.0,        // ?   - INT_ADC_AVAILABLE_CHANNEL
-    0.00763285, // V   - INT_ADC_TRIMMER_HEATER_24_VOLTS (varies inversely with PWM)
-    0.00700441, // V   - INT_ADC_SECONDARY_HEATER_24_VOLTS (varies inversely with PWM for secondary element)
-    0.001221,   // V   - INT_ADC_BOARD_THERMISTOR
-    0.0007326,  // V   - INT_ADC_FPGA_1_8_VOLTS
-    0.0007326,  // V   - INT_ADC_FPGA_1_VOLT
-    0.0007326,  // V   - INT_ADC_PROCESSOR_1_8_VOLTS
-    0.0007326,  // V   - INT_ADC_PROCESSOR_1_2_VOLTS
-    0.00117296, // V   - INT_ADC_SENSORS_3_3_VOLTS
-    0.0014652,  // V   - INT_ADC_SENSORS_5_VOLTS
-    0.00700441, // V   - INT_ADC_MAIN_24_VOLTS
-    0.0014652,  // V   - INT_ADC_LOGIC_5_VOLTS
-    0.00117296, // V   - INT_ADC_3_3_VOLTS
-    0.00117296, // V   - INT_ADC_REFERENCE_VOLTAGE (3V)
-    0.0014652,  // V   - INT_ADC_REF_IN1 (3V)
-    0.0014652,  // V   - INT_ADC_REF_IN2 (3V)
-    0.001221,   // V   - INT_ADC_POWER_SUPPLY_1_THERMISTOR
-    0.00700441, // V   - INT_ADC_MAIN_NON_ISOLATED_24_VOLTS
-    0.00304608  // V   - INT_ADC_POWER_SUPPLY_GATE_DRIVER (5V)
+     0.0,        //     - INT_ADC_NOT_USED
+     0.001465,   // V   - INT_ADC_3_3V_SENSOR_ADC_REF
+     0.009420,   // V   - INT_ADC_24V_ACTUATORS_REG
+     0.000733,   // V   - INT_ADC_1_2V_PROCESSOR
+     0.001465,   // V   - INT_ADC_5V_SENSORS
+     0.001221,   // V   - INT_ADC_BOARD_THERMISTOR
+     0.000733,   // V   - INT_ADC_1_25_FPGA_ADC_REF
+     0.001465,   // V   - INT_ADC_3_3V
+     0.001465,   // V   - INT_ADC_5V_LOGIC
+     0.007106,   // V   - INT_ADC_24V_ACTUATORS
+     0.007106,   // V   - INT_ADC_BACKUP_V
+//     0.000000,   // V   - INT_ADC_DUMMY
 };
 
 // ********** private data **********