Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rc7d90a953d526f987d4f41f24b59ed64548e6fee -rca64c6349b6388b515ebf7087b0e80e0bd41bad4
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision c7d90a953d526f987d4f41f24b59ed64548e6fee)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision ca64c6349b6388b515ebf7087b0e80e0bd41bad4)
@@ -21,12 +21,12 @@
 #include "ConcentratePumps.h"
 #include "Conductivity.h"
 #include "DialysatePumps.h"
-#include "MixingControl.h"
 #include "FpgaDD.h"
 #include "Heaters.h"
 #include "Level.h"
 #include "MessagePayloads.h"
 #include "Messaging.h"
+#include "MixingControl.h"
 #include "ModeGenDialysate.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
@@ -1217,13 +1217,12 @@
  *************************************************************************/
 static void checkDialysateConductivity( void )
 {
-    F32 measuredBicarbConductivity       = getFilteredConductivity( D17_COND );
-    F32 measuredMixedDialysateCond       = getFilteredConductivity( D27_COND );
+    F32 measuredBicarbConductivity       = getFilteredConductivity( D74_COND );
     F32 measuredDialysateConductivity    = getFilteredConductivity( D29_COND );
-    F32 measuredAcidConductivity         = measuredMixedDialysateCond - measuredBicarbConductivity;
+    F32 measuredAcidConductivity         = measuredDialysateConductivity - measuredBicarbConductivity;
     F32 theoreticalBicarbConductivity    = getBicarbConductivityPre();
-    F32 theoreticalAcidConductivity        = getAcidConducivityPost();
-    F32 theoreticalDialysateConductivity   = getTotalConductivity();
+    F32 theoreticalAcidConductivity      = getAcidConducivityPost();
+    F32 theoreticalDialysateConductivity = getTotalConductivity();
     F32 condPercentFactor                = ( DIALYSATE_CONDUCTIVITY_OUT_OF_TARGET_PERCENT / 100.0F );
     F32 bicarbLowThreshold               = theoreticalBicarbConductivity * ( 1.0F - condPercentFactor );
     F32 bicarbHighThreshold              = theoreticalBicarbConductivity * ( 1.0F + condPercentFactor );
@@ -1236,7 +1235,7 @@
     BOOL isAcidCondBelowTarget           = ( measuredAcidConductivity < acidLowThreshold ? TRUE : FALSE );
     BOOL isAcidCondAboveTarget           = ( measuredAcidConductivity > acidHighThreshold ? TRUE : FALSE );
     BOOL isDialysateCondBelowTarget      = ( measuredDialysateConductivity < dialysateLowThreshold ? TRUE : FALSE );
-    BOOL isDialysateCondAboveTarget        = ( measuredDialysateConductivity > dialysateHighThreshold ? TRUE : FALSE );
+    BOOL isDialysateCondAboveTarget      = ( measuredDialysateConductivity > dialysateHighThreshold ? TRUE : FALSE );
 
     if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS ) ) ||
          ( theoreticalBicarbConductivity <= 0.0F ) ||