Index: firmware/App/Modes/PreTreatmentRecirc.c =================================================================== diff -u -r5d9c5362b537331248dc592e05b6b016267eb6d3 -r39156e21acec61d20fa49ee0adfffedf0f8597d9 --- firmware/App/Modes/PreTreatmentRecirc.c (.../PreTreatmentRecirc.c) (revision 5d9c5362b537331248dc592e05b6b016267eb6d3) +++ firmware/App/Modes/PreTreatmentRecirc.c (.../PreTreatmentRecirc.c) (revision 39156e21acec61d20fa49ee0adfffedf0f8597d9) @@ -32,19 +32,19 @@ // ********** private definitions ********** -#define BLOOD_PUMP_RECIRC_FLOW_RATE 100 ///< Blood pump flow rate during recirculation in mL/min. +#define BLOOD_PUMP_RECIRC_FLOW_RATE 100 ///< Blood pump flow rate during recirculation in mL/min. // TODO: Restore to 100 when DPi flow control is fixed. -#define DIALYSATE_PUMP_RECIRC_FLOW_RATE 250 ///< Dialysate pump flow rate during recirculation in mL/min. -#define WARNING_MEDIUM_PRIME_COMPLETED_TIME_MS ( 90 * 60 * MS_PER_SECOND ) ///< Pre-Treatment recirc time before medium priority warning in min. -#define WARNING_HIGH_PRIME_COMPLETED_TIME_MS ( 120 * 60 * MS_PER_SECOND ) ///< Pre-Treatment recirc time before high priority alarm in min. +#define DIALYSATE_PUMP_RECIRC_FLOW_RATE 250 ///< Dialysate pump flow rate during recirculation in mL/min. +#define WARNING_MEDIUM_PRIME_COMPLETED_TIME_MS ( 90 * 60 * MS_PER_SECOND ) ///< Pre-Treatment recirc time before medium priority warning in min. +#define WARNING_HIGH_PRIME_COMPLETED_TIME_MS ( 120 * 60 * MS_PER_SECOND ) ///< Pre-Treatment recirc time before high priority alarm in min. // ********** private data ********** -static HD_PRE_TREATMENT_RECIRC_STATE_T currentPreTreatmentRecircState; ///< Current state of the pre-treatment recirculate state machine. -static BOOL recircResumeRequested; ///< Flag indicates alarm requesting to resume pre-treatment recirculate. -static U32 preTxRecircStartTime; ///< Time pre-treatment re-circulate state started. -static BOOL recircTOWarningGiven; ///< Flag indicates 90 minute warning given. -static BOOL recircTOAlarmGiven; ///< Flag indicates 2 hour alarm triggered. +static HD_PRE_TREATMENT_RECIRC_STATE_T currentPreTreatmentRecircState; ///< Current state of the pre-treatment recirculate state machine. +static BOOL recircResumeRequested; ///< Flag indicates alarm requesting to resume pre-treatment recirculate. +static U32 preTxRecircStartTime; ///< Time pre-treatment re-circulate state started. +static BOOL recircTOWarningGiven; ///< Flag indicates 90 minute warning given. +static BOOL recircTOAlarmGiven; ///< Flag indicates 2 hour alarm triggered. // ********** private function prototypes ********** Index: firmware/App/Modes/Prime.c =================================================================== diff -u -r5d9c5362b537331248dc592e05b6b016267eb6d3 -r39156e21acec61d20fa49ee0adfffedf0f8597d9 --- firmware/App/Modes/Prime.c (.../Prime.c) (revision 5d9c5362b537331248dc592e05b6b016267eb6d3) +++ firmware/App/Modes/Prime.c (.../Prime.c) (revision 39156e21acec61d20fa49ee0adfffedf0f8597d9) @@ -170,7 +170,6 @@ primeStartTime = 0; primePauseStartTime = 0; primeStatusBroadcastTimerCounter = 0; - } /*********************************************************************//** Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r03bd494bf7b7c96f79cf9b8bd0f99432982b9571 -r39156e21acec61d20fa49ee0adfffedf0f8597d9 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 03bd494bf7b7c96f79cf9b8bd0f99432982b9571) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 39156e21acec61d20fa49ee0adfffedf0f8597d9) @@ -791,14 +791,14 @@ *************************************************************************/ void handleUITreatmentLogDataRequest( MESSAGE_T *message ) { + BOOL ack = FALSE; + if ( 0 == message->hdr.payloadLen ) { + ack = TRUE; sendTreatmentLogDataToUI(); } - else - { - sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE ); - } + sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ack ); } /*********************************************************************//**