Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r8a89e041755b26fad2530e1b8ad2cfeed1937b0a -r68f28bf44ff5d3d10420ae0d96aec9eac22e228d --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 8a89e041755b26fad2530e1b8ad2cfeed1937b0a) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 68f28bf44ff5d3d10420ae0d96aec9eac22e228d) @@ -1987,7 +1987,55 @@ sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, status ); } +/*********************************************************************//** + * @brief + * The sendDGInstitutionalValuesRequestToHD function handles sending the + * request to the DG institutional values from HD + * @details Inputs: none + * @details Outputs: none + * @return none + *************************************************************************/ +void sendDGInstitutionalValuesRequestToHD( void ) +{ + MESSAGE_T msg; + // Create a message record + blankMessage( &msg ); + 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 + serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED ); +} + +/*********************************************************************//** + * @brief + * 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 handleDGInstitutionalValuesResponseFromHDInstitRecord( MESSAGE_T* message ) +{ + BOOL status = FALSE; + + if ( message->hdr.payloadLen == sizeof(DG_INSTITUTIONAL_VALUES_T) ) + { + DG_INSTITUTIONAL_VALUES_T institValues; + + memcpy( &institValues, message->payload, sizeof(DG_INSTITUTIONAL_VALUES_T) ); + setMinRORejectionRatioPCT( institValues.minRORejectionRatioPCT ); + setMinInletWaterConductivityAlarmLimitUSPCM( institValues.minInletWaterCondAlarmLimitUSPCM ); + signalDGInstituionalValuesReceived(); + + status = TRUE; + } + + sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, status ); +} + // *********************************************************************** // **************** Message Handling Helper Functions ******************** // *********************************************************************** @@ -3875,38 +3923,6 @@ } /*********************************************************************//** - * @brief - * The handleTestUsedAcidVolumeMLOverrideRequest function handles a - * request to override the acid volume. - * @details Inputs: none - * @details Outputs: message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleTestUsedAcidVolumeMLOverrideRequest( MESSAGE_T *message ) -{ - TEST_OVERRIDE_PAYLOAD_T payload; - BOOL result = FALSE; - - // Verify payload length - if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) ); - if ( FALSE == payload.reset ) - { - result = testSetUsedAcidVolumeMLOverride( payload.state.f32 ); - } - else - { - result = testResetUsedAcidVolumeMLOverride(); - } - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/*********************************************************************//** * The handleSetFansDutyCycleOverrideRequest function handles a * request to override the fans duty cycle. * @details Inputs: none @@ -3938,38 +3954,6 @@ sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); } -/*********************************************************************//** - * @brief - * The handleTestUsedBicarbVolumeMLOverrideRequest function handles a - * request to override the used bicarb volume. - * @details Inputs: none - * @details Outputs: message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleTestUsedBicarbVolumeMLOverrideRequest( MESSAGE_T *message ) -{ - TEST_OVERRIDE_PAYLOAD_T payload; - BOOL result = FALSE; - - // Verify payload length - if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) ); - if ( FALSE == payload.reset ) - { - result = testSetUsedBicarbVolumeMLOverride( payload.state.f32 ); - } - else - { - result = testResetUsedBicarbVolumeMLOverride(); - } - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - #ifndef _RELEASE_ /*********************************************************************//** * @brief @@ -5238,4 +5222,27 @@ sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); } +/*********************************************************************//** + * @brief + * The handleTestEnableModeFillChemsTest function handles a request + * to enable the mode fill chemicals test. + * @details Inputs: none + * @details Outputs: message handled + * @param message a pointer to the message to handle + * @return none + *************************************************************************/ +void handleTestEnableModeFillChemsTest( MESSAGE_T* message ) +{ + BOOL result = FALSE; + + // verify payload length + if ( 0 == message->hdr.payloadLen ) + { + result = testSetEnableTestChemsCondValuesStatus(); + } + + // respond to request + sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); +} + /**@}*/