Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r867bbcd8241071f4c3a994726bbf6c4a6fc6df0d -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 867bbcd8241071f4c3a994726bbf6c4a6fc6df0d) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -42,7 +42,6 @@ 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 OVERRIDE_U32_T lastPressureReadCounter[ NUM_OF_PRESSURE_SENSORS ]; ///< Last pressure sensor read count (Overrideable). -static OVERRIDE_U32_T lastPressureErrorCounter[ NUM_OF_PRESSURE_SENSORS ]; ///< Last pressure sensor error count (Overrideable). // ********** private function prototypes ********** @@ -77,10 +76,6 @@ lastPressureReadCounter[ sensor ].ovInitData = 0; lastPressureReadCounter[ sensor ].override = OVERRIDE_RESET; - lastPressureErrorCounter[ sensor ].data = 0; - lastPressureErrorCounter[ sensor ].ovData = 0; - lastPressureErrorCounter[ sensor ].ovInitData = 0; - lastPressureErrorCounter[ sensor ].override = OVERRIDE_RESET; } // Initialize the FPGA persistent alarms @@ -97,7 +92,7 @@ * sensor readings for all pressure sensors. * @details \b Inputs: FPGA * @details \b Outputs: currentPressureReadings[],currentPresTempReadings[], - * lastPressureReadCounter[],lastPressureErrorCounter[]. + * lastPressureReadCounter[]. * @return none *************************************************************************/ void readPressureSensors( void ) @@ -250,37 +245,7 @@ return result; } -/*********************************************************************//** - * @brief - * The getPressureSensorErrorCount function gets the current pressure sensor - * error count for a given pressure sensor. - * @details \b Alarm: ALARM_ID_RO_SOFTWARE_FAULT if given sensor is invalid. - * @details \b Inputs: lastPressureErrorCounter - * @details \b Outputs: none - * @param sensor ID of pressure sensor to get error count for. - * @return The current pressure sensor error count of a given pressure sensor. - *************************************************************************/ -U32 getPressureSensorErrorCount( PRESSURE_SENSORS_T sensor ) -{ - U32 result = 0; - if ( sensor < NUM_OF_PRESSURE_SENSORS ) - { - result = lastPressureErrorCounter[ sensor ].data; - if ( OVERRIDE_KEY == lastPressureErrorCounter[ sensor ].override ) - { - result = lastPressureErrorCounter[ sensor ].ovData; - } - } - else - { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR4, sensor ) - } - - return result; -} - - /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ @@ -337,21 +302,4 @@ return result; } -/*********************************************************************//** - * @brief - * The testPressureSensorErrorCounterOverride function overrides the value - * of the specified pressure sensor error counter with a given value. - * @details \b Inputs: none - * @details \b Outputs: lastPressureErrorCounter[] - * @param message Override message from Dialin which includes an sensor - * ID and override value of the pressure sensor error counter. - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testPressureSensorErrorCounterOverride( MESSAGE_T *message ) -{ - BOOL result = u32ArrayOverride( message, &lastPressureErrorCounter[0], NUM_OF_PRESSURE_SENSORS - 1, 0, PRES_SENSORS_READ_ERR_MAX_CNT ); - - return result; -} - /**@}*/