Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r5a36a768d11cc597a36b894c1fb3a5e5590130f1 -r9a3be9ebb32e5e0d8e1496def50e04dedf490406 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 5a36a768d11cc597a36b894c1fb3a5e5590130f1) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 9a3be9ebb32e5e0d8e1496def50e04dedf490406) @@ -33,30 +33,30 @@ /// 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_CONCENTRATE_PUMP_1, // 13 - INT_ADC_CONCENTRATE_PUMP_2, // 14 - INT_ADC_PROCESSOR_1_2_VOLTS, // 15 - INT_ADC_REFERENCE_VOLTAGE, // 16 - INT_ADC_PRIMARY_HEATER_24_VOLTS, // 17 - INT_ADC_TRIMMER_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_POWER_SUPPLY_2_THERMISTOR, // 23 + 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_PRIMARY_HEATER_24_VOLTS, // 17 + INT_ADC_TRIMMER_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_POWER_SUPPLY_2_THERMISTOR, // 23 }; const F32 ADC_CHANNEL_READ_TO_UNITS[ NUM_OF_INT_ADC_CHANNELS ] = @@ -66,8 +66,8 @@ 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 - 1.0, // ? - INT_ADC_CONCENTRATE_PUMP_1 // TODO - get units and conversion for these 2 channels - 1.0, // ? - INT_ADC_CONCENTRATE_PUMP_2 + 0.001365, // V - INT_ADC_RO_PUMP_FEEDBACK_DUTY_CYCLE + 1.0, // ? - INT_ADC_AVAILABLE_CHANNEL 0.00700441, // V - INT_ADC_PRIMARY_HEATER_24_VOLTS (varies inversely with PWM for secondary element) 0.00763285, // V - INT_ADC_TRIMMER_HEATER_24_VOLTS (varies inversely with PWM) 0.001221, // V - INT_ADC_BOARD_THERMISTOR