Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rb3076db63d3e6515746948fba3a4c2bf9aad9c27 -r1b76127ac6833e64fb04749707ae899052402f3e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision b3076db63d3e6515746948fba3a4c2bf9aad9c27)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 1b76127ac6833e64fb04749707ae899052402f3e)
@@ -326,7 +326,7 @@
  *************************************************************************/
 void activateAlarmNoData( ALARM_ID_T alarm )
 {
-    activateAlarm2Data( alarm, BLANK_ALARM_DATA, BLANK_ALARM_DATA );
+    activateAlarm2Data( alarm, BLANK_ALARM_DATA, BLANK_ALARM_DATA, FALSE );
 }
 
 /*********************************************************************//**
@@ -342,7 +342,7 @@
  *************************************************************************/
 void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData )
 {
-    activateAlarm2Data( alarm, alarmData, BLANK_ALARM_DATA );
+    activateAlarm2Data( alarm, alarmData, BLANK_ALARM_DATA, FALSE );
 }
 
 /*********************************************************************//**
@@ -354,10 +354,11 @@
  * @details Outputs: alarm triggered message sent, alarm activated
  * @param alarm ID of alarm to activate
  * @param alarmData1 supporting data to include in alarm msg
- * @param alarmData2 supporting data to include in alarm msg
+ * @param alarmData2 supporting data to include in alarm msg
+ * @param outside flag indicates whether alarm is originating from outside HD f/w
  * @return none
  *************************************************************************/
-void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 )
+void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2, BOOL outside )
 {
     // Block if new alarms are occur during loss of AC power
     if ( ( TRUE == getCPLDACPowerLossDetected() ) )
@@ -375,28 +376,36 @@
             if ( ( FALSE == alarmNoRetrigger ) ||
                  ( ( ALARM_TABLE[ alarm ].alarmNoRetrigOnRB != TRUE ) && ( ALARM_TABLE[ alarm ].alarmNoRetrigOnEndTx != TRUE ) ) )
             {
-                // Broadcast alarm and data if alarm not already active
-                if ( FALSE == alarmIsActive[ alarm ] )
+                HD_OP_MODE_T opMode  = getCurrentOperationMode();
+                TREATMENT_STATE_T ts = getTreatmentState();
+
+                // do not trigger alarm if blocked by current mode/state
+                if ( ( ( ALARM_TABLE[ alarm ].alarmBlockRinseback != TRUE ) || ( opMode != MODE_TREA ) || ( ts != TREATMENT_RINSEBACK_STATE ) || ( TRUE == outside ) ) &&
+                     ( ( ALARM_TABLE[ alarm ].alarmBlockEndTx != TRUE ) || ( opMode != MODE_POST ) || ( TRUE == outside )) )
                 {
-                    ALARM_TRIGGERED_PAYLOAD_T data;
+                    // Broadcast alarm and data if alarm not already active
+                    if ( FALSE == alarmIsActive[ alarm ] )
+                    {
+                        ALARM_TRIGGERED_PAYLOAD_T data;
 
-                    data.alarm = (U32)alarm;
-                    data.almDataType1 = (U32)alarmData1.dataType;
-                    data.almData1 = alarmData1.data.uInt.data;
-                    data.almDataType2 = (U32)alarmData2.dataType;
-                    data.almData2 = alarmData2.data.uInt.data;
-                    data.almPriority = ALARM_TABLE[ alarm ].alarmPriority;
-                    data.almRank = ALARM_TABLE[ alarm ].alarmSubRank;
-                    data.almClrTopOnly = ALARM_TABLE[ alarm ].alarmClearOnly;
+                        data.alarm = (U32)alarm;
+                        data.almDataType1 = (U32)alarmData1.dataType;
+                        data.almData1 = alarmData1.data.uInt.data;
+                        data.almDataType2 = (U32)alarmData2.dataType;
+                        data.almData2 = alarmData2.data.uInt.data;
+                        data.almPriority = ALARM_TABLE[ alarm ].alarmPriority;
+                        data.almRank = ALARM_TABLE[ alarm ].alarmSubRank;
+                        data.almClrTopOnly = ALARM_TABLE[ alarm ].alarmClearOnly;
 
-                    broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
-                    // Send information for UI to log to treatment log
-                    if ( ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog ) && ( MODE_TREA == getCurrentOperationMode() ) )
-                    {
-                        sendTreatmentLogAlarmEventData( alarm, alarmData1, alarmData2 );
+                        broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
+                        // Send information for UI to log to treatment log
+                        if ( ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog ) && ( MODE_TREA == getCurrentOperationMode() ) )
+                        {
+                            sendTreatmentLogAlarmEventData( alarm, alarmData1, alarmData2 );
+                        }
                     }
+                    activateAlarm( alarm );
                 }
-                activateAlarm( alarm );
             }
         }
     }