Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r2b47dd2e7974618d8899527cdbff80fa93ebc9fa -rd51921b4d923754ab63db79923d28c09c27af5aa --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 2b47dd2e7974618d8899527cdbff80fa93ebc9fa) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision d51921b4d923754ab63db79923d28c09c27af5aa) @@ -110,6 +110,7 @@ static DG_HEATING_CAL_RECORD_T heatingConstsCalRecord; ///< DG heating calibration record. static DG_ACID_CONCENTRATES_RECORD_T acidConcentrateCalRecord; ///< Acid concentrate calibration record. static DG_BICARB_CONCENTRATES_RECORD_T bicarbConcentrateCalRecord; ///< Bicarb concentrate calibration record. +static DG_CHEMICALS_FILL_COND_CAL_RECORD_T fillCondCalRecord; ///< Fill conductivities calibration record. static F32 targetFillFlowRateLPM; ///< Target fill flow rate in L/min. static BOOL isThisTheFirstCycle; ///< Boolean flag to indicate whether this is the first cycle. static RESERVOIRS_PREVIOUS_STATUS reservoirPreviousStatus[ NUM_OF_DG_RESERVOIRS ]; ///< Reservoirs previous status. @@ -158,6 +159,8 @@ getNVRecord2Driver( GET_CAL_HEATING_RECORD, (U08*)&heatingConstsCalRecord, sizeof( heatingConstsCalRecord ), NUM_OF_CAL_DATA_RSRVRS, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD ); + + getNVRecord2Driver( GET_CAL_FILL_CONDUCTIVITIES_RECORD, (U08*)&fillCondCalRecord, sizeof( fillCondCalRecord ), 0, ALARM_ID_NO_ALARM ); } // If the mode is fault or it is standby and the RO volume has not been written already, write it @@ -227,6 +230,8 @@ calStatus |= getNVRecord2Driver( GET_CAL_BICARB_CONCENTRATES, (U08*)&bicarbConcentrateCalRecord, sizeof( bicarbConcentrateCalRecord ), NUM_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD ); + calStatus |= getNVRecord2Driver( GET_CAL_FILL_CONDUCTIVITIES_RECORD, (U08*)&fillCondCalRecord, sizeof( fillCondCalRecord ), 0, ALARM_ID_NO_ALARM ); + if ( TRUE == calStatus ) { result = SELF_TEST_STATUS_PASSED; @@ -803,6 +808,20 @@ /*********************************************************************//** * @brief + * The getFillChemicalCondRecord function fills the provided buffer with + * the fill conductivities record. + * @details Inputs: fillCondCalRecord + * @details Outputs: none + * @param fillRecord which is the pointer to the provided buffer + * @return none + *************************************************************************/ +void getFillChemicalCondRecord( DG_CHEMICALS_FILL_COND_CAL_RECORD_T* fillRecord ) +{ + memcpy( fillRecord, &fillCondCalRecord, sizeof( DG_CHEMICALS_FILL_COND_CAL_RECORD_T ) ); +} + +/*********************************************************************//** + * @brief * The hasTargetFillVolumeReached function checks if the target fill volume * for specific reservoir has been reached. * @details Inputs: fillVolumeTargetMl