Index: denali.pro.user
===================================================================
diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r595ede3b4cf5a1f5c06a04d1db99a0674ae742bd
--- denali.pro.user	(.../denali.pro.user)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
+++ denali.pro.user	(.../denali.pro.user)	(revision 595ede3b4cf5a1f5c06a04d1db99a0674ae742bd)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2020-11-20T22:53:49. -->
+<!-- Written by QtCreator 4.10.0, 2020-11-23T05:04:51. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r595ede3b4cf5a1f5c06a04d1db99a0674ae742bd
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 595ede3b4cf5a1f5c06a04d1db99a0674ae742bd)
@@ -389,6 +389,7 @@
     case Gui::GuiActionType::ID_AdjustSalineRsp                 : ok = notify<Model::MAdjustSalineResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp               ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp   : ok = notify<Model::MAdjustUltrafiltrationStateResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break;
     case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp        : ok = notify<Model::MAdjustPressuresLimitsResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp      ); break;
+    case Gui::GuiActionType::ID_AdjustHeparinRsp                : ok = notify<Model::MAdjustHeparinResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp              ); break;
 
     // these need to be standard and use notify as well
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp    : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // TODO : implement notify<>()
Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml
===================================================================
diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r595ede3b4cf5a1f5c06a04d1db99a0674ae742bd
--- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 595ede3b4cf5a1f5c06a04d1db99a0674ae742bd)
@@ -27,19 +27,22 @@
  * \brief   Treatment Screen Heparin Management section
  */
 TreatmentFluid { id: _root
-    //// readonly property bool isStarted            : vHDTreatmentStates.hpRunnin
-    //// readonly property bool isOff                : vHDTreatmentStates.hp
-    ////
-    //// readonly property bool isDisabled           : vHDTreatmentStates.sbMaxReached
-    //// readonly property bool isWaitPump           : vHDTreatmentStates.sbWaitPump
+    readonly property bool isOff            : vHDTreatmentStates.hpOff
+    readonly property bool isPaused         : vHDTreatmentStates.hpPaused
+    readonly property bool isInitial        : vHDTreatmentStates.hpInitial_bolus
+    readonly property bool isDispensing     : vHDTreatmentStates.hpDispensing
+    readonly property bool isCompleted      : vHDTreatmentStates.hpCompleted
+    readonly property bool isEmpty          : vHDTreatmentStates.hpEmpty
 
     QtObject { id: _private
-        readonly property string textStart          : qsTr("PAUSE DELIVERY")
-        readonly property string textStop           : qsTr("RESUME DELIVERY" )
+        readonly property string textHeparin        : qsTr("HEPARIN DELIVERY")
+        readonly property string textPause          : qsTr("PAUSE DELIVERY")
+        readonly property string textResume         : qsTr("RESUME DELIVERY" )
         readonly property string textVolumeTarget   : "(" + valueTarget + unit + ")"
-        readonly property string mesgDisabled       : qsTr("Maximum cumulative heparin bolus volume delivered")
-        readonly property string mesgWaitForPump    : "" // qsTr("Saline Bolus is starting") // Not sure if we shouls show any message at this point
-        //// readonly property string mesgRejectReason   : vTreatmentAdjustmentSaline.adjustment_ReasonText
+        readonly property string mesgCompleted      : qsTr("Maximum cumulative heparin bolus volume delivered")
+        readonly property string mesgEmpty          : qsTr("Heparin syringe empty")
+        readonly property string mesgOff            : qsTr("Heparin delivery Off")
+        readonly property string mesgRejectReason   : vTreatmentAdjustmentHeparin.adjustment_ReasonText
     }
 
     title   : qsTr("HEPARIN")
@@ -49,27 +52,26 @@
     targetVisible: false
     progressBarVisible: false
 
-    isTouchable : true //// ! ( _root.isDisabled || _root.isWaitPump )
-    buttonText: qsTr("PAUSE DELIVERY")
-    ////buttonText  : ( _root.isDisabled || _root.isWaitPump ) ? _private.textStart :
-    ////                _root.isStarted                        ? _private.textStop  :
-    ////                                                         _private.textStart
+    isTouchable : ! (isOff || isInitial || isEmpty)
+    buttonText  : isDispensing  ? _private.textPause    :
+                  isPaused      ? _private.textResume   :
+                  isCompleted   ? _private.textResume   :
+                                  _private.textHeparin
     unit        : Variables.unitTextSaline
 
     valueDelivered: vTreatmentHeparin.cumulative // this is the cumulative volume of the Heparin bolus and despensing.
-    ////
+
     VTreatmentHeparin  { id: vTreatmentHeparin }
-    ////
-    //// onClicked: {
-    ////     vTreatmentAdjustmentSaline.doAdjustment()
-    //// }
-    ////
-    //// notification {
-    ////     visible : true
-    ////     text    : isIdle     ? ""                           :
-    ////               isDisabled ? _private.mesgDisabled        :
-    ////               isWaitPump ? _private.mesgWaitForPump     :
-    ////               isStarted  ? _private.mesgRejectReason    :
-    ////                            ""
-    //// }
+
+    onClicked: {
+        vTreatmentAdjustmentHeparin.doAdjustment()
+    }
+
+    notification {
+        visible : true
+        text    : isOff         ? _private.mesgOff          :
+                  isCompleted   ? _private.mesgCompleted    :
+                  isEmpty       ? _private.mesgEmpty        :
+                                  _private.mesgRejectReason
+    }
 }