Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r340b6bedc5aac2ad47364ade48a842f00b12b8fe -rf8bdb3ff260a42f46e178d08979758789db7c307 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 340b6bedc5aac2ad47364ade48a842f00b12b8fe) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision f8bdb3ff260a42f46e178d08979758789db7c307) @@ -4,9 +4,11 @@ #include "BoostPump.h" #include "Compatible.h" #include "Conductivity.h" +#include "DDInterface.h" #include "Flow.h" #include "Level.h" #include "Messaging.h" +#include "ModeGenPermeate.h" #include "OperationModes.h" #include "PAL.h" #include "Pressure.h" @@ -60,31 +62,32 @@ MSG_ID_RO_SOFTWARE_RESET_REQUEST, MSG_ID_RO_SEND_TEST_CONFIGURATION, MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, - MSG_ID_RO_VALVE_CMD_STATE_OVERRIDE_REQUEST, + MSG_ID_RO_VALVE_CMD_STATE_OVERRIDE_REQUEST, //5 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_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + MSG_ID_RO_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, //10 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_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, //15 MSG_ID_RO_DEBUG_EVENT, MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST, MSG_ID_RO_LEVEL_OVERRIDE_REQUEST, MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, - MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST, + MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST, //20 MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST, MSG_ID_RO_FILTERED_FLOW_RATE_OVERRIDE_REQUEST, MSG_ID_RO_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST, MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST, - MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST, + MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST, //25 MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST, MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST, MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST, - MSG_ID_RO_TEMPERATURE_OVERRIDE_REQUEST + MSG_ID_RO_TEMPERATURE_OVERRIDE_REQUEST, + MSG_ID_DD_RO_START_STOP_CMD_REQUEST //30 }; /// Message handling function table @@ -93,31 +96,32 @@ &handleROSoftwareResetRequest, &handleROTestConfiguration, &testValvesStatesPublishIntervalOverride, - &testValveStateOverride, + &testValveStateOverride, //5 &testValveSensedStateOverride, &testSetBoostPumpPWM, &testBoostPumpPWMOverride, &testBoostPumpRPMOverride, - &testROPumpDataPublishIntervalOverride, + &testROPumpDataPublishIntervalOverride, //10 &testPressureSensorReadingsOverride, &testPressureSensorTemperatureReadingsOverride, &testPressureSensorReadCounterOverride, &testPressureSensorErrorCounterOverride, - &testPressureSensorDataPublishIntervalOverride, + &testPressureSensorDataPublishIntervalOverride, //15 &handleUnhandledMsg, &testLevelsDataPublishIntervalOverride, &testLevelStateOverride, &testFlowSensorDataPublishIntervalOverride, - &testFlowSensorReadingsOverride, + &testFlowSensorReadingsOverride, //20 &testFlowSensorTemperatureReadingsOverride, &testFlowSensorFilteredReadingsOverride, &testFlowSensorFilteredTemperatureReadingsOverride, &testConductivitySensorDataPublishIntervalOverride, - &testConductivitySensorReadingsOverride, + &testConductivitySensorReadingsOverride, //25 &testConductivitySensorTemperatureReadingsOverride, &testConductivitySensorReadCounterOverride, &testConductivitySensorErrorCounterOverride, - &testMeasuredTemperatureOverride + &testMeasuredTemperatureOverride, + &handleGeneratePermeateRequestMsg //30 }; #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr)) @@ -131,9 +135,9 @@ // ********** private function prototypes ********** -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 ); +static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack ); /*********************************************************************//** * @brief @@ -259,7 +263,7 @@ * @param ack TRUE if test message was handled successfully, FALSE if not * @return TRUE if response message successfully queued for transmit, FALSE if not *************************************************************************/ -static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack ) +BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack ) { BOOL result; MESSAGE_T msg;