Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r5c3d2c3b1f54008cfdf8fb66ed73f1a8015d9b51 -ra37189e75de205982befcc91176f33c0523b03a8 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 5c3d2c3b1f54008cfdf8fb66ed73f1a8015d9b51) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision a37189e75de205982befcc91176f33c0523b03a8) @@ -7,8 +7,8 @@ * * @file SystemCommMessages.c * -* @author (last) Dara Navaei -* @date (last) 20-May-2023 +* @author (last) Sean Nash +* @date (last) 01-Jun-2023 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -1867,6 +1867,7 @@ payload.alarmsFlags |= ( almStatus.alarmsToEscalate ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE) : 0 ); payload.alarmsFlags |= ( almStatus.alarmsSilenced ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED) : 0 ); payload.alarmsFlags |= ( almStatus.lampOn ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON) : 0 ); + payload.alarmsFlags |= ( almStatus.noReTrigger ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RETRIGGER) : 0 ); payload.alarmsFlags |= ( almStatus.noBloodRecirc ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_BLOOD_RECIRC) : 0 ); payload.alarmsFlags |= ( almStatus.noDialRecirc ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC) : 0 ); payload.alarmsFlags |= ( almStatus.noMinimize ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE) : 0 ); @@ -3366,16 +3367,16 @@ * The sendConfirmationRequest function sends a confirmation request to UI * @details Inputs: none * @details Outputs: none - * @param request_id ID of confirmation being requested - * @param request_type Type of confirmation being requested - * @param reject_reason Reason Reason for reject if type is reject + * @param requestID ID of confirmation being requested + * @param requestType Type of confirmation being requested + * @param rejectReason Reason Reason for reject if type is reject * @return none *************************************************************************/ -void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason ) +void sendConfirmationRequest( GENERIC_CONFIRM_ID_T requestID, GENERIC_CONFIRM_COMMAND_T requestType, U32 rejectReason ) { MESSAGE_T msg; U08 *payloadPtr = msg.payload; - U32 temp_request = request_id; + U32 temp_request = requestID; // Create a message record blankMessage( &msg ); @@ -3385,13 +3386,13 @@ memcpy( payloadPtr, &temp_request, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); - temp_request = request_type; + temp_request = requestType; memcpy( payloadPtr, &temp_request, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &reject_reason, sizeof( U32 ) ); + memcpy( payloadPtr, &rejectReason, sizeof( U32 ) ); // 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_NOT_REQUIRED ); + serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED ); } /*********************************************************************//**