Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r7509916ccc09e9a9060bcb03c72f4658d5ea3dd7 -r37dac720d0a04a6f28ae8f60bf1320ca13989354
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 7509916ccc09e9a9060bcb03c72f4658d5ea3dd7)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 37dac720d0a04a6f28ae8f60bf1320ca13989354)
@@ -420,7 +420,7 @@
 BOOL sendActiveAlarmsList( ACTIVE_ALARM_LIST_RESPONSE_PAYLOAD_T alarmListPayload );
 
 // MSG_ID_HD_TREATMENT_LOG_ALARM_EVENT
-BOOL sendTreatmentLogAlarmEventData( ALARM_ID_T alarmID, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+BOOL sendTreatmentLogAlarmEventData( ALARM_ID_T alarmID, F32 alarmData1, F32 alarmData2 );
 
 // MSG_ID_HD_TREATMENT_LOG_EVENT
 BOOL sendTreatmentLogEventData( TX_EVENT_ID_T event, F32 oldValue, F32 newValue );
@@ -561,6 +561,9 @@
 // MSG_ID_UI_INSTITUTIONAL_RECORD_REQUEST
 void handleSendInstitutionalRecordToUI( MESSAGE_T* message );
 
+// MSG_ID_UI_HD_RESET_IN_SERVICE_MODE_REQUEST
+void handleUIHDResetInServiceModeRequest( MESSAGE_T* message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -646,6 +649,12 @@
 // MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE
 void handleTestBloodPumpOcclusionOverrideRequest( MESSAGE_T *message );
 
+//MSG_ID_HD_PARTIAL_OCCLUSION_BLOOD_PUMP_OVERRIDE
+void handleTestFilteredBloodPumpOcclusionOverrideRequest( MESSAGE_T *message );
+
+//MSG_ID_HD_PARTIAL_OCCL_BLOOD_PUMP_BASELINE_OVERRIDE
+void handleTestBloodPumpOcclusionBaselineOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE
 void handleTestPresOcclBroadcastIntervalOverrideRequest( MESSAGE_T *message );