Index: sources/StateController.h
===================================================================
diff -u -rbf25cc43f3a623f45cadd0c3449838bfe24688c2 -r646712b99c608c9bc67b555497d5a666a0db1fea
--- sources/StateController.h	(.../StateController.h)	(revision bf25cc43f3a623f45cadd0c3449838bfe24688c2)
+++ sources/StateController.h	(.../StateController.h)	(revision 646712b99c608c9bc67b555497d5a666a0db1fea)
@@ -39,6 +39,7 @@
     #define MILLILITERS_PER_LITER          1000
     #define ACCEPT_VALUE                   1
     #define REJECT_VALUE                   0
+    #define START_TX_FROM_MSG_38           1
 
     // Pre treatment defines
     #define DEFAULT_TIMEOUT_S              10
@@ -139,7 +140,6 @@
 
     // New state machine stuff
     struct Treatment_Variables {
-        float accumulatedVolumeML;
         quint32 broadcastIntervalCount;
         quint32 treatmentElapsedTimeS;
         quint32 remainingTreatmentTimeS;
@@ -167,21 +167,21 @@
 
     void prepareOcclusionBroadcastData();
     void prepareTreatmentTimeBroadcastData();
-    void prepareTreatmentStatesBroadcastData(const QVariantList &payload);
     void prepareBloodFlowBroadcastData();
     void prepareDialysateFlowBroadcastData();
     void prepareDialysateOutFlowBroadcastData();
     void prepareTreatmentParamsRangesBroadcastData();
-    void prepareHDModeTransitionBroadcastData(Can::HD_OP_MODE mode);
-    void preparePreTreatmentStatesBroadcastData(const QList<quint32> &preTxStates);
+    void prepareHDModeTransitionBroadcastData(Can::HD_OP_MODE mode, quint32 subMode);
+    void prepareStatesBroadcastData(Can::Message_ID_Enum msgID, const QList<quint32> &preTxStates);
+    void prepareBloodPrimeBroadcastData(float accumulatedVolML);
 
-    void handleTreatmentReceivedMessages();
     void handleTreatmentTimeChangeRequest(const QVariant &payload);
     qint32 handleMsgBBPayload(const QVariant &payload);
     bool hasPreTxTimerElapsed(Can::Message_ID_Enum msgID, Can::Can_Id canChan,
                               quint32 &timerCountDownS,  quint32 defaultTimeoutS);
     void handleUltrafiltrationValidation(const QVariant &payload);
 
+    // State handlers
     void onIdleStateChange(bool active);
     void onTreatmentParamsStateChange(bool active);
     void onWaterSampleStateChange(bool active);