Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r7710fea4486a639caaa3c510add0eac0bcd4ddcc -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -88,6 +88,10 @@ ID_PressureOcclusion = 0x0900, ID_Saline = 0x2F00, // 47 ID_Heparin = 0x4D00, // 77 + ID_Rinseback = 0x5600, // 86 + ID_Recirculate = 0x5A00, // 90 + ID_BloodPrime = 0x5900, // 89 + ID_HDAccelerometerData = 0x3300, // 51 // Alarm Messages ID_AlarmStatus = 0x0200, @@ -104,11 +108,8 @@ ID_StartTreatmentReq = 0x3800, // 56 ID_StartTreatmentRsp = 0x3900, // 57 ID_ConfirmTreatmentReq = 0x3B00, // 59 - ID_EndTreatmentReq = 0x3C00, // 60 - ID_EndTreatmentRsp = 0x3D00, // 61 ID_PrimingData = 0x4300, // 67 - // DG Data Messages ID_DGROPumpData = 0x1F00, // 31 ID_DGPressuresData = 0x2000, // 32 @@ -119,6 +120,7 @@ ID_DGHeatersData = 0x2C00, // 44 ID_DGLoadCellReadingsData = 0x0C00, // 12 ID_DGTemperaturesData = 0x2D00, // 45 + ID_DGAccelerometerData = 0x3400, // 52 // In-Treatment Adjustables ID_AdjustDurationReq = 0x1600, // 22 @@ -136,7 +138,6 @@ ID_AdjustHeparinReq = 0x4B00, // 75 ID_AdjustHeparinRsp = 0x4C00, // 76 - // Ultrafiltration: has also In-Treatment Adjustables but kept together ID_AdjustUltrafiltrationInitReq = 0x4F00, // 79 ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 @@ -149,6 +150,24 @@ ID_AdjustUltrafiltrationConfirmReq = 0x1500, // 21 ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 + + // post-treatment + // Rinseback + ID_AdjustRinsebackReq = 0x5200, // 82 + ID_AdjustRinsebackRsp = 0x5300, // 83 + + // Recirculate + ID_AdjustRecirculateReq = 0x5400, // 84 + ID_AdjustRecirculateRsp = 0x5500, // 85 + + // Treatment End + ID_AdjustTreatmentEndReq = 0x5700, // 87 + ID_AdjustTreatmentEndRsp = 0x5800, // 88 + + // independent bidirectional + ID_AdjustVersionsReq = 0x1C00, // 28 + ID_AdjustHDVersionsRsp = 0x1D00, // 29 + ID_AdjustDGVersionsRsp = 0x1E00, // 30 }; enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { @@ -179,44 +198,78 @@ #include "HDDefs.h" Q_ENUM(HD_Op_Modes) - Q_ENUM(UF_Adjustments) + // Treatment Q_ENUM(Treatment_States) + // Ultrafiltration + Q_ENUM(UF_Adjustments) Q_ENUM(UF_Commands) Q_ENUM(UF_States) - Q_ENUM(Saline_Commands) + // Saline Q_ENUM(Saline_Bolus_States) + Q_ENUM(Saline_Commands) // Heparin - Q_ENUM(Heparin_Commands) Q_ENUM(Heparin_States) + Q_ENUM(Heparin_Commands) + // Rinseback + Q_ENUM(Rinseback_States) + Q_ENUM(Requested_Rinseback_User_Actions) + // Recirculate + Q_ENUM(Treatment_Recirc_States) + Q_ENUM(Requested_Treatment_Recirc_User_Actions) + // Blood Prime + Q_ENUM(Blood_Prime_States) + // Treatment End + Q_ENUM(Treatment_End_States) + Q_ENUM(Requested_Treatment_End_User_Actions) + // Treatment Stop #include "DGDefs.h" Q_ENUM(DG_Op_Modes) }; // to be able to use the enum as signal/slot parameter - typedef GuiActions::GuiActionsType_Enum GuiActionType; - typedef GuiActions::GuiActionsData_Enum GuiActionData; + typedef GuiActions::GuiActionsType_Enum GuiActionType; + typedef GuiActions::GuiActionsData_Enum GuiActionData; - typedef GuiActions::Alarm_Priorities GuiAlarmPriority; - typedef GuiActions::Alarm_List GuiAlarmID; - typedef GuiActions::Alarm_State_Flag_Bit_Positions GuiAlarmFlags; - typedef GuiActions::Alarm_User_Actions GuiAlarmUserActions; + typedef GuiActions::Alarm_Priorities GuiAlarmPriority; + typedef GuiActions::Alarm_List GuiAlarmID; + typedef GuiActions::Alarm_State_Flag_Bit_Positions GuiAlarmFlags; + typedef GuiActions::Alarm_User_Actions GuiAlarmUserActions; - typedef GuiActions::Request_Reject_Reasons GuiRequestReasons; + typedef GuiActions::Request_Reject_Reasons GuiRequestReasons; + // operation mode + typedef GuiActions::HD_Op_Modes GuiHDOpModes; + typedef GuiActions::DG_Op_Modes GuiDGOpModes; + // Treatment States + typedef GuiActions::Treatment_States GuiTreatmentStates; + // Ultrafiltration + typedef GuiActions::UF_States GuiUFStates; + typedef GuiActions::UF_Commands GuiUFCommands; + typedef GuiActions::UF_Adjustments GuiUFAdjustment; + // Saline + typedef GuiActions::Saline_Bolus_States GuiSalineStates; + typedef GuiActions::Saline_Commands GuiSalineCommands; + // Heparin + typedef GuiActions::Heparin_States GuiHeparinStates; + typedef GuiActions::Heparin_Commands GuiHeparinCommands; + // Rinseback + typedef GuiActions::Rinseback_States GuiRinsebackStates; + typedef GuiActions::Requested_Rinseback_User_Actions GuiRinsebackCommands; + // Recirculate + typedef GuiActions::Treatment_Recirc_States GuiRecirculateStates; + typedef GuiActions::Requested_Treatment_Recirc_User_Actions GuiRecirculateCommands; + // Blood Prime + typedef GuiActions::Blood_Prime_States GuiBloodPrimeStates; +// typedef GuiActions::Requested_Blood_Prime_User_Actions GuiBloodPrimeCommands; // No user Action defined + // Treatment End + typedef GuiActions::Treatment_End_States GuiTreatmentEndStates; + typedef GuiActions::Requested_Treatment_End_User_Actions GuiTreatmentEndCommands; + // Treatment Stop + typedef GuiActions::Treatment_Stop_States GuiTreatmentStopStates; +// typedef GuiActions::Requested_Treatment_Stop_User_Actions GuiTreatmentStopCommands; // No user Action defined - typedef GuiActions::HD_Op_Modes GuiHDOpModes; - typedef GuiActions::DG_Op_Modes GuiDGOpModes; - typedef GuiActions::UF_Adjustments GuiUFAdjustment; - typedef GuiActions::Treatment_States GuiTreatmentStates; - typedef GuiActions::UF_Commands GuiUFCommands; - typedef GuiActions::UF_States GuiUFStates; - typedef GuiActions::Saline_Commands GuiSalineCommands; - typedef GuiActions::Saline_Bolus_States GuiSalineStates; - typedef GuiActions::Heparin_Commands GuiHeparinCommands; - typedef GuiActions::Heparin_States GuiHeparinStates; - void registerTypes(); void registerQmlTypes();