Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r27792ea3eb8f23c8f0432620619fad4f654bdbe3 -rcaa8c39a7f29badacdcc7a85ecc65d86d48c5978 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 27792ea3eb8f23c8f0432620619fad4f654bdbe3) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision caa8c39a7f29badacdcc7a85ecc65d86d48c5978) @@ -1989,19 +1989,19 @@ /*********************************************************************//** * @brief - * The sendMaxRORejectionRatioRequestToHD function handles sending the max RO - * rejection ratio request to HD + * The sendDGInstitutionalValuesRequestToHD function handles sending the + * request to the DG institutional values from HD * @details Inputs: none * @details Outputs: none * @return none *************************************************************************/ -void sendMaxRORejectionRatioRequestToHD( void ) +void sendDGInstitutionalValuesRequestToHD( void ) { MESSAGE_T msg; // Create a message record blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_DG_MAX_RO_REJ_RATIO_FROM_HD_INSTIT_RECORD_REQUEST; + msg.hdr.msgID = MSG_ID_DG_INSTIT_VALUES_FROM_HD_INSTIT_RECORD_REQUEST; msg.hdr.payloadLen = 0; // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer @@ -2010,23 +2010,24 @@ /*********************************************************************//** * @brief - * The handleMaxRORejectionResponseFromHDInstitRecord function handles receiving - * max RO rejection ratio response from HD institutional record + * The handleDGInstitutionalValuesResponseFromHDInstitRecord function handles + * receiving DG institutional values from HD institutional record * @details Inputs: none * @details Outputs: message handled * @param message a pointer to the message to handle * @return none *************************************************************************/ -void handleMaxRORejectionResponseFromHDInstitRecord( MESSAGE_T* message ) +void handleDGInstitutionalValuesResponseFromHDInstitRecord( MESSAGE_T* message ) { BOOL status = FALSE; - if ( message->hdr.payloadLen == sizeof(F32) ) + if ( message->hdr.payloadLen == sizeof(DG_INSTITUTIONAL_VALUES_T) ) { - F32 roRejectionRatio; + DG_INSTITUTIONAL_VALUES_T institValues; - memcpy( &roRejectionRatio, message->payload, sizeof(F32) ); - setMaxRORejectionRatio( roRejectionRatio ); + memcpy( &institValues, message->payload, sizeof(DG_INSTITUTIONAL_VALUES_T) ); + setMaxRORejectionRatio( institValues.maxRORejectionRatio ); + setMinInletWaterConductivityAlarmLimitUSPCM( institValues.minInletWaterCondAlarmLimitUSPCM ); status = TRUE; }