Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -raeffb83507735fc1c84773e868e20ac7aeb60afc -rf86e456301fa34dc0169644a1d4dd45b17afa5fe --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision aeffb83507735fc1c84773e868e20ac7aeb60afc) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision f86e456301fa34dc0169644a1d4dd45b17afa5fe) @@ -500,15 +500,15 @@ /*********************************************************************//** * @brief - * The testPressureSensorFilteredReadingsOverride function overrides the - * filtered value of the specified pressure sensor with a given value. + * The testDDPressureSensorFilteredReadingsOverride function overrides the + * filtered value of the specified DD pressure sensor with a given value. * @details \b Inputs: none * @details \b Outputs: filteredcurrentPressureReadings[] * @param message Override message from Dialin which includes an sensor - * ID and override value of the pressure sensor. + * ID and override value of the DD pressure sensor. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testPressureSensorFilteredReadingsOverride( MESSAGE_T *message ) +BOOL testDDPressureSensorFilteredReadingsOverride( MESSAGE_T *message ) { BOOL result = f32ArrayOverride( message, &filteredcurrentPressureReadings[0], LAST_DD_PRESSURE_SENSOR ); @@ -517,19 +517,53 @@ /*********************************************************************//** * @brief - * The testPressureSensorFilteredTemperatureReadingsOverride function overrides the - * value of the specified pressure sensor filtered temperature with a given value. + * The testDDPressureSensorFilteredTemperatureReadingsOverride function overrides the + * value of the specified DD 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 - * ID and override value of the pressure sensor temperature. + * ID and override value of the DD pressure sensor temperature. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ) +BOOL testDDPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ) { BOOL result = f32ArrayOverride( message, &filteredcurrentPresTempReadings[0], LAST_DD_PRESSURE_SENSOR ); return result; } +/*********************************************************************//** + * @brief + * The testFPPressureSensorFilteredReadingsOverride function overrides the + * filtered value of the specified FP pressure sensor with a given value. + * @details \b Inputs: none + * @details \b Outputs: filteredcurrentPressureReadings[] + * @param message Override message from Dialin which includes an sensor + * ID and override value of the FP pressure sensor. + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +BOOL testFPPressureSensorFilteredReadingsOverride( MESSAGE_T *message ) +{ + BOOL result = f32ArrayOverride( message, &filteredcurrentPressureReadings[FIRST_IO_PRESSURE_SENSOR], NUM_OF_PRESSURE_SENSORS - 1 ); + + return result; +} + +/*********************************************************************//** + * @brief + * The testFPPressureSensorFilteredTemperatureReadingsOverride function overrides the + * value of the specified FP pressure sensor filtered temperature with a given value. + * @details \b Inputs: none + * @details \b Outputs: filteredcurrentPresTempReadings[] + * @param message Override message from Dialin which includes a sensor + * ID and override value of the FP pressure sensor temperature. + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +BOOL testFPPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ) +{ + BOOL result = f32ArrayOverride( message, &filteredcurrentPresTempReadings[FIRST_IO_PRESSURE_SENSOR], NUM_OF_PRESSURE_SENSORS - 1 ); + + return result; +} + /**@}*/ Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -raeffb83507735fc1c84773e868e20ac7aeb60afc -rf86e456301fa34dc0169644a1d4dd45b17afa5fe --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision aeffb83507735fc1c84773e868e20ac7aeb60afc) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision f86e456301fa34dc0169644a1d4dd45b17afa5fe) @@ -72,8 +72,10 @@ BOOL testDDPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testFPPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); -BOOL testPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); -BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testDDPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); +BOOL testDDPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testFPPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); +BOOL testFPPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); /**@}*/ Index: firmware/App/Services/Messaging.c =================================================================== diff -u -raeffb83507735fc1c84773e868e20ac7aeb60afc -rf86e456301fa34dc0169644a1d4dd45b17afa5fe --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision aeffb83507735fc1c84773e868e20ac7aeb60afc) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision f86e456301fa34dc0169644a1d4dd45b17afa5fe) @@ -118,8 +118,8 @@ { MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST, &testDDPressureSensorReadingsOverride }, { MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, &testDDPressureSensorTemperatureReadingsOverride }, { MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testDDPressureSensorDataPublishIntervalOverride }, - { MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST, &testPressureSensorFilteredReadingsOverride }, - { MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST, &testPressureSensorFilteredTemperatureReadingsOverride }, + { MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST, &testDDPressureSensorFilteredReadingsOverride }, + { MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST, &testDDPressureSensorFilteredTemperatureReadingsOverride }, { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST, &testConductivitySensorReadingsOverride }, { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, &testConductivitySensorTemperatureReadingsOverride }, { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST, &testConductivitySensorReadCounterOverride }, @@ -207,6 +207,8 @@ { MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST, &testFPPressureSensorReadingsOverride }, { MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST, &testFPPressureSensorTemperatureReadingsOverride }, { MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testFPPressureSensorDataPublishIntervalOverride }, + { MSG_ID_FP_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST, &testFPPressureSensorFilteredReadingsOverride }, + { MSG_ID_FP_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST, &testFPPressureSensorFilteredTemperatureReadingsOverride }, }; #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))