Index: firmware/App/Controllers/MixingControl.h =================================================================== diff -u -r145fd716a856f864f39fb0f9884865f6e45b9256 -rfc6a157a48debd4ee8c2fb8dec8af21f5b07abe2 --- firmware/App/Controllers/MixingControl.h (.../MixingControl.h) (revision 145fd716a856f864f39fb0f9884865f6e45b9256) +++ firmware/App/Controllers/MixingControl.h (.../MixingControl.h) (revision fc6a157a48debd4ee8c2fb8dec8af21f5b07abe2) @@ -8,7 +8,7 @@ * @file MixingControl.h * * @author (last) Sameer Kalliadan Poyil -* @date (last) 16-Jun-2026 +* @date (last) 17-Jul-2026 * * @author (original) Sameer Kalliadan Poyil * @date (original) 15-Jun-2026 @@ -48,6 +48,10 @@ F32 lastBicarbMixVolume; ///< Mixing control last bicarb mix volume F32 currentAcidMixVolume; ///< Mixing control current acid mix volume F32 lastAcidMixVolume; ///< Mixing control last acid mix volume + F32 bicarbConductivityPreMix; ///< Bicarb conductivity pre mix + F32 bicarbConductivityPostMix; ///< Bicarb conductivity post mix + F32 acidConductivityPostMix; ///< Acid conductivity post mix + F32 totalConductivity; ///< Total Conductivity(Acid+Bicab)or Dialysate conductivity // 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 @@ -61,15 +65,16 @@ // ********** public function prototypes ********** - void execMixingControl( void ); +void initMixingControl( void ); +void execMixingControl( void ); F32 getBicarbMixVol( void ); F32 getAcidMixVol( void ); BOOL testMixingControlDataPublishIntervalOverride( MESSAGE_T *message ); -BOOL testMixingControlAcidVolumeOverride( MESSAGE_T *message ); -BOOL testMixingControlBicarbVolumeOverride( MESSAGE_T *message ); +BOOL testMixingControlAcidMixVolumeOverride( MESSAGE_T *message ); +BOOL testMixingControlBicarbMixVolumeOverride( MESSAGE_T *message ); BOOL testMixingControlBicarbVolControlKpGainOverride( MESSAGE_T *message ); BOOL testMixingControlBicarbVolControlKiGainOverride( MESSAGE_T *message );