Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r7d4fe5b7c29e66be9c09c076eb8c7b295e1d280b
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 7d4fe5b7c29e66be9c09c076eb8c7b295e1d280b)
@@ -390,7 +390,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 +453,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();
     }