Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r63062ac38e905678faa6660652ada4a38a0e3b10 -r031a5ae459c0b73d8b95e6cb8a484309846c1b46
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 63062ac38e905678faa6660652ada4a38a0e3b10)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 031a5ae459c0b73d8b95e6cb8a484309846c1b46)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Hung Nguyen
-* @date    (last)      15-Feb-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      18-Feb-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1803,8 +1803,7 @@
     payload.alarmsFlags |= ( almStatus.noResume                     ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RESUME)          : 0 );
     payload.alarmsFlags |= ( almStatus.noRinseback                  ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK)       : 0 );
     payload.alarmsFlags |= ( almStatus.noEndTreatment               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT)   : 0 );
-    payload.alarmsFlags |= ( almStatus.noNewTreatment               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT)   : 0 );
-    payload.alarmsFlags |= ( almStatus.usrACKRequired               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK)      : 0 );
+    payload.alarmsFlags |= ( almStatus.ok                           ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY)      : 0 );
     payload.alarmsFlags |= ( almStatus.alarmsToEscalate             ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE) : 0 );
     payload.alarmsFlags |= ( almStatus.alarmsSilenced               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED)    : 0 );
     payload.alarmsFlags |= ( almStatus.lampOn                       ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON)            : 0 );