Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r94fc1cd187816ecbf176df26f9dc5601bf379f13 -r88563177f10f20ced98750b2e40036201728131d --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 94fc1cd187816ecbf176df26f9dc5601bf379f13) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 88563177f10f20ced98750b2e40036201728131d) @@ -61,142 +61,157 @@ */ enum GuiActionsType_Enum /* : quint16 QML doesn't support enum types */ { - ID_Unknown = 0x0000, - ID_CANBusFaultCount = 0x9909, + ID_Unknown = 0x0000, + ID_CANBusFaultCount = 0x9909, - ID_RawData = 0xFFFE, + ID_RawData = 0xFFFE, - ID_Acknow = 0xFFFF, - ID_AcknowGeneric = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder + ID_Acknow = 0xFFFF, + ID_AcknowGeneric = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder - ID_HDDebugText = 0xF1FF, - ID_DGDebugText = 0xF2FF, + ID_HDDebugText = 0xF1FF, + ID_DGDebugText = 0xF2FF, - ID_DGCheckIn = 0x0600, - ID_KeepAlive = 0x0700, + ID_DGCheckIn = 0x0600, + ID_KeepAlive = 0x0700, - // HD Data Messages - ID_HDOperationModeData = 0x2500, // 37 - ID_PreTreatmentStates = 0x5C00, // 92 - ID_TreatmentStates = 0x0F00, // 15 + // HD State Messages + ID_HDOperationModeData = 0x2500, // 37 + ID_PreTreatmentStates = 0x5C00, // 92 + ID_TreatmentStates = 0x0F00, // 15 + ID_PostTreatmentStates = 0x7700, // 119 - ID_PowerOff = 0x0100, - ID_ShuttingDown = 0x0E00, - ID_TreatmentTime = 0x0D00, - ID_BloodFlow = 0x0500, - ID_DialysateInletFlow = 0x0800, - ID_DialysateOutletFlow = 0x0B00, - ID_TreatmentRanges = 0x1A00, // 26 - 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 + ID_PowerOff = 0x0100, + ID_ShuttingDown = 0x0E00, + ID_TreatmentTime = 0x0D00, + ID_BloodFlow = 0x0500, + ID_DialysateInletFlow = 0x0800, + ID_DialysateOutletFlow = 0x0B00, + ID_TreatmentRanges = 0x1A00, // 26 + 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, - ID_AlarmTriggered = 0x0300, - ID_AlarmCleared = 0x0400, - ID_AlarmClearedConditionReq = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus - ID_AlarmClearedConditionRsp = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus - ID_AlarmSilenceReq = 0x3200, // 50 - ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD + ID_AlarmStatus = 0x0200, + ID_AlarmTriggered = 0x0300, + ID_AlarmCleared = 0x0400, + ID_AlarmClearedConditionReq = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus + ID_AlarmClearedConditionRsp = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus + ID_AlarmSilenceReq = 0x3200, // 50 + ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD // Pre-Treatment // Pre-Treatment Initiate Treatment - ID_AdjustInitTreatmentReq = 0x3800, // 56 - ID_AdjustInitTreatmentRsp = 0x3900, // 57 + ID_AdjustInitTreatmentReq = 0x3800, // 56 + ID_AdjustInitTreatmentRsp = 0x3900, // 57 // Pre-Treatment Parameters Validation/Confirm - ID_AdjustParametersValidationReq = 0x3500, // 53 - ID_AdjustParametersValidationRsp = 0x3600, // 54 - ID_AdjustParametersConfirmReq = 0x3B00, // 59 + ID_AdjustParametersValidationReq = 0x3500, // 53 + ID_AdjustParametersValidationRsp = 0x3600, // 54 + ID_AdjustParametersConfirmReq = 0x3B00, // 59 // Pre-Treatment Water Sample - ID_DGFilterFlushData = 0x6000, // 96 - ID_AdjustWaterSampleReq = 0x5D00, // 93 - ID_AdjustWaterSampleRsp = 0x5E00, // 94 - ID_AdjustWaterSampleResultReq = 0x5F00, // 95 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_DGFilterFlushData = 0x6000, // 96 + ID_AdjustWaterSampleReq = 0x5D00, // 93 + ID_AdjustWaterSampleRsp = 0x5E00, // 94 + ID_AdjustWaterSampleResultReq = 0x5F00, // 95 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment Consumables Installation Confirm - ID_AdjustConsumablesConfirmReq = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_AdjustConsumablesConfirmReq = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment SelfTest NoCartridge Progress Data - ID_SelfTestNoCartridgeData = 0x6100, // 97 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_SelfTestNoCartridgeData = 0x6100, // 97 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment Disposables Installation Confirm - ID_AdjustDisposablesConfirmReq = 0x6200, // 98 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_AdjustDisposablesConfirmReq = 0x6200, // 98 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment SelfTest Dry Progress Data - ID_SelfTestDryData = 0x6300, // 99 + ID_SelfTestDryData = 0x6300, // 99 // Pre-Treatment Disposable Priming - ID_AdjustDisposablesPrimeReq = 0x3C00, // 60 - ID_AdjustDisposablesPrimeRsp = 0x3D00, // 61 - ID_DisposablesPrimeData = 0x4300, // 67 + ID_AdjustDisposablesPrimeReq = 0x3C00, // 60 + ID_AdjustDisposablesPrimeRsp = 0x3D00, // 61 + ID_DisposablesPrimeData = 0x4300, // 67 // Pre-Treatment Patient Connection Begin - ID_AdjustPatientConnectionBeginReq = 0x6400, // 100 - ID_AdjustPatientConnectionBeginRsp = 0x6500, // 101 + ID_AdjustPatientConnectionBeginReq = 0x6400, // 100 + ID_AdjustPatientConnectionBeginRsp = 0x6500, // 101 // Pre-Treatment Ultrafiltration initial volume - ID_AdjustUltrafiltrationInitReq = 0x4F00, // 79 - ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 + ID_AdjustUltrafiltrationInitReq = 0x4F00, // 79 + ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 // Pre-Treatment Patient Connection Confirm - ID_AdjustPatientConnectionConfirmReq= 0x6600, // 102 - ID_AdjustPatientConnectionConfirmRsp= 0x6700, // 103 + ID_AdjustPatientConnectionConfirmReq = 0x6600, // 102 + ID_AdjustPatientConnectionConfirmRsp = 0x6700, // 103 // Pre-Treatment Start Treatment - ID_AdjustStartTreatmentReq = 0x7100, // 113 - ID_AdjustStartTreatmentRsp = 0x7200, // 114 + ID_AdjustStartTreatmentReq = 0x7100, // 113 + ID_AdjustStartTreatmentRsp = 0x7200, // 114 // DG Data Messages - ID_DGROPumpData = 0x1F00, // 31 - ID_DGPressuresData = 0x2000, // 32 - ID_DGDrainPumpData = 0x2400, // 36 - ID_DGOperationModeData = 0x2700, // 39 - ID_DGReservoirData = 0x2800, // 40 - ID_DGValvesStatesData = 0x2A00, // 42 - ID_DGHeatersData = 0x2C00, // 44 - ID_DGLoadCellReadingsData = 0x0C00, // 12 - ID_DGTemperaturesData = 0x2D00, // 45 - ID_DGAccelerometerData = 0x3400, // 52 + ID_DGROPumpData = 0x1F00, // 31 + ID_DGPressuresData = 0x2000, // 32 + ID_DGDrainPumpData = 0x2400, // 36 + ID_DGOperationModeData = 0x2700, // 39 + ID_DGReservoirData = 0x2800, // 40 + ID_DGValvesStatesData = 0x2A00, // 42 + ID_DGHeatersData = 0x2C00, // 44 + ID_DGLoadCellReadingsData = 0x0C00, // 12 + ID_DGTemperaturesData = 0x2D00, // 45 + ID_DGAccelerometerData = 0x3400, // 52 // In-Treatment Adjustables - ID_AdjustDurationReq = 0x1600, // 22 - ID_AdjustDurationRsp = 0x1B00, // 27 + ID_AdjustDurationReq = 0x1600, // 22 + ID_AdjustDurationRsp = 0x1B00, // 27 - ID_AdjustBloodDialysateReq = 0x1700, // 23 - ID_AdjustBloodDialysateRsp = 0x1800, // 24 + ID_AdjustBloodDialysateReq = 0x1700, // 23 + ID_AdjustBloodDialysateRsp = 0x1800, // 24 - ID_AdjustPressuresLimitsReq = 0x4600, // 70 - ID_AdjustPressuresLimitsRsp = 0x4700, // 71 + ID_AdjustPressuresLimitsReq = 0x4600, // 70 + ID_AdjustPressuresLimitsRsp = 0x4700, // 71 - ID_AdjustSalineReq = 0x1200, // 18 - ID_AdjustSalineRsp = 0x1400, // 20 + ID_AdjustSalineReq = 0x1200, // 18 + ID_AdjustSalineRsp = 0x1400, // 20 - ID_AdjustHeparinReq = 0x4B00, // 75 - ID_AdjustHeparinRsp = 0x4C00, // 76 + ID_AdjustHeparinReq = 0x4B00, // 75 + ID_AdjustHeparinRsp = 0x4C00, // 76 // Ultrafiltration - ID_AdjustUltrafiltrationStateReq = 0x1000, // 16 - ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 + ID_AdjustUltrafiltrationStateReq = 0x1000, // 16 + ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 - ID_AdjustUltrafiltrationEditReq = 0x1100, // 17 - ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 + ID_AdjustUltrafiltrationEditReq = 0x1100, // 17 + ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 - ID_AdjustUltrafiltrationConfirmReq = 0x1500, // 21 - ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 + ID_AdjustUltrafiltrationConfirmReq = 0x1500, // 21 + ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 - // post-treatment + // End-Treatment // Rinseback - ID_AdjustRinsebackReq = 0x5200, // 82 - ID_AdjustRinsebackRsp = 0x5300, // 83 + ID_AdjustRinsebackReq = 0x5200, // 82 + ID_AdjustRinsebackRsp = 0x5300, // 83 // Recirculate - ID_AdjustRecirculateReq = 0x5400, // 84 - ID_AdjustRecirculateRsp = 0x5500, // 85 + ID_AdjustRecirculateReq = 0x5400, // 84 + ID_AdjustRecirculateRsp = 0x5500, // 85 // Treatment End - ID_AdjustTreatmentEndReq = 0x5700, // 87 - ID_AdjustTreatmentEndRsp = 0x5800, // 88 + ID_AdjustTreatmentEndReq = 0x5700, // 87 + ID_AdjustTreatmentEndRsp = 0x5800, // 88 - // independent bidirectional - ID_AdjustVersionsReq = 0x1C00, // 28 - ID_AdjustHDVersionsRsp = 0x1D00, // 29 - ID_AdjustDGVersionsRsp = 0x1E00, // 30 + // Post-Treatment + // Patient Disconnect + ID_AdjustPatientDisconnectionConfirmReq = 0x4A00, // 74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + + // Disposables Removal + ID_AdjustDisposablesRemovalConfirmReq = 0x7300, // 115 + ID_AdjustDisposableRemovalConfirmRsp = 0x7400, // 116 + + // Treatment Log + ID_AdjustTreatmentLogReq = 0x7500, // 117 + ID_AdjustTreatmentLogRsp = 0x7600, // 118 + + // Independent Bidirectional + ID_AdjustVersionsReq = 0x1C00, // 28 + ID_AdjustHDVersionsRsp = 0x1D00, // 29 + ID_AdjustDGVersionsRsp = 0x1E00, // 30 + + }; enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { @@ -271,62 +286,65 @@ }; // 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; + typedef GuiActions::HD_Op_Modes GuiHDOpModes; + typedef GuiActions::DG_Op_Modes GuiDGOpModes; // Treatment States - typedef GuiActions::Treatment_States GuiTreatmentStates; + typedef GuiActions::Treatment_States GuiTreatmentStates; // Ultrafiltration - typedef GuiActions::UF_States GuiUFStates; - typedef GuiActions::UF_Commands GuiUFCommands; - typedef GuiActions::UF_Adjustments GuiUFAdjustment; + 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; + typedef GuiActions::Saline_Bolus_States GuiSalineStates; + typedef GuiActions::Saline_Commands GuiSalineCommands; // Heparin - typedef GuiActions::Heparin_States GuiHeparinStates; - typedef GuiActions::Heparin_Commands GuiHeparinCommands; + typedef GuiActions::Heparin_States GuiHeparinStates; + typedef GuiActions::Heparin_Commands GuiHeparinCommands; // Rinseback - typedef GuiActions::Rinseback_States GuiRinsebackStates; - typedef GuiActions::Requested_Rinseback_User_Actions GuiRinsebackCommands; + 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; + 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 + 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; + 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::Treatment_Stop_States GuiTreatmentStopStates; +// typedef GuiActions::Requested_Treatment_Stop_User_Actions GuiTreatmentStopCommands; // No user Action defined // Pre-Treatment SubMode - typedef GuiActions::HD_Pre_Treatment_Mode_States GuiPreTreatmentStates; + typedef GuiActions::HD_Pre_Treatment_Mode_States GuiPreTreatmentStates; // Pre-Treatment Water Sample - typedef GuiActions::HD_Pre_Treatment_Sample_Water_States GuiPreTreatmentWaterSampleStates; - typedef GuiActions::Requested_Sample_Water_User_Actions GuiPreTreatmentWaterSampleCommands; + typedef GuiActions::HD_Pre_Treatment_Sample_Water_States GuiPreTreatmentWaterSampleStates; + typedef GuiActions::Requested_Sample_Water_User_Actions GuiPreTreatmentWaterSampleCommands; // Pre-Treatment Self Test Consumable typedef GuiActions::HD_Pre_Treatment_Consumable_Self_Test_States GuiPreTreatmentSelfTestConsumablesStates; // Pre-Treatment Self Test No Cartridge typedef GuiActions::HD_Pre_Treatment_No_Cart_Self_Tests_States GuiPreTreatmentSelfTestNoCartridgeStates; // Pre-Treatment Self Test Dry - typedef GuiActions::HD_Pre_Treatment_Dry_Self_Tests_States GuiPreTreatmentSelfTestDryStates; + typedef GuiActions::HD_Pre_Treatment_Dry_Self_Tests_States GuiPreTreatmentSelfTestDryStates; // Pre-Treatment Prime - typedef GuiActions::HD_Pre_Treatment_Prime_States GuiPreTreatmentPrimeStates; + typedef GuiActions::HD_Pre_Treatment_Prime_States GuiPreTreatmentPrimeStates; // Pre-Treatment Recirculate - typedef GuiActions::HD_Pre_Treatment_Recirc_States GuiPreTreatmentRecirculateStates; + typedef GuiActions::HD_Pre_Treatment_Recirc_States GuiPreTreatmentRecirculateStates; + // Post-Treatment SubMode + typedef GuiActions::HD_Post_Treatment_Mode_States GuiPostTreatmentStates; + /*! * \brief enumString * \details converts the enum index to it's code defined text