Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -rc9aa3971be05f25a7b0d7124e57cc60617c90ad7 -r3edf8084a5028ee0d00a3fba496284e593e4254d --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision c9aa3971be05f25a7b0d7124e57cc60617c90ad7) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 3edf8084a5028ee0d00a3fba496284e593e4254d) @@ -79,7 +79,7 @@ static OVERRIDE_F32_T filteredcurrentPressureReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< filtered current pressure sensor pressure readings (overrideable). static OVERRIDE_F32_T filteredcurrentPresTempReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< filtered current pressure sensor temperature readings (overrideable). -//static DD_PRES_SENSORS_CAL_RECORD_T pressuresCalRecord; ///< Pressures calibration record. +//static RO_PRES_SENSORS_CAL_RECORD_T pressuresCalRecord; ///< Pressures calibration record. static FILTER_PRESSURE_READINGS_T filteredPressureReadings[NUM_OF_PRESSURE_SENSORS]; ///< Filtered pressure reading for pressure sensors. static FILTER_PRESSURE_TEMPERATURE_READINGS_T filteredPressureTempReadings[NUM_OF_PRESSURE_SENSORS]; ///< Filtered pressure reading for pressure sensors. @@ -191,7 +191,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR5, sensor ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR5, (U32)sensor ) } return result; @@ -221,7 +221,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR6, sensor ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR6, (U32)sensor ) } return result; @@ -513,7 +513,7 @@ * @details \b Inputs: none * @details \b Outputs: pressuresDataPublishInterval * @param message Override message from Dialin which includes the value - * that override valves states publish interval with (in ms) + * that override pressure data publish interval with (in ms) * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ) @@ -545,8 +545,8 @@ * The testPressureSensorFilteredTemperatureReadingsOverride function overrides the * value of the specified pressure sensor filtered temperature with a given value. * @details \b Inputs: none - * @details \b Outputs: currentPresTempReadings[] - * @param message Override message from Dialin which includes an sensor + * @details \b Outputs: filteredcurrentPresTempReadings[] + * @param message Override message from Dialin which includes a sensor * ID and override value of the pressure sensor temperature. * @return TRUE if override successful, FALSE if not *************************************************************************/