Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -r486713fc443f635ac6e071020df1ec5478547a23 -r60834a8b3bf8348515a367ba635aa8ad63ea7f22 --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 486713fc443f635ac6e071020df1ec5478547a23) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 60834a8b3bf8348515a367ba635aa8ad63ea7f22) @@ -63,10 +63,10 @@ #define FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE 0.1 ///< Flow integrated volume has 10% tolerance compare to load cell reading. #define CONDUCTIVITY_WHEN_ACID_JUG_EMPTY 10000.0 ///< The conductivity value when the acid jug is empty. -#define CONDUCTIVITY_WHEN_BICARB_JUG_EMPTY 12000.0 ///< The conductivity value when the bicard jug is empty. +#define CONDUCTIVITY_WHEN_BICARB_JUG_EMPTY 12000.0 ///< The conductivity value when the bicarb jug is empty. #define ACID_TEST_CD1_TCD 12252.1 ///< Used for testing CD1 acid theoretical conductivity. #define ACID_TEST_CD2_TCD ACID_TEST_CD1_TCD ///< Used for testing CD2 acid theoretical conductivity. -#define BICARD_TEST_CD2_TCD 6820.91 ///< Used for testing CD2 bicard theoretical conductivity. +#define BICARB_TEST_CD2_TCD 6820.91 ///< Used for testing CD2 bicarb theoretical conductivity. #define FIVE_PERCENT_FACTOR 0.05 ///< 5.0 / 100.0 used to calculate conductivity within range of -/+ 5%. #define RO_PUMP_LOOKUP_TABLE_SIZE 4 ///< Size of array used as RO pump speed lookup table. #define CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN 5.0 ///< Concentrate pump additional speed during priming in mL/min. @@ -106,7 +106,7 @@ /// DG broadcast dialysate fill data structure. typedef struct { - F32 averageBicardConductivity; ///< The average bicarb conductivity calculated in one fill. + F32 averageBicarbConductivity; ///< The average bicarb conductivity calculated in one fill. F32 averageAcidConductivity; ///< The average acid conductivity calculated in one fill. BOOL isThisTheFirstFill; ///< Indicate if this is the first fill. F32 pctDiffInConductivity; ///< The percent difference between CD1 and CD2. @@ -128,17 +128,17 @@ static F32 totalROFlowRateMLPM; ///< Total RO flow rate over period of time. static F32 acidConductivityTotal; ///< Total of acid conductivity during fill. -static F32 bicarbConductivityTotal; ///< Total of bicard conductivity during fill. +static F32 bicarbConductivityTotal; ///< Total of bicarb conductivity during fill. static U32 conductivitySampleCount; ///< Sample count of conductivity during fill. -static F32 averageBicardConductivity; ///< Average bicard conductivity over 30 seconds. +static F32 averageBicarbConductivity; ///< Average bicarb conductivity over 30 seconds. static F32 averageAcidConductivity; ///< Average acid conductivity over 30 seconds. static F32 pctDiffInConductivity; ///< Percent difference in conductivity between CD1 (acid) and CD2 (bicarb). -static U32 bicardConductivitySampleCount; ///< Sample count of bicard conductivity over 30 seconds. +static U32 bicarbConductivitySampleCount; ///< Sample count of bicarb conductivity over 30 seconds. static U32 acidConductivitySampleCount; ///< Sample count of acid conductivity over 30 seconds. -static F32 totalBicardConductivity; ///< Total bicard conductivity over 30 seconds. +static F32 totalBicarbConductivity; ///< Total bicarb conductivity over 30 seconds. static F32 totalAcidConductivity; ///< Total acid conductivity over 30 seconds. static OVERRIDE_F32_T usedAcidVolumeML = { 0.0, 0.0, 0.0, 0.0 }; ///< The integrated acid concentration volume has been used in mL. @@ -195,12 +195,12 @@ conductivitySampleCount = 0; concentratePumpPrimeCount = 0; pumpSpeedIndex = 0; - averageBicardConductivity = 0.0; + averageBicarbConductivity = 0.0; averageAcidConductivity = 0.0; pctDiffInConductivity = 0.0; - bicardConductivitySampleCount = 0; + bicarbConductivitySampleCount = 0; acidConductivitySampleCount = 0; - totalBicardConductivity = 0.0; + totalBicarbConductivity = 0.0; totalAcidConductivity = 0.0; initPersistentAlarm( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS ); @@ -590,9 +590,9 @@ else { // Initialization - totalBicardConductivity = 0.0; - averageBicardConductivity = 0.0; - bicardConductivitySampleCount = 0; + totalBicarbConductivity = 0.0; + averageBicarbConductivity = 0.0; + bicarbConductivitySampleCount = 0; // Set pumps flow rate to prepare for bicarb conductivity testing setROPumpTargetFlowRateLPM( RO_PUMP_400_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_40_ML_PER_MIN ); @@ -617,25 +617,25 @@ static DG_FILL_MODE_STATE_T handleTestBicarbConductivityState( void ) { DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY; - F32 bicardConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR ); + F32 bicarbConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR ); - totalBicardConductivity += bicardConductivity; - bicardConductivitySampleCount++; + totalBicarbConductivity += bicarbConductivity; + bicarbConductivitySampleCount++; if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) ) { - averageBicardConductivity = totalBicardConductivity / bicardConductivitySampleCount; + averageBicarbConductivity = totalBicarbConductivity / bicarbConductivitySampleCount; - if ( TRUE == isValueWithinPercentRange( averageBicardConductivity, BICARD_TEST_CD2_TCD, FIVE_PERCENT_FACTOR ) ) + if ( TRUE == isValueWithinPercentRange( averageBicarbConductivity, BICARB_TEST_CD2_TCD, FIVE_PERCENT_FACTOR ) ) { // Initialization requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB ); - totalBicardConductivity = 0.0; + totalBicarbConductivity = 0.0; totalAcidConductivity = 0.0; - averageBicardConductivity = 0.0; + averageBicarbConductivity = 0.0; averageAcidConductivity = 0.0; pctDiffInConductivity = 0.0; - bicardConductivitySampleCount = 0; + bicarbConductivitySampleCount = 0; acidConductivitySampleCount = 0; // Set pumps flow rate to prepare for acid conductivity testing setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI ); @@ -647,7 +647,7 @@ } else { - SET_ALARM_WITH_1_F32_DATA( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, averageBicardConductivity ); + SET_ALARM_WITH_1_F32_DATA( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, averageBicarbConductivity ); requestNewOperationMode( DG_MODE_GENE ); } } @@ -658,32 +658,32 @@ /*********************************************************************//** * @brief * The handleTestAcidConductivityState function validates that the average - * conductivity of the acid and bicard concentrate are within 5% of the + * conductivity of the acid and bicarb concentrate are within 5% of the * theoretical conductivity over 30 seconds sampling period. * acid concentrate. - * @details Inputs: Acid and bicard conductivity sensor values - * @details Outputs: Verified acid, bicard, acid & bicard conductivity values + * @details Inputs: Acid and bicarb conductivity sensor values + * @details Outputs: Verified acid, bicarb, acid & bicarb conductivity values * @return the next state *************************************************************************/ static DG_FILL_MODE_STATE_T handleTestAcidConductivityState( void ) { DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY; F32 acidConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR ); - F32 bicardConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR ); + F32 bicarbConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR ); - totalBicardConductivity += bicardConductivity; - bicardConductivitySampleCount++; + totalBicarbConductivity += bicarbConductivity; + bicarbConductivitySampleCount++; totalAcidConductivity += acidConductivity; acidConductivitySampleCount++; if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) ) { - averageBicardConductivity = totalBicardConductivity / bicardConductivitySampleCount; + averageBicarbConductivity = totalBicarbConductivity / bicarbConductivitySampleCount; averageAcidConductivity = totalAcidConductivity / acidConductivitySampleCount; - pctDiffInConductivity = fabs( 2.0 * ( averageAcidConductivity - averageBicardConductivity ) / ( averageAcidConductivity + averageBicardConductivity ) ); + pctDiffInConductivity = fabs( 2.0 * ( averageAcidConductivity - averageBicarbConductivity ) / ( averageAcidConductivity + averageBicarbConductivity ) ); - if ( ( TRUE == isValueWithinPercentRange(averageBicardConductivity, BICARD_TEST_CD2_TCD, FIVE_PERCENT_FACTOR) ) && + if ( ( TRUE == isValueWithinPercentRange(averageBicarbConductivity, BICARB_TEST_CD2_TCD, FIVE_PERCENT_FACTOR) ) && ( TRUE == isValueWithinPercentRange(averageAcidConductivity, ACID_TEST_CD2_TCD, FIVE_PERCENT_FACTOR) ) && ( pctDiffInConductivity < FIVE_PERCENT_FACTOR ) ) { @@ -822,7 +822,7 @@ F32 filledVolumeML = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight; F32 integratedVolumeToLoadCellReadingPercent = fabs( 1 - ( filledVolumeML / integratedVolumeML ) ); F32 avgAcidConductivity = acidConductivityTotal / conductivitySampleCount; - F32 avgBicardConductivity = bicarbConductivityTotal / conductivitySampleCount; + F32 avgBicarbConductivity = bicarbConductivityTotal / conductivitySampleCount; fillStatus.fillAvgConductivityOutOfRange = FALSE; // init to FALSE when fill has reached target @@ -835,13 +835,13 @@ #endif #ifndef DISABLE_DIALYSATE_CHECK // SRSDG 400 - if ( TRUE == isValueWithinPercentRange( avgBicardConductivity, BICARB_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR ) ) + if ( TRUE == isValueWithinPercentRange( avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR ) ) { fillStatus.fillAvgConductivityOutOfRange = TRUE; // flag to signal idle mode to handle bad fill fillStatus.isThisFirstFill = TRUE; setBottlesNeedPrimeFlag( TRUE ); - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_REPLACE_CONCENTRATE_BOTTLES, avgBicardConductivity, BICARB_NORMAL_CONDUCTIVITY ); // trigger replace bottles alarm #1 - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT, avgBicardConductivity, BICARB_NORMAL_CONDUCTIVITY ); // immediately trigger wait for dialysate alarm #2 + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_REPLACE_CONCENTRATE_BOTTLES, avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY ); // trigger replace bottles alarm #1 + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT, avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY ); // immediately trigger wait for dialysate alarm #2 requestNewOperationMode( DG_MODE_GENE ); // leave fill mode and go to idle } @@ -1047,7 +1047,7 @@ // Populate the data structure for publication fillModeData.averageAcidConductivity = averageAcidConductivity; - fillModeData.averageBicardConductivity = averageBicardConductivity; + fillModeData.averageBicarbConductivity = averageBicarbConductivity; fillModeData.isThisTheFirstFill = isThisTheFirstFill(); fillModeData.pctDiffInConductivity = pctDiffInConductivity; fillModeData.usedAcidVolumeML = usedAcidVolumeML.data; @@ -1111,9 +1111,9 @@ * @brief * The testSetUsedBicarbVolumeMLOverride function overrides the * bicarb volume. - * @details Inputs: used bicard volume - * @details Outputs: used bicard volume - * @param: value : override used bicard volume in mL + * @details Inputs: used bicarb volume + * @details Outputs: used bicarb volume + * @param: value : override used bicarb volume in mL * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testSetUsedBicarbVolumeMLOverride( F32 value ) @@ -1134,9 +1134,9 @@ /*********************************************************************//** * @brief * The testResetUsedBicarbVolumeMLOverride function resets the override - * of the used bicard volume. - * @details Inputs: used bicard volume - * @details Outputs: used bicard volume + * of the used bicarb volume. + * @details Inputs: used bicarb volume + * @details Outputs: used bicarb volume * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testResetUsedBicarbVolumeMLOverride( void )