Index: firmware/App/Drivers/BPDriver.c
===================================================================
diff -u -rd22b634e0d703617cebdd7817c76895ed7b33128 -r58ad7a3b04dca85bb15d640fe65e2d175953c9e5
--- firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision d22b634e0d703617cebdd7817c76895ed7b33128)
+++ firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 58ad7a3b04dca85bb15d640fe65e2d175953c9e5)
@@ -142,6 +142,7 @@
 
     if ( TRUE == requestAdultBPMeasurement )
     {
+        SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, BP_DRIVER_IDLE_STATE, BP_DRIVER_MEASURE_STATE )
         requestAdultBPMeasurement = FALSE;
         bpMeasurementReady        = FALSE;
         bpDriverError             = FALSE;
@@ -179,15 +180,18 @@
 
     if ( BP_MODULE_BUSY_CLEAR == ( getNIBPStatusResponse() & BP_MODULE_BUSY_MASK ) )
     {
+        SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, BP_DRIVER_MEASURE_STATE, 11 )
         // Verify BP measurement data is available
         if ( BP_RESP_CODE_BPDATA == getBPResponseCode() )
         {
+            SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, BP_DRIVER_MEASURE_STATE, BP_DRIVER_GET_DATA_STATE )
             setNIBPCommand( (U08)BP_CMD_GET_BP_DATA );
             nextState = BP_DRIVER_GET_DATA_STATE;
         }
         // Check whether BP module error occurred
         else if ( BP_MODULE_BUSY_CLEAR != ( getNIBPStatusResponse() & BP_MODULE_ERROR_MASK ) )
         {
+            SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, BP_DRIVER_MEASURE_STATE, BP_DRIVER_IDLE_STATE )
             bpDriverError = TRUE;
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, getNIBPStatusResponse(), bpDriverState );
             nextState = BP_DRIVER_IDLE_STATE;
@@ -211,6 +215,7 @@
 
     if ( ( getNIBPStatusResponse() & BP_MODULE_BUSY_MASK ) == 0 )
     {
+        SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, BP_DRIVER_GET_DATA_STATE, 11 )
         bpResults.systolic  = getNIBPSystolicPressure();
         bpResults.diastolic = getNIBPDiastolicPressure();
         bpResults.heartRate = getNIBPHeartRate();
Index: firmware/App/Drivers/BPDriver.h
===================================================================
diff -u -rd22b634e0d703617cebdd7817c76895ed7b33128 -r58ad7a3b04dca85bb15d640fe65e2d175953c9e5
--- firmware/App/Drivers/BPDriver.h	(.../BPDriver.h)	(revision d22b634e0d703617cebdd7817c76895ed7b33128)
+++ firmware/App/Drivers/BPDriver.h	(.../BPDriver.h)	(revision 58ad7a3b04dca85bb15d640fe65e2d175953c9e5)
@@ -21,6 +21,7 @@
 // ********** public definitions **********
 
 #include "TDCommon.h"
+#include "TDDefs.h"
 #include "Types.h"
 
 /**