Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r38a89cb53b4ed2e467f51d41e30d43010fdd23e3 -re4cc37257141c5227186ac6d8ca3d6c87d009042
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 38a89cb53b4ed2e467f51d41e30d43010fdd23e3)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
@@ -312,7 +312,11 @@
 
         if ( elapsedSelfTestTimeInSecs <= MAX_NO_CARTRIDGE_SELF_TEST_TIME )
         {
-            broadcastNoCartSelfTestTime( MAX_NO_CARTRIDGE_SELF_TEST_TIME, ( MAX_NO_CARTRIDGE_SELF_TEST_TIME - elapsedSelfTestTimeInSecs ) );
+            SELF_TEST_NO_CARTRIDGE_PAYLOAD_T data;
+
+            data.timeout   = MAX_NO_CARTRIDGE_SELF_TEST_TIME;
+            data.countdown = ( MAX_NO_CARTRIDGE_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
+            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
         }
         else
         {
@@ -443,7 +447,11 @@
 
         if ( elapsedSelfTestTimeInSecs <= MAX_DRY_SELF_TEST_TIME )
         {
-            broadcastDrySelfTestTime( MAX_DRY_SELF_TEST_TIME, ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs ) );
+            SELF_TEST_DRY_PAYLOAD_T data;
+
+            data.timeout   = MAX_DRY_SELF_TEST_TIME;
+            data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
+            broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
         }
         else
         {