Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -raeffb83507735fc1c84773e868e20ac7aeb60afc -rfd42b31a0572ab85c862ebf94997766f27dd8e97 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision aeffb83507735fc1c84773e868e20ac7aeb60afc) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) @@ -54,13 +54,6 @@ 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. -//static const U32 TWO_TO_POWER_OF_6 = ( 1 << 6 ); ///< 2^6. -//static const U32 TWO_TO_POWER_OF_7 = ( 1 << 7 ); ///< 2^7. -//static const U32 TWO_TO_POWER_OF_15 = ( 1 << 15 ); ///< 2^15. -//static const U32 TWO_TO_POWER_OF_16 = ( 1 << 16 ); ///< 2^16. -//static const U32 TWO_TO_POWER_OF_17 = ( 1 << 17 ); ///< 2^17. -//static const U32 TWO_TO_POWER_OF_21 = ( 1 << 21 ); ///< 2^21. - // ********** private function prototypes ********** //static F32 convertBaroPressureReading2mmHg( U32 rawPressure ); @@ -116,16 +109,7 @@ F32 presMinPSI = PRES_MIN_PSI; // Update and convert raw pressures to mmHg - if ( getTestConfigStatus( TEST_CONFIG_BETA_HW ) != TRUE ) - { - presMinPSI = PRES_MIN_PSI_ALPHA; - currentPressureReadings[ D9_PRES ].data = convertPressureReading( getFPGAD9PresRawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); - } - else - { - currentPressureReadings[ D9_PRES ].data = convertPressureReading( getFPGAD9PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); - } - + currentPressureReadings[ D9_PRES ].data = convertPressureReading( getFPGAD9PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); currentPressureReadings[ D66_PRES ].data = convertPressureReading( getFPGAD66PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); currentPressureReadings[ D51_PRES ].data = convertPressureReading( getFPGAD51PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); currentPressureReadings[ D18_PRES ].data = convertPressureReading( getFPGAD18PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); @@ -269,7 +253,7 @@ * @details \b Inputs: none * @details \b Outputs: currentPressureReadings[] * @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 testDDPressureSensorReadingsOverride( MESSAGE_T *message ) @@ -286,7 +270,7 @@ * @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 testDDPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ) @@ -298,35 +282,49 @@ /*********************************************************************//** * @brief - * The testFPPressureSensorReadingsOverride function overrides the value of - * the specified FP pressure sensor with a given value. + * The testIOFPPressureSensorReadingsOverride function overrides the value of + * the specified IOFP pressure sensor with a given value. * @details \b Inputs: none * @details \b Outputs: currentPressureReadings[] * @param message Override message from Dialin which includes an sensor - * ID and override value of the pressure sensor. + * ID and override value of the IOFP pressure sensor. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPPressureSensorReadingsOverride( MESSAGE_T *message ) +BOOL testIOFPPressureSensorReadingsOverride( MESSAGE_T *message ) { - BOOL result = f32ArrayOverride( message, ¤tPressureReadings[FIRST_IO_PRESSURE_SENSOR], NUM_OF_PRESSURE_SENSORS - 1 ); + BOOL result = FALSE; + TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; + OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + if ( ( payload.index >= FIRST_IO_PRESSURE_SENSOR ) && ( payload.index <= LAST_FP_PRESSURE_SENSOR ) ) + { + BOOL result = f32ArrayOverride( message, ¤tPressureReadings[0], NUM_OF_PRESSURE_SENSORS - 1 ); + } + return result; } /*********************************************************************//** * @brief - * The testFPPressureSensorTemperatureReadingsOverride function overrides the - * value of the specified FP pressure sensor temperature with a given value. + * The testIOFPPressureSensorTemperatureReadingsOverride function overrides the + * value of the specified IOFP pressure sensor 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 IOFP pressure sensor temperature. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ) +BOOL testIOFPPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ) { - BOOL result = f32ArrayOverride( message, ¤tPresTempReadings[FIRST_IO_PRESSURE_SENSOR], NUM_OF_PRESSURE_SENSORS - 1 ); + BOOL result = FALSE; + TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; + OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + if ( ( payload.index >= FIRST_IO_PRESSURE_SENSOR ) && ( payload.index <= LAST_FP_PRESSURE_SENSOR ) ) + { + BOOL result = f32ArrayOverride( message, ¤tPresTempReadings[0], NUM_OF_PRESSURE_SENSORS - 1 ); + } + return result; } Index: firmware/App/Drivers/PressureSensor.h =================================================================== diff -u -raeffb83507735fc1c84773e868e20ac7aeb60afc -rfd42b31a0572ab85c862ebf94997766f27dd8e97 --- firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision aeffb83507735fc1c84773e868e20ac7aeb60afc) +++ firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) @@ -64,8 +64,8 @@ BOOL testDDPressureSensorReadingsOverride( MESSAGE_T *message ); BOOL testDDPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ); -BOOL testFPPressureSensorReadingsOverride( MESSAGE_T *message ); -BOOL testFPPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ); /**@}*/ Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r9b9ab4a5135966c607c657eb18fe368c30247113 -rfd42b31a0572ab85c862ebf94997766f27dd8e97 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 9b9ab4a5135966c607c657eb18fe368c30247113) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) @@ -99,8 +99,7 @@ static F32 getConvertedPressure( PRESSURE_SENSORS_T sensor, F32 pressure ); static PRESSURE_STATE_T handlePressuresInitState( void ); static PRESSURE_STATE_T handlePressuresContReadState( void ); -static void publishDDPressuresData( void ); -static void publishFPPressuresData( void ); +static void publishPressuresData( void ); /*********************************************************************//** * @brief @@ -260,8 +259,7 @@ } // publish pressure/occlusion data on interval - publishDDPressuresData(); - publishFPPressuresData(); + publishPressuresData(); } /*********************************************************************//** @@ -398,57 +396,43 @@ /*********************************************************************//** * @brief - * The publishDDPressuresData function publishes DD pressures data at a set interval. - * @details \b Inputs: ddPressuresDataPublicationTimerCounter - * @details \b Outputs: ddPressuresDataPublicationTimerCounter - * @details \b Message \b Sent: MSG_ID_DD_PRESSURES_DATA to publish pressure data. + * The publishPressuresData function publishes pressures data at a set interval. + * @details \b Inputs: ddPressuresDataPublicationTimerCounter, + * fpPressuresDataPublicationTimerCounter + * @details \b Outputs: ddPressuresDataPublicationTimerCounter, + * fpPressuresDataPublicationTimerCounter + * @details \b Message \b Sent: MSG_ID_DD_PRESSURES_DATA, MSG_ID_FP_PRESSURES_DATA + * to publish pressure data. * @return none *************************************************************************/ -static void publishDDPressuresData( void ) +static void publishPressuresData( void ) { - // publish pressure/occlusion data on interval + // publish DD pressure/occlusion data on interval if ( ++ddPressuresDataPublicationTimerCounter >= getU32OverrideValue( &ddPressuresDataPublishInterval ) ) { - PRESSURE_TEMP_DD_DATA_T data; + PRESSURE_DD_DATA_T data; data.d9Pressure = getFilteredPressure( D9_PRES ); data.d66Pressure = getFilteredPressure( D66_PRES ); data.d51Pressure = getFilteredPressure( D51_PRES ); data.d18Pressure = getFilteredPressure( D18_PRES ); data.d41Pressure = getFilteredPressure( D41_PRES ); -// data.d9PresTemp = getFilteredPressureSensorTemperature( D9_PRES ); -// data.d66PresTemp = getFilteredPressureSensorTemperature( D66_PRES ); -// data.d51PresTemp = getFilteredPressureSensorTemperature( D51_PRES ); -// data.d18PresTemp = getFilteredPressureSensorTemperature( D18_PRES ); -// data.d41PresTemp = getFilteredPressureSensorTemperature( D41_PRES ); ddPressuresDataPublicationTimerCounter = 0; - broadcastData( MSG_ID_DD_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DD_DATA_T ) ); + broadcastData( MSG_ID_DD_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( PRESSURE_DD_DATA_T ) ); } -} - -/*********************************************************************//** - * @brief - * The publishFPPressuresData function publishes FP pressures data at a set interval. - * @details \b Inputs: fpPressuresDataPublicationTimerCounter - * @details \b Outputs: fpPressuresDataPublicationTimerCounter - * @details \b Message \b Sent: MSG_ID_FP_PRESSURES_DATA to publish pressure data. - * @return none - *************************************************************************/ -static void publishFPPressuresData( void ) -{ - // publish pressure/occlusion data on interval + // publish FP pressure/occlusion data on interval if ( ++fpPressuresDataPublicationTimerCounter >= getU32OverrideValue( &fpPressuresDataPublishInterval ) ) { - PRESSURE_TEMP_FP_DATA_T data; + PRESSURE_FP_DATA_T data; data.m1Pressure = getFilteredPressure( M1_PRES ); data.m3Pressure = getFilteredPressure( M3_PRES ); data.p8Pressure = getFilteredPressure( P8_PRES ); data.p13Pressure = getFilteredPressure( P13_PRES ); data.p17Pressure = getFilteredPressure( P17_PRES ); - broadcastData( MSG_ID_FP_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_FP_DATA_T ) ); + broadcastData( MSG_ID_FP_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( PRESSURE_FP_DATA_T ) ); fpPressuresDataPublicationTimerCounter = 0; } } @@ -478,15 +462,15 @@ /*********************************************************************//** * @brief - * The testFPPressureSensorDataPublishIntervalOverride function overrides the - * FP pressure sensor data publish interval. + * The testIOFPPressureSensorDataPublishIntervalOverride function overrides the + * IOFP pressure sensor data publish interval. * @details \b Inputs: none * @details \b Outputs: fpPressuresDataPublishInterval * @param message Override message from Dialin which includes the value - * that override FP pressure data publish interval with (in ms) + * that override IOFP pressure data publish interval with (in ms) * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ) +BOOL testIOFPPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ) { BOOL result = u32BroadcastIntervalOverride( message, &fpPressuresDataPublishInterval, TASK_PRIORITY_INTERVAL ); @@ -529,35 +513,49 @@ /*********************************************************************//** * @brief - * The testFPPressureSensorFilteredReadingsOverride function overrides the - * filtered value of the specified FP pressure sensor with a given value. + * The testIOFPPressureSensorFilteredReadingsOverride function overrides the + * filtered value of the specified IOFP 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. + * ID and override value of the IOFP pressure sensor. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPPressureSensorFilteredReadingsOverride( MESSAGE_T *message ) +BOOL testIOFPPressureSensorFilteredReadingsOverride( MESSAGE_T *message ) { - BOOL result = f32ArrayOverride( message, &filteredcurrentPressureReadings[FIRST_IO_PRESSURE_SENSOR], NUM_OF_PRESSURE_SENSORS - 1 ); + BOOL result = FALSE; + TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; + OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + if ( ( payload.index >= FIRST_IO_PRESSURE_SENSOR ) && ( payload.index <= LAST_FP_PRESSURE_SENSOR ) ) + { + BOOL result = f32ArrayOverride( message, &filteredcurrentPressureReadings[0], 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. + * The testIOFPPressureSensorFilteredTemperatureReadingsOverride function overrides the + * value of the specified IOFP 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. + * ID and override value of the IOFP pressure sensor temperature. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ) +BOOL testIOFPPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ) { - BOOL result = f32ArrayOverride( message, &filteredcurrentPresTempReadings[FIRST_IO_PRESSURE_SENSOR], NUM_OF_PRESSURE_SENSORS - 1 ); + BOOL result = FALSE; + TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; + OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + if ( ( payload.index >= FIRST_IO_PRESSURE_SENSOR ) && ( payload.index <= LAST_FP_PRESSURE_SENSOR ) ) + { + BOOL result = f32ArrayOverride( message, &filteredcurrentPresTempReadings[0], NUM_OF_PRESSURE_SENSORS - 1 ); + } + return result; } Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -r9b9ab4a5135966c607c657eb18fe368c30247113 -rfd42b31a0572ab85c862ebf94997766f27dd8e97 --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 9b9ab4a5135966c607c657eb18fe368c30247113) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) @@ -40,7 +40,7 @@ F32 d51Pressure; ///< Spent Dialysate pressure F32 d18Pressure; ///< Fresh Dialysate pressure F32 d41Pressure; ///< Transmembrane pressure -} PRESSURE_TEMP_DD_DATA_T; +} PRESSURE_DD_DATA_T; /// FP Pressure data struct. typedef struct @@ -50,7 +50,7 @@ F32 p8Pressure; ///< Pressure before inlet conductivity sensor (P8) F32 p13Pressure; ///< Pressure before RO filter (P13) F32 p17Pressure; ///< Pressure after RO filter (P17) -} PRESSURE_TEMP_FP_DATA_T; +} PRESSURE_FP_DATA_T; // ********** public function prototypes ********** @@ -61,11 +61,11 @@ F32 getFilteredPressureSensorTemperature( PRESSURE_SENSORS_T sensor ); BOOL testDDPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); -BOOL testFPPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testDDPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); BOOL testDDPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); -BOOL testFPPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); -BOOL testFPPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); /**@}*/ Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r9b9ab4a5135966c607c657eb18fe368c30247113 -rfd42b31a0572ab85c862ebf94997766f27dd8e97 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 9b9ab4a5135966c607c657eb18fe368c30247113) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) @@ -112,8 +112,7 @@ static void filterTemperatureReadings( void ); static void filterDialTemperatureReadings( void ); static void getTempMovingAverageTimeInterval( void ); -static void publishDDTemperatureSensorsData( void ); -static void publishFPTemperatureSensorsData( void ); +static void publishTemperatureSensorsData( void ); /*********************************************************************//** * @brief * The initTemperature function initializes the temperature unit. @@ -232,8 +231,7 @@ filterTemperatureReadings(); // Publish the data - publishDDTemperatureSensorsData(); - publishFPTemperatureSensorsData(); + publishTemperatureSensorsData(); } /*********************************************************************//** @@ -445,16 +443,18 @@ /*********************************************************************//** * @brief - * The publishDDTemperatureSensorsData function broadcasts the DD + * The publishTemperatureSensorsData function broadcasts the * temperature sensors data at the publication interval. - * @details \b Inputs: ddTempDataPublicationTimerCounter and publish interval time. - * @details \b Outputs: ddTempDataPublicationTimerCounter - * @details \b Message \b Sent: MSG_ID_DD_TEMPERATURE_DATA publishes the temperature - * data in a periodic interval. + * @details \b Inputs: ddTempDataPublicationTimerCounter + * fpTempDataPublicationTimerCounter and publish interval time. + * @details \b Outputs: ddTempDataPublicationTimerCounter, fpTempDataPublicationTimerCounter + * @details \b Message \b Sent: MSG_ID_DD_TEMPERATURE_DATA, MSG_ID_FP_TEMPERATURE_DATA + * publishes the temperature data in a periodic interval. * @return none *************************************************************************/ -static void publishDDTemperatureSensorsData( void ) +static void publishTemperatureSensorsData( void ) { + // publish DD temperature data on interval if ( ++ddTempDataPublicationTimerCounter >= getU32OverrideValue( &ddTempSensorsPublishInterval ) ) { TEMPERATURE_SENSORS_DD_DATA_T data; @@ -483,20 +483,7 @@ broadcastData( MSG_ID_DD_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DD_DATA_T ) ); ddTempDataPublicationTimerCounter = 0; } -} - -/*********************************************************************//** - * @brief - * The publishFPTemperatureSensorsData function broadcasts the FP - * temperature sensors data at the publication interval. - * @details \b Inputs: fpTempDataPublicationTimerCounter, tempSensorsPublishInterval - * @details \b Outputs: fpTempDataPublicationTimerCounter - * @details \b Message \b Sent: MSG_ID_FP_TEMPERATURE_DATA publishes the temperature - * data in a periodic interval. - * @return none - *************************************************************************/ -static void publishFPTemperatureSensorsData( void ) -{ + // publish FP temperature data on interval if ( ++fpTempDataPublicationTimerCounter >= getU32OverrideValue( &fpTempSensorsPublishInterval ) ) { TEMPERATURE_SENSORS_FP_DATA_T data; @@ -541,15 +528,15 @@ /*********************************************************************//** * @brief - * The testFPTemperatureSensorsDataPublishIntervalOverride function - * overrides the FP temperature sensors data publish interval. + * The testIOFPTemperatureSensorsDataPublishIntervalOverride function + * overrides the IOFP temperature sensors data publish interval. * @details \b Inputs: none * @details \b Outputs: fpTempSensorsPublishInterval * @param Override message from Dialin which includes the interval - * (in ms) to override the FP temperature sensor data broadcast interval to. + * (in ms) to override the IOFP temperature sensor data broadcast interval to. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ) +BOOL testIOFPTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ) { BOOL result = u32BroadcastIntervalOverride( message, &fpTempSensorsPublishInterval, TASK_PRIORITY_INTERVAL ); Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -r9b9ab4a5135966c607c657eb18fe368c30247113 -rfd42b31a0572ab85c862ebf94997766f27dd8e97 --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 9b9ab4a5135966c607c657eb18fe368c30247113) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) @@ -81,7 +81,7 @@ void checkDialysateTemperatureSensors( void ); BOOL testDDTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); -BOOL testFPTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testIOFPTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); /**@}*/ Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319 -rfd42b31a0572ab85c862ebf94997766f27dd8e97 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) @@ -204,12 +204,12 @@ { MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST, &testROPumpTargetPressureOverride }, { MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST, &testROPumpTargetFlowOverride }, { MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST, &testROPumpTargetDutyCycleOverride }, - { 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 }, - { MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testFPTemperatureSensorsDataPublishIntervalOverride }, + { MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST, &testIOFPPressureSensorReadingsOverride }, + { MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST, &testIOFPPressureSensorTemperatureReadingsOverride }, + { MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testIOFPPressureSensorDataPublishIntervalOverride }, + { MSG_ID_FP_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST, &testIOFPPressureSensorFilteredReadingsOverride }, + { MSG_ID_FP_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST, &testIOFPPressureSensorFilteredTemperatureReadingsOverride }, + { MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testIOFPTemperatureSensorsDataPublishIntervalOverride }, }; #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))