Index: firmware/App/Controllers/DryBiCart.c =================================================================== diff -u -rb92b5e0b81f0cfcd821de28e2b309c36eb957a46 -r84176d86411c556fda5080aab9dbb5c6269cb03d --- firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision b92b5e0b81f0cfcd821de28e2b309c36eb957a46) +++ firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision 84176d86411c556fda5080aab9dbb5c6269cb03d) @@ -112,9 +112,9 @@ #define MIX_CONTROL_INTERVAL_MS ( 15 * MS_PER_SECOND ) ///< Dialysate mixing control interval in ms #define BICARB_MIX_CONTROL_INTERVAL ( 3 * MS_PER_SECOND /\ - TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the dialysate mix is controlled. + TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the biarb mix is controlled. #define ACID_MIX_CONTROL_INTERVAL ( MIX_CONTROL_INTERVAL_MS /\ - TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the dialysate mix is controlled. + TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the Acid mix is controlled. #define BICARB_DEADBAND_CONTROL 50.0F ///< Dry Bicarb dead band control #define ACID_DEADBAND_CONTROL 100.0F ///< Acid dead band control @@ -215,15 +215,15 @@ static OVERRIDE_F32_T dryBiCartBicarbTargetConductivity; ///< Target bicarb conductivity static OVERRIDE_F32_T dryBiCartBicarbDeltaConductivity; ///< Target delta conductivity -static OVERRIDE_F32_T dryBiCartDialysateTargetConductivity; ///< Acid bicarb mix conductivity -static OVERRIDE_F32_T dryBiCartDialysateDeltaConductivity; ///< Acid bicarb delta conductivity +static OVERRIDE_F32_T dryBiCartDialysateTargetConductivity; ///< Target Dialysate conductivity +static OVERRIDE_F32_T dryBiCartDialysateDeltaConductivity; ///< Delta Target Dialysate conductivity -static OVERRIDE_F32_T dryBiCartStdMixingBCVolume; ///< Acid bicarb mix conductivity -static OVERRIDE_F32_T dryBiCartTargetAdjNaSettings; ///< Acid bicarb delta conductivity -static OVERRIDE_F32_T dryBiCartTargetAdjBicarbSettings; ///< Acid bicarb delta conductivity +static OVERRIDE_F32_T dryBiCartStdMixingBCVolume; ///< Standard mixing Balancing chamber volume +static OVERRIDE_F32_T dryBiCartTargetAdjNaSettings; ///< Dialysate Target Settings Adjusted Na +static OVERRIDE_F32_T dryBiCartTargetAdjBicarbSettings; ///< Dialysate Target Settings Adjusted bicarb -static OVERRIDE_U32_T dryBiCartBicarbMixControlInterval; ///< Mix control interval -static OVERRIDE_U32_T dryBiCartAcidMixControlInterval; ///< Mix control interval +static OVERRIDE_U32_T dryBiCartBicarbMixControlInterval; ///< Bicarb Mix control interval +static OVERRIDE_U32_T dryBiCartAcidMixControlInterval; ///< Acid Mix control interval static PI_CONTROLLER_SIGNALS_DATA bicarbControlSignals; ///< Bicarb closed loop control signal data static PI_CONTROLLER_SIGNALS_DATA acidControlSignals; ///< Acid closed loop control signal data @@ -1038,7 +1038,7 @@ /*********************************************************************//** * @brief - * The getDryBicartBicarbMixControlInterval function gets the bicart mix control interval + * The getDryBicartBicarbMixControlInterval function gets the bicart bicarb mix control interval * @details \b Inputs: dryBiCartBicarbMixControlInterval * @details \b Outputs: none * @return TRUE if successful, FALSE if not. @@ -1052,6 +1052,20 @@ /*********************************************************************//** * @brief + * The getDryBicartAcidMixControlInterval function gets the bicart acid mix control interval + * @details \b Inputs: dryBiCartAcidMixControlInterval + * @details \b Outputs: none + * @return TRUE if successful, FALSE if not. + *************************************************************************/ +static U32 getDryBicartAcidMixControlInterval( void ) +{ + U32 result = getU32OverrideValue( &dryBiCartAcidMixControlInterval ); + + return result; +} + +/*********************************************************************//** + * @brief * The handleDialysateOpenLoopState function handles the dialysate open loop state of * the dialysate mix controller state machine. * @details \b Inputs: D17_COND, D29_COND @@ -1169,7 +1183,7 @@ if ( ACID_MIX_ID == mixId ) { // control interval for acid - if ( ( ++dialysateMix[ mixId ].controlTimerCounter >= ACID_MIX_CONTROL_INTERVAL ) ) + if ( ( ++dialysateMix[ mixId ].controlTimerCounter >= getDryBicartAcidMixControlInterval() ) ) { F32 acidMixVol; @@ -2019,8 +2033,8 @@ * @brief * The testDryBiCartFillCycleMaxCountOverride function sets the override value * of the max dry bicart fill cycle count. - * @details Inputs: biCartMaxFillCycleCount - * @details Outputs: biCartMaxFillCycleCount + * @details \b Inputs: biCartMaxFillCycleCount + * @details \b Outputs: biCartMaxFillCycleCount * @param message Override message from Dialin which includes the override * value to override the max dry bicart fill cycle count. * @return TRUE if override successful, FALSE if not @@ -2102,8 +2116,8 @@ * @brief * The testDryBiCartAcidMixVolumeOverride function sets the override value * of the acid concentrate mixing volume. - * @details Inputs: dryBiCartAcidMixVolume - * @details Outputs: dryBiCartAcidMixVolume + * @details \b Inputs: dryBiCartAcidMixVolume + * @details \b Outputs: dryBiCartAcidMixVolume * @param message Override message from Dialin which includes the override * value to override the acid concentrate mixing volume. * @return TRUE if override successful, FALSE if not @@ -2119,8 +2133,8 @@ * @brief * The testDryBiCartBicarbMixVolumeOverride function sets the override value * of the bicarb concentrate mixing volume. - * @details Inputs: dryBiCartBicarbMixVolume - * @details Outputs: dryBiCartBicarbMixVolume + * @details \b Inputs: dryBiCartBicarbMixVolume + * @details \b Outputs: dryBiCartBicarbMixVolume * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate mixing volume. * @return TRUE if override successful, FALSE if not @@ -2136,8 +2150,8 @@ * @brief * The testDryBiCartBicarbMixVolControlKpGainOverride function sets the override value * of the Kp gain coefficient for closed loop bicarb mixing volume control - * @details Inputs: dryBiCartBicarbMixVolumeKpGain - * @details Outputs: dryBiCartBicarbMixVolumeKpGain + * @details \b Inputs: dryBiCartBicarbMixVolumeKpGain + * @details \b Outputs: dryBiCartBicarbMixVolumeKpGain * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate mixing volume kp gain. * @return TRUE if override successful, FALSE if not @@ -2157,8 +2171,8 @@ * @brief * The testDryBiCartBicarbMixVolControlKiGainOverride function sets the override value * of the Ki gain coefficient for closed loop bicarb concentrate mixing volume control - * @details Inputs: dryBiCartBicarbMixVolumeKiGain - * @details Outputs: dryBiCartBicarbMixVolumeKiGain + * @details \b: dryBiCartBicarbMixVolumeKiGain + * @details \b Outputs: dryBiCartBicarbMixVolumeKiGain * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate mixing volume ki gain. * @return TRUE if override successful, FALSE if not @@ -2178,8 +2192,8 @@ * @brief * The testDryBiCartAcidMoxVolControlKpGainOverride function sets the override value * of the Kp gain coefficient for closed loop acid concentrate mixing volume control - * @details Inputs: dryBiCartAcidMixVolumeKpGain - * @details Outputs: dryBiCartAcidMixVolumeKpGain + * @details \b Inputs: dryBiCartAcidMixVolumeKpGain + * @details \b Outputs: dryBiCartAcidMixVolumeKpGain * @param message Override message from Dialin which includes the override * value to override the acid concentrate mixing volume kp gain. * @return TRUE if override successful, FALSE if not @@ -2199,8 +2213,8 @@ * @brief * The testDryBiCartAcidMixVolControlKiGainOverride function sets the override value * of the Ki gain coefficient for closed loop acid concentrate mixing volume control - * @details Inputs: dryBiCartAcidMixVolumeKiGain - * @details Outputs: dryBiCartAcidMixVolumeKiGain + * @details \b Inputs: dryBiCartAcidMixVolumeKiGain + * @details \b Outputs: dryBiCartAcidMixVolumeKiGain * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate mixing volume ki gain. * @return TRUE if override successful, FALSE if not @@ -2220,8 +2234,8 @@ * @brief * The testDryBiCartTargetConductivityOverride function sets the override value * of target conductivity for closed loop control - * @details Inputs: dryBiCartTargetConductivity - * @details Outputs: dryBiCartTargetConductivity + * @details \b Inputs: dryBiCartTargetConductivity + * @details \b Outputs: dryBiCartTargetConductivity * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate target conductivity. * @return TRUE if override successful, FALSE if not @@ -2237,8 +2251,8 @@ * @brief * The testDryBiCartDeltaConductivityOverride function sets the override value * of delta target conductivity for closed loop control - * @details Inputs: dryBiCartDeltaConductivity - * @details Outputs: dryBiCartDeltaConductivity + * @details \b Inputs: dryBiCartDeltaConductivity + * @details \b Outputs: dryBiCartDeltaConductivity * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate delta target conductivity. * @return TRUE if override successful, FALSE if not @@ -2254,8 +2268,8 @@ * @brief * The testDryBiCartAcidBicarbTargetConductivityOverride function sets the override value * of acid bicarb mix target conductivity for closed loop control - * @details Inputs: dryBiCartAcidBicarbMixTargetConductivity - * @details Outputs: dryBiCartAcidBicarbMixTargetConductivity + * @details \b Inputs: dryBiCartAcidBicarbMixTargetConductivity + * @details \b Outputs: dryBiCartAcidBicarbMixTargetConductivity * @param message Override message from Dialin which includes the override * value to override the acid bicarb mix target conductivity. * @return TRUE if override successful, FALSE if not @@ -2271,9 +2285,8 @@ * @brief * The testDryBiCartAcidBicarbDeltaConductivityOverride function sets the override value * of delta target conductivity for acid bicarb mix closed loop control - * @details Inputs: dryBiCartDeltaConductivity - * - * @details Outputs: dryBiCartDeltaConductivity + * @details \b Inputs: dryBiCartDeltaConductivity + * @details \b Outputs: dryBiCartDeltaConductivity * @param message Override message from Dialin which includes the override * value to override the acid bicarb mix target delta conductivity. * @return TRUE if override successful, FALSE if not @@ -2289,8 +2302,8 @@ * @brief * The testDryBiCartUpperCartPressureOverride function sets the override value * of bicart upper cart pressure - * @details Inputs: dryBiCartUpperCartPressure - * @details Outputs: dryBiCartUpperCartPressure + * @details \b Inputs: dryBiCartUpperCartPressure + * @details \b Outputs: dryBiCartUpperCartPressure * @param message Override message from Dialin which includes the override * value to override the bicart upper cart pressure * @return TRUE if override successful, FALSE if not @@ -2306,8 +2319,8 @@ * @brief * The testDryBiCartLowerCartPressureOverride function sets the override value * of Lowercart pressure - * @details Inputs: dryBiCartLowerCartPressure - * @details Outputs: dryBiCartLowerCartPressure + * @details \b Inputs: dryBiCartLowerCartPressure + * @details \b Outputs: dryBiCartLowerCartPressure * @param message Override message from Dialin which includes the override * value to override the bicart lower pressure. * @return TRUE if override successful, FALSE if not @@ -2323,8 +2336,8 @@ * @brief * The testDryBiCartBicarbMixControlIntervalOverride function sets the override value * of bicarb mix control interval - * @details Inputs: dryBiCartBicarbMixControlInterval - * @details Outputs: dryBiCartBicarbMixControlInterval + * @details \b Inputs: dryBiCartBicarbMixControlInterval + * @details \b Outputs: dryBiCartBicarbMixControlInterval * @param message Override message from Dialin which includes the override * value to override the bicart lower pressure. * @return TRUE if override successful, FALSE if not @@ -2340,8 +2353,8 @@ * @brief * The testDryBiCartAcidMixControlIntervalOverride function sets the override value * of acid mix control interval - * @details Inputs: dryBiCartAcidMixControlInterval - * @details Outputs: dryBiCartAcidMixControlInterval + * @details \b Inputs: dryBiCartAcidMixControlInterval + * @details \b Outputs: dryBiCartAcidMixControlInterval * @param message Override message from Dialin which includes the override * value to override the bicart lower pressure. * @return TRUE if override successful, FALSE if not @@ -2357,8 +2370,8 @@ * @brief * The testDryBiCartStdMixingBCVolumeOverride function sets the override value * of acid mix control interval - * @details Inputs: dryBiCartStdMixingBCVolume - * @details Outputs: dryBiCartStdMixingBCVolume + * @details \b Inputs: dryBiCartStdMixingBCVolume + * @details \b Outputs: dryBiCartStdMixingBCVolume * @param message Override message from Dialin which includes the override * value to override the bicart lower pressure. * @return TRUE if override successful, FALSE if not @@ -2374,8 +2387,8 @@ * @brief * The testDryBiCartTargetAdjNASettingOverride function sets the override value * of acid mix control interval - * @details Inputs: dryBiCartTargetAdjNaSettings - * @details Outputs: dryBiCartTargetAdjNaSettings + * @details \b Inputs: dryBiCartTargetAdjNaSettings + * @details \b Outputs: dryBiCartTargetAdjNaSettings * @param message Override message from Dialin which includes the override * value to override the bicart lower pressure. * @return TRUE if override successful, FALSE if not @@ -2391,8 +2404,8 @@ * @brief * The testDryBiCartAcidMixControlIntervalOverride function sets the override value * of acid mix control interval - * @details Inputs: dryBiCartTargetAdjBicarbSettings - * @details Outputs: dryBiCartTargetAdjBicarbSettings + * @details \b Inputs: dryBiCartTargetAdjBicarbSettings + * @details \b Outputs: dryBiCartTargetAdjBicarbSettings * @param message Override message from Dialin which includes the override * value to override the bicart lower pressure. * @return TRUE if override successful, FALSE if not Index: firmware/App/Controllers/DryBiCart.h =================================================================== diff -u -r4c91b459486b4150d09b2f1a13b763ef3d430b2f -r84176d86411c556fda5080aab9dbb5c6269cb03d --- firmware/App/Controllers/DryBiCart.h (.../DryBiCart.h) (revision 4c91b459486b4150d09b2f1a13b763ef3d430b2f) +++ firmware/App/Controllers/DryBiCart.h (.../DryBiCart.h) (revision 84176d86411c556fda5080aab9dbb5c6269cb03d) @@ -64,7 +64,6 @@ F32 dryBiCartAcidMixingKIgain; ///< Dry bicart acid mixing control ki gain } DRY_BICART_DATA_T; - #pragma pack(pop) // ********** public function prototypes **********