Index: sources/drydemo/StateControllerTreatmentBroadcasts.cpp
===================================================================
diff -u -r6e845078107f7d15a3e471be421d5bce31fc51da -rbb80bbccaf1c911be48493868c18c656d84b2ec1
--- sources/drydemo/StateControllerTreatmentBroadcasts.cpp	(.../StateControllerTreatmentBroadcasts.cpp)	(revision 6e845078107f7d15a3e471be421d5bce31fc51da)
+++ sources/drydemo/StateControllerTreatmentBroadcasts.cpp	(.../StateControllerTreatmentBroadcasts.cpp)	(revision bb80bbccaf1c911be48493868c18c656d84b2ec1)
@@ -36,7 +36,7 @@
     _isBroadcastListReady = true;
 }
 
-void StateController::handleTreatmentStatesBroadcastData(const QList<quint32> &txStates, const Broadcast_Type BCType)
+void StateController::handleTreatmentStatesBroadcastData(const Broadcast_Type BCType)
 {
     static quint32 broadcastCounter = 0;
     if ((++broadcastCounter % NUN_OF_COUNTS_QART_BC_EMIT != 0) && (BCType == BC_DELAYED)) { return; }
@@ -45,7 +45,16 @@
     msg.append(static_cast<quint16>(ID_TD_TREATMENT_STATE_DATA));
     msg.append(Can_Id::eChlid_TD_Sync);
 
-    for (auto item: txStates) { msg.append(item);}
+    msg.append(_treatmentSubStates.txStates);
+    msg.append(_treatmentSubStates.bloodPrimeStates);
+    msg.append(_treatmentSubStates.dialysisSubState);
+    msg.append(0); // TODO add ISO UF
+    msg.append(0); // TODO add treatment paused
+    msg.append(_treatmentSubStates.rinsebackState);
+    msg.append(_treatmentSubStates.recircState);
+    msg.append(0); // TODO add treatment end
+    msg.append(_treatmentSubStates.fluidBolusState);
+    msg.append(0); // Heparin state
     _isBroadcastListReady = false;
     _broadcastMessages.append(msg);
     _isBroadcastListReady = true;
@@ -120,7 +129,7 @@
 void StateController::handleTreatmentTimeProcessAndBroadcastData(const Broadcast_Type BCType)
 {
     static quint32 broadcastCounter = 12;
-    if (_treatmentStatus.fluidBolusState == FLUID_BOLUS_IDLE_STATE) {
+    if (_treatmentSubStates.fluidBolusState == FLUID_BOLUS_IDLE_STATE) {
        _treatmentStatus.treatmentElapsedTimeMS += QOBJECT_TIMER_TIMEOUT_MS;
     }
 
@@ -150,7 +159,7 @@
 
     quint32 dummyData  = 1;
     float   dummyFloat = 150.2;
-    quint32 dialBypass = (_treatmentStatus.fluidBolusState == FLUID_BOLUS_SALINE_IN_PROGRESS_STATE ? BYPASS_DIALYSATE_DELIVER : ALLOW_DIALYSATE_DELIVER);
+    quint32 dialBypass = (_treatmentSubStates.fluidBolusState == FLUID_BOLUS_SALINE_IN_PROGRESS_STATE ? BYPASS_DIALYSATE_DELIVER : ALLOW_DIALYSATE_DELIVER);
 
     QVariantList msg;
     msg.append(static_cast<quint16>(ID_DD_GEN_DIALYSATE_MODE_DATA));
@@ -202,7 +211,7 @@
     float UFVolLMS        = presUFRateLHR / (static_cast<float>(MINUTES_PER_HOUR * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND));
 
     // Only count for UF when the dialysis state is in UF
-    if (_treatmentStatus.dialysisSubState == DIALYSIS_UF_STATE) {
+    if (_treatmentSubStates.dialysisSubState == DIALYSIS_UF_STATE) {
         _treatmentStatus.ufVolDeliveredL += UFVolLMS * PROGRESS_TIME_BC_INTERVAL_MS;
     }
 
@@ -214,7 +223,7 @@
     msg.append(presUFVolL);
     msg.append(targetUFRateLHR);
     msg.append(_treatmentStatus.ufVolDeliveredL);
-    msg.append(static_cast<quint32>(_treatmentStatus.dialysisSubState));
+    msg.append(static_cast<quint32>(_treatmentSubStates.dialysisSubState));
     _isBroadcastListReady = false;
     _broadcastMessages.append(msg);
     _isBroadcastListReady = true;