Index: firmware/App/Controllers/BalancingChamber.c =================================================================== diff -u -rf6b5a627c4f735ea5f425e0804defded0d6ed224 -re0c913b397af3122889433d855c5c5fb328f9865 --- firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision f6b5a627c4f735ea5f425e0804defded0d6ed224) +++ firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision e0c913b397af3122889433d855c5c5fb328f9865) @@ -287,7 +287,7 @@ /*********************************************************************//** * @brief - * The valveControlForBCOpenState function open the all balancing + * The valveControlForBCOpenState function opens all of the balancing * chamber valves. * @details \b Inputs: none * @details \b Outputs: valve states Index: firmware/App/Controllers/DryBiCart.c =================================================================== diff -u -rf6b5a627c4f735ea5f425e0804defded0d6ed224 -re0c913b397af3122889433d855c5c5fb328f9865 --- firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision f6b5a627c4f735ea5f425e0804defded0d6ed224) +++ firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision e0c913b397af3122889433d855c5c5fb328f9865) @@ -22,7 +22,6 @@ #include "DialysatePumps.h" #include "DDDefs.h" #include "DryBiCart.h" -#include "FPOperationModes.h" #include "Level.h" #include "Messaging.h" #include "ModeGenDialysate.h" @@ -143,17 +142,17 @@ dryBiCartFillRequested.data = FALSE; dryBiCartFillRequested.ovData = FALSE; dryBiCartFillRequested.ovInitData = FALSE; - dryBiCartFillRequested.override = 0; + dryBiCartFillRequested.override = OVERRIDE_RESET; dryBiCartDrainRequested.data = FALSE; dryBiCartDrainRequested.ovData = FALSE; dryBiCartDrainRequested.ovInitData = FALSE; - dryBiCartDrainRequested.override = 0; + dryBiCartDrainRequested.override = OVERRIDE_RESET; bicarbChamberFillRequested.data = FALSE; bicarbChamberFillRequested.ovData = FALSE; bicarbChamberFillRequested.ovInitData = FALSE; - bicarbChamberFillRequested.override = 0; + bicarbChamberFillRequested.override = OVERRIDE_RESET; dryBiCartFillStartTime = 0; lastFillDurationInMS = 0; @@ -594,8 +593,8 @@ * @brief * The handleBicarbChamberPressureCheckStartState function actuates the vent valve * present in the Bicart assembly. - * @details \b Inputs: none - * @details \b Outputs: valve states + * @details \b Inputs: D66 Pressure, D63 level + * @details \b Outputs: none * @return the next bicarb chamber fill state. *************************************************************************/ static BICARB_CHAMBER_FILL_EXEC_STATE_T handleBicarbChamberPressureCheckState( void ) @@ -671,8 +670,9 @@ * @brief * The handleDryBicartDrainStartState function set the one time actuation for bicarb drain request * from dry bicarbonate cartridge. - * @details \b Inputs: dryBiCartDrainRequested - * @details \b Outputs: valve states, dryBiCartDrainStartTime, dryBiCartDrainExecState + * @details \b Inputs: none + * @details \b Outputs: valve states, dryBiCartDrainStartTime, dryBiCartDrainPhaseStartTime, dryBiCartDrainLastCondSampleTime, + * dryBiCartDrainCondStableCount * @return the next drybicart drain state. *************************************************************************/ static DRY_BICART_DRAIN_EXEC_STATE_T handleDryBicartDrainStartState( void ) @@ -713,8 +713,8 @@ * @brief * The handleDryBicartFluidDrainState function initiates the water drain * from dry bicarbonate cartridge. - * @details \b Inputs: none - * @details \b Outputs: valve states + * @details \b Inputs: dryBiCartDrainPhaseStartTime + * @details \b Outputs: dryBiCartDrainPhaseStartTime * @return the next drybicart drain state. *************************************************************************/ static DRY_BICART_DRAIN_EXEC_STATE_T handleDryBicartFluidDrainState( void ) @@ -743,7 +743,7 @@ * The handleDryBicartPressureEquillibriumState function performs pressure * equilibration by opening D64 while D80/D85 are open. * @details \b Inputs: none - * @details \b Outputs: valve state + * @details \b Outputs: dryBiCartDrainPhaseStartTime * @return the next drybicart drain state. *************************************************************************/ static DRY_BICART_DRAIN_EXEC_STATE_T handleDryBicartPressureEquillibriumState( void ) @@ -770,8 +770,8 @@ * The handleDryBicartFluidDrainDurationCheckState function monitors conductivity * through D17 and D74 and determines drain completion, otherwise switch back and forth between * DRY_BICART_FLUID_DRAIN_STATE and DRY_BICART_PRESSURE_EQUILLIBRIUM_STATE - * @details \b Inputs: P17_COND, P74_COND - * @details \b Outputs: next state decision + * @details \b Inputs: P17_COND, P74_COND, dryBiCartDrainCondStableCount + * @details \b Outputs: dryBiCartDrainPhaseStartTime, dryBiCartDrainLastCondSampleTime * @return the next drybicart drain state. *************************************************************************/ static DRY_BICART_DRAIN_EXEC_STATE_T handleDryBicartFluidDrainDurationCheckState( void ) @@ -842,7 +842,7 @@ * The handleDryBicartFluidDrainEndState function handles the end state for * draining of the fluid. * @details \b Inputs: none - * @details \b Outputs: valve state / pump control + * @details \b Outputs: dryBiCartDrainRequested * @return the next drybicart drain state. *************************************************************************/ static DRY_BICART_DRAIN_EXEC_STATE_T handleDryBicartFluidDrainEndState( void ) @@ -903,7 +903,7 @@ * The publishDryBicartData function broadcasts the dry bicart * data at defined interval. * @details \b Inputs: dryBiCartDataPublicationTimerCounter - * @details \b Outputs: DD dry bicart data broadcast message sent + * @details \b Outputs: none * @details \b Message \Sent: MSG_ID_DD_DRY_BICART_DATA to publish the dry bicart * data. * @return none @@ -975,7 +975,7 @@ * @brief * The testDryBiCartFillRequestOverride function starts/stops the dry bicart * fill. - * @details \b Inputs: tester logged in + * @details \b Inputs: &dryBiCartFillRequested * @details \b Outputs: dryBiCartFillRequested * @param message set message from Dialin which includes the dry bicart fill * start/stop. @@ -992,7 +992,7 @@ * @brief * The testBiCarbChamberFillRequestOverride function starts/stops the bicarb * chamber F fill. - * @details \b Inputs: tester logged in + * @details \b Inputs: bicarbChamberFillRequested * @details \b Outputs: bicarbChamberFillRequested * @param message set message from Dialin which includes the bicarb chamber * fill start/stop. @@ -1009,7 +1009,7 @@ * @brief * The testDryBiCartDrainRequestOverride function starts/stops the bicart * drain request - * @details \b Inputs: tester logged in + * @details \b Inputs: bicarbChamberFillRequested * @details \b Outputs: bicarbChamberFillRequested * @param message set message from Dialin which includes the bicart * drain request start/stop. Index: firmware/App/Controllers/DryBiCart.h =================================================================== diff -u -re48bec7b1330b195afadcbf8bc58bdb4f1d5b03e -re0c913b397af3122889433d855c5c5fb328f9865 --- firmware/App/Controllers/DryBiCart.h (.../DryBiCart.h) (revision e48bec7b1330b195afadcbf8bc58bdb4f1d5b03e) +++ firmware/App/Controllers/DryBiCart.h (.../DryBiCart.h) (revision e0c913b397af3122889433d855c5c5fb328f9865) @@ -53,10 +53,11 @@ void transitionToDryBicart( void ); // Prepares for transition to dry bicart execution U32 execDryBicartFillMode( void ); // Execute the dry bicart state machine U32 execBicarbChamberFillMode( void ); // Execute the bicarb chamber fill state machine -U32 execDryBicartDrainMode( void ); // Execute dry bicart drain state machine +U32 execDryBicartDrainMode( void ); // Execute dry bicart drain state machine void execDryBicart( void ); // Execute the list of drybicart state machines void setBicarbChamberFillRequested( void ); // Sets the Flag for dry bicarb chamber fill request data to be true -void setBicartFillRequested( void ); +void setBicartFillRequested( void ); // Sets the Flag for dry bicart fill request data to be true +void setBicartDrainRequested( void ); // Sets the Flag for dry bicart drain request data to be true DRY_BICART_FILL_EXEC_STATE_T getCurrentDryBiCartFillExecState( void ); // Get the current state of the dry bicart fill execution Index: firmware/App/Modes/ModePreGenDialysate.c =================================================================== diff -u -rf6b5a627c4f735ea5f425e0804defded0d6ed224 -re0c913b397af3122889433d855c5c5fb328f9865 --- firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision f6b5a627c4f735ea5f425e0804defded0d6ed224) +++ firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision e0c913b397af3122889433d855c5c5fb328f9865) @@ -254,11 +254,10 @@ return state; } - /*********************************************************************//** * @brief - * The handleDryBicartFillCheckState function executes intial dryy bicart fill request - * @details \b Inputs: state + * The handleDryBicartFillCheckState function executes intial dry bicart fill request + * @details \b Inputs: none * @details \b Outputs: none * @return current state of PreGenDialysate mode *************************************************************************/ Index: firmware/App/Services/Messaging.c =================================================================== diff -u -re48bec7b1330b195afadcbf8bc58bdb4f1d5b03e -re0c913b397af3122889433d855c5c5fb328f9865 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision e48bec7b1330b195afadcbf8bc58bdb4f1d5b03e) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision e0c913b397af3122889433d855c5c5fb328f9865) @@ -727,6 +727,7 @@ return result; } + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/