Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -r6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543 -r11a668a2f4a0401eed544be570d9102d143b6f00
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 11a668a2f4a0401eed544be570d9102d143b6f00)
@@ -105,8 +105,10 @@
     dialysateDeliveryCmdSet.ufRate          = 0.0F;
     dialysateDeliveryCmdSet.dialTemp        = 0.0F;
     dialysateDeliveryCmdSet.bypassDialyzer  = TRUE;
-    dialysateDeliveryCmdSet.acidType        = 0;
-    dialysateDeliveryCmdSet.bicarbType      = 0;
+    dialysateDeliveryCmdSet.acidKPlus       = 0.0F;
+    dialysateDeliveryCmdSet.acidCa2Plus     = 0.0F;
+    dialysateDeliveryCmdSet.sodium          = 0;
+    dialysateDeliveryCmdSet.bicarbonate     = 0;
 }
 
 /**********************************************************************//**
@@ -297,15 +299,17 @@
  * @param bicarb Type of bicarbonate concentrate used.
  * @return none
  *************************************************************************/
-void cmdStartGenerateDialysate( F32 qd, F32 quf, F32 dialTemp, BOOL bypass, ACID_CONCENTRATE_TYPE_T acid, BICARB_CONCENTRATE_TYPE_T bicarb )
+void cmdStartGenerateDialysate( F32 qd, F32 quf, F32 dialTemp, BOOL bypass, F32 acidKPlus, F32 acidCa2Plus, U32 sodium, U32 bicarbonate )
 {
     dialysateDeliveryCmdSet.start          = TRUE;
     dialysateDeliveryCmdSet.dialRate       = qd;
     dialysateDeliveryCmdSet.ufRate         = quf;
     dialysateDeliveryCmdSet.dialTemp       = dialTemp;
     dialysateDeliveryCmdSet.bypassDialyzer = bypass;
-    dialysateDeliveryCmdSet.acidType       = (U32)acid;
-    dialysateDeliveryCmdSet.bicarbType     = (U32)bicarb;
+    dialysateDeliveryCmdSet.acidKPlus      = acidKPlus;
+    dialysateDeliveryCmdSet.acidCa2Plus    = acidCa2Plus;
+    dialysateDeliveryCmdSet.sodium         = sodium;
+    dialysateDeliveryCmdSet.bicarbonate    = bicarbonate;
 
 #ifndef TEST_UI_ONLY
     sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) );