Index: firmware/App/Modes/FPModes/FlushFilter.c =================================================================== diff -u -r1738bd16294a1ebc0c01f1a7f340213d6a0d4582 -rf4f631761bb5d7fe936bfd80ba49ddc6aea115d6 --- firmware/App/Modes/FPModes/FlushFilter.c (.../FlushFilter.c) (revision 1738bd16294a1ebc0c01f1a7f340213d6a0d4582) +++ firmware/App/Modes/FPModes/FlushFilter.c (.../FlushFilter.c) (revision f4f631761bb5d7fe936bfd80ba49ddc6aea115d6) @@ -44,7 +44,6 @@ #define INLET_TEMPERATURE_PERSISTENCE_TIMER_MS ( 5 * MS_PER_SECOND ) ///< Persistence timer to trigger alarm in ms. #define INLET_TEMPERATURE_CRITICAL_THRESHOLD_C 40.0F ///< Maximum allowed M3 Inlet temperature in C during filters flush state. - // ********** private data ********** static FP_FILTER_FLUSH_STATE_T filterFlushState; ///< Currently active filter flush state. Index: firmware/App/Modes/FPModes/InletPressureCheck.c =================================================================== diff -u -rfeffc616fe52aa0719cfabeb1d94f4d20b3d354b -rf4f631761bb5d7fe936bfd80ba49ddc6aea115d6 --- firmware/App/Modes/FPModes/InletPressureCheck.c (.../InletPressureCheck.c) (revision feffc616fe52aa0719cfabeb1d94f4d20b3d354b) +++ firmware/App/Modes/FPModes/InletPressureCheck.c (.../InletPressureCheck.c) (revision f4f631761bb5d7fe936bfd80ba49ddc6aea115d6) @@ -192,7 +192,6 @@ checkPersistentAlarm( ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE, isPresOutOfLowRange, pressureM3, minThreshold ); checkPersistentAlarm( ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE, isPresOutOfHighRange, pressureM3, maxThreshold ); } - } } else Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c =================================================================== diff -u -rfeffc616fe52aa0719cfabeb1d94f4d20b3d354b -rf4f631761bb5d7fe936bfd80ba49ddc6aea115d6 --- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c (.../ModePreGenPermeateDefeatured.c) (revision feffc616fe52aa0719cfabeb1d94f4d20b3d354b) +++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c (.../ModePreGenPermeateDefeatured.c) (revision f4f631761bb5d7fe936bfd80ba49ddc6aea115d6) @@ -38,7 +38,6 @@ #define PRE_GEN_DEF_FLUSH_TIMEOUT_MS ( 30 * MS_PER_SECOND ) #define PRE_GEN_DEF_WATER_CHECK_TIMEOUT_MS ( 10 * MS_PER_SECOND ) - // ********** private data ********** static FP_PRE_GENP_DEF_MODE_STATE_T preGenPermeateDefState; ///< Currently active generate Permeate Defeatured state. Index: firmware/App/Monitors/WaterQualityMonitor.c =================================================================== diff -u -r1738bd16294a1ebc0c01f1a7f340213d6a0d4582 -rf4f631761bb5d7fe936bfd80ba49ddc6aea115d6 --- firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision 1738bd16294a1ebc0c01f1a7f340213d6a0d4582) +++ firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision f4f631761bb5d7fe936bfd80ba49ddc6aea115d6) @@ -412,47 +412,20 @@ /*********************************************************************//** * @brief - * The sendCalculatedRODutyCycleToDialin function sends the RO duty cycle - * status to dialin. - * @details \b Message \b sent: MSG_ID_FP_RO_CALCULATED_DUTY_CYCLE_RESPONSE - * @details \b Inputs: CalculatedRODutyCycle - * @details \b Outputs: none - * @return TRUE if the duty cycle message is successfully queued for - * transmit, otherwise FALSE - *************************************************************************/ -BOOL sendCalculatedRODutyCycleToDialin( void ) -{ - BOOL result = FALSE; - F32 CalculatedRODutyCycle = getCalculatedRODutyCycle(); - MESSAGE_T msg; - U08 *payloadPtr = msg.payload; - - // Create a message record - blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_FP_RO_CALCULATED_DUTY_CYCLE_RESPONSE; - msg.hdr.payloadLen = sizeof(CalculatedRODutyCycle); - - memcpy( payloadPtr, (U08*)&CalculatedRODutyCycle, sizeof( CalculatedRODutyCycle ) ); - - // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, COMM_BUFFER_OUT_DD_CAN_PC, ACK_NOT_REQUIRED ); - - return result; -} - -/*********************************************************************//** - * @brief - * The testROGetCurrentCalcuclatedDutyCycle function + * The testROGetCurrentCalculatedDutyCycle function * return RO calculated duty cycle at instantaneous pressure * @details \b Inputs: none * @details \b Outputs: none * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testROGetCurrentCalcuclatedDutyCycle() +BOOL testROGetCurrentCalculatedDutyCycle( MESSAGE_T *message ) { BOOL result = FALSE; - result = sendCalculatedRODutyCycleToDialin(); + CURRENT_RO_PUMP_CAL_DUTY_CYCLE_DATA_T CalculatedRODutyCycle; + CalculatedRODutyCycle.curentCalculatedDutyCycle = getCalculatedRODutyCycle(); + result = sendMessage( MSG_ID_FP_RO_CALCULATED_DUTY_CYCLE_RESPONSE, COMM_BUFFER_OUT_DD_CAN_PC, (U08*)&CalculatedRODutyCycle, sizeof( CURRENT_RO_PUMP_CAL_DUTY_CYCLE_DATA_T ) ); + return result; } Index: firmware/App/Monitors/WaterQualityMonitor.h =================================================================== diff -u -r1738bd16294a1ebc0c01f1a7f340213d6a0d4582 -rf4f631761bb5d7fe936bfd80ba49ddc6aea115d6 --- firmware/App/Monitors/WaterQualityMonitor.h (.../WaterQualityMonitor.h) (revision 1738bd16294a1ebc0c01f1a7f340213d6a0d4582) +++ firmware/App/Monitors/WaterQualityMonitor.h (.../WaterQualityMonitor.h) (revision f4f631761bb5d7fe936bfd80ba49ddc6aea115d6) @@ -32,6 +32,12 @@ // ********** public definitions ********** +//Current calculated RO pump duty cycle data struct. +typedef struct +{ + F32 curentCalculatedDutyCycle; ///< Current calculate RO pump duty cycle based on P13 pressure +} CURRENT_RO_PUMP_CAL_DUTY_CYCLE_DATA_T; + // ********** public definitions ********** void initWaterQualityMonitor( void ); @@ -49,6 +55,6 @@ void checkRODutyCycle( void ); void checkROInletPressure( void ); -BOOL testROGetCurrentCalcuclatedDutyCycle(); +BOOL testROGetCurrentCalculatedDutyCycle( MESSAGE_T *message ); #endif Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r70cf903c053edbf91f91993ef320277269d31504 -rf4f631761bb5d7fe936bfd80ba49ddc6aea115d6 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 70cf903c053edbf91f91993ef320277269d31504) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision f4f631761bb5d7fe936bfd80ba49ddc6aea115d6) @@ -245,7 +245,7 @@ { MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST, &testSetGeneratePermeateSignal }, { MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testRORejectionRatioDataPublishIntervalOverride }, { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST, &testRORejectionRatioFilteredOverride }, - { MSG_ID_FP_RO_GET_CALCULATED_DUTY_CYCLE_REQUEST, &testROGetCurrentCalcuclatedDutyCycle }, + { MSG_ID_FP_RO_GET_CALCULATED_DUTY_CYCLE_REQUEST, &testROGetCurrentCalculatedDutyCycle }, { MSG_ID_FP_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testFilterFlushDataPublishIntervalOverride }, { MSG_ID_FP_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST, &testFilterFlushTimerOverride }, { MSG_ID_FP_FLUSH_PERMEATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testPermeateFlushDataPublishIntervalOverride },