Index: firmware/App/Drivers/InternalADC.h =================================================================== diff -u -r35de566c96433689821b7a21f731df26b40d67ae -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 --- firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 35de566c96433689821b7a21f731df26b40d67ae) +++ firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 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.h +* @file InternalADC.h * -* @author (last) Quang Nguyen -* @date (last) 26-Aug-2020 +* @author (last) Dara Navaei +* @date (last) 17-Apr-2023 * -* @author (original) Sean -* @date (original) 04-Feb-2020 +* @author (original) Sean +* @date (original) 04-Feb-2020 * ***************************************************************************/ @@ -32,7 +32,7 @@ #define INT_ADC_BITS_PER_CHANNEL 12 ///< DG internal ADC bits per channel. #define INT_ADC_FULL_SCALE_BITS 4095 ///< DG internal ADC full scale range. -#define INT_ADC_REF_V 3.0 ///< DG internal ADC reference voltage. +#define INT_ADC_REF_V 3.0F ///< DG internal ADC reference voltage. /// Enumeration of DG internal ADC channels. typedef enum Int_ADC_Channels @@ -42,9 +42,9 @@ INT_ADC_RO_PUMP_OUTLET_PRESSURE, ///< DG internal ADC RO pump outlet pressure channel INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE, ///< DG internal ADC drain pump outlet pressure channel INT_ADC_DRAIN_PUMP_INLET_PRESSURE, ///< DG internal ADC drain pump inlet pressure channel - INT_ADC_CONCENTRATE_PUMP_1, ///< DG internal ADC concentrate pump number 1 channel - INT_ADC_CONCENTRATE_PUMP_2, ///< DG internal ADC concentrate pump number 2 channel - INT_ADC_PRIMARY_HEATER_24_VOLTS, ///< DG internal ADC primary heater 24 volt supply channel + INT_ADC_RO_PUMP_FEEDBACK_DUTY_CYCLE, ///< DG internal ADC RO pump feedback duty cycle channel + INT_ADC_AVAILABLE_CHANNEL, ///< DG internal ADC available channel + INT_ADC_SECONDARY_HEATER_24_VOLTS, ///< DG internal ADC secondary heater 24 volt supply channel INT_ADC_TRIMMER_HEATER_24_VOLTS, ///< DG internal ADC trimmer heater 24 volt supply channel INT_ADC_BOARD_THERMISTOR, ///< DG internal ADC DG board thermistor channel INT_ADC_FPGA_1_8_VOLTS, ///< DG internal ADC DG FPGA 1.8 volt supply channel @@ -53,14 +53,14 @@ INT_ADC_PROCESSOR_1_2_VOLTS, ///< DG internal ADC DG processor 1.2 volt supply channel INT_ADC_SENSORS_3_3_VOLTS, ///< DG internal ADC DG sensors 3.3 volt supply channel INT_ADC_SENSORS_5_VOLTS, ///< DG internal ADC DG sensors 5 volt supply channel - INT_ADC_MAIN_24_VOLTS, ///< DG internal ADC DG sensors 6 volt supply channel + INT_ADC_MAIN_24_VOLTS, ///< DG internal ADC DG 24 volt supply channel INT_ADC_LOGIC_5_VOLTS, ///< DG internal ADC DG logic 5 volt supply channel INT_ADC_3_3_VOLTS, ///< DG internal ADC DG 3.3 volt supply channel INT_ADC_REFERENCE_VOLTAGE, ///< DG internal ADC reference voltage channel INT_ADC_REF_IN1, ///< DG internal ADC external ADC1 reference voltage channel INT_ADC_REF_IN2, ///< DG internal ADC external ADC2 reference voltage channel INT_ADC_POWER_SUPPLY_1_THERMISTOR, ///< DG internal ADC DG power supply 1 thermistor - INT_ADC_POWER_SUPPLY_2_THERMISTOR, ///< DG internal ADC DG power supply 2 thermistor + INT_ADC_MAIN_NON_ISOLATED_24_VOLTS, ///< DG internal ADC DG 24 volts non-isolated voltage channel INT_ADC_POWER_SUPPLY_GATE_DRIVER, ///< DG internal ADC DG power supply gate driver NUM_OF_INT_ADC_CHANNELS ///< Number of DG internal ADC channels } INT_ADC_CHANNEL_T;