Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r6e6b2319dc060c5fa59062742978ac47d3b92082 -r53a25d66832105280c55adc778923ee251fe0b28
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6e6b2319dc060c5fa59062742978ac47d3b92082)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 53a25d66832105280c55adc778923ee251fe0b28)
@@ -1108,9 +1108,9 @@
             alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RESUME ] = ALARM_TABLE[ a ].alarmNoResume;
             alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ] = ALARM_TABLE[ a ].alarmNoRinseback;
             alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ] = ALARM_TABLE[ a ].alarmNoEndTreatment;
-            alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RESUME ] = alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ];
-            alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ] = alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RINSEBACK ];
-            alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ] = alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_END_TREATMENT ];
+            alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RESUME ] = ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ] ? FALSE : TRUE );
+            alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ] = ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RINSEBACK ] ? FALSE : TRUE );
+            alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ] = ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_END_TREATMENT ] ? FALSE : TRUE );
             if ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ] )
             {
                 noResume = ( TRUE == ALARM_TABLE[ a ].alarmNoResume ? TRUE : noResume );
@@ -1250,12 +1250,12 @@
         data.audioCurrLG = getAlarmAudioPrimaryLowGainCurrent();
         data.backupAudioCurr = getAlarmAudioBackupCurrent();
         data.safetyShutdown = isSafetyShutdownActivated();
-        data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RESUME ]         = alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RESUME ];
-        data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ]      = alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ];
-        data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ]  = alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ];
-        data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_RESUME ]         = alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RESUME ];
-        data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ]      = alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ];
-        data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ]  = alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ];
+        data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RESUME ]         = (U08)alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RESUME ];
+        data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ]      = (U08)alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ];
+        data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ]  = (U08)alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ];
+        data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_RESUME ]         = (U08)alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RESUME ];
+        data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ]      = (U08)alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ];
+        data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ]  = (U08)alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ];
 
         broadcastData( MSG_ID_HD_ALARM_INFORMATION, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( ALARM_INFO_PAYLOAD_T ) );
         alarmInfoPublicationTimerCounter = 0;