Index: firmware/App/Modes/ModePreGenDialysate.c =================================================================== diff -u -r0452674a0f7a356ab65d147d8222b6efabfd0bf7 -re9d780d77db564793278dac7dc613354f7b93049 --- firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision 0452674a0f7a356ab65d147d8222b6efabfd0bf7) +++ firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision e9d780d77db564793278dac7dc613354f7b93049) @@ -46,16 +46,16 @@ #define PRE_GEN_DIALYSATE_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the pre-gen dialysate mode data published. #define HYD_CHAMBER_PRES_CHECK_TIME_OUT ( 30 * MS_PER_SECOND ) ///< Time out period when hydraulics chamber pressure check initiated #define NEG_PRES_PERSISTENCE_TIME_MS ( 1 * MS_PER_SECOND ) ///< Persistence time for Hydraulics chamber negative degassing pressure check. -#define PRE_GEN_DEFAULT_TIME_OUT ( 60 * MS_PER_SECOND ) -#define PRE_GEN_FILL_HYDRO_CHAMBER_TIMEOUT ( 60 * MS_PER_SECOND ) -#define PRE_GEN_FILL_HYDRO_CHAMBER_STABILITY_TIMER ( 10 * MS_PER_SECOND ) -#define PRE_GEN_PRIME_CONCENTRATE_TIMEOUT ( 30 * MS_PER_SECOND ) -#define PRE_GEN_PRIME_CONCENTRATE_PUMP_SPEED 100.0F -#define PRE_GEN_PRIME_CONCENTRATE_VOLUME 0xFFFF -#define PRE_GEN_PRIME_BAL_CHAMBER_CONCENTRATE_PUMP_SPEED 60.0F -#define PRE_GEN_PRIME_D12_RPM 1600.0F -#define PRE_GEN_PRIME_D48_RPM 2000.0F -#define PRE_GEN_PRIME_DIALYZER_CONCENTRATE_PUMP_SPEED 30.0F +#define PRE_GEN_DEFAULT_TIME_OUT ( 60 * MS_PER_SECOND ) ///< Pre Generate Default timeout for various states in ms. +#define PRE_GEN_FILL_HYDRO_CHAMBER_TIMEOUT ( 60 * MS_PER_SECOND ) ///< Pre Generate Hydro Chamber timeout in ms +#define PRE_GEN_FILL_HYDRO_CHAMBER_STABILITY_TIMER ( 10 * MS_PER_SECOND ) ///< Pre Generate Hydro Chamber stability timer +#define PRE_GEN_PRIME_CONCENTRATE_TIMEOUT ( 30 * MS_PER_SECOND ) ///< Pre Generate concentrate line priming timer. +#define PRE_GEN_PRIME_CONCENTRATE_PUMP_SPEED 100.0F ///< Concentrate line priming speed. +#define PRE_GEN_PRIME_CONCENTRATE_VOLUME 0xFFFF ///< Concentrate line volume. FFFF = no set volume. +#define PRE_GEN_PRIME_BAL_CHAMBER_CONCENTRATE_PUMP_SPEED 60.0F ///< Concentrate line speed for balancing chamber switching. +#define PRE_GEN_PRIME_D12_RPM 1600.0F ///< Pre Generate D12 set RPM. +#define PRE_GEN_PRIME_D48_RPM 2000.0F ///< Pre Generate D48 set rpm. +#define PRE_GEN_PRIME_DIALYZER_CONCENTRATE_PUMP_SPEED 30.0F ///< Pre Generate prime dialyzer concentate pump speed. // ********** private data ********** @@ -67,11 +67,11 @@ static BOOL pendingStopDDPreGenDialRequest; ///< Flag indicating TD has requested DD stop the pre generation dialysate. static U32 preGenDialysatePublishTimerCounter; ///< Pre-Gen Dialysate data broadcast timer counter used to schedule when to transmit data. static OVERRIDE_U32_T preGenDialysateModePublishInterval; ///< Interval (in task intervals) at which to publish pre-gen dialysate mode data to CAN bus. -static U32 preGenAcidPrimeTimer; -static U32 preGenBicarbPrimeTimer; -static U32 preGenfillChamberCTimer; -static BOOL currentHydroChamberStatus; -static U32 startPreGenHydroStabilityTimer; +static U32 preGenAcidPrimeTimer; ///< Acid priming timer counter. +static U32 preGenBicarbPrimeTimer; ///< Bicarb priming timer counter. +static U32 preGenfillChamberCTimer; ///< Hydro chamber timer counter. +static BOOL currentHydroChamberStatus; ///< Current hydro chamber status. +static U32 startPreGenHydroStabilityTimer; ///< Hydro Chamber stability timer. // ********** private function prototypes ********** @@ -151,8 +151,6 @@ { DD_PRE_GEN_DIALYSATE_STATE_T prevState = preGenDialysateState; - - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_SKIP_PRE_GEN_PRIMING ) ) { preGenDialysateState = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND; @@ -421,6 +419,14 @@ return state; } +/*********************************************************************//** + * @brief + * The handlePrimeAcidLine function handles priming the acid line + * and transition to next state. + * @details \b Inputs: state + * @details \b Outputs: none + * @return current state of PreGenDialysate mode + *************************************************************************/ static DD_PRE_GEN_DIALYSATE_STATE_T handlePrimeAcidLine( void ) { DD_PRE_GEN_DIALYSATE_STATE_T state = DD_PRE_GEN_PRIME_ACID_LINE;