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; }