Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -ra28daf72bbc8bd7313425471555d5189d946af13 -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision a28daf72bbc8bd7313425471555d5189d946af13) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764) @@ -912,12 +912,7 @@ { dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE; - if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) ) - { - // The empty bottle alarms should not be active. If they are, the user shall insert the new bottle first and then hit Ok/Resume and - // then the fill can go. This is to make sure the next fill is done the full bottles - sendDGFillCommand( DG_CMD_START, fillToVolMl, targetFlowLPM ); - } + sendDGFillCommand( DG_CMD_START, fillToVolMl, targetFlowLPM ); } /*********************************************************************//** Index: firmware/App/Modes/TreatmentRecirc.c =================================================================== diff -u -r65ed49c5a339297028707bdf8f3dec698c8ae74e -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 --- firmware/App/Modes/TreatmentRecirc.c (.../TreatmentRecirc.c) (revision 65ed49c5a339297028707bdf8f3dec698c8ae74e) +++ firmware/App/Modes/TreatmentRecirc.c (.../TreatmentRecirc.c) (revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764) @@ -7,8 +7,8 @@ * * @file TreatmentRecirc.c * -* @author (last) Sean Nash -* @date (last) 31-Jul-2023 +* @author (last) Dara Navaei +* @date (last) 27-Mar-2025 * * @author (original) Sean Nash * @date (original) 20-Jan-2021 Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rad07750abbb443aa6139b74f79ea2d9c7f6e4076 -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision ad07750abbb443aa6139b74f79ea2d9c7f6e4076) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764) @@ -8,7 +8,7 @@ * @file AlarmMgmt.c * * @author (last) Dara Navaei -* @date (last) 06-May-2024 +* @date (last) 02-Apr-2025 * * @author (original) Sean Nash * @date (original) 07-Nov-2019 Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -r708898fe91142d09cc1188b3187375d62cc87cc8 -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 708898fe91142d09cc1188b3187375d62cc87cc8) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764) @@ -7,8 +7,8 @@ * * @file AlarmMgmt.h * -* @author (last) Sean Nash -* @date (last) 08-Sep-2023 +* @author (last) Dara Navaei +* @date (last) 25-Mar-2025 * * @author (original) Sean Nash * @date (original) 07-Nov-2019 Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rc0b5416c7c5471942efd66f4b811dd464d7d6b24 -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision c0b5416c7c5471942efd66f4b811dd464d7d6b24) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764) @@ -8,7 +8,7 @@ * @file SystemCommMessages.c * * @author (last) Dara Navaei -* @date (last) 29-Jan-2025 +* @date (last) 28-Mar-2025 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -3758,7 +3758,36 @@ return result; } +/*********************************************************************//** + * @brief + * The handleDGRequestMaxRORejectionRatio function handles the DG request + * to receive the max RO rejection ratio from HD institutional record. + * @details Inputs: none + * @details Outputs: none + * @param message a pointer to the message to handle + * @return none + *************************************************************************/ +void handleDGRequestMaxRORejectionRatio( MESSAGE_T* message ) +{ + if ( 0 == message->hdr.payloadLen ) + { + MESSAGE_T msg; + F32 maxRORejectionRatioInInstitRecord = getMaxRORejectionRatioInInstitRecord(); + + // Create a message record + blankMessage( &msg ); + msg.hdr.msgID = MSG_ID_HD_MAX_RO_REJ_RATIO_FROM_HD_INSTIT_RECORD_RESPONSE; + msg.hdr.payloadLen = sizeof( F32 ); + + memcpy( msg.payload, &maxRORejectionRatioInInstitRecord, sizeof( F32 ) ); + + // 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_DG, ACK_REQUIRED ); + } +} + + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r65ed49c5a339297028707bdf8f3dec698c8ae74e -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 65ed49c5a339297028707bdf8f3dec698c8ae74e) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764) @@ -8,7 +8,7 @@ * @file SystemCommMessages.h * * @author (last) Dara Navaei -* @date (last) 24-Oct-2024 +* @date (last) 27-Mar-2025 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -567,6 +567,9 @@ // MSG_ID_DG_START_STOP_PASSIVE_COOL_HEAT_DISINFECT BOOL sendDGStartHeatDisinfectPassiveCoolModeCommand( BOOL start ); +// MSG_ID_DG_RO_REJ_RATIO_FROM_HD_INSTIT_RECORD_REQUEST +void handleDGRequestMaxRORejectionRatio( MESSAGE_T* message ); + // *********** public test support message functions ********** // MSG_TESTER_LOG_IN