Index: firmware/App/Controllers/MixingControl.h
===================================================================
diff -u -rbd522c8ffdf75130571e5b6a79d1b1d6acd78b1c -r590c4b129a1b8fced97b8f653fb58e97fdf64a28
--- firmware/App/Controllers/MixingControl.h	(.../MixingControl.h)	(revision bd522c8ffdf75130571e5b6a79d1b1d6acd78b1c)
+++ firmware/App/Controllers/MixingControl.h	(.../MixingControl.h)	(revision 590c4b129a1b8fced97b8f653fb58e97fdf64a28)
@@ -33,8 +33,8 @@
 
 // ********** public definitions **********
 
-#define DIALYSATE_TARGET_STD_NA_SETTINGS            137.0F                                                                                          ///< Standard target sodium
-#define DIALYSATE_TARGET_STD_BICARB_SETTING         33.0F
+#define DIALYSATE_TARGET_STD_NA_SETTINGS     137.0F     ///< Standard target sodium
+#define DIALYSATE_TARGET_STD_BICARB_SETTING  33.0F      ///< Standard target bicarbonate
 
 #pragma pack(push, 1)
 /// mixing control data structure
@@ -71,6 +71,10 @@
 F32 getBicarbMixVol( void );
 F32 getAcidMixVol( void );
 
+F32 getBicarbConductivityPre( void );
+F32 getAcidConducivityPost( void );
+F32 getTotalConductivity( void );
+
 BOOL testMixingControlDataPublishIntervalOverride( MESSAGE_T *message );
 
 BOOL testMixingControlAcidVolumeOverride( MESSAGE_T *message );