Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4 -ra5a547f5decf862cfeb2c952a5bd267a3af3cf5b
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision a5a547f5decf862cfeb2c952a5bd267a3af3cf5b)
@@ -8,7 +8,7 @@
 * @file    DialInFlow.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      18-Jan-2023
+* @date    (last)      10-Feb-2023
 *
 * @author  (original)  Sean
 * @date    (original)  16-Dec-2019
@@ -512,7 +512,7 @@
     }
     else
     {   // Alarm if not receiving new dialysate flow readings in timely manner
-        if ( TRUE == isDGCommunicating() )
+        if ( ( TRUE == isDGCommunicating() ) && ( isACPowerLost() != TRUE ) )
         {
             if ( ++dialysateFlowDataFreshStatusCounter > DIP_DIALYSATE_FLOW_DATA_ALARM_THRESHOLD )
             {
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4 -ra5a547f5decf862cfeb2c952a5bd267a3af3cf5b
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a5a547f5decf862cfeb2c952a5bd267a3af3cf5b)
@@ -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 ) );
     }
 }