Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r609d5c77e1f5bd85e9dd1a90b786e56004a79f06 -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 609d5c77e1f5bd85e9dd1a90b786e56004a79f06) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file InternalADC.c * * @author (last) Dara Navaei -* @date (last) 09-Nov-2021 +* @date (last) 17-Apr-2023 * * @author (original) Sean * @date (original) 04-Feb-2020 @@ -50,13 +50,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_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_POWER_SUPPLY_2_THERMISTOR, // 23 + INT_ADC_MAIN_NON_ISOLATED_24_VOLTS, // 23 }; const F32 ADC_CHANNEL_READ_TO_UNITS[ NUM_OF_INT_ADC_CHANNELS ] = @@ -68,8 +68,8 @@ 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.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.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 @@ -84,7 +84,7 @@ 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.00700441, // V - INT_ADC_MAIN_NON_ISOLATED_24_VOLTS 0.00304608 // V - INT_ADC_POWER_SUPPLY_GATE_DRIVER (5V) };