Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision cd5be724d5a3ba7457e761191d82f278654d7f5c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-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) Sean Nash -* @date (last) 28-Jun-2021 +* @date (last) 19-Apr-2023 * * @author (original) Sean Nash * @date (original) 08-Nov-2019 @@ -28,8 +28,8 @@ // ********** private definitions ********** #define MAX_ADC_CHANNELS 24 ///< ADC supports up to 24 channels. -#define SIZE_OF_ROLLING_AVG 16 ///< Samples in rolling average calculations. -#define ROLLING_AVG_SHIFT_DIVIDER 4 ///< Rolling average shift divider. +#define SIZE_OF_ROLLING_AVG 8 ///< Samples in rolling average calculations. +#define ROLLING_AVG_SHIFT_DIVIDER 3 ///< Rolling average shift divider. /// Mapping from enumerated used ADC channel to processor channel ID. const INT_ADC_CHANNEL_T ADC_CHANNEL_NUM_TO_CHANNEL_ID[ MAX_ADC_CHANNELS ] = @@ -57,7 +57,7 @@ INT_ADC_NOT_USED, // 20 INT_ADC_NOT_USED, // 21 INT_ADC_24V_ACTUATORS, // 22 - INT_ADC_BACKUP_ALARM_CURRENT // 23 - No longer used - moved to FPGA. + INT_ADC_NOT_USED_2 // 23 }; const F32 ADC_CHANNEL_READ_TO_UNITS[ NUM_OF_INT_ADC_CHANNELS ] = @@ -74,14 +74,14 @@ 0.009420, // V - INT_ADC_24V_ACTUATORS_REG 0.000733, // V - INT_ADC_1_2V_PROCESSOR 0.001465, // V - INT_ADC_5V_SENSORS - 0.007326, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_HG + 0.014650, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_HG 0.001221, // V - INT_ADC_BOARD_THERMISTOR 0.000733, // V - INT_ADC_1_25_FPGA_ADC_REF 0.001465, // V - INT_ADC_3_3V 0.001465, // V - INT_ADC_5V_LOGIC - 0.073260, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_LG + 0.073240, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_LG 0.007106, // V - INT_ADC_24V_ACTUATORS - 0.073260, // mA - INT_ADC_BACKUP_ALARM_CURRENT + 0.0, // - INT_ADC_NOT_USED_2 0.000000, // V - INT_ADC_DUMMY };