Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -re12fd5b499b9d32bd21b43cd4d178dd0241aa1e3 -rc312f6b14dd4dd9571c3a6bed6de28eaf1c71a34 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision e12fd5b499b9d32bd21b43cd4d178dd0241aa1e3) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision c312f6b14dd4dd9571c3a6bed6de28eaf1c71a34) @@ -3504,29 +3504,21 @@ * The sendConfirmationRequest function sends a confirmation request to UI * @details Inputs: none * @details Outputs: none - * @param requestID ID of confirmation being requested - * @param requestType Type of confirmation being requested - * @param rejectReason Reason Reason for reject if type is reject + * @param request ID pointer to generic message request structure * @return none *************************************************************************/ -void sendConfirmationRequest( GENERIC_CONFIRM_ID_T requestID, GENERIC_CONFIRM_COMMAND_T requestType, U32 rejectReason ) +void sendConfirmationRequest( GENERIC_CONFIRMATION_REQUEST_T *request ) { MESSAGE_T msg; U08 *payloadPtr = msg.payload; - U32 temp_request = requestID; // Create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_HD_UI_CONFIRMATION_REQUEST; // The payload length is U32 Request ID, U32 Type, U32 Reject Reason - msg.hdr.payloadLen = 3 * sizeof( U32 ); + msg.hdr.payloadLen = sizeof( GENERIC_CONFIRMATION_REQUEST_T ); - memcpy( payloadPtr, &temp_request, sizeof( U32 ) ); - payloadPtr += sizeof( U32 ); - temp_request = requestType; - memcpy( payloadPtr, &temp_request, sizeof( U32 ) ); - payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &rejectReason, sizeof( U32 ) ); + memcpy( payloadPtr, request, sizeof( GENERIC_CONFIRMATION_REQUEST_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_UI, ACK_REQUIRED ); Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -ra28daf72bbc8bd7313425471555d5189d946af13 -rc312f6b14dd4dd9571c3a6bed6de28eaf1c71a34 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision a28daf72bbc8bd7313425471555d5189d946af13) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision c312f6b14dd4dd9571c3a6bed6de28eaf1c71a34) @@ -136,6 +136,18 @@ U32 minDialRate; ///< Minimum dialysate flow rate (in mL/min) U32 maxDialRate; ///< Maximum dialysate flow rate (in mL/min) } TREATMENT_PARAM_BROADCAST_PAYLOAD_T; + +/// Payload structure for generic confirmation request +typedef struct +{ + U32 requestID; ///< Generic request ID. + U32 requestType; ///< Generic request type. + U32 rejectReason; ///< Reject reason. + F32 genericPayload1; ///< Generic payload 1. + F32 genericPayload2; ///< Generic payload 2. + F32 genericPayload3; ///< Generic payload 3. + F32 genericPayload4; ///< Generic payload 4. +} GENERIC_CONFIRMATION_REQUEST_T; // ********** public function prototypes ********** @@ -523,7 +535,7 @@ void handleUIConfirmationResponse( MESSAGE_T *message ); // MSG_ID_HD_REQUEST_UI_CONFIRMATION -void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason ); +void sendConfirmationRequest( GENERIC_CONFIRMATION_REQUEST_T *request ); // MSG_ID_HD_REQUEST_DG_ALARMS BOOL sendRequestForDGResendAlarms( void );