Index: firmware/App/Controllers/BalancingChamber.c =================================================================== diff -u -rcd1161514dbaff9e5b222931fff99618e39fd7ec -r5531ef9081711c5d57cceba2d51ff9bb24b7c254 --- firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision cd1161514dbaff9e5b222931fff99618e39fd7ec) +++ firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision 5531ef9081711c5d57cceba2d51ff9bb24b7c254) @@ -342,7 +342,7 @@ currentBalChamberSwitchingCounter += 1; currentBalChamberFillCounter += 1; - if ( ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE ) && ( balChamberExecState > BAL_CHAMBER_STATE_IDLE ) ) + if ( ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) && ( balChamberExecState > BAL_CHAMBER_STATE_IDLE ) ) { #ifdef CONDUCTIVE_LEVEL_SENSOR_ENABLED if ( LVL_STATE_LOW == bicarbChamberLevel ) @@ -618,7 +618,7 @@ spentFillRiseMissCounter = 0; isSpentFillComplete = FALSE; - if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE ) + if ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) { bicarbVolume = getBicarbMixVol(); acidVolume = getAcidMixVol(); @@ -764,7 +764,7 @@ } // If the dry bicarbonate is enabled then we ignore looking at d18 pressure to be in range. - if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) ) && ( TRUE == getBicarbChamberFillRequested() ) ) + if ( ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) && ( FALSE == getBicarbChamberFillRequested() ) ) { isPressureStabilizedDuringFill = TRUE; } @@ -936,7 +936,7 @@ spentFillRiseMissCounter = 0; isSpentFillComplete = FALSE; - if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE ) + if ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) { bicarbVolume = getBicarbMixVol(); acidVolume = getAcidMixVol(); @@ -1016,7 +1016,7 @@ spentDialPressure = getFilteredPressure( D51_PRES ); // If the dry bicarbonate is enabled then we ignore looking at d18 pressure to be in range. - if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) ) && ( TRUE == getBicarbChamberFillRequested() ) ) + if ( ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) && ( FALSE == getBicarbChamberFillRequested() ) ) { isPressureStabilizedDuringFill = TRUE; } Index: firmware/App/Controllers/MixingControl.h =================================================================== diff -u -rcd1161514dbaff9e5b222931fff99618e39fd7ec -r5531ef9081711c5d57cceba2d51ff9bb24b7c254 --- firmware/App/Controllers/MixingControl.h (.../MixingControl.h) (revision cd1161514dbaff9e5b222931fff99618e39fd7ec) +++ firmware/App/Controllers/MixingControl.h (.../MixingControl.h) (revision 5531ef9081711c5d57cceba2d51ff9bb24b7c254) @@ -37,30 +37,25 @@ /// mixing control data structure typedef struct { - U32 bicarbMixingState; - U32 bicarbControlInterval; - U32 acidMixingState; - U32 acidControlInterval; - F32 bicarbVolume; ///< Mixing control bicarb mix volume - F32 acidVolume; ///< Mixing control acid mix volume + U32 bicarbMixingState; ///< Bicarb Mixing State + U32 bicarbControlInterval; ///< Bicarb Control interval + U32 acidMixingState; ///< Acid mixing state + U32 acidControlInterval; ///< Acid control interval + F32 bicarbVolume; ///< Mixing control bicarb mix volume + F32 acidVolume; ///< Mixing control acid mix volume // TODO: remove after closed loops stabilized - PI_CONTROLLER_SIGNALS_DATA bicarbData; ///< Mixing control bicarb mixing closed loop control signals data - PI_CONTROLLER_SIGNALS_DATA acidData; ///< Mixing control acid mixing closed loop control signals data - F32 bicarbKPgain; ///< Mixing control bicarb kp gain - F32 bicarbKIgain; ///< Mixing control bicarb ki gain - F32 acidKPgain; ///< Mixing control acid kp gain - F32 aciKIgain; ///< Mixing control acid ki gain + PI_CONTROLLER_SIGNALS_DATA bicarbData; ///< Mixing control bicarb mixing closed loop control signals data + PI_CONTROLLER_SIGNALS_DATA acidData; ///< Mixing control acid mixing closed loop control signals data + F32 bicarbKPgain; ///< Mixing control bicarb kp gain + F32 bicarbKIgain; ///< Mixing control bicarb ki gain + F32 acidKPgain; ///< Mixing control acid kp gain + F32 aciKIgain; ///< Mixing control acid ki gain } MIXING_CONTROL_DATA_T; #pragma pack(pop) // ********** public function prototypes ********** -#if 0 -void initDryMixingControl( void ); -void transitionToDryMixingControl( void ); -void execDryBicart( void ); -#endif void execDialysateCompositionMixingController( void ); F32 getBicarbMixVol( void ); Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -r0bcac6885c8461b05da276fd245b580b7339ddfd -r5531ef9081711c5d57cceba2d51ff9bb24b7c254 --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 0bcac6885c8461b05da276fd245b580b7339ddfd) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 5531ef9081711c5d57cceba2d51ff9bb24b7c254) @@ -257,7 +257,7 @@ setValveState( D85_VALV, VALVE_STATE_CLOSED ); setValveState( D31_VALV, VALVE_STATE_CLOSED ); - if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) { setValveState( D80_VALV, VALVE_STATE_OPEN ); // Bicarb valve setValveState( D64_VALV, VALVE_STATE_CLOSED ); @@ -342,7 +342,7 @@ setValveState( D35_VALV, VALVE_STATE_OPEN ); // VDI setValveState( D40_VALV, VALVE_STATE_OPEN ); // VDO - if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) { setValveState( D80_VALV, VALVE_STATE_OPEN ); // Bicarb valve setValveState( D64_VALV, VALVE_STATE_CLOSED ); @@ -365,7 +365,7 @@ setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve setValveState( D34_VALV, VALVE_STATE_OPEN ); // Bypass valve - if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) { setValveState( D80_VALV, VALVE_STATE_OPEN ); // Bicarb valve setValveState( D64_VALV, VALVE_STATE_CLOSED ); @@ -412,7 +412,7 @@ setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve setValveState( D34_VALV, VALVE_STATE_OPEN ); // Bypass valve - if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) { setValveState( D80_VALV, VALVE_STATE_OPEN ); // Bicarb valve setValveState( D64_VALV, VALVE_STATE_OPEN ); // Bicarb chamber purge valve @@ -470,7 +470,7 @@ setValveState( D34_VALV, VALVE_STATE_OPEN ); setValveState( D53_VALV, VALVE_STATE_OPEN ); - if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) { setValveState( D80_VALV, VALVE_STATE_OPEN ); setValveState( D64_VALV, VALVE_STATE_CLOSED ); Index: firmware/App/Modes/ModePreGenDialysate.c =================================================================== diff -u -r6d4aa77e6b85aa7621a234660f631e725fb1d441 -r5531ef9081711c5d57cceba2d51ff9bb24b7c254 --- firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision 6d4aa77e6b85aa7621a234660f631e725fb1d441) +++ firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision 5531ef9081711c5d57cceba2d51ff9bb24b7c254) @@ -274,7 +274,7 @@ { //TODO: Change to wet self test state later DD_PRE_GEN_DIALYSATE_STATE_T state = DD_PRE_GEN_DRY_BICART_INITIAL_FILL; - +#if 0 // TODO: testing drybicart fill in pre-gen if ( getTestConfigStatus( TEST_CONFIG_DD_DRY_BICART_TEST ) == TRUE ) { @@ -286,6 +286,7 @@ // TODO: Alarm if it is not completed within 1.5 minutes } else +#endif { // not bicart fill, move to next state state = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND; Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r6d0bd19fb192dcd272fa773e8833862cc8a8f750 -r5531ef9081711c5d57cceba2d51ff9bb24b7c254 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 6d0bd19fb192dcd272fa773e8833862cc8a8f750) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 5531ef9081711c5d57cceba2d51ff9bb24b7c254) @@ -98,7 +98,7 @@ // manage concentrate pumps execConcentratePumpController(); - if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE ) + if ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) { // manage drybicart state machines execDryBicart();