Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rc06a32218bad65414ccda5d41293e5349e46d241 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision c06a32218bad65414ccda5d41293e5349e46d241)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -22,14 +22,14 @@
 #include "DDInterface.h"
 #include "ModeService.h"
 #include "ModeTreatment.h"
-#include "ModeTxParams.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "StateTxDialysis.h"
 #include "StateTxPaused.h"
 //#include "Switches.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
+#include "TxParams.h"
 #include "Valves.h"
 
 /**
@@ -812,13 +812,13 @@
                 payload.treatmentTimeRemaininginSec = 0;
             }
         }
-        sendMessage( MSG_ID_TD_TREATMENT_TIME_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&payload), sizeof( TREATMENT_TIME_DATA_T ) );
+        broadcastData( MSG_ID_TD_TREATMENT_TIME_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&payload), sizeof( TREATMENT_TIME_DATA_T ) );
 
         // Build and send treatment set points message.
         spPayload.bloodFlow = getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW );
         spPayload.dialFlow  = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW );
         spPayload.dialTemp  = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
-        sendMessage( MSG_ID_TD_TREATMENT_SET_POINTS, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&spPayload), sizeof( TREATMENT_SET_POINTS_T ) );
+        broadcastData( MSG_ID_TD_TREATMENT_SET_POINTS, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&spPayload), sizeof( TREATMENT_SET_POINTS_T ) );
     }
 
     // Broadcast treatment state data at interval
@@ -838,8 +838,7 @@
         payload.txEndState = 0; // getCurrentTreatmentEndState();
         payload.txSalBolusState = 0; //
         payload.txHepState = 0; //
-
-        sendMessage( MSG_ID_TD_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&payload), sizeof( TREATMENT_STATE_DATA_T ) );
+        broadcastData( MSG_ID_TD_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&payload), sizeof( TREATMENT_STATE_DATA_T ) );
     }
 }
 
@@ -967,7 +966,10 @@
 {
     U32 treatmentTime = MIN_TREATMENT_TIME_MINUTES;
 
-//    if ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_ONE_MINUTE_TREATMENT ) )
+#if 0
+    // TODO implement the test configuration
+    //if ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_ONE_MINUTE_TREATMENT ) )
+#endif
     {
         treatmentTime = 1;
     }