Index: sources/view/settings/VCalibrationSettings.cpp
===================================================================
diff -u -r969fb65fb9857c0a6a84cb9f7d591d16de40e898 -rbb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43
--- sources/view/settings/VCalibrationSettings.cpp	(.../VCalibrationSettings.cpp)	(revision 969fb65fb9857c0a6a84cb9f7d591d16de40e898)
+++ sources/view/settings/VCalibrationSettings.cpp	(.../VCalibrationSettings.cpp)	(revision bb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43)
@@ -17,18 +17,20 @@
     });
 }
 
-QVariantList View::VCalibrationSettings::createInitPayload(int vCount)
+QVariantList View::VCalibrationSettings::initList(const QStringList &vTitles)
 {
-    QVariantList list;
-    list.reserve(vCount);
+    columnTitle ( vTitles ) ;
 
-    for (int i = 0; i < vCount; ++i) {
-        list.append(0);
+    QVariantList mInitValues;
+    mInitValues.reserve(vTitles.count());
+
+    for (int i = 0; i < vTitles.count(); ++i) {
+        mInitValues.append(0.0);
     }
 
-    rejectionReasons(list);
+    rejectionReasons(mInitValues);
 
-    return list;
+    return mInitValues;
 }
 
 quint32 View::VCalibrationSettings::getEpochUTC()
@@ -43,49 +45,82 @@
     _calibrationList.clear();
 
     switch (vIndex) {
-    case ePressure          :
-    {
-        columnTitle ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
-        QVariantList initPayloadValues = createInitPayload(_columnTitle.count()); // may remove alter when we add getter message from FW
-        // DD Pressure sensors
-        _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Outlet Pressure")},                      { eRole_Component, tr("D9" )},  {eRole_Payload, initPayloadValues   }});
-        _calibrationList.appendRow( {{ eRole_Title, tr("Dry Bicarb Pressure")},                             { eRole_Component, tr("D66")},  {eRole_Payload, initPayloadValues   }});
-        _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pressure")},                        { eRole_Component, tr("D51")},  {eRole_Payload, initPayloadValues   }});
-        _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pressure")},                        { eRole_Component, tr("D15")},  {eRole_Payload, initPayloadValues   }});
-        _calibrationList.appendRow( {{ eRole_Title, tr("Transmembrane Pressure")},                          { eRole_Component, tr("D41")},  {eRole_Payload, initPayloadValues   }});
-        _calibrationList.appendRow( {{ eRole_Title, tr("D87 Pressure Sensor")},                             { eRole_Component, tr("D87")},  {eRole_Payload, initPayloadValues   }});
-//        // FP Pressure sensors
-        _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before regulator")},           { eRole_Component, tr("M3") },  {eRole_Payload, initPayloadValues   }});
-        _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure after regulator")},            { eRole_Component, tr("P8") },  {eRole_Payload, initPayloadValues   }});
-        _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before the cond. sensor")},    { eRole_Component, tr("P13")},  {eRole_Payload, initPayloadValues   }});
-        _calibrationList.appendRow( {{ eRole_Title, tr("Pressure before the RO filter")},                   { eRole_Component, tr("P17")},  {eRole_Payload, initPayloadValues   }});
-        _calibrationList.appendRow( {{ eRole_Title, tr("Pressure after the RO filter")},                    { eRole_Component, tr("P46")},  {eRole_Payload, initPayloadValues   }});
-        break;
+        case ePressure          :
+        {
+            QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
+            // DD Pressure sensors
+            _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Outlet Pressure")},                      { eRole_Component, tr("D9" )},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Dry Bicarb Pressure")},                             { eRole_Component, tr("D66")},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pressure")},                        { eRole_Component, tr("D51")},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pressure")},                        { eRole_Component, tr("D15")},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Transmembrane Pressure")},                          { eRole_Component, tr("D41")},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("D87 Pressure Sensor")},                             { eRole_Component, tr("D87")},  {eRole_Payload, initPayloadValues   }});
+            // FP Pressure sensors
+            _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before regulator")},           { eRole_Component, tr("M3") },  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure after regulator")},            { eRole_Component, tr("P8") },  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before the cond. sensor")},    { eRole_Component, tr("P13")},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Pressure before the RO filter")},                   { eRole_Component, tr("P17")},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Pressure after the RO filter")},                    { eRole_Component, tr("P46")},  {eRole_Payload, initPayloadValues   }});
+            break;
+        }
+        case eTemperature       :
+        {
+            QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
+            _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Inlet")},        { eRole_Component, tr("D1" )},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Outlet")},       { eRole_Component, tr("D78")},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Primary Heater")},   { eRole_Component, tr("D4" )},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Trimmer Heater")},              { eRole_Component, tr("D50")},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Conductivity")},                { eRole_Component, tr("D99")},  {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Barometric")},                  { eRole_Component, tr("BRD")},  {eRole_Payload, initPayloadValues   }});
+            break;
+        }
+        case eConcentratePump   :
+        {
+            QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
+            _calibrationList.appendRow( {{ eRole_Title, tr("Acid")},                { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Bicarbonate")},         { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Ultrafiltration")},     { eRole_Component, tr("D76"     )}, {eRole_Payload, initPayloadValues   }});
+            break;
+        }
+        case eDialysatePumpD12   :
+        {
+            QVariantList initPayloadValues = initList  ( { tr("Target Speed"), tr("Cal Time") } ) ;
+            _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pump")},    { eRole_Component, tr("D12"     )}, {eRole_Payload, initPayloadValues   }});
+            break;
+        }
+        case eDialysatePumpD48  :
+        {
+            QVariantList initPayloadValues = initList  ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
+            _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pump")},    { eRole_Component, tr("D48"     )}, {eRole_Payload, initPayloadValues   }});
+            break;
+        }
+        case eAcidTypes         :
+        {
+            QVariantList initPayloadValues = initList  ( { tr("Mix Ratio"), tr("Full Bottle Vol. (mL)"), tr("Cond. (uS/cm)"), tr("Temp (°C)"), tr("Cal Time") } ) ;
+            _calibrationList.appendRow( {{ eRole_Title, tr("08-1251-1")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("08-2251-0")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("08-3251-9")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   }});
+            break;
+        }
+        case eBicarbTypes       :
+        {
+            QVariantList initPayloadValues = initList  ( { tr("Mix Ratio"), tr("Start Volume (mL)"), tr("Cond. (uS/cm)"), tr("Temp (°C)"), tr("Cal Time") } ) ;
+            _calibrationList.appendRow( {{ eRole_Title, tr("08-677753-0")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   }});
+            break;
+        }
+        case eAccelerometer     :
+        {
+            QVariantList initPayloadValues = initList  ( { tr("X axis offset"), tr("Y axis offset"), tr("Z axis offset"), tr("Cal Time") } ) ;
+            _calibrationList.appendRow( {{ eRole_Title, tr("Accelerometer")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   }});
+            break;
+        }
+        case eBloodLeak         :
+        {
+            QVariantList initPayloadValues = initList  ( { tr("Set Point"), tr("Cal Time") } ) ;
+            _calibrationList.appendRow( {{ eRole_Title, tr("Blood Leak")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   }});
+            break;
+        }
     }
-    case eTemperature       :
-        columnTitle ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
-
-        break;
-    case eConcentratePump   :
-        columnTitle ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
-        break;
-    case eDialysatePumpD48  :
-        columnTitle ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
-
-        break;
-    case eDialysatePumpD1   :
-        columnTitle ( { tr("Target Speed"), tr("Cal Time") } ) ;
-
-        break;
-    case eAcidTypes         :
-        break;
-    case eBicarbTypes       :
-        break;
-    case eAccelerometer     :
-        break;
-    case eBloodLeak         :
-        break;
-    }
 }
 
 void View::VCalibrationSettings::doAdjustment(int vIndex, int vSensorIndex, QVariantList vPayload)
@@ -105,18 +140,17 @@
 
     qDebug() << "Cal Time: " << vPayload.last() << " -- Epoch:" << calTime;
 
-
     switch (vIndex) {
     case ePressure          :
         break;
     case eTemperature       :
         break;
     case eConcentratePump   :
         break;
+    case eDialysatePumpD12   :
+        break;
     case eDialysatePumpD48  :
         break;
-    case eDialysatePumpD1   :
-        break;
     case eAcidTypes         :
         break;
     case eBicarbTypes       :