Index: firmware/App/Controllers/BalancingChamber.c =================================================================== diff -u -rd5c94536929ded738e5c8d139d8c46b1d3e035ef -r9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84 --- firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision d5c94536929ded738e5c8d139d8c46b1d3e035ef) +++ firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision 9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84) @@ -52,7 +52,8 @@ #define SPENT_DIFF_COUNT_ZERO 0 ///< Zero count difference for spent side fill comparing target count #define D48_SPEED_ADJUST_FACTOR 0.5F ///< D48 speed adjustment factor ( 50% of speed adjustment = 0.5) #define D48_SPEED_RANGE_LIMIT 0.25F ///< D48 speed adjustment range check limit ( D48 speed can vary +/-25% of initial calculated speed) -#define BICARB_CHAMBER_PERIODIC_FILL_TIME ( 1 * SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ) ///< Periodic bicarb chamber fill request 60 sec x 20 = 1200 +#define BICARB_CHAMBER_PERIODIC_FILL_TIME ( 1 * SEC_PER_MIN * \ + ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ) ///< Periodic bicarb chamber fill request 60 sec x 20 = 1200 #define BAL_CHAMBER_FILL_TIMEOUT_FACTOR 1.5 ///< Balancing Chamber fill timeout factor (150% of observed fill count) /// Payload record structure for balancing chamber switch only request @@ -222,7 +223,7 @@ currentBalChamberSwitchingCounter += 1; currentBalChamberFillCounter += 1; - if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE && balChamberExecState > BAL_CHAMBER_STATE_IDLE) + if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE && balChamberExecState > BAL_CHAMBER_STATE_START) { // Increment counter for dry bicarb chamber fill bicarbChamberPeriodicFillCounter += 1; @@ -464,8 +465,8 @@ if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE ) { - bicarbVolume = getBicarbDoseVol(); - acidVolume = getAcidDoseVol(); + bicarbVolume = getBicarbMixVol(); + acidVolume = getAcidMixVol(); } else { @@ -699,8 +700,8 @@ if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE ) { - bicarbVolume = getBicarbDoseVol(); - acidVolume = getAcidDoseVol(); + bicarbVolume = getBicarbMixVol(); + acidVolume = getAcidMixVol(); } else { Index: firmware/App/Controllers/DryBiCart.c =================================================================== diff -u -rd5c94536929ded738e5c8d139d8c46b1d3e035ef -r9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84 --- firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision d5c94536929ded738e5c8d139d8c46b1d3e035ef) +++ firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision 9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84) @@ -45,13 +45,14 @@ #define DRY_BICART_DATA_PUBLISH_INTERVAL ( 250 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the balancing chamber data published. // Dry Bicart Fill -#define DRY_BICART_FILL_DURATION_MIN_MS (2 * MS_PER_SECOND) ///< Minimum fill duration to be met to end the fill cycle. +#define DRY_BICART_FILL_DURATION_MIN_MS ( 2 * MS_PER_SECOND ) ///< Minimum fill duration to be met to end the fill cycle. #define DRY_BICART_FILL_COMPLETE_TIME_MS ( 1 * MS_PER_SECOND ) ///< Wait time to reset the request flag after fill complete #define DRY_BICART_FILL_DURATION_DIFF_MS 750 ///< Fill duration difference between last and current fill cycle. -#define DRY_BICART_FILL_COMPLETE_PRESSURE 12.0F ///< Maximum pressure reached to indicate the dry bicart fill being completed. -#define DRY_BICART_FILL_INITIATE_PRESSURE 7.5F ///< Minimum pressure required to initiate the dry bicart fill process. -#define DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE 7.0F ///< Maximum pressure reached to indicate the dry bicart fill being completed. -#define DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE 5.0F ///< Minimum pressure required to initiate the dry bicart fill process. +#define PRESSURE_OFFSET 2 +#define DRY_BICART_FILL_COMPLETE_PRESSURE (10.0F + PRESSURE_OFFSET) ///< Maximum pressure reached to indicate the dry bicart fill being completed. +#define DRY_BICART_FILL_INITIATE_PRESSURE 3.0F ///< Minimum pressure required to initiate the dry bicart fill process. +#define DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE 6.0F ///< Maximum pressure reached to indicate the dry bicart fill being completed. +#define DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE 3.0F ///< Minimum pressure required to initiate the dry bicart fill process. #define DRY_BICART_DEFAULT_MAX_FILL_CYCLE_CNT 10 ///< Default max fill cycle allowed for dry bicart fill/mix with water. #define DRY_BICART_MAX_FILL_CYCLE_CNT 30 ///< Max fill cycle allowed (by override) for dry bicart fill/mix with water. @@ -61,9 +62,9 @@ #define DRY_BICART_FILL_VENT_COMPLETE_PRESSURE 1.5F ///< Pressure reached to indicate the dry bicart venting being completed. // Bicarb chamber fill/Supply -#define DRY_BICART_SUPPLY_VALVE_D80_OPEN_TIME_MS ( ( 3 * MS_PER_SECOND ) ) ///< Max time allowed for supply (opening D80 valve) during bicarb chamber (F) fill. +#define DRY_BICART_SUPPLY_VALVE_D80_OPEN_TIME_MS ( 3 * MS_PER_SECOND ) ///< Max time allowed for supply (opening D80 valve) during bicarb chamber (F) fill. #define DRY_BICART_SUPPLY_VENT_TIME_MS ( 1 * MS_PER_SECOND ) ///< Wait time to vent dry bicart gas before actuating Bicarb chamber(F) venting. -#define DRY_BICART_SUPPLY_VENT_MAX_TIME_MS ( 1.2 * MS_PER_SECOND ) ///< Max time to vent both dry bicart and Chamber F. +#define DRY_BICART_SUPPLY_VENT_MAX_TIME_MS ( 1.1 * MS_PER_SECOND ) ///< Max time to vent both dry bicart and Chamber F. // Dry Bicart Drain #define LARGE_DRY_BICART_MAX_DRAIN_TIME_MS ( 8 * SEC_PER_MIN * MS_PER_SECOND ) ///< Max drain time for large dry bicart in ms. @@ -81,22 +82,21 @@ #define KP_SCALE_FACTOR 1 #define KI_SCALE_FACTOR 1 -#define BICARB_VOL_CONTROL_P_COEFFICIENT 0.00008484//0.0002121//0.00008484//( 0.0002121 / KP_SCALE_FACTOR )//0.000065F ///< Propotional gain (kp) -#define BICARB_VOL_CONTROL_I_COEFFICIENT 0.00033936//0.0002121//0.00033936//( 0.0003121 * KI_SCALE_FACTOR )//0.00022F ///< Integral gain. (ki) -#define MIN_BICARB_VOLUME_MLPM 0.868686869 ///< Minimum target bicarb in mL/min. +#define BICARB_VOL_CONTROL_P_COEFFICIENT 0.00008484 ///< Proportional gain (kp) +#define BICARB_VOL_CONTROL_I_COEFFICIENT 0.00033936 ///< Integral gain. (ki) +#define MIN_BICARB_VOLUME_MLPM 0.868686869 ///< Minimum target bicarb in mL/min. #define MAX_BICARB_VOLUME_MLPM 1.8 ///< Maximum target bicarb volume in mL/min. -#define ACID_VOL_CONTROL_P_COEFFICIENT 0.00000997//0.000024925F//0.000065F ///< Propotional gain (kp) -#define ACID_VOL_CONTROL_I_COEFFICIENT 0.00003988//0.000014925F//0.00022F ///< Integral gain. (ki) -#define MIN_ACID_VOLUME_MLPM 0.653333333 // 0.2 ///< Minimum target acid volume in mL/min. -#define MAX_ACID_VOLUME_MLPM 0.70 ///< Maximum target acid volume in mL/min. +#define ACID_VOL_CONTROL_P_COEFFICIENT (0.00000997/2) ///< Proportional gain (kp) +#define ACID_VOL_CONTROL_I_COEFFICIENT (0.00003988/2) ///< Integral gain. (ki) +#define MIN_ACID_VOLUME_MLPM 0.3 ///< Minimum target acid volume in mL/min. +#define MAX_ACID_VOLUME_MLPM 1.0 ///< Maximum target acid volume in mL/min. - #define STD_BICARB_DOSING 1.146666667F ///< Standard bicarb dosing volume #define STD_ACID_DOSING 0.666666667F ///< Standard acid dosing volume #define DRY_BICARB_TARGET_CONDUCTIVITY 2714.0F ///< Target bicarb conductivity -#define DRY_BICARB_DELTA_CONDUCTIVITY 500.0F ///< Delta bicarb conductivity +#define DRY_BICARB_DELTA_CONDUCTIVITY 500.0F ///< Delta bicarb conductivity #define DRY_ACID_BICARB_TARGET_CONDUCTIVITY 13734.87F ///< Target acid bicarb mix conductivity #define DRY_ACID_BICARB_DELTA_CONDUCTIVITY 700.0F ///< Delta acid bicarb mix conductivity @@ -108,11 +108,11 @@ #define MIN_BICARB_CONDUCTIVITY 2000 ///< Minimum Bicarb conductivity limit #define MAX_BICARB_CONDUCTIVITY 4000 ///< Maximum Bicarb conductivity limit -#define DOSING_NO_FEED_FORWARD 0.0F ///< Feedforward term for dialysate pump control +#define MIX_NO_FEED_FORWARD 0.0F ///< Feedforward term for dialysate closed loop control -#define DOSE_CONTROL_INTERVAL_MS ( 15 * MS_PER_SECOND ) ///< Dialysate dosing control interval in ms -#define DOSE_CONTROL_INTERVAL ( DOSE_CONTROL_INTERVAL_MS /\ - TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the dialysate dose is controlled. +#define MIXING_CONTROL_INTERVAL_MS ( 15 * MS_PER_SECOND ) ///< Dialysate mixing control interval in ms +#define MIXING_CONTROL_INTERVAL ( MIXING_CONTROL_INTERVAL_MS /\ + TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the dialysate mixing is controlled. /// Payload record structure for dry bicart fill request typedef struct @@ -145,15 +145,15 @@ DIALYSATE_MIXING_OPEN_LOOP_STATE = 0, ///< Dialysate open loop state DIALYSATE_MIXING_RAMP_UP_STATE, ///< Dialysate mixing ramp up state DIALYSATE_MIXING_CONTROL_TO_TARGET_STATE, ///< Dialysate mixing control to target state - NUM_OF_DIALYSATE_MIXING_STATES ///< Number of dialysate mixingstates + NUM_OF_DIALYSATE_MIXING_STATES ///< Number of dialysate mixing states } DIALYSATE_MIXING_STATE_T; /// Dialysate Mixing state machine data structure typedef struct { - U32 controlTimerCounter; ///< Timer counter to perform control on dialysate dose. + U32 controlTimerCounter; ///< Timer counter to perform control on dialysate mixing. DIALYSATE_MIXING_STATE_T dialysateMixingState; ///< Current state of dialysate mixing controller state machine. -} DIALYSATE_DOSE_DATA_T; +} DIALYSATE_MIXING_DATA_T; // ********** private data ********** @@ -166,6 +166,9 @@ static U32 lastFillDurationInMS; ///< Previous time duration to fill the bicart fill. static U32 currentFillDurationInMS; ///< Current time duration to fill the bicart fill. static OVERRIDE_U32_T biCartMaxFillCycleCount; ///< Maximum number of drybicart fill cycle ( overrideable) +static OVERRIDE_F32_T dryBiCartUpperCartPressure; ///< Upper cart pressure +static OVERRIDE_F32_T dryBiCartLowerCartPressure; ///< Lower cart pressure + // initiate the fill/supply/drain static OVERRIDE_U32_T dryBiCartFillRequested; ///< Start/stop dry bicart fill. static OVERRIDE_U32_T bicarbChamberFillRequested; ///< Start/stop bicarb chamber fill. @@ -188,29 +191,28 @@ static DRY_BICART_OPERATION_T dryBicartStartRequest; ///< Dry bicart operation, fill or supply or drain request // drybicart mixing -static OVERRIDE_F32_T dryBiCartAcidDoseVolume; ///< Acid concentrate volume in ml ( overrideable). -static OVERRIDE_F32_T dryBiCartBicarbDoseVolume; ///< Bicarb concentrate volume in ml ( overrideable). +static OVERRIDE_F32_T dryBiCartAcidMixVolume; ///< Acid concentrate volume in ml ( overrideable). +static OVERRIDE_F32_T dryBiCartBicarbMixVolume; ///< Bicarb concentrate volume in ml ( overrideable). -static OVERRIDE_F32_T dryBiCartAcidDoseVolumeKpGain; ///< Acid kp gain. -static OVERRIDE_F32_T dryBiCartAcidDoseVolumeKiGain; ///< Acid ki gain. +static OVERRIDE_F32_T dryBiCartAcidMixVolumeKpGain; ///< Acid kp gain. +static OVERRIDE_F32_T dryBiCartAcidMixVolumeKiGain; ///< Acid ki gain. -static OVERRIDE_F32_T dryBiCartBicarbDoseVolumeKpGain; ///< Bicarb kp gain -static OVERRIDE_F32_T dryBiCartBicarbDoseVolumeKiGain; ///< Acid ki gain. +static OVERRIDE_F32_T dryBiCartBicarbMixVolumeKpGain; ///< Bicarb kp gain +static OVERRIDE_F32_T dryBiCartBicarbMixVolumeKiGain; ///< Acid ki gain. -static DIALYSATE_DOSE_DATA_T dialysateMix[ NUM_OF_DIALYSATE_MIXING_ID ]; ///< Array of dialysate mixing data structure. +static DIALYSATE_MIXING_DATA_T dialysateMix[ NUM_OF_DIALYSATE_MIXING_ID ]; ///< Array of dialysate mixing data structure. static OVERRIDE_F32_T dryBiCartBicarbTargetConductivity; ///< Target bicarb conductivity static OVERRIDE_F32_T dryBiCartBicarbDeltaConductivity; ///< Target delta conductivity -static OVERRIDE_F32_T dryBiCartAcidBicarbMixTargetConductivity; ///< Acid bicarb mix conductivity -static OVERRIDE_F32_T dryBiCartAcidBicarbMixDeltaConductivity; ///< Acid bicarb delta conductivity +static OVERRIDE_F32_T dryBiCartDialysateTargetConductivity; ///< Acid bicarb mix conductivity +static OVERRIDE_F32_T dryBiCartDialysateDeltaConductivity; ///< Acid bicarb delta conductivity +static OVERRIDE_F32_T dryBiCartMixControlInterval; ///< 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 -//For testing -static F32 pIControlSignal[ NUM_OF_CONTROLLER_SIGNAL ]; - // ********** private function prototypes ********** static void updateDrybicartOperation(void); @@ -238,10 +240,24 @@ static DRY_BICART_DRAIN_EXEC_STATE_T handleDryBicartFluidDrainEndState( void ); // dosing control loop -static DIALYSATE_MIXING_STATE_T handleDialysateOpenLoopState( DIALYSATE_MIXING_ID_T doseId ); -static DIALYSATE_MIXING_STATE_T handleDialysateDoseRampToTargetState( DIALYSATE_MIXING_ID_T doseId ); -static DIALYSATE_MIXING_STATE_T handleDialysateDoseControlToTargetState( DIALYSATE_MIXING_ID_T doseId ); +static DIALYSATE_MIXING_STATE_T handleDialysateMixOpenLoopState( DIALYSATE_MIXING_ID_T mixId ); +static DIALYSATE_MIXING_STATE_T handleDialysateMixRampToTargetState( DIALYSATE_MIXING_ID_T mixId ); +static DIALYSATE_MIXING_STATE_T handleDialysateMixControlToTargetState( DIALYSATE_MIXING_ID_T mixId ); +static void setBicarbMixVol( F32 targetValue ); +static void setAcidMixVol( F32 targetValue ); +static F32 getBicarbDeltaConductivity( void ); +static F32 getBicarbTargetConductivity( void ); +static F32 getAcidBicarbDeltaConductivity( void ); +static F32 getAcidBicarbTargetConductivity( void ); +static F32 getBicarbKpGainCoefficient( void ); +static F32 getBicarbKiGainCoefficient( void ); +static F32 getAcidKpGainCoefficient( void ); +static F32 getAcidKiGainCoefficient( void ); +static F32 getDryBicartLowerCartPressure( void ); +static F32 getDryBicartUpperCartPressure( void ); +static F32 getDryBicartMixControlInterval( void ); + // publish the status static void publishDryBicartData( void ); static U32 getDryBicartFillDataPublishInterval( void ); @@ -266,7 +282,7 @@ for ( mixId = DIALYSATE_MIX_ID_FIRST; mixId < NUM_OF_DIALYSATE_MIXING_ID; mixId++ ) { dialysateMix[ mixId ].dialysateMixingState = DIALYSATE_MIXING_OPEN_LOOP_STATE; - dialysateMix[ mixId ].controlTimerCounter = 0; + dialysateMix[ mixId ].controlTimerCounter = 0; } dryBiCartDataPublishInterval.data = DRY_BICART_DATA_PUBLISH_INTERVAL; @@ -299,35 +315,35 @@ dryBiCartType.ovInitData = 0; dryBiCartType.override = OVERRIDE_RESET; - dryBiCartAcidDoseVolume.data = DEFAULT_ACID_VOLUME_ML; - dryBiCartAcidDoseVolume.ovData = DEFAULT_ACID_VOLUME_ML; - dryBiCartAcidDoseVolume.ovInitData = 0.0F; - dryBiCartAcidDoseVolume.override = OVERRIDE_RESET; + dryBiCartAcidMixVolume.data = DEFAULT_ACID_VOLUME_ML; + dryBiCartAcidMixVolume.ovData = DEFAULT_ACID_VOLUME_ML; + dryBiCartAcidMixVolume.ovInitData = 0.0F; + dryBiCartAcidMixVolume.override = OVERRIDE_RESET; - dryBiCartBicarbDoseVolume.data = DEFAULT_BICARB_VOLUME_ML; - dryBiCartBicarbDoseVolume.ovData = DEFAULT_BICARB_VOLUME_ML; - dryBiCartBicarbDoseVolume.ovInitData = 0.0F; - dryBiCartBicarbDoseVolume.override = OVERRIDE_RESET; + dryBiCartBicarbMixVolume.data = DEFAULT_BICARB_VOLUME_ML; + dryBiCartBicarbMixVolume.ovData = DEFAULT_BICARB_VOLUME_ML; + dryBiCartBicarbMixVolume.ovInitData = 0.0F; + dryBiCartBicarbMixVolume.override = OVERRIDE_RESET; - dryBiCartAcidDoseVolumeKpGain.data = ACID_VOL_CONTROL_P_COEFFICIENT; - dryBiCartAcidDoseVolumeKpGain.ovData = ACID_VOL_CONTROL_P_COEFFICIENT; - dryBiCartAcidDoseVolumeKpGain.ovInitData = 0.0F; - dryBiCartAcidDoseVolumeKpGain.override = OVERRIDE_RESET; + dryBiCartAcidMixVolumeKpGain.data = ACID_VOL_CONTROL_P_COEFFICIENT; + dryBiCartAcidMixVolumeKpGain.ovData = ACID_VOL_CONTROL_P_COEFFICIENT; + dryBiCartAcidMixVolumeKpGain.ovInitData = 0.0F; + dryBiCartAcidMixVolumeKpGain.override = OVERRIDE_RESET; - dryBiCartAcidDoseVolumeKiGain.data = ACID_VOL_CONTROL_I_COEFFICIENT; - dryBiCartAcidDoseVolumeKiGain.ovData = ACID_VOL_CONTROL_I_COEFFICIENT; - dryBiCartAcidDoseVolumeKiGain.ovInitData = 0.0F; - dryBiCartAcidDoseVolumeKiGain.override = OVERRIDE_RESET; + dryBiCartAcidMixVolumeKiGain.data = ACID_VOL_CONTROL_I_COEFFICIENT; + dryBiCartAcidMixVolumeKiGain.ovData = ACID_VOL_CONTROL_I_COEFFICIENT; + dryBiCartAcidMixVolumeKiGain.ovInitData = 0.0F; + dryBiCartAcidMixVolumeKiGain.override = OVERRIDE_RESET; - dryBiCartBicarbDoseVolumeKpGain.data = BICARB_VOL_CONTROL_P_COEFFICIENT; - dryBiCartBicarbDoseVolumeKpGain.ovData = BICARB_VOL_CONTROL_P_COEFFICIENT; - dryBiCartBicarbDoseVolumeKpGain.ovInitData = 0.0F; - dryBiCartBicarbDoseVolumeKpGain.override = OVERRIDE_RESET; + dryBiCartBicarbMixVolumeKpGain.data = BICARB_VOL_CONTROL_P_COEFFICIENT; + dryBiCartBicarbMixVolumeKpGain.ovData = BICARB_VOL_CONTROL_P_COEFFICIENT; + dryBiCartBicarbMixVolumeKpGain.ovInitData = 0.0F; + dryBiCartBicarbMixVolumeKpGain.override = OVERRIDE_RESET; - dryBiCartBicarbDoseVolumeKiGain.data = BICARB_VOL_CONTROL_I_COEFFICIENT; - dryBiCartBicarbDoseVolumeKiGain.ovData = BICARB_VOL_CONTROL_I_COEFFICIENT; - dryBiCartBicarbDoseVolumeKiGain.ovInitData = 0.0F; - dryBiCartBicarbDoseVolumeKiGain.override = OVERRIDE_RESET; + dryBiCartBicarbMixVolumeKiGain.data = BICARB_VOL_CONTROL_I_COEFFICIENT; + dryBiCartBicarbMixVolumeKiGain.ovData = BICARB_VOL_CONTROL_I_COEFFICIENT; + dryBiCartBicarbMixVolumeKiGain.ovInitData = 0.0F; + dryBiCartBicarbMixVolumeKiGain.override = OVERRIDE_RESET; dryBiCartBicarbTargetConductivity.data = DRY_BICARB_TARGET_CONDUCTIVITY; dryBiCartBicarbTargetConductivity.ovData = DRY_BICARB_TARGET_CONDUCTIVITY; @@ -339,16 +355,31 @@ dryBiCartBicarbDeltaConductivity.ovInitData = 0.0F; dryBiCartBicarbDeltaConductivity.override = OVERRIDE_RESET; - dryBiCartAcidBicarbMixTargetConductivity.data = DRY_ACID_BICARB_TARGET_CONDUCTIVITY; - dryBiCartAcidBicarbMixTargetConductivity.ovData = DRY_ACID_BICARB_TARGET_CONDUCTIVITY; - dryBiCartAcidBicarbMixTargetConductivity.ovInitData = 0.0F; - dryBiCartAcidBicarbMixTargetConductivity.override = OVERRIDE_RESET; + dryBiCartDialysateTargetConductivity.data = DRY_ACID_BICARB_TARGET_CONDUCTIVITY; + dryBiCartDialysateTargetConductivity.ovData = DRY_ACID_BICARB_TARGET_CONDUCTIVITY; + dryBiCartDialysateTargetConductivity.ovInitData = 0.0F; + dryBiCartDialysateTargetConductivity.override = OVERRIDE_RESET; - dryBiCartAcidBicarbMixDeltaConductivity.data = DRY_ACID_BICARB_DELTA_CONDUCTIVITY; - dryBiCartAcidBicarbMixDeltaConductivity.ovData = DRY_ACID_BICARB_DELTA_CONDUCTIVITY; - dryBiCartAcidBicarbMixDeltaConductivity.ovInitData = 0.0F; - dryBiCartAcidBicarbMixDeltaConductivity.override = OVERRIDE_RESET; + dryBiCartDialysateDeltaConductivity.data = DRY_ACID_BICARB_DELTA_CONDUCTIVITY; + dryBiCartDialysateDeltaConductivity.ovData = DRY_ACID_BICARB_DELTA_CONDUCTIVITY; + dryBiCartDialysateDeltaConductivity.ovInitData = 0.0F; + dryBiCartDialysateDeltaConductivity.override = OVERRIDE_RESET; + dryBiCartUpperCartPressure.data = DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE; + dryBiCartUpperCartPressure.ovData = DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE; + dryBiCartUpperCartPressure.ovInitData = 0.0F; + dryBiCartUpperCartPressure.override = OVERRIDE_RESET; + + dryBiCartLowerCartPressure.data = DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE; + dryBiCartLowerCartPressure.ovData = DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE; + dryBiCartLowerCartPressure.ovInitData = 0.0F; + dryBiCartLowerCartPressure.override = OVERRIDE_RESET; + + dryBiCartMixControlInterval.data = MIXING_CONTROL_INTERVAL; + dryBiCartMixControlInterval.ovData = MIXING_CONTROL_INTERVAL; + dryBiCartMixControlInterval.ovInitData = 0.0F; + dryBiCartMixControlInterval.override = OVERRIDE_RESET; + dryBiCartFillStartTime = 0; lastFillDurationInMS = 0; currentFillDurationInMS = 0; @@ -363,15 +394,15 @@ initializePIController(PI_CONTROLLER_ID_BICARB_VOL, 0.0F,\ getBicarbKpGainCoefficient(), getBicarbKiGainCoefficient(),\ - MIN_BICARB_VOLUME_MLPM, MAX_BICARB_VOLUME_MLPM, FALSE, DOSING_NO_FEED_FORWARD ); + MIN_BICARB_VOLUME_MLPM, MAX_BICARB_VOLUME_MLPM, FALSE, MIX_NO_FEED_FORWARD ); - resetPIController(PI_CONTROLLER_ID_BICARB_VOL, STD_BICARB_DOSING, DOSING_NO_FEED_FORWARD); + resetPIController(PI_CONTROLLER_ID_BICARB_VOL, STD_BICARB_DOSING, MIX_NO_FEED_FORWARD); initializePIController(PI_CONTROLLER_ID_ACID_VOL, 0.0F, \ getAcidKpGainCoefficient(), getAcidKiGainCoefficient(),\ - MIN_ACID_VOLUME_MLPM, MAX_ACID_VOLUME_MLPM, FALSE, DOSING_NO_FEED_FORWARD ); + MIN_ACID_VOLUME_MLPM, MAX_ACID_VOLUME_MLPM, FALSE, MIX_NO_FEED_FORWARD ); - resetPIController(PI_CONTROLLER_ID_ACID_VOL, STD_ACID_DOSING, DOSING_NO_FEED_FORWARD); + resetPIController(PI_CONTROLLER_ID_ACID_VOL, STD_ACID_DOSING, MIX_NO_FEED_FORWARD); } /*********************************************************************//** @@ -405,19 +436,19 @@ switch ( dialysateMix[ mixId ].dialysateMixingState ) { case DIALYSATE_MIXING_OPEN_LOOP_STATE: - dialysateMix[ mixId ].dialysateMixingState = handleDialysateOpenLoopState( mixId ); + dialysateMix[ mixId ].dialysateMixingState = handleDialysateMixOpenLoopState( mixId ); break; case DIALYSATE_MIXING_RAMP_UP_STATE: - dialysateMix[ mixId ].dialysateMixingState = handleDialysateDoseRampToTargetState( mixId ); + dialysateMix[ mixId ].dialysateMixingState = handleDialysateMixRampToTargetState( mixId ); break; case DIALYSATE_MIXING_CONTROL_TO_TARGET_STATE: - dialysateMix[ mixId ].dialysateMixingState = handleDialysateDoseControlToTargetState( mixId ); + dialysateMix[ mixId ].dialysateMixingState = handleDialysateMixControlToTargetState( mixId ); break; default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSATE_DOSE_EXEC_INVALID_STATE, mixId ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSATE_MIX_EXEC_INVALID_STATE, mixId ) dialysateMix[ mixId ].dialysateMixingState = DIALYSATE_MIXING_OPEN_LOOP_STATE; break; } @@ -436,7 +467,7 @@ { updateDrybicartOperation(); - if( getCurrentBalancingChamberExecState() > BAL_CHAMBER_STATE_IDLE ) + if( getCurrentBalancingChamberExecState() > BAL_CHAMBER_STATE_START ) { // closed loop bicarb and acid dosing controller execDialysateCompositionMixingController(); @@ -476,6 +507,7 @@ break; } + // to avoid compilation warning since this parameter is not used any where (void)dryBicartSubstate; // Publish dry bicart data publishDryBicartData(); @@ -546,6 +578,7 @@ *************************************************************************/ U32 execBicarbChamberFillMode( void ) { + // TODO in pregen mode call hydChamberWaterInletControl(); // execute bicarb chamber fill state machine switch ( bicarbChamberFillExecState ) { @@ -627,396 +660,430 @@ return dryBiCartDrainExecState; } + + /*********************************************************************//** * @brief - * The setBicarbDoseVol function sets bicarb dose volume provided by the controller - * @details \b Inputs: none - * @details \b Outputs: dryBiCartBicarbDoseVolume - * @param targetValue bicarb dose volume + * TThe getBicarbMixVol function gets the bicarb mix volume provided by the controller + * @details \b Inputs: dryBiCartBicarbMixVolume + * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -void setBicarbDoseVol( F32 targetValue ) +F32 getBicarbMixVol( void ) { - dryBiCartBicarbDoseVolume.data = targetValue; + F32 result = dryBiCartBicarbMixVolume.data; + + if ( OVERRIDE_KEY == dryBiCartBicarbMixVolume.override ) + { + result = dryBiCartBicarbMixVolume.ovData; + } + + return result; } /*********************************************************************//** * @brief - * TThe getBicarbDoseVol function gets the bicarb dose volume provided by the controller - * @details \b Inputs: dryBiCartBicarbDoseVolume + * The getAcidMixVol function gets acid mix volume provided by the controller + * @details \b Inputs: dryBiCartAcidMixVolume * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getBicarbDoseVol( void ) +F32 getAcidMixVol( void ) { - F32 result = dryBiCartBicarbDoseVolume.data; + F32 result = dryBiCartAcidMixVolume.data; - if ( OVERRIDE_KEY == dryBiCartBicarbDoseVolume.override ) + if ( OVERRIDE_KEY == dryBiCartAcidMixVolume.override ) { - result = dryBiCartBicarbDoseVolume.ovData; + result = dryBiCartAcidMixVolume.ovData; } return result; } /*********************************************************************//** * @brief - * The setAcidDoseVol function sets acid dose volume provided by the controller + * The setBicarbChamberFillRequested function sets the chmaberFillRequest * flag value to be True. - * @details \b Inputs: none - * @details \b Outputs: dryBiCartAcidDoseVolume - * @param targetValue acid dose volume + * @details \b Inputs: dryBiCartFillRequested, dryBiCartDrainRequested + * @details \b Outputs: bicarbChamberFillRequested * @return TRUE if successful, FALSE if not. *************************************************************************/ -void setAcidDoseVol( F32 targetValue ) +BOOL setBicarbChamberFillRequested( void ) { - dryBiCartAcidDoseVolume.data = targetValue; + BOOL result = FALSE; + BOOL requestStatus = getU32OverrideValue( &dryBiCartFillRequested ) || getU32OverrideValue( &dryBiCartDrainRequested ); + + // ensure that there is no other operation in progress before new request set to true + if ( FALSE == requestStatus ) + { + bicarbChamberFillRequested.data = TRUE; + result = TRUE; + } + + return result; } /*********************************************************************//** * @brief - * The getBicarbAcidDoseVol function gets acid dose volume provided by the controller + * The getBicarbChamberFillRequested function gets the chmaberFillRequest * flag values - * @details \b Inputs: dryBiCartAcidDoseVolume + * @details \b Inputs: bicarbChamberFillRequested * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getAcidDoseVol( void ) +BOOL getBicarbChamberFillRequested( void ) { - F32 result = dryBiCartAcidDoseVolume.data; + BOOL result = FALSE; - if ( OVERRIDE_KEY == dryBiCartAcidDoseVolume.override ) + if ( (TRUE == getU32OverrideValue( &bicarbChamberFillRequested ) ) ) { - result = dryBiCartAcidDoseVolume.ovData; + result = TRUE; } return result; } /*********************************************************************//** * @brief - * The getBicarbDeltaConductivity function gets the delta target conductivity - * @details \b Inputs: dryBiCartBicarbDeltaConductivity - * @details \b Outputs: none + * The setBicartFillRequested function sets the bicart fill request + * flag value to be True. + * @details \b Inputs: bicarbChamberFillRequested, dryBiCartDrainRequested + * @details \b Outputs: dryBiCartFillRequested * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getBicarbDeltaConductivity( void ) +BOOL setBicartFillRequested( void ) { - F32 result = dryBiCartBicarbDeltaConductivity.data; + BOOL result = FALSE; + BOOL requestStatus = getU32OverrideValue( &bicarbChamberFillRequested ) || getU32OverrideValue( &dryBiCartDrainRequested ); - if ( OVERRIDE_KEY == dryBiCartBicarbDeltaConductivity.override ) + //ensure that there is no other operation in progress before new request set to true + if ( FALSE == requestStatus ) { - result = dryBiCartBicarbDeltaConductivity.ovData; + dryBiCartFillRequested.data = TRUE; + result = TRUE; } return result; } /*********************************************************************//** * @brief - * The getBicarbTargetConductivity function gets the target conductivity - * @details \b Inputs: dryBiCartBicarbTargetConductivity + * The getBicartFillRequested function gets the bicart fill request + * flag value + * @details \b Inputs: dryBiCartFillRequested * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getBicarbTargetConductivity( void ) +BOOL getBicartFillRequested( void ) { - F32 result = dryBiCartBicarbTargetConductivity.data; + BOOL result = FALSE; - if ( OVERRIDE_KEY == dryBiCartBicarbTargetConductivity.override ) + if ( ( TRUE == getU32OverrideValue( &dryBiCartFillRequested ) ) ) { - result = dryBiCartBicarbTargetConductivity.ovData; + result = TRUE; } return result; } /*********************************************************************//** * @brief - * The getAcidBicarbDeltaConductivity function gets the acid bicarb delta target conductivity - * flag values - * @details \b Inputs: dryBiCartAcidBicarbMixDeltaConductivity - * @details \b Outputs: none + * The setBicartDrainRequested function sets the bicart drain request + * flag value to be True. + * @details \b Inputs: bicarbChamberFillRequested,dryBiCartFillRequested + * @details \b Outputs: dryBiCartDrainRequested * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getAcidBicarbDeltaConductivity( void ) +BOOL setBicartDrainRequested( void ) { - F32 result = dryBiCartAcidBicarbMixDeltaConductivity.data; + BOOL result = FALSE; + BOOL requestStatus = getU32OverrideValue( &bicarbChamberFillRequested ) || getU32OverrideValue( &dryBiCartFillRequested ); - if ( OVERRIDE_KEY == dryBiCartAcidBicarbMixDeltaConductivity.override ) + //ensure that there is no other operation in progress before new request set to true + if ( FALSE == requestStatus ) { - result = dryBiCartAcidBicarbMixDeltaConductivity.ovData; + dryBiCartDrainRequested.data = TRUE; + result = TRUE; } return result; } /*********************************************************************//** * @brief - * The getAcidBicarbTargetConductivity function gets the acid bicarb delta target conductivity - * flag values - * @details \b Inputs: dryBiCartAcidBicarbMixTargetConductivity + * The getBicartDrainRequested function gets the bicart drain request + * flag value + * @details \b Inputs: dryBiCartDrainRequested * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getAcidBicarbTargetConductivity( void ) +BOOL getBicartDrainRequested( void ) { - F32 result = dryBiCartAcidBicarbMixTargetConductivity.data; + BOOL result = FALSE; - if ( OVERRIDE_KEY == dryBiCartAcidBicarbMixTargetConductivity.override ) + if ( ( TRUE == getU32OverrideValue( &dryBiCartDrainRequested ) ) ) { - result = dryBiCartAcidBicarbMixTargetConductivity.ovData; + result = TRUE; } return result; } /*********************************************************************//** * @brief - * The getBicarbKpGainCoefficient function gets the Kp Gain for closed loop - * bicarb dose volume control - * flag values - * @details \b Inputs: dryBiCartBicarbDoseVolumeKpGain + * The getCurrentDryBiCartFillExecState function returns the current state + * of the dry bicart fill state. + * @details \b Inputs: dryBiCartFillExecState * @details \b Outputs: none + * @return the current state of dry bicart fill exec state. + *************************************************************************/ +DRY_BICART_FILL_EXEC_STATE_T getCurrentDryBiCartFillExecState( void ) +{ + return dryBiCartFillExecState; +} + +/*********************************************************************//** + * @brief + * The setAcidMixVol function sets acid mix volume provided by the controller + * flag value to be True. + * @details \b Inputs: none + * @details \b Outputs: dryBiCartAcidMixVolume + * @param targetValue acid mix volume * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getBicarbKpGainCoefficient( void ) +static void setAcidMixVol( F32 targetValue ) { - F32 result = dryBiCartBicarbDoseVolumeKpGain.data; + dryBiCartAcidMixVolume.data = targetValue; +} - if ( OVERRIDE_KEY == dryBiCartBicarbDoseVolumeKpGain.override ) - { - result = dryBiCartBicarbDoseVolumeKpGain.ovData; - } - - return result; +/*********************************************************************//** + * @brief + * The setBicarbMixVol function sets bicarb Mix volume provided by the controller + * @details \b Inputs: none + * @details \b Outputs: dryBiCartBicarbMixVolume + * @param targetValue bicarb Mix volume + * @return TRUE if successful, FALSE if not. + *************************************************************************/ +static void setBicarbMixVol( F32 targetValue ) +{ + dryBiCartBicarbMixVolume.data = targetValue; } /*********************************************************************//** * @brief - * The getBicarbKiGainCoefficient function gets the Kp Gain for closed loop - * bicarb dose volume control - * flag values - * @details \b Inputs: dryBiCartBicarbDoseVolumeKiGain + * The getBicarbDeltaConductivity function gets the delta target conductivity + * @details \b Inputs: dryBiCartBicarbDeltaConductivity * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getBicarbKiGainCoefficient( void ) +static F32 getBicarbDeltaConductivity( void ) { - F32 result = dryBiCartBicarbDoseVolumeKiGain.data; + F32 result = dryBiCartBicarbDeltaConductivity.data; - if ( OVERRIDE_KEY == dryBiCartBicarbDoseVolumeKiGain.override ) + if ( OVERRIDE_KEY == dryBiCartBicarbDeltaConductivity.override ) { - result = dryBiCartBicarbDoseVolumeKiGain.ovData; + result = dryBiCartBicarbDeltaConductivity.ovData; } return result; } /*********************************************************************//** * @brief - * The getAcidKpGainCoefficient function gets the Kp Gain for closed loop - * acid dose volume control - * flag values - * @details \b Inputs: dryBiCartAcidDoseVolumeKpGain + * The getBicarbTargetConductivity function gets the target conductivity + * @details \b Inputs: dryBiCartBicarbTargetConductivity * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getAcidKpGainCoefficient( void ) +static F32 getBicarbTargetConductivity( void ) { - F32 result = dryBiCartAcidDoseVolumeKpGain.data; + F32 result = dryBiCartBicarbTargetConductivity.data; - if ( OVERRIDE_KEY == dryBiCartAcidDoseVolumeKpGain.override ) + if ( OVERRIDE_KEY == dryBiCartBicarbTargetConductivity.override ) { - result = dryBiCartAcidDoseVolumeKpGain.ovData; + result = dryBiCartBicarbTargetConductivity.ovData; } return result; } /*********************************************************************//** * @brief - * The getAcidKiGainCoefficient function gets the Ki Gain for closed loop - * acid dose volume control - * flag values - * @details \b Inputs: dryBiCartAcidDoseVolumeKiGain + * The getAcidBicarbDeltaConductivity function gets the acid bicarb delta target conductivity + * @details \b Inputs: dryBiCartAcidBicarbMixDeltaConductivity * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -F32 getAcidKiGainCoefficient( void ) +static F32 getAcidBicarbDeltaConductivity( void ) { - F32 result = dryBiCartAcidDoseVolumeKiGain.data; + F32 result = dryBiCartDialysateDeltaConductivity.data; - if ( OVERRIDE_KEY == dryBiCartAcidDoseVolumeKiGain.override ) + if ( OVERRIDE_KEY == dryBiCartDialysateDeltaConductivity.override ) { - result = dryBiCartAcidDoseVolumeKiGain.ovData; + result = dryBiCartDialysateDeltaConductivity.ovData; } return result; } /*********************************************************************//** * @brief - * The setBicarbChamberFillRequested function sets the chmaberFillRequest - * flag value to be True. - * @details \b Inputs: dryBiCartFillRequested, dryBiCartDrainRequested - * @details \b Outputs: bicarbChamberFillRequested + * The getAcidBicarbTargetConductivity function gets the acid bicarb delta target conductivity + * @details \b Inputs: dryBiCartAcidBicarbMixTargetConductivity + * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -BOOL setBicarbChamberFillRequested( void ) +static F32 getAcidBicarbTargetConductivity( void ) { - BOOL result = FALSE; - BOOL requestStatus = getU32OverrideValue( &dryBiCartFillRequested ) || getU32OverrideValue( &dryBiCartDrainRequested ); + F32 result = dryBiCartDialysateTargetConductivity.data; - // ensure that there is no other operation in progress before new request set to true - if ( FALSE == requestStatus ) + if ( OVERRIDE_KEY == dryBiCartDialysateTargetConductivity.override ) { - bicarbChamberFillRequested.data = TRUE; - result = TRUE; + result = dryBiCartDialysateTargetConductivity.ovData; } return result; } /*********************************************************************//** * @brief - * The getBicarbChamberFillRequested function gets the chmaberFillRequest - * flag values - * @details \b Inputs: bicarbChamberFillRequested + * The getBicarbKpGainCoefficient function gets the Kp Gain for closed loop + * bicarb mix volume control + * @details \b Inputs: dryBiCartBicarbMixVolumeKpGain * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -BOOL getBicarbChamberFillRequested( void ) +static F32 getBicarbKpGainCoefficient( void ) { - BOOL result = FALSE; + F32 result = dryBiCartBicarbMixVolumeKpGain.data; - if ( (TRUE == getU32OverrideValue( &bicarbChamberFillRequested ) ) ) + if ( OVERRIDE_KEY == dryBiCartBicarbMixVolumeKpGain.override ) { - result = TRUE; + result = dryBiCartBicarbMixVolumeKpGain.ovData; } return result; } /*********************************************************************//** * @brief - * The setBicartFillRequested function sets the bicart fill request - * flag value to be True. - * @details \b Inputs: bicarbChamberFillRequested, dryBiCartDrainRequested - * @details \b Outputs: dryBiCartFillRequested + * The getBicarbKiGainCoefficient function gets the Kp Gain for closed loop + * bicarb mix volume control + * @details \b Inputs: dryBiCartBicarbMixVolumeKiGain + * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -BOOL setBicartFillRequested( void ) +static F32 getBicarbKiGainCoefficient( void ) { - BOOL result = FALSE; - BOOL requestStatus = getU32OverrideValue( &bicarbChamberFillRequested ) || getU32OverrideValue( &dryBiCartDrainRequested ); + F32 result = dryBiCartBicarbMixVolumeKiGain.data; - //ensure that there is no other operation in progress before new request set to true - if ( FALSE == requestStatus ) + if ( OVERRIDE_KEY == dryBiCartBicarbMixVolumeKiGain.override ) { - dryBiCartFillRequested.data = TRUE; - result = TRUE; + result = dryBiCartBicarbMixVolumeKiGain.ovData; } return result; } /*********************************************************************//** * @brief - * The getBicartFillRequested function gets the bicart fill request - * flag value - * @details \b Inputs: dryBiCartFillRequested + * The getAcidKpGainCoefficient function gets the Kp Gain for closed loop + * acid mix volume control + * @details \b Inputs: dryBiCartAcidMixVolumeKpGain * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -BOOL getBicartFillRequested( void ) +static F32 getAcidKpGainCoefficient( void ) { - BOOL result = FALSE; + F32 result = dryBiCartAcidMixVolumeKpGain.data; - if ( ( TRUE == getU32OverrideValue( &dryBiCartFillRequested ) ) ) + if ( OVERRIDE_KEY == dryBiCartAcidMixVolumeKpGain.override ) { - result = TRUE; + result = dryBiCartAcidMixVolumeKpGain.ovData; } return result; } /*********************************************************************//** * @brief - * The setBicartDrainRequested function sets the bicart drain request - * flag value to be True. - * @details \b Inputs: bicarbChamberFillRequested,dryBiCartFillRequested - * @details \b Outputs: dryBiCartDrainRequested + * The getAcidKiGainCoefficient function gets the Ki Gain for closed loop + * acid mix volume control + * @details \b Inputs: dryBiCartAcidMixVolumeKiGain + * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -BOOL setBicartDrainRequested( void ) +static F32 getAcidKiGainCoefficient( void ) { - BOOL result = FALSE; - BOOL requestStatus = getU32OverrideValue( &bicarbChamberFillRequested ) || getU32OverrideValue( &dryBiCartFillRequested ); + F32 result = dryBiCartAcidMixVolumeKiGain.data; - //ensure that there is no other operation in progress before new request set to true - if ( FALSE == requestStatus ) + if ( OVERRIDE_KEY == dryBiCartAcidMixVolumeKiGain.override ) { - dryBiCartDrainRequested.data = TRUE; - result = TRUE; + result = dryBiCartAcidMixVolumeKiGain.ovData; } return result; } /*********************************************************************//** * @brief - * The getBicartDrainRequested function gets the bicart drain request - * flag value - * @details \b Inputs: dryBiCartDrainRequested + * The getDryBicartUpperCartPressure function gets the bicart upper threshold pressure + * @details \b Inputs: dryBiCartUpperCartPressure * @details \b Outputs: none * @return TRUE if successful, FALSE if not. *************************************************************************/ -BOOL getBicartDrainRequested( void ) +static F32 getDryBicartUpperCartPressure( void ) { - BOOL result = FALSE; + F32 result = getF32OverrideValue( &dryBiCartUpperCartPressure ); - if ( ( TRUE == getU32OverrideValue( &dryBiCartDrainRequested ) ) ) - { - result = TRUE; - } + return result; +} +/*********************************************************************//** + * @brief + * The getDryBicartLowerCartPressure function gets the bicart lower threshold pressure + * @details \b Inputs: dryBiCartLowerCartPressure + * @details \b Outputs: none + * @return TRUE if successful, FALSE if not. + *************************************************************************/ +static F32 getDryBicartLowerCartPressure( void ) +{ + F32 result = getF32OverrideValue( &dryBiCartLowerCartPressure ); + return result; } /*********************************************************************//** * @brief - * The getCurrentDryBiCartFillExecState function returns the current state - * of the dry bicart fill state. - * @details \b Inputs: dryBiCartFillExecState + * The getDryBicartMixControlInterval function gets the bicart mix control interval + * @details \b Inputs: dryBiCartMixControlInterval * @details \b Outputs: none - * @return the current state of dry bicart fill exec state. + * @return TRUE if successful, FALSE if not. *************************************************************************/ -DRY_BICART_FILL_EXEC_STATE_T getCurrentDryBiCartFillExecState( void ) +static F32 getDryBicartMixControlInterval( void ) { - return dryBiCartFillExecState; + F32 result = getF32OverrideValue( &dryBiCartMixControlInterval ); + + return result; } /*********************************************************************//** * @brief * The handleDialysateOpenLoopState function handles the dialysate open loop state of - * the dialysate dose controller state machine. + * the dialysate mix controller state machine. * @details \b Inputs: D17_COND, D29_COND * @details \b Outputs: none - * @param doseId dialysate dose id to run the dialysate dose + * @param mixId dialysate mix id to run the dialysate mix * @return next state for the controller state machine *************************************************************************/ -static DIALYSATE_MIXING_STATE_T handleDialysateOpenLoopState( DIALYSATE_MIXING_ID_T mixId ) +static DIALYSATE_MIXING_STATE_T handleDialysateMixOpenLoopState( DIALYSATE_MIXING_ID_T mixId ) { - DIALYSATE_MIXING_STATE_T result = DIALYSATE_MIXING_OPEN_LOOP_STATE; + DIALYSATE_MIXING_STATE_T result; if ( BICARB_MIX_ID == mixId ) { -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ + result = DIALYSATE_MIXING_OPEN_LOOP_STATE; F32 measuredBicarbConductivity = getFilteredConductivity( D17_COND ); -#else - F32 measuredBicarbConductivity = getFilteredConductivity( D17_COND ); -#endif // if measured conductivity crossed (targetConductivity- deltaConuctivity) , switch to closed loop if ( measuredBicarbConductivity >= ( getBicarbTargetConductivity() - getBicarbDeltaConductivity() ) ) { @@ -1025,15 +1092,13 @@ } else if ( ACID_MIX_ID == mixId ) { -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ + result = DIALYSATE_MIXING_OPEN_LOOP_STATE; F32 measuredAcidBicarbMixConductivity = getFilteredConductivity( D27_COND ); -#else - F32 measuredAcidBicarbMixConductivity = getFilteredConductivity( D27_COND ); -#endif + // if measured conductivity crossed (targetConductivity- deltaConuctivity) , switch to closed loop if ( measuredAcidBicarbMixConductivity >= ( getAcidBicarbTargetConductivity() - getAcidBicarbDeltaConductivity() ) ) { - result = DIALYSATE_MIXING_RAMP_UP_STATE; + result = DIALYSATE_MIXING_RAMP_UP_STATE; } } @@ -1043,27 +1108,27 @@ /*********************************************************************//** * @brief * The handleDialysatePumpRampToTargetState function handles the dialysate ramp to target state of - * the dialysate dose controller state machine. + * the dialysate mix controller state machine. * @details \b Inputs: none * @details \b Outputs: none - * @param doseId dose id to + * @param mixId mix id to * @return next state for the controller state machine *************************************************************************/ -static DIALYSATE_MIXING_STATE_T handleDialysateDoseRampToTargetState( DIALYSATE_MIXING_ID_T mixId ) +static DIALYSATE_MIXING_STATE_T handleDialysateMixRampToTargetState( DIALYSATE_MIXING_ID_T mixId ) { DIALYSATE_MIXING_STATE_T state = DIALYSATE_MIXING_RAMP_UP_STATE; //if ( TRUE == stepDialysatePumpToTargetSpeed( pumpId ) ) { if ( BICARB_MIX_ID == mixId ) { - resetPIController( PI_CONTROLLER_ID_BICARB_VOL, STD_BICARB_DOSING, DOSING_NO_FEED_FORWARD ); + resetPIController( PI_CONTROLLER_ID_BICARB_VOL, STD_BICARB_DOSING, MIX_NO_FEED_FORWARD ); state = DIALYSATE_MIXING_CONTROL_TO_TARGET_STATE; } else if ( ACID_MIX_ID == mixId ) { - resetPIController( PI_CONTROLLER_ID_ACID_VOL, STD_ACID_DOSING, DOSING_NO_FEED_FORWARD ); + resetPIController( PI_CONTROLLER_ID_ACID_VOL, STD_ACID_DOSING, MIX_NO_FEED_FORWARD ); state = DIALYSATE_MIXING_CONTROL_TO_TARGET_STATE; } @@ -1075,17 +1140,17 @@ /*********************************************************************//** * @brief * The handleDialysatePumpControlToTargetState function handles the control to - * target state of the dialysate dose controller state machine.. + * target state of the dialysate mix controller state machine.. * @details \b Inputs: D17_COND, D29_COND, controlTimerCounter * @details \b Outputs:none * @return next state of the controller state machine *************************************************************************/ -static DIALYSATE_MIXING_STATE_T handleDialysateDoseControlToTargetState( DIALYSATE_MIXING_ID_T mixId ) +static DIALYSATE_MIXING_STATE_T handleDialysateMixControlToTargetState( DIALYSATE_MIXING_ID_T mixId ) { DIALYSATE_MIXING_STATE_T state = DIALYSATE_MIXING_CONTROL_TO_TARGET_STATE; // control at set minimum interval or interval is expired and balance chamber fill is complete - if ( ( ( ++dialysateMix[ mixId ].controlTimerCounter >= DOSE_CONTROL_INTERVAL ) ) ) + if ( ( ++dialysateMix[ mixId ].controlTimerCounter >= getDryBicartMixControlInterval() ) ) { dialysateMix[ mixId ].controlTimerCounter = 0; @@ -1099,50 +1164,29 @@ F32 measuredBicarbConductivity; //U32 i; -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ - easuredBicarbConductivity = getFilteredConductivity( D17_COND ); -#else - measuredBicarbConductivity = getFilteredConductivity( D17_COND ); -#endif - F32 bicarbDoseVol = runPIController(PI_CONTROLLER_ID_BICARB_VOL, getBicarbTargetConductivity(), measuredBicarbConductivity); + measuredBicarbConductivity = getFilteredConductivity( D17_COND ); + F32 bicarbMixVol = runPIController(PI_CONTROLLER_ID_BICARB_VOL, getBicarbTargetConductivity(), measuredBicarbConductivity); //Set bicarb dosing vol - setBicarbDoseVol( bicarbDoseVol ); - //U32 i; + setBicarbMixVol( bicarbMixVol ); -#if 0 - for ( i = 0; i < NUM_OF_CONTROLLER_SIGNAL; i++ ) - { - pIControlSignal[ i ] = getPIControllerSignals( PI_CONTROLLER_ID_BICARB_VOL, (PI_CONTROLLER_SIGNALS_ID)i ); - } -#endif debugBicarbControl = getDebugPIControllerSignals( PI_CONTROLLER_ID_BICARB_VOL ); memcpy((void*)&bicarbControlSignals, (void*)&debugBicarbControl, sizeof(PI_CONTROLLER_SIGNALS_DATA)); } - // ACID dose + // ACID Mix else if ( ACID_MIX_ID == mixId ) { F32 measuredAcidBicarbMixConductivity; - //U32 i; PI_CONTROLLER_SIGNALS_DATA debugAcidControl; -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ measuredAcidBicarbMixConductivity = getFilteredConductivity( D27_COND ); -#else - measuredAcidBicarbMixConductivity = getFilteredConductivity( D27_COND ); -#endif - F32 acidDoseVol = runPIController(PI_CONTROLLER_ID_ACID_VOL, getAcidBicarbTargetConductivity(), measuredAcidBicarbMixConductivity); + + F32 acidMixVol = runPIController(PI_CONTROLLER_ID_ACID_VOL, getAcidBicarbTargetConductivity(), measuredAcidBicarbMixConductivity); //Set acid dosing vol - setAcidDoseVol( acidDoseVol ); - //U32 i; + setAcidMixVol( acidMixVol ); -#if 0 - for ( i = 0; i < NUM_OF_CONTROLLER_SIGNAL; i++ ) - { - pIControlSignal[ i ] = getPIControllerSignals( PI_CONTROLLER_ID_ACID_VOL, (PI_CONTROLLER_SIGNALS_ID)i ); - } -#endif debugAcidControl = getDebugPIControllerSignals( PI_CONTROLLER_ID_ACID_VOL ); + memcpy((void*)&acidControlSignals, (void*)&debugAcidControl, sizeof(PI_CONTROLLER_SIGNALS_DATA)); } } @@ -1396,6 +1440,9 @@ // TODO: implement the broadcast message for fill complete if ( TRUE == didTimeout( dryBiCartFillStartTime, DRY_BICART_FILL_COMPLETE_TIME_MS ) ) { + currentFillDurationInMS = 0; + lastFillDurationInMS = 0; + biCartFillCycleCounter = 0; // Go idle dryBiCartFillRequested.data = FALSE; // for this request override also cleared @@ -1473,7 +1520,7 @@ BICARB_CHAMBER_FILL_EXEC_STATE_T state = BICARB_CARTRIDGE_FILL_WATER_END_STATE; F32 d66Pressure = getFilteredPressure( D66_PRES ); - if ( d66Pressure >= DRY_BICART_FILL_COMPLETE_PRESSURE ) + if ( d66Pressure >= getDryBicartUpperCartPressure() ) { // Close water inlet valve as D66 pressure reaches 15 PSI. setValveState( D65_VALV, VALVE_STATE_CLOSED ); @@ -1537,7 +1584,7 @@ state = BICARB_CHAMBER_PRESSURE_CHECK_STATE; } // Open water inlet valve to fill the bicart - else if ( d66Pressure <= DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE ) + else if ( d66Pressure <= getDryBicartLowerCartPressure() ) { setValveState( D65_VALV, VALVE_STATE_OPEN ); state = BICARB_CHAMBER_PRESSURE_CHECK_STATE; @@ -1574,12 +1621,11 @@ dryBiCarbSypplyVentStartTime = getMSTimerCount(); state = BICARB_SUPPLY_VENT_START_STATE; } - else if ( d66Pressure <= DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE ) + else if ( d66Pressure <= getDryBicartLowerCartPressure() ) { - setValveState( D65_VALV, VALVE_STATE_OPEN ); - } + setValveState( D65_VALV, VALVE_STATE_OPEN ); } // Close water inlet valve as fill is complete. - else if ( d66Pressure >= DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE ) + else if ( d66Pressure >= getDryBicartUpperCartPressure() ) { setValveState( D65_VALV, VALVE_STATE_CLOSED ); } @@ -1598,7 +1644,38 @@ static BICARB_CHAMBER_FILL_EXEC_STATE_T handleBicarbChamberSupplyVentStartState(void) { BICARB_CHAMBER_FILL_EXEC_STATE_T state = BICARB_SUPPLY_VENT_START_STATE; + float setpoint; + U32 startTime; + F32 d66Pressure = getFilteredPressure( D66_PRES ); + F32 tmpD66Pressure = getFilteredPressure( D66_PRES ); + setpoint = d66Pressure - 1.0; + + + + //if ( TRUE == didTimeout( dryBiCarbSupplyStartTime, 10 ) ) +#if 1 + while ( tmpD66Pressure >= getDryBicartLowerCartPressure() && tmpD66Pressure >= setpoint ) { + //setpoint = d66Pressure - 1.0; + + // Venting loop: stay open until target PSI is reached + setValveState( D64_VALV, VALVE_STATE_CLOSED ); + setValveState( D85_VALV, VALVE_STATE_OPEN ); + startTime = getMSTimerCount(); + while ( TRUE != didTimeout( startTime, 25 ) ) + { + } + // close the vallve + setValveState( D85_VALV, VALVE_STATE_CLOSED ); + setValveState( D64_VALV, VALVE_STATE_OPEN ); + startTime = getMSTimerCount(); + while ( TRUE != didTimeout( startTime, 25 ) ) + { + } + tmpD66Pressure = getFilteredPressure( D66_PRES ); + //sleep + } +#endif if ( TRUE == didTimeout( dryBiCarbSypplyVentStartTime, DRY_BICART_SUPPLY_VENT_TIME_MS ) ) { //Vent bicart after 1 sec @@ -1607,10 +1684,20 @@ if ( TRUE == didTimeout( dryBiCarbSypplyVentStartTime, DRY_BICART_SUPPLY_VENT_MAX_TIME_MS ) ) { - //Vent chamber F after 3 sec setValveState( D85_VALV, VALVE_STATE_CLOSED ); + //Vent chamber F after 200 ms setValveState( D64_VALV, VALVE_STATE_OPEN ); dryBiCarbSypplyVentStartTime = getMSTimerCount(); + //state = BICARB_SUPPLY_VENT_END_STATE; + } + + // D66 pressure drops or time out + if ( ( d66Pressure <= DRY_BICART_FILL_VENT_COMPLETE_PRESSURE ) || + ( TRUE == didTimeout( dryBiCarbSypplyVentStartTime, DRY_BICART_FILL_VENT_MAX_TIME_MS ) ) ) + { + setValveState( D64_VALV, VALVE_STATE_OPEN ); + setValveState( D85_VALV, VALVE_STATE_CLOSED ); + dryBiCarbSypplyVentStartTime = getMSTimerCount(); state = BICARB_SUPPLY_VENT_END_STATE; } @@ -1629,7 +1716,7 @@ { BICARB_CHAMBER_FILL_EXEC_STATE_T state = BICARB_SUPPLY_VENT_END_STATE; - // close bicart vent and chamber f vent after 3 sec + // close bicart vent and chamber f vent after 1 sec if ( TRUE == didTimeout( dryBiCarbSypplyVentStartTime, DRY_BICART_SUPPLY_VENT_TIME_MS ) ) { setValveState( D85_VALV, VALVE_STATE_CLOSED ); @@ -1855,14 +1942,17 @@ // TODO: remove after feature testing memcpy( &data.dryBiCartAcidDosingControl , &acidControlSignals , sizeof( PI_CONTROLLER_SIGNALS_DATA ) ); - data.dryBiCartAcidDoseVolume = getAcidDoseVol(); - data.dryBiCartBicarbDoseVolume = getBicarbDoseVol(); + data.dryBiCartAcidMixVolume = getAcidMixVol(); + data.dryBiCartBicarbMixVolume = getBicarbMixVol(); // TODO: remove after feature testing data.dryBiCartBicarbDosingKPgain = getBicarbKpGainCoefficient(); // TODO: remove after feature testing data.dryBiCartBicarbDosingKIgain = getBicarbKiGainCoefficient(); - + + data.dryBiCartAcidDosingKPgain = getAcidKpGainCoefficient(); + data.dryBiCartAcidDosingKIgain = getAcidKiGainCoefficient(); + broadcastData( MSG_ID_DD_DRY_BICART_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( DRY_BICART_DATA_T ) ); dryBiCartDataPublicationTimerCounter = 0; @@ -1977,123 +2067,123 @@ /*********************************************************************//** * @brief - * The testAcidDoseVolumeOverride function sets the override value + * The testDryBiCartAcidMixVolumeOverride function sets the override value * of the acid concentrate dosing volume. - * @details Inputs: dryBiCartAcidDoseVolume - * @details Outputs: dryBiCartAcidDoseVolume + * @details Inputs: dryBiCartAcidMixVolume + * @details Outputs: dryBiCartAcidMixVolume * @param message Override message from Dialin which includes the override * value to override the acid concentrate dosing volume. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testDryBiCartAcidDoseVolumeOverride( MESSAGE_T *message ) +BOOL testDryBiCartAcidMixVolumeOverride( MESSAGE_T *message ) { - BOOL result = f32Override( message, &dryBiCartAcidDoseVolume ); + BOOL result = f32Override( message, &dryBiCartAcidMixVolume ); return result; } /*********************************************************************//** * @brief - * The testBicarbDoseVolumeOverride function sets the override value + * The testDryBiCartBicarbMixVolumeOverride function sets the override value * of the bicarb concentrate dosing volume. - * @details Inputs: dryBiCartBicarbDoseVolume - * @details Outputs: dryBiCartBicarbDoseVolume + * @details Inputs: dryBiCartBicarbMixVolume + * @details Outputs: dryBiCartBicarbMixVolume * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate dosing volume. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testDryBiCartBicarbDoseVolumeOverride( MESSAGE_T *message ) +BOOL testDryBiCartBicarbMixVolumeOverride( MESSAGE_T *message ) { - BOOL result = f32Override( message, &dryBiCartBicarbDoseVolume ); + BOOL result = f32Override( message, &dryBiCartBicarbMixVolume ); return result; } /*********************************************************************//** * @brief - * The testDryBiCartBicarbKpGainBicarbDoseVolumeOverride function sets the override value + * The testDryBiCartBicarbMixVolControlKpGainOverride function sets the override value * of the Kp gain coefficient for closed loop bicarb dosing volume control - * @details Inputs: dryBiCartBicarbDoseVolumeKpGain - * @details Outputs: dryBiCartBicarbDoseVolumeKpGain + * @details Inputs: dryBiCartBicarbMixVolumeKpGain + * @details Outputs: dryBiCartBicarbMixVolumeKpGain * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate dosing volume kp gain. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testDryBiCartBicarbDoseVolControlKpGainOverride( MESSAGE_T *message ) +BOOL testDryBiCartBicarbMixVolControlKpGainOverride( MESSAGE_T *message ) { - BOOL result = f32Override( message, &dryBiCartBicarbDoseVolumeKpGain ); + BOOL result = f32Override( message, &dryBiCartBicarbMixVolumeKpGain ); initializePIController(PI_CONTROLLER_ID_BICARB_VOL, MIN_BICARB_VOLUME_MLPM,\ getBicarbKpGainCoefficient(), getBicarbKiGainCoefficient(),\ - MIN_BICARB_VOLUME_MLPM, MAX_BICARB_VOLUME_MLPM, FALSE, DOSING_NO_FEED_FORWARD ); + MIN_BICARB_VOLUME_MLPM, MAX_BICARB_VOLUME_MLPM, FALSE, MIX_NO_FEED_FORWARD ); - resetPIController(PI_CONTROLLER_ID_BICARB_VOL, STD_BICARB_DOSING, DOSING_NO_FEED_FORWARD); + resetPIController(PI_CONTROLLER_ID_BICARB_VOL, STD_BICARB_DOSING, MIX_NO_FEED_FORWARD); return result; } /*********************************************************************//** * @brief - * The testDryBiCartBicarbKiGainBicarbDoseVolumeOverride function sets the override value + * The testDryBiCartBicarbMixVolControlKiGainOverride function sets the override value * of the Ki gain coefficient for closed loop bicarb concentrate dosing volume control - * @details Inputs: dryBiCartBicarbDoseVolumeKiGain - * @details Outputs: dryBiCartBicarbDoseVolumeKiGain + * @details Inputs: dryBiCartBicarbMixVolumeKiGain + * @details Outputs: dryBiCartBicarbMixVolumeKiGain * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate dosing volume ki gain. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testDryBiCartBicarbDoseVolControlKiGainOverride( MESSAGE_T *message ) +BOOL testDryBiCartBicarbMixVolControlKiGainOverride( MESSAGE_T *message ) { - BOOL result = f32Override( message, &dryBiCartBicarbDoseVolumeKiGain ); + BOOL result = f32Override( message, &dryBiCartBicarbMixVolumeKiGain ); initializePIController(PI_CONTROLLER_ID_BICARB_VOL, MIN_BICARB_VOLUME_MLPM,\ getBicarbKpGainCoefficient(), getBicarbKiGainCoefficient(),\ - MIN_BICARB_VOLUME_MLPM, MAX_BICARB_VOLUME_MLPM, FALSE, DOSING_NO_FEED_FORWARD ); - resetPIController(PI_CONTROLLER_ID_BICARB_VOL, STD_BICARB_DOSING, DOSING_NO_FEED_FORWARD); + MIN_BICARB_VOLUME_MLPM, MAX_BICARB_VOLUME_MLPM, FALSE, MIX_NO_FEED_FORWARD ); + resetPIController(PI_CONTROLLER_ID_BICARB_VOL, STD_BICARB_DOSING, MIX_NO_FEED_FORWARD); return result; } /*********************************************************************//** * @brief - * The testDryBiCartBicarbKpGainBicarbDoseVolumeOverride function sets the override value + * The testDryBiCartAcidMoxVolControlKpGainOverride function sets the override value * of the Kp gain coefficient for closed loop acid concentrate dosing volume control - * @details Inputs: dryBiCartAcidDoseVolumeKpGain - * @details Outputs: dryBiCartAcidDoseVolumeKpGain + * @details Inputs: dryBiCartAcidMixVolumeKpGain + * @details Outputs: dryBiCartAcidMixVolumeKpGain * @param message Override message from Dialin which includes the override * value to override the acid concentrate dosing volume kp gain. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testDryBiCartAcidDoseVolControlKpGainOverride( MESSAGE_T *message ) +BOOL testDryBiCartAcidMixVolControlKpGainOverride( MESSAGE_T *message ) { - BOOL result = f32Override( message, &dryBiCartAcidDoseVolumeKpGain ); + BOOL result = f32Override( message, &dryBiCartAcidMixVolumeKpGain ); initializePIController(PI_CONTROLLER_ID_ACID_VOL, MIN_ACID_VOLUME_MLPM, \ getAcidKpGainCoefficient(), getAcidKiGainCoefficient(),\ - MIN_ACID_VOLUME_MLPM, MAX_ACID_VOLUME_MLPM, FALSE, DOSING_NO_FEED_FORWARD ); - resetPIController(PI_CONTROLLER_ID_ACID_VOL, STD_ACID_DOSING, DOSING_NO_FEED_FORWARD); + MIN_ACID_VOLUME_MLPM, MAX_ACID_VOLUME_MLPM, FALSE, MIX_NO_FEED_FORWARD ); + resetPIController(PI_CONTROLLER_ID_ACID_VOL, STD_ACID_DOSING, MIX_NO_FEED_FORWARD); return result; } /*********************************************************************//** * @brief - * The testDryBiCartBicarbKiGainBicarbDoseVolumeOverride function sets the override value + * The testDryBiCartAcidMixVolControlKiGainOverride function sets the override value * of the Ki gain coefficient for closed loop acid concentrate dosing volume control - * @details Inputs: dryBiCartAcidDoseVolumeKiGain - * @details Outputs: dryBiCartAcidDoseVolumeKiGain + * @details Inputs: dryBiCartAcidMixVolumeKiGain + * @details Outputs: dryBiCartAcidMixVolumeKiGain * @param message Override message from Dialin which includes the override * value to override the bicarb concentrate dosing volume ki gain. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testDryBiCartAcidDoseVolControlKiGainOverride( MESSAGE_T *message ) +BOOL testDryBiCartAcidMixVolControlKiGainOverride( MESSAGE_T *message ) { - BOOL result = f32Override( message, &dryBiCartAcidDoseVolumeKiGain ); + BOOL result = f32Override( message, &dryBiCartAcidMixVolumeKiGain ); initializePIController(PI_CONTROLLER_ID_ACID_VOL, MIN_ACID_VOLUME_MLPM, \ getAcidKpGainCoefficient(), getAcidKiGainCoefficient(),\ - MIN_ACID_VOLUME_MLPM, MAX_ACID_VOLUME_MLPM, FALSE, DOSING_NO_FEED_FORWARD ); - resetPIController(PI_CONTROLLER_ID_ACID_VOL, STD_ACID_DOSING, DOSING_NO_FEED_FORWARD); + MIN_ACID_VOLUME_MLPM, MAX_ACID_VOLUME_MLPM, FALSE, MIX_NO_FEED_FORWARD ); + resetPIController(PI_CONTROLLER_ID_ACID_VOL, STD_ACID_DOSING, MIX_NO_FEED_FORWARD); return result; } @@ -2144,7 +2234,7 @@ *************************************************************************/ BOOL testDryBiCartAcidBicarbTargetConductivityOverride( MESSAGE_T *message ) { - BOOL result = f32Override( message, &dryBiCartAcidBicarbMixTargetConductivity ); + BOOL result = f32Override( message, &dryBiCartDialysateTargetConductivity ); return result; } @@ -2162,9 +2252,45 @@ *************************************************************************/ BOOL testDryBiCartAcidBicarbDeltaConductivityOverride( MESSAGE_T *message ) { - BOOL result = f32Override( message, &dryBiCartAcidBicarbMixDeltaConductivity ); + BOOL result = f32Override( message, &dryBiCartDialysateDeltaConductivity ); return result; } +/*********************************************************************//** + * @brief + * The testDryBiCartUpperCartPressureOverride function sets the override value + * of bicart upper cart pressure + * @details Inputs: dryBiCartUpperCartPressure + * + * @details 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 + *************************************************************************/ +BOOL testDryBiCartUpperCartPressureOverride( MESSAGE_T *message ) +{ + BOOL result = f32Override( message, &dryBiCartUpperCartPressure ); + + return result; +} + +/*********************************************************************//** + * @brief + * The testDryBiCartLowerCartPressureOverride function sets the override value + * of Lowercart pressure + * @details Inputs: dryBiCartLowerCartPressure + * + * @details 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 + *************************************************************************/ +BOOL testDryBiCartLowerCartPressureOverride( MESSAGE_T *message ) +{ + BOOL result = f32Override( message, &dryBiCartLowerCartPressure ); + + return result; +} + /**@}*/ Index: firmware/App/Controllers/DryBiCart.h =================================================================== diff -u -rd5c94536929ded738e5c8d139d8c46b1d3e035ef -r9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84 --- firmware/App/Controllers/DryBiCart.h (.../DryBiCart.h) (revision d5c94536929ded738e5c8d139d8c46b1d3e035ef) +++ firmware/App/Controllers/DryBiCart.h (.../DryBiCart.h) (revision 9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84) @@ -33,7 +33,7 @@ // ********** public definitions ********** -//#pragma pack(push, 1) +#pragma pack(push, 1) /// dry bicart data structure typedef struct { @@ -56,16 +56,18 @@ PI_CONTROLLER_SIGNALS_DATA dryBiCartBicarbDosingControl; ///< Dry bicart bicarb dosing closed loop control signals data PI_CONTROLLER_SIGNALS_DATA dryBiCartAcidDosingControl; ///< Dry bicart acid dosing closed loop control signals data - F32 dryBiCartAcidDoseVolume; ///< Dry bicart acid dose volume - F32 dryBiCartBicarbDoseVolume; ///< Dry bicart bicarb dose volume + F32 dryBiCartAcidMixVolume; ///< Dry bicart acid dose volume + F32 dryBiCartBicarbMixVolume; ///< Dry bicart bicarb dose volume F32 dryBiCartBicarbDosingKPgain; ///< Dry bicart bicarb dosing control kp gain F32 dryBiCartBicarbDosingKIgain; ///< Dry bicart bicarb dosing control ki gain - //F32 dryBiCartAcidDosingKPgain; ///< Dry bicart acid dosing control kp gain - //F32 dryBiCartAcidDosingKIgain; ///< Dry bicart acid dosing control ki gain + + F32 dryBiCartAcidDosingKPgain; ///< Dry bicart acid dosing control kp gain + F32 dryBiCartAcidDosingKIgain; ///< Dry bicart acid dosing control ki gain + } DRY_BICART_DATA_T; -//#pragma pack(pop) +#pragma pack(pop) // ********** public function prototypes ********** @@ -79,26 +81,15 @@ BOOL setBicartFillRequested( void ); BOOL setBicartDrainRequested( void ); -F32 getAcidBicarbTargetConductivity( void ); -F32 getAcidBicarbDeltaConductivity( void ); +F32 getDialysateTargetConductivity( void ); +F32 getDialysateDeltaConductivity( void ); F32 getBicarbTargetConductivity( void ); F32 getBicarbDeltaConductivity( void ); -//void setBicarb( F32 targetValue ); -//F32 getBicarb( void ); -void setBicarbDoseVol( F32 targetValue ); -F32 getBicarbDoseVol( void ); +F32 getBicarbMixVol( void ); +F32 getAcidMixVol( void ); -F32 getAcidDoseVol( void ); -void setAcidDoseVol( F32 targetValue ); - -F32 getBicarbKpGainCoefficient( void ); -F32 getBicarbKiGainCoefficient( void ); - -F32 getAcidKpGainCoefficient( void ); -F32 getAcidKiGainCoefficient( void ); - DRY_BICART_FILL_EXEC_STATE_T getCurrentDryBiCartFillExecState( void ); BOOL testDryBiCartDataPublishIntervalOverride( MESSAGE_T *message ); @@ -111,18 +102,22 @@ BOOL testDryBiCartAcidDoseVolumeOverride( MESSAGE_T *message ); BOOL testDryBiCartBicarbDoseVolumeOverride( MESSAGE_T *message ); -BOOL testDryBiCartBicarbDoseVolControlKpGainOverride( MESSAGE_T *message ); -BOOL testDryBiCartBicarbDoseVolControlKiGainOverride( MESSAGE_T *message ); +BOOL testDryBiCartBicarbMixVolControlKpGainOverride( MESSAGE_T *message ); +BOOL testDryBiCartBicarbMixVolControlKiGainOverride( MESSAGE_T *message ); -BOOL testDryBiCartAcidDoseVolControlKpGainOverride( MESSAGE_T *message ); -BOOL testDryBiCartAcidDoseVolControlKiGainOverride( MESSAGE_T *message ); +BOOL testDryBiCartAcidMixVolControlKpGainOverride( MESSAGE_T *message ); +BOOL testDryBiCartAcidMixVolControlKiGainOverride( MESSAGE_T *message ); BOOL testDryBiCartTargetConductivityOverride( MESSAGE_T *message ); BOOL testDryBiCartDeltaConductivityOverride( MESSAGE_T *message ); BOOL testDryBiCartAcidBicarbDeltaConductivityOverride( MESSAGE_T *message ); BOOL testDryBiCartAcidBicarbTargetConductivityOverride( MESSAGE_T *message ); + +BOOL testDryBiCartUpperCartPressureOverride( MESSAGE_T *message ); +BOOL testDryBiCartLowerCartPressureOverride( MESSAGE_T *message ); + /**@}*/ #endif Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -rd5c94536929ded738e5c8d139d8c46b1d3e035ef -r9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84 --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision d5c94536929ded738e5c8d139d8c46b1d3e035ef) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84) @@ -154,7 +154,7 @@ SW_FAULT_ID_DRY_BICART_DRAIN_INVALID_EXEC_STATE = 123, SW_FAULT_ID_INVALID_RINSE_PUMP = 124, SW_FAULT_ID_PI_CTRL_INVALID_FEED_FORWARD_LIMIT = 125, - SW_FAULT_ID_DIALYSATE_DOSE_EXEC_INVALID_STATE = 126, + SW_FAULT_ID_DIALYSATE_MIX_EXEC_INVALID_STATE = 126, NUM_OF_SW_FAULT_IDS } DD_SW_FAULT_ID_T; Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rd5c94536929ded738e5c8d139d8c46b1d3e035ef -r9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision d5c94536929ded738e5c8d139d8c46b1d3e035ef) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84) @@ -3092,7 +3092,7 @@ #if 1 // Remove when Beta 1.9 is obsolete if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D63_LEVEL_BIT ) >> 1; + result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT1 ) ) >> BIT1; } else { @@ -3120,7 +3120,7 @@ #if 1 // Remove when Beta 1.9 is obsolete if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D98_LEVEL_BIT ) >> 2; + result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT2 ) ) >> BIT2; } else { @@ -3148,7 +3148,7 @@ #if 1 // Remove when Beta 1.9 is obsolete if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D46_LEVEL_BIT ); + result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT ( BIT0 ) ) >> BIT0; } else { Index: firmware/App/Services/Messaging.c =================================================================== diff -u -rd5c94536929ded738e5c8d139d8c46b1d3e035ef -r9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision d5c94536929ded738e5c8d139d8c46b1d3e035ef) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84) @@ -285,10 +285,12 @@ { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testGenPermeateDefDataPublishIntervalOverride}, { MSG_ID_FP_DEF_STATUS_REQUEST, &testGetFPDefeaturedStatus }, - { MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST, &testDryBiCartBicarbDoseVolControlKpGainOverride }, - { MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST, &testDryBiCartBicarbDoseVolControlKiGainOverride }, - { MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST, &testDryBiCartAcidDoseVolControlKpGainOverride }, - { MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST, &testDryBiCartAcidDoseVolControlKiGainOverride }, + { MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST, &testDryBiCartBicarbMixVolControlKiGainOverride }, + { MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST, &testDryBiCartAcidMixVolControlKpGainOverride }, + { MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST, &testDryBiCartAcidMixVolControlKpGainOverride }, + { MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST, &testDryBiCartAcidMixVolControlKiGainOverride }, + { MSG_ID_DD_BICART_UPPER_PRESSURE_OVERRIDE_REQUEST, &testDryBiCartUpperCartPressureOverride }, + { MSG_ID_DD_BICART_LOWER_PRESSURE_OVERRIDE_REQUEST, &testDryBiCartLowerCartPressureOverride } , }; /// Calculation for number of entries in the incoming message function handler look-up table.