Index: firmware/App/Controllers/PermeateTank.c =================================================================== diff -u -rb92c26da32bed791d9836391080eacf19f221de6 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Controllers/PermeateTank.c (.../PermeateTank.c) (revision b92c26da32bed791d9836391080eacf19f221de6) +++ firmware/App/Controllers/PermeateTank.c (.../PermeateTank.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -151,6 +151,7 @@ { return permeateTankControllerState; } + /*********************************************************************//** * @brief * The execPermeateTankController function executes the air trap control state machine. @@ -208,8 +209,8 @@ * @brief * The handlePermeateTankManualControlState function handles the manual control * state of the permeate tank. - * @details \b Inputs: permeateTankControllerState - * @details \b Outputs: none + * @details \b Inputs: pendingStartPermeateTankController + * @details \b Outputs: pendingStartPermeateTankController * @return next state *************************************************************************/ static PERMEATE_TANK_STATE_T handlePermeateTankManualControlState( void ) @@ -231,8 +232,8 @@ * The handleAirTrapRaiseLevelState function handles the raise level state * of the permeate tank. * @details \b Message \b Sent: MSG_ID_TD_EVENT if raising level completed - * @details \b Inputs: pendingStopAirTrapController - * @details \b Outputs: none + * @details \b Inputs: pendingStopPermeateTankController + * @details \b Outputs: pendingStopPermeateTankController * @return next state *************************************************************************/ static PERMEATE_TANK_STATE_T handlePermeateTankFillState( void ) @@ -266,8 +267,8 @@ * @brief * The handlePermeateTankFullState function handles the lower level state * of the permeate tank. - * @details \b Inputs: none - * @details \b Outputs: none + * @details \b Inputs: tankFullAlarmTimeout, pendingStopPermeateTankController, tankFullDelayTime + * @details \b Outputs: pendingStopPermeateTankController * @return next state *************************************************************************/ static PERMEATE_TANK_STATE_T handlePermeateTankFullState( void ) @@ -286,7 +287,6 @@ pendingStopPermeateTankController = FALSE; state = PERMEATE_TANK_MANUAL_CONTROL_STATE; } - else if ( ( ( level == LEVEL_STATE_MEDIUM ) && ( TRUE == didTimeout( tankFullDelayTime, PERMEATE_TANK_FULL_SWITCH_MS ) ) ) || ( level == LEVEL_STATE_LOW ) ) { @@ -392,6 +392,5 @@ return result; } - /**@}*/ Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r3a5cc585b69ffa194e3601a005915d23b48bd865 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 3a5cc585b69ffa194e3601a005915d23b48bd865) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -15,9 +15,6 @@ * ***************************************************************************/ -//#include - - #include "Flow.h" //#include "NVDataMgmt.h" #include "Messaging.h" Index: firmware/App/Modes/FPModeStandby.c =================================================================== diff -u -r2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Modes/FPModeStandby.c (.../FPModeStandby.c) (revision 2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff) +++ firmware/App/Modes/FPModeStandby.c (.../FPModeStandby.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -15,7 +15,6 @@ * ***************************************************************************/ - #include "BoostPump.h" #include "FPModeStandby.h" #include "FPOperationModes.h" Index: firmware/App/Modes/FlushConcentrate.c =================================================================== diff -u -r3a5cc585b69ffa194e3601a005915d23b48bd865 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Modes/FlushConcentrate.c (.../FlushConcentrate.c) (revision 3a5cc585b69ffa194e3601a005915d23b48bd865) +++ firmware/App/Modes/FlushConcentrate.c (.../FlushConcentrate.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -47,8 +47,6 @@ // ********** private data ********** -/// - static const F32 CONCENTRATE_FLOW_INTEGRATOR = 1.0F / (F32)( SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ); ///< Multiplier to convert flow (mL/min) into volume (mL) for period of general task interval. static FP_CONC_FLUSH_STATE_T concentrateFlushState; ///< Currently active Concentrate flush state. static U32 concentrateFlushDataPublicationTimerCounter; ///< Used to schedule Concentrate flush data publication to CAN bus. Index: firmware/App/Modes/ModePreGenPermeate.c =================================================================== diff -u -r6dd382e3988fac2f9ee041b4738d67305e17a6a2 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Modes/ModePreGenPermeate.c (.../ModePreGenPermeate.c) (revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2) +++ firmware/App/Modes/ModePreGenPermeate.c (.../ModePreGenPermeate.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -15,7 +15,6 @@ * ***************************************************************************/ - #include "BoostPump.h" #include "DDInterface.h" #include "FlushFilter.h" Index: firmware/App/Modes/ModePreGenPermeateDefeatured.h =================================================================== diff -u -r9b91228c0cb3eee3f06cfab4436e812722187839 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Modes/ModePreGenPermeateDefeatured.h (.../ModePreGenPermeateDefeatured.h) (revision 9b91228c0cb3eee3f06cfab4436e812722187839) +++ firmware/App/Modes/ModePreGenPermeateDefeatured.h (.../ModePreGenPermeateDefeatured.h) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -52,5 +52,4 @@ /**@}*/ - #endif Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -15,7 +15,6 @@ * ***************************************************************************/ - #include "AlarmMgmtFP.h" #include "Messaging.h" #include "FPOperationModes.h" Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -42,7 +42,6 @@ static void publishTemperatureSensorsData( void ); - /*********************************************************************//** * @brief * The initTemperature function initializes the temperature unit. @@ -113,8 +112,6 @@ *************************************************************************/ - - /*********************************************************************//** * @brief * The testTemperatureSensorsDataPublishIntervalOverride function overrides the @@ -132,5 +129,4 @@ return result; } - /**@}*/ Index: firmware/App/Services/AlarmMgmtFP.h =================================================================== diff -u -r6dd382e3988fac2f9ee041b4738d67305e17a6a2 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Services/AlarmMgmtFP.h (.../AlarmMgmtFP.h) (revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2) +++ firmware/App/Services/AlarmMgmtFP.h (.../AlarmMgmtFP.h) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -49,7 +49,6 @@ BOOL testClearAllAlarms( MESSAGE_T *message ); - /**@}*/ #endif Index: firmware/App/Services/DDInterface.c =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -187,29 +187,25 @@ { result = requestPreGenDefStart(); } - else { result = requestPreGenStart(); } } - else if ( FP_MODE_PGEN == roMode ) { if ( FALSE == start ) { result = requestPreGenStop(); } - else { // Set flow rate and delivery. setDDPermeateFlowRate( roRate ); result = TRUE; } } - else if ( FP_MODE_DPGW == roMode ) { result = requestPreGenDefStop(); @@ -240,13 +236,11 @@ { result = requestGenWaterDefStart(); } - else { result = requestGenWaterStart(); } } - else { // Set flow rate and delivery. Index: firmware/App/Services/DDInterface.h =================================================================== diff -u -r410afd26b3ae5e372310c696c82f58c59235e10d -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Services/DDInterface.h (.../DDInterface.h) (revision 410afd26b3ae5e372310c696c82f58c59235e10d) +++ firmware/App/Services/DDInterface.h (.../DDInterface.h) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -18,7 +18,7 @@ #ifndef __DD_INTERFACE_H__ #define __DD_INTERFACE_H__ -#include "../../Common/FPDefs.h" +#include "FPDefs.h" #include "FPCommon.h" #include "DDDefs.h" Index: firmware/App/Services/FpgaFP.c =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Services/FpgaFP.c (.../FpgaFP.c) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Services/FpgaFP.c (.../FpgaFP.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -15,7 +15,6 @@ * ***************************************************************************/ - #include "string.h" // for memset(), memcpy() #include "Compatible.h" Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -1,6 +1,5 @@ - #include // for memcpy() #include "BoostPump.h" @@ -73,6 +72,9 @@ static const MSG_HANDLER_LOOKUP_T MSG_FUNCTION_HANDLER_LOOKUP[] = { { MSG_ID_FP_TESTER_LOGIN_REQUEST, &handleTesterLogInRequest }, { MSG_ID_FP_SOFTWARE_RESET_REQUEST, &handleROSoftwareResetRequest }, +{ MSG_ID_FW_VERSIONS_REQUEST, &handleVersionRequestMessage }, +{ MSG_ID_DD_FP_START_STOP_CMD_REQUEST, &handleGenerateWaterRequestMsg }, +{ MSG_ID_FP_RO_PUMP_STOP_REQUEST, &testROPumpHardStop }, { MSG_ID_FP_SEND_TEST_CONFIGURATION, &handleROTestConfiguration }, { MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testValvesStatesPublishIntervalOverride }, { MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST, &testValveStateOverride }, @@ -98,7 +100,6 @@ { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST, &testConductivitySensorTemperatureReadingsOverride }, { MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST, &testConductivitySensorReadCounterOverride }, { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST, &testConductivitySensorErrorCounterOverride }, -{ MSG_ID_DD_FP_START_STOP_CMD_REQUEST, &handleGenerateWaterRequestMsg }, { MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testPreGenDataPublishIntervalOverride }, { MSG_ID_FP_SET_OPERATION_MODE_REQUEST, &testSetOperationMode }, { MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testTemperatureSensorsDataPublishIntervalOverride }, @@ -110,8 +111,6 @@ { MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST, &testBoostPumpTargetFlowOverride }, { MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST, &testBoostPumpTargetDutyCycleOverride }, { MSG_ID_FP_BOOST_PUMP_STOP_REQUEST, &testBoostPumpHardStop }, -{ MSG_ID_FP_RO_PUMP_STOP_REQUEST, &testROPumpHardStop }, -{ MSG_ID_FW_VERSIONS_REQUEST, &handleVersionRequestMessage }, { MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST, &testSetResetSafetyShutdownOverride }, { MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST, &testAlarmStateOverride }, { MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST, &testClearAllAlarms }, Index: firmware/App/Services/SystemCommFP.c =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r6d85a90d2325163e936055a620a8b6aa1a6db65a --- firmware/App/Services/SystemCommFP.c (.../SystemCommFP.c) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Services/SystemCommFP.c (.../SystemCommFP.c) (revision 6d85a90d2325163e936055a620a8b6aa1a6db65a) @@ -1,6 +1,5 @@ - #include // For memcpy() #include "can.h"