Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r364181b1c7ef0ae4d88a7bb0001a34e93fdb495f -re6504e7e162d00745033a55191d6f810d2753105 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 364181b1c7ef0ae4d88a7bb0001a34e93fdb495f) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision e6504e7e162d00745033a55191d6f810d2753105) @@ -39,25 +39,13 @@ #define BAR_TO_MMHG ( 750.062F ) ///< Conversion factor for converting bar to mmHg. #define PRES_SENSORS_READ_ERR_MAX_CNT 255 ///< Pressure sensor read and error max count value -/// Barometric sensor conversion coefficients -typedef struct -{ - U16 pressureSensitivity; ///< Barometric sensor pressure sensitivity constant. - U16 pressureOffset; ///< Barometric sensor pressure offset constant. - U16 pressureSensitivityTempCoeff; ///< Barometric sensor pressure sensitivity temperature coefficient. - U16 pressureOffsetTempCoeff; ///< Barometric sensor pressure offset temperature coefficient. -} BARO_SENSOR_CONSTS_T; - // ********** private data ********** static OVERRIDE_F32_T currentPressureReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< Current pressure sensor pressure readings (overrideable). static OVERRIDE_F32_T currentPresTempReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< Current pressure sensor temperature readings (overrideable). -//static BARO_SENSOR_CONSTS_T baroConvConsts; ///< Barometric sensor conversion constants. // ********** private function prototypes ********** -//static F32 convertBaroPressureReading2mmHg( U32 rawPressure ); -//static F32 calculateBaroPressure( U32 pressure ); /*********************************************************************//** * @brief @@ -84,11 +72,6 @@ currentPresTempReadings[ sensor ].override = OVERRIDE_RESET; } - //Initialize baro variable -// baroConvConsts.pressureOffset = 0; -// baroConvConsts.pressureOffsetTempCoeff = 0; -// baroConvConsts.pressureSensitivity = 0; -// baroConvConsts.pressureSensitivityTempCoeff = 0; } /*********************************************************************//** @@ -114,7 +97,6 @@ currentPressureReadings[ D51_PRES ].data = convertPressureReading( getFPGAD51PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); currentPressureReadings[ D18_PRES ].data = convertPressureReading( getFPGAD18PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); currentPressureReadings[ D41_PRES ].data = convertPressureReading( getFPGAD41PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); -// currentPressureReadings[ BARO_PRES ].data = convertBaroPressureReading2mmHg( getFPGABaroPressure() ); currentPressureReadings[ M1_PRES ].data = convertPressureReading( getFPGAM1RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); currentPressureReadings[ M3_PRES ].data = convertPressureReading( getFPGAM3RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); currentPressureReadings[ P8_PRES ].data = convertPressureReading( getFPGAP8RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); @@ -134,52 +116,6 @@ currentPresTempReadings[ P17_PRES ].data = convertPressureTempReading2DegC( getFPGAP17RawTemperature() ); } -///*********************************************************************//** -// * @brief -// * The convertBaroPressureReading2mmHg function converts the raw pressure counts -// * in to mmHg unit. -// * @details \b Inputs: FPGA -// * @details \b Outputs: baroConvConsts -// * @param rawPressure the raw baro sensor reading from FPGA. -// * @return the converted baro pressure (in mmHg). -// *************************************************************************/ -//static F32 convertBaroPressureReading2mmHg( U32 rawPressure ) -//{ -// F32 baroPressure = 0.0F; -// -// baroConvConsts.pressureSensitivity = getFPGABaroPressureSensitivity(); -// baroConvConsts.pressureSensitivityTempCoeff = getFPGABaroTempCoeffOfPressSensitvity(); -// baroConvConsts.pressureOffset = getFPGABaroPressureOffset(); -// baroConvConsts.pressureOffsetTempCoeff = getFPGABaroTempCoeffOfPressOffset(); -// baroPressure = calculateBaroPressure( rawPressure ); -// -// return baroPressure; -//} - -///*********************************************************************//** -// * @brief -// * The calculateBaroPressure function performs the required calculations -// * to compute the baro pressure readings. -// * @details \b Inputs: baroConvConsts -// * @details \b Outputs: none -// * @param pressure the raw baro sensor reading from FPGA. -// * @return converted baro pressure (in mmHg). -// *************************************************************************/ -//static F32 calculateBaroPressure( U32 pressure ) -//{ -// S32 tempDiff = getBaroSensorTemperatureDiff(); -// S64 tempOffset = ( baroConvConsts.pressureOffsetTempCoeff * tempDiff ) / TWO_TO_POWER_OF_6; -// S64 presOffset = baroConvConsts.pressureOffset * TWO_TO_POWER_OF_17; -// S64 offset = presOffset + tempOffset; -// S64 tempSensitivity = ( baroConvConsts.pressureSensitivityTempCoeff * tempDiff ) / TWO_TO_POWER_OF_7; -// S64 presSensitivity = baroConvConsts.pressureSensitivity * TWO_TO_POWER_OF_16; -// S64 sensitivity = tempSensitivity + presSensitivity; -// S32 pres = (S32)( ( ( pressure * sensitivity ) / TWO_TO_POWER_OF_21 ) - offset ) / TWO_TO_POWER_OF_15; -// F32 presmmHg = ( (F32)pres / (F32)( COUNTS_TO_MILLI_BAR * ONE_BAR_TO_MILLI_BAR ) ) * BAR_TO_MMHG; -// -// return presmmHg; -//} - /*********************************************************************//** * @brief * The getPressure function gets the current pressure (in mmHg) for a given Index: firmware/App/Drivers/PressureSensor.h =================================================================== diff -u -rfd42b31a0572ab85c862ebf94997766f27dd8e97 -re6504e7e162d00745033a55191d6f810d2753105 --- firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) +++ firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision e6504e7e162d00745033a55191d6f810d2753105) @@ -41,7 +41,6 @@ D51_PRES, ///< Spent Dialysate pressure (PDs) D18_PRES, ///< Fresh Dialysate pressure (PDf) D41_PRES, ///< Transmembrane pressure (Ptm) -// BARO_PRES, ///< barometric pressure sensor ToDo moved to TD LAST_DD_PRESSURE_SENSOR = D41_PRES, ///< End of DD pressure sensor group M1_PRES, ///< Water inlet pressure before regulator (PRi) FIRST_IO_PRESSURE_SENSOR = M1_PRES, ///< Start of IO pressure sensor group Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -r89f18a07a6d5837bf9b4559a69046e2b06f32c35 -re6504e7e162d00745033a55191d6f810d2753105 --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision e6504e7e162d00745033a55191d6f810d2753105) @@ -55,10 +55,7 @@ #define NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C 80.0F ///< Non fluid temperature sensors path maximum allowed temperature in C. #define TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS ( 5 * MS_PER_SECOND ) ///< Temperature sensor out of range persistent period in milliseconds. #define DATA_PUBLISH_COUNTER_START_COUNT 30 ///< Data publish counter start count. -#define BARO_SENSOR_REFERENCE_TEMP_C 2000 ///< Barometric sensor reference temperature in C. -#define BARO_SENSOR_WAIT_FOR_COEFF_TIME_OUT_MS ( 20 * MS_PER_SECOND ) ///< Barometric sensor wait for coefficients timeout in milliseconds. #define TEMP_READ_COUNTER_MAX_VALUE 255 ///< FPGA temperature sensor read counter max value. -#define BARO_SENSOR_CRC_MAX_VALUE 65535 ///< Baro sensor coefficients CRC max value static const U32 TEMP_EQUATION_RESISTOR_CALC = 1 << ( TEMP_SENSORS_ADC_BITS - 1 ); ///< Temperature sensors resistor calculation (2^(24 - 1)). static const F32 TEMP_EQUATION_COEFF_A = 3.9083E-3; ///< ADC to temperature conversion coefficient A. @@ -77,39 +74,13 @@ S32 adcNextIndex; ///< Next ADC read index S32 adcRunningSum; ///< ADC running sum F32 maxAllowedTemp; ///< Maximum allowed temperature of the sensor - S32 baroTempSnsrDiff; ///< Barometric sensor temperature difference } TEMP_SENSOR_T; -/// Barometric sensor temperature conversion -typedef struct -{ - U16 refTemperature; ///< Barometric sensor reference temperature. - U16 temperatureCoeff; ///< Barometric sensor temperature coefficient. - OVERRIDE_U32_T coeffsCRC; ///< Barometric sensor coefficients CRC. - U32 waitForCoeffStartTimeMS; ///< Barometric sensor wait for coefficients start time in milliseconds. - BOOL hasCRCBeenChecked; ///< Barometric sensor has CRC been checked flag. -} BARO_SENSOR_CONSTS_T; - -/// Barometric sensor - 6 type of coefficients -typedef struct -{ - U16 mfgInfo; ///< Barometric sensor manufacturing info. - U16 pressSensitivity; ///< Barometric sensor pressure sensitivity. - U16 pressOffset; ///< Barometric sensor pressure offset. - U16 tempCoeffOfPressSens; ///< Barometric sensor temperature coefficient of pressure sensor. - U16 tempCoeffPressOffset; ///< Barometric sensor temperature coefficient of pressure offset. - U16 referenceTemp; ///< Barometric sensor reference temperature. - U16 tempCoeffOfTemp; ///< Barometric sensor temperature coefficient of Temperature sensor. - U16 crc; ///< Barometric sensor CRC of the coefficients. -} BARO_SENSORS_COEFFS_T; - // ********** private data ********** static TEMP_SENSOR_T tempSensors [ NUM_OF_TEMPERATURE_SENSORS ]; ///< Temperature sensors' data structure. static OVERRIDE_F32_T temperatureValue[ NUM_OF_TEMPERATURE_SENSORS ]; ///< Temperature values with override static OVERRIDE_U32_T lastTemperatureReadCounter; ///< Temperature sensors read count from FPGA. -static OVERRIDE_U32_T lastBaroTempReadCounter; ///< Barometric sensor read count from FPGA. -static BARO_SENSOR_CONSTS_T baroConvConsts; ///< Barometric sensor conversion constants. //static DD_TEMP_SENSORS_CAL_RECORD_T tempSensorCalRecord; ///< Temperature sensors calibration record. @@ -118,7 +89,6 @@ static F32 getADC2TempConversion( F32 avgADC, U32 gain, U32 refResistance, U32 zeroDegResistance, F32 adcConversionCoeff ); static void processTempSnsrsADCRead( U32 sensorIndex, U32 adc ); static void processADCRead( U32 sensorIndex, S32 adc ); -static void checkBaroSensorCRC( void ); static void checkTemperatureSensors( void ); static void getCalibrationAppliedTemperatureValue( U32 sesnorIndex, F32* temperature ); @@ -134,19 +104,12 @@ U08 i; F32 conversionCoeff = 1.0F / 13584.0F; - baroConvConsts.coeffsCRC.data = 0; - baroConvConsts.hasCRCBeenChecked = FALSE; - baroConvConsts.waitForCoeffStartTimeMS = 0; - for ( i = 0; i < NUM_OF_TEMPERATURE_SENSORS; ++i ) { memset( &tempSensors[ i ], 0x0, sizeof( TEMP_SENSOR_T ) ); //benignPolynomialCalRecord( &tempSensorCalRecord.tempSensors[ i ] ); } - // Initialize the barometric sensor's temperature conversion constants - memset( &baroConvConsts, 0x0, sizeof( BARO_SENSOR_CONSTS_T ) ); - // Initialize TH1 (primary heater), TH2(outlet Heat Exchanger), TAUX ( Inlet Heat exchanger), // TH3 ( Trim Heater) constants. tempSensors[ D1_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; @@ -173,14 +136,11 @@ tempSensors[ BRD_TEMP ].conversionCoeff = conversionCoeff; tempSensors[ BRD_TEMP ].maxAllowedTemp = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ BARO_TEMP ].maxAllowedTemp = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - // Persistent alarm for the temperature sensors range check initPersistentAlarm( ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS ); // Initialize the FPGA persistent alarms initFPGAPersistentAlarm( FPGA_PERS_ERROR_RTD_ADC_TEMP_SENSORS, ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); - initFPGAPersistentAlarm( FPGA_PERS_ERROR_BARO_SENSOR, ALARM_ID_DD_BARO_SENSOR_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); } /*********************************************************************//** @@ -213,36 +173,10 @@ /*********************************************************************//** * @brief - * The getBaroSensorTemperatureDiff function returns the barometric pressure - * sensor's temperature difference. - * @details \b Inputs: tempSensors - * @details \b Outputs: none - * @return barometric pressure sensor temperature difference - *************************************************************************/ -S32 getBaroSensorTemperatureDiff( void ) -{ - return tempSensors[ BARO_TEMP ].baroTempSnsrDiff; -} - -/*********************************************************************//** - * @brief - * The setBaroSensorCoefficientReadStartTime function populates the start - * time of baro sensor coefficient read transaction initiated to FPGA. - * @details \b Inputs: none - * @details \b Outputs: baroConvConsts - * @return none - *************************************************************************/ -void setBaroSensorCoefficientReadStartTime( void ) -{ - baroConvConsts.waitForCoeffStartTimeMS = getMSTimerCount(); -} - -/*********************************************************************//** - * @brief * The readTemperatureSensors function reads the temperature sensor * value from FPGA. * @details \b Inputs: FPGA - * @details \b Outputs: lastTemperatureReadCounter,lastBaroTempReadCounter + * @details \b Outputs: lastTemperatureReadCounter * @return none *************************************************************************/ void readTemperatureSensors( void ) @@ -256,22 +190,8 @@ processTempSnsrsADCRead( D4_TEMP, getFPGAD4Temp() ); processTempSnsrsADCRead( D50_TEMP, getFPGAD50Temp() ); - //TODO: Read Board temperture + //TODO: Read Board temperature //processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR, getFPGACondSnsrInternalTemp() ); - - //Read Baro temperature sensor - if ( getCurrentOperationMode() != DD_MODE_INIT ) - { -#ifdef ENABLE_ALARM_1 - // Make sure the baro sensor coefficients are not corrupted - checkBaroSensorCRC(); -#endif -// baroConvConsts.refTemperature = getFPGABaroReferenceTemperature(); -// baroConvConsts.temperatureCoeff = getFPGABaroTempCoeffOfTemperature(); -// lastBaroTempReadCounter.data = (U32)getFPGABaroReadCount(); -// -// processTempSnsrsADCRead( BARO_TEMP, getFPGABaroTemperature() ); - } } /*********************************************************************//** @@ -296,42 +216,17 @@ /*********************************************************************//** * @brief - * The getBaroTempSensorsReadCount function gets the barometric temperature sensor - * read count. - * @details \b Inputs: lastBaroTempReadCounter - * @details \b Outputs: none - * @return The barometric temperature sensor read count. - *************************************************************************/ -U32 getBaroTempSensorsReadCount( void ) -{ - U32 result = lastBaroTempReadCounter.data; - - if ( OVERRIDE_KEY == lastBaroTempReadCounter.override ) - { - result = lastBaroTempReadCounter.ovData; - } - - return result; -} - -/*********************************************************************//** - * @brief * The checkTemperatureSensors function checks the temperature sensor * freshness and see if there is any read failures from FPGA. * @details \b Inputs: Temperature sensors reading from FPGA * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT when temperature sensor * read count not updated periodically - * @details \b Alarms: ALARM_ID_DD_BARO_SENSOR_FPGA_FAULT when baro temperature sensor - * read count not updated periodically * @return none *************************************************************************/ static void checkTemperatureSensors( void ) { checkFPGAPersistentAlarms( FPGA_PERS_ERROR_RTD_ADC_TEMP_SENSORS, getTemperatureSensorsReadCount() ); -#ifdef ENABLE_ALARM_1 - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_BARO_SENSOR, getBaroTempSensorsReadCount() ); -#endif } /*********************************************************************//** @@ -427,17 +322,6 @@ //TODO : Need details on calculations. break; - case BARO_TEMP: - { - S32 baroTempSensorsDiff = (S32)avgADCReads - ( baroConvConsts.refTemperature * TWO_TO_POWER_OF_8 ); - S64 differenceTimesCoefficient = (S64)baroTempSensorsDiff * (S64)baroConvConsts.temperatureCoeff; - S64 baroSnsrTemperature = BARO_SENSOR_REFERENCE_TEMP_C + ( differenceTimesCoefficient / TWO_TO_POWER_OF_23 ); - - temperature = (F32)( baroSnsrTemperature / 100.0F ); - tempSensors[ sensorIndex ].baroTempSnsrDiff = baroTempSensorsDiff; - } - break; - default: // Wrong sensor was called, raise an alarm SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED2, sensorIndex ); @@ -493,53 +377,6 @@ /*********************************************************************//** * @brief - * The checkBaroSensorCRC function gets all the barometric sensor coefficients - * and calls crc4 function to calculate the CRC of the coefficients and compares - * them to the provided CRC by the manufacturer. - * @details \b Inputs: hasBaroCoeffsBeenChecked - * @details \b Outputs: hasBaroCoeffsBeenChecked - * @details \b Alarms: ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC when baro - * temperature sensor coefficient CRC mismatch or timeout. - * @return none - *************************************************************************/ -static void checkBaroSensorCRC( void ) -{ -// U32 baroCRC = (U32)getFPGABaroCoeffsCRC(); -// BOOL hasCRCChanged = ( baroCRC != getU32OverrideValue( &baroConvConsts.coeffsCRC ) ? TRUE : FALSE ); -// -// // Once FPGA is ready get the barometric sensor's temperature conversion constants -// if ( TRUE == hasCRCChanged ) -// { -// U08 calculatedCRC; -// BARO_SENSORS_COEFFS_T baroCoeffs; -// -// baroCoeffs.mfgInfo = getFPGABaroMfgInfo(); -// baroCoeffs.pressSensitivity = getFPGABaroPressureSensitivity(); -// baroCoeffs.pressOffset = getFPGABaroPressureOffset(); -// baroCoeffs.tempCoeffOfPressSens = getFPGABaroTempCoeffOfPressSensitvity(); -// baroCoeffs.tempCoeffPressOffset = getFPGABaroTempCoeffOfPressOffset(); -// baroCoeffs.referenceTemp = getFPGABaroReferenceTemperature(); -// baroCoeffs.tempCoeffOfTemp = getFPGABaroTempCoeffOfTemperature(); -// baroCoeffs.crc = MASK_OFF_LSB & getFPGABaroCoeffsCRC(); -// calculatedCRC = crc4( (U16*)&baroCoeffs, sizeof( baroCoeffs ) ); -// baroConvConsts.coeffsCRC.data = baroCRC; -// baroCRC = (U16)( baroCRC & MASK_OFF_MSB ) & MASK_OFF_NIBBLE_MSB; -// baroConvConsts.hasCRCBeenChecked = TRUE; -// -// if ( calculatedCRC != baroCRC ) -// { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC, calculatedCRC, baroCoeffs.crc ); -// } -// } -// else if ( ( TRUE == didTimeout( baroConvConsts.waitForCoeffStartTimeMS, BARO_SENSOR_WAIT_FOR_COEFF_TIME_OUT_MS ) ) && -// ( FALSE == baroConvConsts.hasCRCBeenChecked ) ) -// { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC, 0, baroCRC ); -// } -} - -/*********************************************************************//** - * @brief * The getCalibrationAppliedTemperatureValue function applies the calibration * values to the provided temperature value * @details \b Inputs: tempSensorCalRecord @@ -571,10 +408,6 @@ //calId = CAL_DATA_TRIM_HEATER_TEMP; break; - case BARO_TEMP: - //calId = CAL_DATA_BARMOTERIC_TEMP; - break; - default: // Set the calibration temperature value as num of meaning calibration is not needed for the provided sensor //calId = NUM_OF_CAL_DATA_TEMP_SENSORS; @@ -631,38 +464,4 @@ return result; } -/*********************************************************************//** - * @brief - * The testBaroTemperatureReadCounterOverride function sets the override value - * of the baro temperature read counter. - * @details Inputs: lastBaroTempReadCounter - * @details Outputs: lastBaroTempReadCounter - * @param message Override message from Dialin which includes the read - * counter value to override for the baro sensor. - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testBaroTemperatureReadCounterOverride( MESSAGE_T *message ) -{ - BOOL result = u32Override( message, &lastBaroTempReadCounter, 0, TEMP_READ_COUNTER_MAX_VALUE ); - - return result; -} - -/*********************************************************************//** - * @brief - * The testBaroTemperatureReadCounterOverride function sets the override value - * of the baro temperature read counter. - * @details Inputs: lastBaroTempReadCounter - * @details Outputs: lastBaroTempReadCounter - * @param message Override message from Dialin which includes the CRC - * value to override for the baro sensor. - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testBaroTemperatureCRCOverride( MESSAGE_T *message ) -{ - BOOL result = u32Override( message, &baroConvConsts.coeffsCRC, 0, BARO_SENSOR_CRC_MAX_VALUE ); - - return result; -} - /**@}*/ Index: firmware/App/Drivers/TemperatureSensors.h =================================================================== diff -u -red39129abdca4ec343369d83494530b23621e052 -re6504e7e162d00745033a55191d6f810d2753105 --- firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision ed39129abdca4ec343369d83494530b23621e052) +++ firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision e6504e7e162d00745033a55191d6f810d2753105) @@ -40,7 +40,6 @@ X6_TEMP, ///< Heat exchanger Outlet temperature sensor D4_TEMP, ///< Hydraulics primary heater temperature sensor D50_TEMP, ///< Trimmer heater temperature sensor - BARO_TEMP, ///< Barometric temperature sensor BRD_TEMP, ///< DD board temperature sensor ( thermistor ) NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSORS_T; @@ -50,17 +49,12 @@ void initTemperatureSensors( void ); F32 getTemperatureValue( U32 sensorIndex ); -S32 getBaroSensorTemperatureDiff( void ); void readTemperatureSensors( void ); void monitorTemperatureSenors( void ); U32 getTemperatureSensorsReadCount( void ); -U32 getBaroTempSensorsReadCount( void ); -void setBaroSensorCoefficientReadStartTime( void ); BOOL testMeasuredTemperatureOverride( MESSAGE_T *message ); BOOL testTemperatureReadCounterOverride( MESSAGE_T *message ); -BOOL testBaroTemperatureReadCounterOverride( MESSAGE_T *message ); -BOOL testBaroTemperatureCRCOverride( MESSAGE_T *message ); /**@}*/ Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r97ea48347859157d941d743deedb5b980b4c4594 -re6504e7e162d00745033a55191d6f810d2753105 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 97ea48347859157d941d743deedb5b980b4c4594) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision e6504e7e162d00745033a55191d6f810d2753105) @@ -329,9 +329,6 @@ *************************************************************************/ static F32 getConvertedPressure( PRESSURE_SENSORS_T sensor, F32 pressure ) { - //TODO : Waiting for TD firmware implementation for Baro sensor -// F32 baroPressurePSI = getPressure( BARO_PRES ) * MMHG_TO_PSI_CONVERSION; - // calibrated pressure //F32 calPressure = getCalibrationAppliedPressure( sensor, pressure ); Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -ra8b1004967be1c3bd4d46e96ff5886a0ec1446cc -re6504e7e162d00745033a55191d6f810d2753105 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision a8b1004967be1c3bd4d46e96ff5886a0ec1446cc) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision e6504e7e162d00745033a55191d6f810d2753105) @@ -239,7 +239,7 @@ * The handleExecStart function waits for a period of time and switches to * the state that reads the ADC values from FPGA. * @details \b Inputs: startTime - * @details \b Outputs: startTime, baroCoeffsWaitToRcvStartTime + * @details \b Outputs: startTime * @return the next state of the state machine *************************************************************************/ static TEMPSENSORS_EXEC_STATES_T handleExecStart( void ) @@ -254,7 +254,6 @@ else if ( TRUE == didTimeout( startTime, ADC_FPGA_READ_DELAY ) ) { startTime = 0; - setBaroSensorCoefficientReadStartTime(); state = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; } @@ -464,7 +463,9 @@ data.d4Temp = getTemperatureValue( D4_TEMP ); data.d50Temp = getTemperatureValue( D50_TEMP ); data.boardTemp = getTemperatureValue( BRD_TEMP ); - data.baroTemp = getTemperatureValue( BARO_TEMP ); + // TODO: update the following lines after Baro Sensor data is read from TD + data.baroTemp = 0.0F; +// data.baroTemp = getTemperatureValue( BARO_TEMP ); data.d16CondTemp = getConductivityTemperatureValue( D17_COND ); data.d28CondTemp = getConductivityTemperatureValue( D27_COND ); data.d30CondTemp = getConductivityTemperatureValue( D29_COND ); Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r89f18a07a6d5837bf9b4559a69046e2b06f32c35 -re6504e7e162d00745033a55191d6f810d2753105 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision e6504e7e162d00745033a55191d6f810d2753105) @@ -136,8 +136,6 @@ { MSG_ID_DD_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testDDTemperatureSensorsDataPublishIntervalOverride }, { MSG_ID_DD_TEMPERATURE_SENSOR_MEASURED_TEMPERATURE_OVERRIDE_REQUEST, &testMeasuredTemperatureOverride }, { MSG_ID_DD_TEMPERATURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST, &testTemperatureReadCounterOverride }, - { MSG_ID_DD_TEMPERATURE_SENSOR_BARO_READ_COUNTER_OVERRIDE_REQUEST, &testBaroTemperatureReadCounterOverride }, - { MSG_ID_DD_TEMPERATURE_SENSOR_BARO_CRC_OVERRIDE_REQUEST, &testBaroTemperatureCRCOverride }, { MSG_ID_DD_DIALYSATE_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testDialysatePumpsDataPublishIntervalOverride }, { MSG_ID_DD_DIALYSATE_PUMPS_TARGET_SPEED_OVERRIDE_REQUEST, &testDialysatePumpTargetSpeedOverride }, { MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_SPEED_OVERRIDE_REQUEST, &testDialysatePumpMeasuredSpeedOverride },