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 );