Index: firmware/App/Controllers/Thermistors.c =================================================================== diff -u -r215aa867f1769e07088ff5354ed17b0fd1a0f909 -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 --- firmware/App/Controllers/Thermistors.c (.../Thermistors.c) (revision 215aa867f1769e07088ff5354ed17b0fd1a0f909) +++ firmware/App/Controllers/Thermistors.c (.../Thermistors.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2023 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 Thermistors.c * * @author (last) Dara Navaei -* @date (last) 03-Jan-2023 +* @date (last) 18-Apr-2023 * * @author (original) Dara Navaei * @date (original) 25-Nov-2020 @@ -238,18 +238,20 @@ #ifndef _RELEASE_ if ( HW_CONFIG_BETA == getHardwareConfigStatus() ) { + // In Beta thermistor power supply 2 is printed as thermistor power supply 1. The corresponding ADC channel has been + // reassigned to non-isolated power supply voltage in DVT. So its enums has been renamed. thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].rawADCRead = getIntADCReading( INT_ADC_BOARD_THERMISTOR ); thermistorsStatus[ THERMISTOR_POWER_SUPPLY_1 ].rawADCRead = getIntADCReading( INT_ADC_POWER_SUPPLY_1_THERMISTOR ); - thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].rawADCRead = getIntADCReading( INT_ADC_POWER_SUPPLY_2_THERMISTOR ); + thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].rawADCRead = getIntADCReading( INT_ADC_POWER_SUPPLY_1_THERMISTOR ); } else +#endif { thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].rawADCRead = getFPGAOnBoardThermistorCount(); thermistorsStatus[ THERMISTOR_POWER_SUPPLY_1 ].rawADCRead = getIntADCReading( INT_ADC_POWER_SUPPLY_1_THERMISTOR ); thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].rawADCRead = getFPGAPowerSupply2ThermistorCount(); } -#endif // Get all the raw readings in ADC // Zero the counter for the next round of reading