Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rccd30f78626597083d05d343651b334b87b46e46 -r9fda0ba6fa4ca547e9c922765f95570c8d94df48
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision ccd30f78626597083d05d343651b334b87b46e46)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9fda0ba6fa4ca547e9c922765f95570c8d94df48)
@@ -156,8 +156,10 @@
 #define SYRINGE_PUMP_STALL_SPEED_THRESHOLD            0.05F                                 ///< Minimum syringe pump speed to be considered not stalled.
 
 #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS        ( 2 * MS_PER_SECOND )                 ///< Syringe pump ADC FPGA error timeout in milliseconds.
+
 #define SYRINGE_PUMP_DAC_MAX_RETRIES                  5                                     ///< Syringe pump DAC retries to write.
 #define SYRINGE_PUMP_DAC_TIMER                        ( 200 / TASK_PRIORITY_INTERVAL )      ///< Syringe pump DAC timer between retries.
+
 /// Defined states for the syringe pump control state machine.
 typedef enum SyringePump_States
 {
@@ -2129,7 +2131,7 @@
         volData.syringePumpVolumeRequired = syringePumpVolumeRequired;
 
         broadcastData( MSG_ID_HD_SYRINGE_PUMP_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SYRINGE_PUMP_DATA_PAYLOAD_T ) );
-        broadcastData( MSG_ID_HD_HEPARIN_DATA_BROADCAST, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&volData, sizeof( SYRINGE_PUMP_VOLUME_DATA_T ) );
+        broadcastData( MSG_ID_HD_HEPARIN_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&volData, sizeof( SYRINGE_PUMP_VOLUME_DATA_T ) );
         syringePumpDataPublicationTimerCounter = 0;
     }
 }
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rccd30f78626597083d05d343651b334b87b46e46 -r9fda0ba6fa4ca547e9c922765f95570c8d94df48
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ccd30f78626597083d05d343651b334b87b46e46)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9fda0ba6fa4ca547e9c922765f95570c8d94df48)
@@ -8,7 +8,7 @@
 * @file    SelfTests.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      07-Feb-2023
+* @date    (last)      10-Feb-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -359,11 +359,11 @@
 
             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 ) );
+            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -517,7 +517,7 @@
 
         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 ) );
+        broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
     }
 }