Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -ra49bd0780d97bb4ce04a9d7b128a6e3c2df044e1 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision f068446fdb7889d320ddb6ffbd58f347ce0501e7) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision a49bd0780d97bb4ce04a9d7b128a6e3c2df044e1) @@ -1,4 +1,4 @@ -/************************************************************************** +/**********************************************************************//** * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * @@ -26,28 +26,28 @@ const INT_ADC_CHANNEL_T adcChannelNum2ChannelId[ MAX_ADC_CHANNELS ] = { - INT_ADC_DIAL_IN_PUMP_SPEED, // 0 - INT_ADC_NOT_USED, // 1 - INT_ADC_NOT_USED, // 2 - INT_ADC_NOT_USED, // 3 + 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_NOT_USED, // 4 - INT_ADC_NOT_USED, // 5 - INT_ADC_NOT_USED, // 6 - INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT, // 7 - INT_ADC_NOT_USED, // 8 - INT_ADC_NOT_USED, // 9 - INT_ADC_NOT_USED, // 10 - INT_ADC_NOT_USED, // 11 - INT_ADC_NOT_USED, // 12 - INT_ADC_NOT_USED, // 13 - INT_ADC_NOT_USED, // 14 - INT_ADC_NOT_USED, // 15 - INT_ADC_BLOOD_PUMP_SPEED, // 16 - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, // 17 - INT_ADC_DIAL_OUT_PUMP_SPEED, // 18 - INT_ADC_DIAL_OUT_PUMP_MOTOR_CURRENT,// 19 - INT_ADC_NOT_USED, // 20 - INT_ADC_NOT_USED, // 21 + 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_SENSORS_6_VOLTS, // 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_NOT_USED, // 22 INT_ADC_NOT_USED // 23 }; @@ -66,7 +66,7 @@ -/************************************************************************* +/*********************************************************************//** * @brief initInternalADC * The initInternalADC function initializes the InternalADC module. * @details @@ -98,7 +98,7 @@ adcEnableNotification( adcREG1, adcGROUP1 ); } -/************************************************************************* +/*********************************************************************//** * @brief adcNotification * The adcNotification function handles an ADC conversion complete interrupt. \n * All channel readings in the FIFO are retrieved. @@ -117,7 +117,7 @@ } } -/************************************************************************* +/*********************************************************************//** * @brief execInternalADC * The execInternalADC function processes the last set of raw ADC channel \n * readings and kicks off the next conversion of ADC channels. @@ -155,7 +155,7 @@ adcStartConversion( adcREG1, adcGROUP1 ); } -/************************************************************************* +/*********************************************************************//** * @brief getIntADCReading * The getIntADCReading function gets the latest average reading for a given \n * channel.