Index: firmware/App/Services/AlarmMgmtDD.c
===================================================================
diff -u -r1e514f4c45263ce5a0c183c6f7a8c211594913b3 -rca49c8bcf4dc7117612d93a69e58b160a5f9b3c4
--- firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision 1e514f4c45263ce5a0c183c6f7a8c211594913b3)
+++ firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision ca49c8bcf4dc7117612d93a69e58b160a5f9b3c4)
@@ -197,7 +197,7 @@
          ( ( props.alarmBlockEndTx != TRUE ) || ( tdModes.tdMode != MODE_POST ) ) )
     {
         // broadcast alarm and data if alarm not already active
-        if ( ( FALSE == isAlarmActive( alarm ) ) && ( TRUE == isTDCommunicating() ) )
+        if ( ( FALSE == isAlarmActive( alarm ) ) )
         {
             broadcastAlarmTriggered( alarm, alarmData1, alarmData2, props.alarmSource );
         }
@@ -228,10 +228,8 @@
         // clear alarm and broadcast alarm clear if not already cleared (and not a DD fault which should not be cleared)
         if ( ( TRUE == isAlarmActive( alarm ) ) && ( props.alarmIsDDFault != TRUE ) )
         {
-            if ( TRUE == isTDCommunicating() )
-            {
-                broadcastAlarmCleared( alarm, props.alarmSource );
-            }
+
+            broadcastAlarmCleared( alarm, props.alarmSource );
             setAlarmActive( alarm, FALSE );
             clearAlarmConditionDD( alarm );
         }
@@ -265,10 +263,7 @@
         // clear alarm and broadcast alarm clear if not already cleared
         if ( TRUE == isAlarmConditionDetected( alarm ) )
         {
-            if ( TRUE == isTDCommunicating() )
-            {
-                broadcastAlarmConditionCleared( alarm, props.alarmSource );
-            }
+            broadcastAlarmConditionCleared( alarm, props.alarmSource );
             setAlarmConditionDetected( alarm, FALSE );
         }
     }
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r095866efd8f10bdead490578e7584051d79292f0 -rca49c8bcf4dc7117612d93a69e58b160a5f9b3c4
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 095866efd8f10bdead490578e7584051d79292f0)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision ca49c8bcf4dc7117612d93a69e58b160a5f9b3c4)
@@ -251,7 +251,7 @@
     U16 temperatureP13;                         ///< Reg 674.  P13 temperature data.
     S16 pressureP17;                            ///< Reg 676.  P17 pressure data.
     U16 temperatureP17;                         ///< Reg 678.  P17 temperature data.
-    U16 p40PumpTachCount;                       ///< Reg 680.  P40 pump tachometer counter.
+    U16 p40PumpRPMCounts;                       ///< Reg 680.  P40 pump tachometer counter.
     U08 p25LevelSwitch;                         ///< Reg 682.  P25 level switch.
     U08 reserved4;                              ///< Reg 683.  Reserved.
     U32 conductivityP9Data;                     ///< Reg 684.  P9 conductivity sensor data.
@@ -371,7 +371,7 @@
     U16 temperatureP13;                         ///< Reg 634.  P13 temperature data.
     S16 pressureP17;                            ///< Reg 636.  P17 pressure data.
     U16 temperatureP17;                         ///< Reg 638.  P17 temperature data.
-    U16 p40PumpTachCount;                       ///< Reg 640.  P40 pump tachometer counter.
+    U16 p40PumpRPMCounts;                       ///< Reg 640.  P40 pump rpm counter.
     U08 p25LevelSwitch;                         ///< Reg 642.  P25 level switch.
     U08 fpgaGPIOStatus;                         ///< Reg 643.  GPIO Status
     U16 flowRateP7;                             ///< Reg 644.  P7 flow sensor rate.
@@ -4073,15 +4073,15 @@
 
 /*********************************************************************//**
  * @brief
- * The getFPGAP12PumpTachCount function gets the running 16-bit tachometer count
+ * The getFPGAP40PumpRPMCount function gets the running 16-bit rpm count
  * from the P40 pump hall sensor.
- * @details \b Inputs: p40PumpTachCount
+ * @details \b Inputs: p40PumpRPMCounts
  * @details \b Outputs: none
- * @return P40 pump tachometer count
+ * @return P40 pump rpm count
  *************************************************************************/
-U16 getFPGAP40PumpTachCount( void )
+U16 getFPGAP40PumpRPMCount( void )
 {
-    return GET_FPGA_SENSOR_FIELD( p40PumpTachCount );
+    return GET_FPGA_SENSOR_FIELD( p40PumpRPMCounts );
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/FpgaDD.h
===================================================================
diff -u -r3701c29d97c1b1571d41732ad7fba58ace4b75d7 -rca49c8bcf4dc7117612d93a69e58b160a5f9b3c4
--- firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision 3701c29d97c1b1571d41732ad7fba58ace4b75d7)
+++ firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision ca49c8bcf4dc7117612d93a69e58b160a5f9b3c4)
@@ -347,7 +347,7 @@
 void setFPGAP40PumpEnable( BOOL enable );
 void setFPGAP40PumpPWM( U16 pwm );
 U16  getFPGAP40PumpPWM( void );
-U16  getFPGAP40PumpTachCount( void );
+U16  getFPGAP40PumpRPMCount( void );
 
 /**@}*/