Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r75e1ae332d1446dddf9b8d4ce6e8317449c57d67
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 75e1ae332d1446dddf9b8d4ce6e8317449c57d67)
@@ -8,7 +8,7 @@
 * @file    Buttons.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      13-Jun-2022
+* @date    (last)      18-Jan-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -260,6 +260,18 @@
 
 /*********************************************************************//**
  * @brief
+ * The resetStuckButtonPOSTState function resets the stuck button POST state.
+ * @details Inputs: none
+ * @details Outputs: buttonSelfTestState
+ * @return none
+ *************************************************************************/
+void resetStuckButtonPOSTState( void )
+{
+    buttonSelfTestState = BUTTON_SELF_TEST_STATE_START;
+}
+
+/*********************************************************************//**
+ * @brief
  * The userConfirmOffButton function handles user confirmation of the off
  * button.  The off request will be initiated here if confirmed or cancelled
  * if rejected by user.
@@ -390,7 +402,12 @@
             // If off request in a valid mode, send to UI for user confirmation
             userConfirmOffButton( OFF_BUTTON_RSP_USER_REQUESTS_POWER_OFF );
             // Log off button press
-            sendTreatmentLogEventData( OFF_BUTTON_PRESSED_EVENT, 0.0F, 0.0F );
+            sendTreatmentLogEventData( OFF_BUTTON_PRESSED_EVENT, 0.0F, 0.0F );
+            SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BUTTON, BUTTON_OFF, BUTTON_STATE_PRESSED )
+        }
+        else
+        {
+            SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BUTTON, BUTTON_OFF, BUTTON_STATE_RELEASED )
         }
         prevOffButtonState = getOffButtonState();
     }
@@ -448,6 +465,11 @@
             stopButtonPendingTimer = getMSTimerCount();
             // Log stop button press
             sendTreatmentLogEventData( STOP_BUTTON_PRESSED_EVENT, 0.0F, 0.0F );
+            SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BUTTON, BUTTON_STOP, BUTTON_STATE_PRESSED )
+        }
+        else
+        {
+            SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BUTTON, BUTTON_STOP, BUTTON_STATE_RELEASED )
         }
         prevStopButtonState = getStopButtonState();
     }