Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 -re08ab54617b1fe401344af87a081eccce0022e74 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision e08ab54617b1fe401344af87a081eccce0022e74) @@ -3760,27 +3760,29 @@ /*********************************************************************//** * @brief - * The handleDGRequestMaxRORejectionRatio function handles the DG request - * to receive the max RO rejection ratio from HD institutional record. + * The handleDGRequestInstitutionalValues function handles the DG request + * to receive the DG institutional values from HD institutional record. * @details Inputs: none * @details Outputs: none * @param message a pointer to the message to handle * @return none *************************************************************************/ -void handleDGRequestMaxRORejectionRatio( MESSAGE_T* message ) +void handleDGRequestInstitutionalValues( MESSAGE_T* message ) { if ( 0 == message->hdr.payloadLen ) { MESSAGE_T msg; + DG_INSTITUTIONAL_VALUES_T dgInstitValues; - F32 maxRORejectionRatioInInstitRecord = getMaxRORejectionRatioInInstitRecord(); + dgInstitValues.maxRORejectionRatio = getMaxRORejectionRatioInInstitRecord(); + dgInstitValues.minInletWaterCondAlarmLimitUSPCM = getMinInletWaterConductivityLimitInstitRecord(); // Create a message record blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_HD_MAX_RO_REJ_RATIO_FROM_HD_INSTIT_RECORD_RESPONSE; - msg.hdr.payloadLen = sizeof( F32 ); + msg.hdr.msgID = MSG_ID_DG_INSTIT_VALUES_FROM_HD_INSTIT_RECORD_RESPONSE; + msg.hdr.payloadLen = sizeof( DG_INSTITUTIONAL_VALUES_T ); - memcpy( msg.payload, &maxRORejectionRatioInInstitRecord, sizeof( F32 ) ); + memcpy( msg.payload, &dgInstitValues, sizeof( DG_INSTITUTIONAL_VALUES_T ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );