Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -r6c60d0d0300828750c76f2e397d4e7ccaa84bbb2 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 6c60d0d0300828750c76f2e397d4e7ccaa84bbb2) @@ -33,6 +33,7 @@ MSG_ID_DG_CHECK_IN, // 6 MSG_ID_UI_CHECK_IN, // 7 MSG_ID_DIALYSATE_FLOW_DATA, // 8 + MSG_ID_PRESSURE_OCCLUSION_DATA, // 9 // service/test CAN messages @@ -53,18 +54,29 @@ MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE, // 0x800D MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE, // 0x800E MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE, // 0x800F - MSG_ID_DIAL_FLOW_SET_PT_OVERRIDE, // 0x8010 - MSG_ID_DIAL_FLOW_MEAS_OVERRIDE, // 0x8011 - MSG_ID_DIAL_PUMP_MC_MEAS_SPEED_OVERRIDE, // 0x8012 - MSG_ID_DIAL_PUMP_MC_MEAS_CURR_OVERRIDE, // 0x8013 - MSG_ID_DIAL_FLOW_SEND_INTERVAL_OVERRIDE, // 0x8014 - MSG_ID_DIAL_PUMP_MEAS_SPEED_OVERRIDE, // 0x8015 - MSG_ID_DIAL_PUMP_MEAS_ROTOR_SPEED_OVERRIDE, // 0x8016 + MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE, // 0x8010 + MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE, // 0x8011 + MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE, // 0x8012 + MSG_ID_DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE, // 0x8013 + MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE, // 0x8014 + MSG_ID_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE, // 0x8015 + MSG_ID_DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE, // 0x8016 + MSG_ID_PRESSURE_ARTERIAL_OVERRIDE, // 0x8017 + MSG_ID_PRESSURE_VENOUS_OVERRIDE, // 0x8018 + MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE, // 0x8019 + MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE, // 0x801A + MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE, // 0x801B + MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE, // 0x801C END_OF_MSG_IDS } MSG_ID_T; // ********** public function prototypes ********** +#ifndef ACK_NOT_IMPLEMENTED +// ACK MSG +BOOL sendACKMsg( MESSAGE_T *message ); +#endif + // MSG_ID_OFF_BUTTON_PRESS BOOL sendOffButtonMsgToUI( U08 cmd ); void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message ); @@ -82,6 +94,9 @@ // MSG_ID_DIALYSATE_FLOW_DATA BOOL broadcastDialInFlowData( U32 flowStPt, F32 measFlow, F32 measRotorSpd, F32 measSpd, F32 measMCSpd, F32 measMCCurr, F32 pwmDC ); +// MSG_ID_PRESSURE_OCCLUSION_DATA +BOOL broadcastPresOcclData( F32 artPres, F32 venPres, F32 bpOccl, F32 diOccl, F32 doOccl ); + // MSG_ID_DG_CHECK_IN void handleDGCheckIn( MESSAGE_T *message ); // MSG_ID_UI_CHECK_IN @@ -141,26 +156,44 @@ // MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE void handleTestBloodPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message ); -// MSG_ID_DIAL_FLOW_SET_PT_OVERRIDE -void handleTestDialFlowSetPointOverrideRequest( MESSAGE_T *message ); +// MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE +void handleTestDialInFlowSetPointOverrideRequest( MESSAGE_T *message ); -// MSG_ID_DIAL_FLOW_MEAS_OVERRIDE -void handleTestDialFlowMeasuredOverrideRequest( MESSAGE_T *message ); +// MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE +void handleTestDialInFlowMeasuredOverrideRequest( MESSAGE_T *message ); -// MSG_ID_DIAL_PUMP_MC_MEAS_SPEED_OVERRIDE -void handleTestDialPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message ); +// MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE +void handleTestDialInPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message ); -// MSG_ID_DIAL_PUMP_MC_MEAS_CURR_OVERRIDE -void handleTestDialPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message ); +// MSG_ID_DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE +void handleTestDialInPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message ); -// MSG_ID_DIAL_FLOW_SEND_INTERVAL_OVERRIDE -void handleTestDialFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message ); +// MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE +void handleTestDialInFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message ); -// MSG_ID_DIAL_PUMP_MEAS_SPEED_OVERRIDE -void handleTestDialPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message ); +// MSG_ID_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE +void handleTestDialInPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message ); -// MSG_ID_DIAL_PUMP_MEAS_ROTOR_SPEED_OVERRIDE -void handleTestDialPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message ); +// MSG_ID_DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE +void handleTestDialInPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message ); +// MSG_ID_PRESSURE_ARTERIAL_OVERRIDE +void handleTestArterialPressureOverrideRequest( MESSAGE_T *message ); +// MSG_ID_PRESSURE_VENOUS_OVERRIDE +void handleTestVenousPressureOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE +void handleTestBloodPumpOcclusionOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE +void handleTestDialysateInletPumpOcclusionOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE +void handleTestDialysateOutletPumpOcclusionOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE +void handleTestPresOcclBroadcastIntervalOverrideRequest( MESSAGE_T *message ); + #endif +