Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r35de566c96433689821b7a21f731df26b40d67ae -r08e11fb11f818dd326617362ca7361b2fae1662a --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 35de566c96433689821b7a21f731df26b40d67ae) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 08e11fb11f818dd326617362ca7361b2fae1662a) @@ -60,32 +60,32 @@ }; const F32 ADC_CHANNEL_READ_TO_UNITS[ NUM_OF_INT_ADC_CHANNELS ] = -{ // TODO - get conversion for these channels +{ 0.0, // - INT_ADC_NOT_USED - 0.06434, // PSIA- INT_ADC_RO_PUMP_INLET_PRESSURE - 0.06434, // PSIA- INT_ADC_RO_PUMP_OUTLET_PRESSURE - 0.06434, // PSIA- INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE - 0.06434, // PSIA- INT_ADC_DRAIN_PUMP_INLET_PRESSURE - 1.0, // ? - INT_ADC_CONCENTRATE_PUMP_1 + 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 + 1.0, // ? - INT_ADC_CONCENTRATE_PUMP_1 // TODO - get units and conversion for these 2 channels 1.0, // ? - INT_ADC_CONCENTRATE_PUMP_2 - 1.0, // V - INT_ADC_PRIMARY_HEATER_24_VOLTS - 1.0, // V - INT_ADC_TRIMMER_HEATER_24_VOLTS - 1.0, // C - INT_ADC_BOARD_THERMISTOR - 1.0, // V - INT_ADC_FPGA_1_8_VOLTS - 1.0, // V - INT_ADC_FPGA_1_VOLT - 1.0, // V - INT_ADC_PROCESSOR_1_8_VOLTS - 1.0, // V - INT_ADC_PROCESSOR_1_2_VOLTS - 1.0, // V - INT_ADC_SENSORS_3_3_VOLTS - 1.0, // V - INT_ADC_SENSORS_5_VOLTS - 1.0, // V - INT_ADC_MAIN_24_VOLTS - 1.0, // V - INT_ADC_LOGIC_5_VOLTS - 1.0, // V - INT_ADC_3_3_VOLTS - 1.0, // V - INT_ADC_REFERENCE_VOLTAGE - 1.0, // V - INT_ADC_REF_IN1 - 1.0, // V - INT_ADC_REF_IN2 - 1.0, // C - INT_ADC_POWER_SUPPLY_1_THERMISTOR - 1.0, // C - INT_ADC_POWER_SUPPLY_2_THERMISTOR - 1.0 // V - INT_ADC_POWER_SUPPLY_GATE_DRIVER + 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 + 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.001221, // V - INT_ADC_POWER_SUPPLY_2_THERMISTOR + 0.00304608 // V - INT_ADC_POWER_SUPPLY_GATE_DRIVER (5V) }; // ********** private data **********