Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef -rd8cd7de2f84b26aafc153e2bb665a5058a040bf0 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision d8cd7de2f84b26aafc153e2bb665a5058a040bf0) @@ -6,7 +6,8 @@ #include "Messaging.h" #include "OperationModes.h" #include "PAL.h" -#include "PressureSensor.h" +#include "Pressure.h" +//#include "PressureSensor.h" #include "ROPump.h" #include "SystemCommRO.h" #include "Utilities.h" @@ -60,7 +61,14 @@ MSG_ID_RO_VALVE_SENSED_STATE_OVERRIDE_REQUEST, MSG_ID_RO_BOOST_PUMP_SET_PWM_REQUEST, MSG_ID_RO_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST, - MSG_ID_RO_BOOST_PUMP_SPEED_OVERRIDE_REQUEST + MSG_ID_RO_BOOST_PUMP_SPEED_OVERRIDE_REQUEST, + MSG_ID_RO_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + MSG_ID_RO_PRESSURE_OVERRIDE_REQUEST, + MSG_ID_RO_PRESSURE_TEMP_OVERRIDE_REQUEST, + MSG_ID_RO_PRESSURE_READ_COUNT_OVERRIDE_REQUEST, + MSG_ID_RO_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST, + MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + MSG_ID_RO_DEBUG_EVENT }; /// Message handling function table @@ -73,7 +81,14 @@ &testValveSensedStateOverride, &testSetBoostPumpPWM, &testBoostPumpPWMOverride, - &testBoostPumpRPMOverride + &testBoostPumpRPMOverride, + &testROPumpDataPublishIntervalOverride, + &testPressureSensorReadingsOverride, + &testPressureSensorTemperatureReadingsOverride, + &testPressureSensorReadCounterOverride, + &testPressureSensorErrorCounterOverride, + &testPressureSensorDataPublishIntervalOverride, + &handleUnhandledMsg }; #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr)) @@ -87,8 +102,9 @@ // ********** private function prototypes ********** -static BOOL sendTestAckResponseMsg( MSG_ID_T msgID, BOOL ack ); static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack ); +static MsgFuncPtr getMsgHandler( U16 msgID ); +static BOOL sendTestAckResponseMsg( MSG_ID_T msgID, BOOL ack ); /*********************************************************************//** * @brief @@ -299,6 +315,19 @@ } } +/*********************************************************************//** + * @brief + * The handleUnhandledMsg function handles messages that are not handled (yet or ever). + * @details \b Inputs: none + * @details \b Outputs: none + * @param message Incoming message to not handle + * @return FALSE (indicating message not handled). + *************************************************************************/ +BOOL handleUnhandledMsg( MESSAGE_T *message ) +{ + return FALSE; // message not handled or handling for message not implemented yet +} + // *********************************************************************** // ***************** Message Sending Helper Functions ******************** // ***********************************************************************