Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -rfba69244d94307e50fefaa1e88bcbb979584461e -raef3220987083ca1392a894cd50e3b8599aaa32a --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision fba69244d94307e50fefaa1e88bcbb979584461e) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision aef3220987083ca1392a894cd50e3b8599aaa32a) @@ -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/ModeTreatmentParams.c =================================================================== diff -u -re42bc54b5c3ff134d9f4526034e3c522a64f0cdf -raef3220987083ca1392a894cd50e3b8599aaa32a --- firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision e42bc54b5c3ff134d9f4526034e3c522a64f0cdf) +++ firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision aef3220987083ca1392a894cd50e3b8599aaa32a) @@ -43,8 +43,8 @@ #define NO_HEPARIN_TYPE_SET 0xFFFFFFFF ///< UI will send this value for Heparin type if Heparin not used #define INSTIT_CHEM_DISINFECT_ENABLE_RANGE 1 ///< Institutional record chemical disinfect enable/disable allowable range -#define INSTIT_RO_REJECTION_RATIO_MIN 0.0F ///< Institutional record RO rejection ratio minimum -#define INSTIT_RO_REJECTION_RATIO_MAX 1.0F ///< Institutional record RO rejection ratio maximum +#define INSTIT_MAX_RO_REJECTION_RATIO_MIN 0.0F ///< Institutional record max RO rejection ratio minimum +#define INSTIT_MAX_RO_REJECTION_RATIO_MAX 1.0F ///< Institutional record max RO rejection ratio maximum /// Record for range and default of treatment parameters. typedef struct @@ -1028,8 +1028,8 @@ ( nvInstRcrd->maxHeparinBolusVolumeML <= TREAT_PARAMS_PROPERTIES[ TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ].max.sFlt ) ? TRUE : FALSE ); result &= ( ( nvInstRcrd->minHeparinBolusVolumeML <= nvInstRcrd->maxHeparinBolusVolumeML ) ? TRUE : FALSE ); result &= ( ( nvInstRcrd->enableChemicalDisinfect <= INSTIT_CHEM_DISINFECT_ENABLE_RANGE ) ? TRUE : FALSE ); - result &= ( ( nvInstRcrd->roRejectionRatio >= INSTIT_RO_REJECTION_RATIO_MIN ) && - ( nvInstRcrd->roRejectionRatio <= INSTIT_RO_REJECTION_RATIO_MAX ) ? TRUE : FALSE ); + result &= ( ( nvInstRcrd->maxRORejectionRatio >= INSTIT_MAX_RO_REJECTION_RATIO_MIN ) && + ( nvInstRcrd->maxRORejectionRatio <= INSTIT_MAX_RO_REJECTION_RATIO_MAX ) ? TRUE : FALSE ); return result; } Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -re42bc54b5c3ff134d9f4526034e3c522a64f0cdf -raef3220987083ca1392a894cd50e3b8599aaa32a --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision e42bc54b5c3ff134d9f4526034e3c522a64f0cdf) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision aef3220987083ca1392a894cd50e3b8599aaa32a) @@ -1219,8 +1219,8 @@ handleUIHDResetInServiceModeRequest( message ); break; - case MSG_ID_DG_RO_REJ_RATIO_FROM_HD_INSTIT_RECORD_REQUEST: - handleDGRequestRORejectionRatio( message ); + case MSG_ID_DG_MAX_RO_REJ_RATIO_FROM_HD_INSTIT_RECORD_REQUEST: + handleDGRequestMaxRORejectionRatio( message ); break; // NOTE: this always must be the last case Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -re42bc54b5c3ff134d9f4526034e3c522a64f0cdf -raef3220987083ca1392a894cd50e3b8599aaa32a --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision e42bc54b5c3ff134d9f4526034e3c522a64f0cdf) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision aef3220987083ca1392a894cd50e3b8599aaa32a) @@ -3760,27 +3760,27 @@ /*********************************************************************//** * @brief - * The handleDGRequestRORejectionRatio function handles the DG request - * to receive the RO rejection ratio from HD institutional record. + * 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 handleDGRequestRORejectionRatio( MESSAGE_T* message ) +void handleDGRequestMaxRORejectionRatio( MESSAGE_T* message ) { if ( 0 == message->hdr.payloadLen ) { MESSAGE_T msg; - F32 roRejectionRatioInInstitRecord = getRORejectionRatioInInstitRecord(); + F32 maxRORejectionRatioInInstitRecord = getMaxRORejectionRatioInInstitRecord(); // Create a message record blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_HD_RO_REJ_RATIO_FROM_HD_INSTIT_RECORD_TO_DG_RESPONSE; + msg.hdr.msgID = MSG_ID_HD_MAX_RO_REJ_RATIO_FROM_HD_INSTIT_RECORD_RESPONSE; msg.hdr.payloadLen = sizeof( F32 ); - memcpy( msg.payload, &roRejectionRatioInInstitRecord, 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 ); Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -re42bc54b5c3ff134d9f4526034e3c522a64f0cdf -raef3220987083ca1392a894cd50e3b8599aaa32a --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision e42bc54b5c3ff134d9f4526034e3c522a64f0cdf) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision aef3220987083ca1392a894cd50e3b8599aaa32a) @@ -568,7 +568,7 @@ BOOL sendDGStartHeatDisinfectPassiveCoolModeCommand( BOOL start ); // MSG_ID_DG_RO_REJ_RATIO_FROM_HD_INSTIT_RECORD_REQUEST -void handleDGRequestRORejectionRatio( MESSAGE_T* message ); +void handleDGRequestMaxRORejectionRatio( MESSAGE_T* message ); // *********** public test support message functions **********