Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rbf9223700613ced6c377f3e3a7b4de8367c30474 -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision bf9223700613ced6c377f3e3a7b4de8367c30474) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd) @@ -61,7 +61,6 @@ enum GuiActionsType_Enum /* : quint16 QML does not support enum types */ { ID_Unknown = 0x0000, - ID_CANBusFaultCount = 0x9909, ID_RawData = 0xFFFE, @@ -71,14 +70,14 @@ ID_TDDebugText = 0xF1FF, ID_DDDebugText = 0xF2FF, - ID_HDGeneralEvent = 0xA400, - ID_DGGeneralEvent = 0xA500, + ID_HDGeneralEvent = 0xA40F, //// ----- @CRAPIZED: had to change to avoid duplication + ID_DGGeneralEvent = 0xA50F, //// ----- @CRAPIZED: had to change to avoid duplication ID_TDCheckIn = 0x1000, // 16 //// ----- @LEAHIZED // Generic Confirmation - ID_DuetConfirmHDi = 0xBA00, // 186 - ID_DuetConfirmUIr = 0xBB00, // 187 + ID_DuetConfirmTDi = 0xB500, // 181 + ID_DuetConfirmUIr = 0xB600, // 182 // POST ID_HDPostSingleResultData = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication @@ -126,8 +125,7 @@ ID_PostTreatmentStates = 0x770F, // 119 //// ----- @CRAPIZED: had to change to avoid duplication // ----- - ID_PowerOff = 0x010F, // 010F //// ----- @CRAPIZED - ID_ShuttingDown = 0x0E0F, // 35 //// ----- @CRAPIZED: had to change to avoid duplication + ID_PowerOffWarning = 0x2200, // 34 //// ----- @LEAHIZED ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED ID_BloodFlow = 0x1100, // 17 //// ----- @LEAHIZED ID_DialysateInletFlow = 0x0800, @@ -138,9 +136,9 @@ ID_Heparin = 0x8C00, // 140 ID_IsolatedUF = 0x9A00, // 154 ID_Rinseback = 0x8F00, // 143 //// ----- @LEAHIZED - ID_Recirculate = 0x5A00, // 90 + ID_Recirculate = 0xA800, // 168 ID_BloodPrime = 0x9700, // 151 - ID_TreatmentStop = 0x4900, // 73 + ID_TreatmentStop = 0x5B00, // 91 ID_Vitals = 0x6500, // 101 // Alarm Messages @@ -159,18 +157,19 @@ ID_AdjustInitTreatmentRsp = 0x4600, // 70 //// ----- @LEAHIZED ID_AdjustParametersValidationReq = 0x3F00, // 63 //// ----- @LEAHIZED ID_AdjustParametersValidationRsp = 0x4000, // 64 //// ----- @LEAHIZED - ID_AdjustParametersConfirmReq = 0x4400, // 68 //// ----- @LEAHIZED + ID_AdjustParametersConfirmReq = 0x440F, // 68 //// ----- @LEAHIZED -> CRAPIZED OBSOLETE ID_TreatmentRanges = 0x4300, // 67 //// ----- @LEAHIZED // Pre-Treatment Water Sample ID_DGFilterFlushData = 0x600F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustWaterSampleReq = 0x5D00, // 93 - ID_AdjustWaterSampleRsp = 0x5E00, // 94 - ID_AdjustWaterSampleResultReq = 0x5F0F, // 95 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustWaterSampleResultReq = 0XA300, // 163 + ID_AdjustWaterSampleResultRsp = 0xAB00, // + ID_AdjustWaterSampleData = 0xAC00, // + // 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 // 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 = 0x610F, // 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 = 0x9200, // 146 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response ID_AdjustDisposablesConfirmRsp = 0x9300, // 147 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response @@ -196,10 +195,10 @@ // DG Data Messages ID_DGROPumpData = 0x1F0F, // 31 //// ----- @CRAPIZED: had to change to avoid duplication ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication - ID_DGOperationModeData = 0x270F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication + ID_DDOperationModeData = 0x1300, ID_DGReservoirData = 0x280F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_DGLoadCellReadingsData = 0x0C00, // 12 - ID_DGAccelerometerData = 0x3400, // 52 + ID_DGAccelerometerData = 0x340F, // 52 //// ----- @CRAPIZED: had to change to avoid duplication ID_DDValvesStatesData = 0x1B00, // 27 //// ----- @LEAHIZED ID_DDPressuresData = 0x1C00, // 28 //// ----- @LEAHIZED ID_DDConductivityData = 0x1F00, // 31 //// ----- @LEAHIZED @@ -209,7 +208,7 @@ ID_DDHeatersData = 0x2800, // 40 //// ----- @LEAHIZED ID_DDLevelData = 0x2900, // 41 //// ----- @LEAHIZED ID_DDGenDialysateData = 0x2F00, // 47 //// ----- @LEAHIZED - ID_DDBloodLeakData = 0x6000, // 96 //// ----- TODO: Payload subject to change given FW implementation + ID_DDBloodLeakData = 0x6100, // 96 //// ----- @LEAHIZED // FP Data Messages ID_FPValvesStatesData = 0x310F, // 49 //// ----- @OBSOLETE. REMOVE? @@ -220,6 +219,7 @@ ID_FPConductivityData = 0x3700, // 55 //// ----- @LEAHIZED ID_FPTemperaturesData = 0x3900, // 57 //// ----- @LEAHIZED ID_FPROBoosterPumpData = 0x5000, // 80 //// ----- @LEAHIZED + ID_FPRORejectionPercentageData = 0x7100, // 113 //// ----- @LEAHIZED // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 @@ -233,7 +233,7 @@ ID_TDBatteryData = 0x5400, // 84 //// ----- TODO: Payload subject to change given FW implementation ID_TDSwitchesData = 0x2100, // 33 //// ----- @LEAHIZED ID_TDEjectorData = 0x4E00, // 78 //// ----- @LEAHIZED - ID_TDTemperatureData = 0x5300, // 83 //// ----- TODO: Payload subject to change given FW implementation + ID_TDTemperatureData = 0x5300, // 83 //// ----- @LEAHIZED ID_TreatmentParametersSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED // Blood Prime @@ -273,9 +273,15 @@ ID_AdjustVitalsReq = 0x6300, // 99 ID_AdjustVitalsRsp = 0x6400, // 100 + ID_AdjustVitalsAlarmLimitsReq = 0xB800, // 184 + ID_AdjustVitalsAlarmLimitsRsp = 0xB900, // 100 + ID_AdjustHeparinReq = 0x8A00, // 138 ID_AdjustHeparinRsp = 0x8B00, // 139 + ID_AdjustPressuresWideningReq = 0xA400, // 114 //// ----- @LEAHIZED + ID_AdjustPressuresWideningRsp = 0xA500, // 115 //// ----- @LEAHIZED + // Ultrafiltration ID_AdjustUltrafiltrationStateReq = 0x4700, // 71 //// ----- @LEAHIZED ID_AdjustUltrafiltrationStateRsp = 0x4800, // 72 //// ----- @LEAHIZED @@ -301,8 +307,8 @@ ID_AdjustRinsebackRsp = 0x9100, // 145 //// ----- @LEAHIZED // Recirculate - ID_AdjustRecirculateReq = 0x540F, // 84 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustRecirculateRsp = 0x5500, // 85 + ID_AdjustRecirculateReq = 0xA600, // 166 + ID_AdjustRecirculateRsp = 0xA700, // 167 // Treatment End ID_AdjustTreatmentEndReq = 0x8D00, // 141 @@ -311,28 +317,29 @@ // Post-Treatment // Patient Disconnect ID_AdjustPatientDisconnectNotifyReq = 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 - ID_AdjustPatientDisconnectConfirmReq = 0x060F, // 060f //// ----- @CRAPIZED - ID_AdjustPatientDisconnectConfirmRsp = 0x7E0F, // 126 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustPatientDisconnectConfirmReq = 0x5500, // 85 + ID_AdjustPatientDisconnectConfirmRsp = 0x5600, // 86 // Disposables Removal ID_AdjustDisposablesRemovalConfirmReq = 0x9400, // 148 ID_AdjustDisposablesRemovalConfirmRsp = 0x9500, // 149 // Treatment Log Adjs - ID_AdjustTreatmentLogReq = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustTreatmentLogRsp = 0x760F, // 118 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustTreatmentLogReq = 0xA900, // 166 + ID_AdjustTreatmentLogRsp = 0xAA00, // 167 + // Treatment Log Data - ID_TreatmentLogAvrgeData = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication - ID_TreatmentLogAlarmData = 0x950F, // 149 //// ----- @CRAPIZED: had to change to avoid duplication - ID_TreatmentLogEventData = 0x960F, // 150 //// ----- @CRAPIZED: had to change to avoid duplication + ID_TreatmentLogAvrgeData = 0xAD00, // + ID_TreatmentLogAlarmData = 0x6A00, // 106 //// ----- @LEAHIZED + ID_TreatmentLogEventData = 0x6B00, // 107 //// ----- @LEAHIZED // Disinfect ID_AdjustDisinfectModeReq = 0x9A0F, // 154 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisinfectModeRsp = 0x9B0F, // 155 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisinfectStartReq = 0x7F0F, // 127 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisinfectStartRsp = 0x800F, // 128 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustDGCleaningUsageReq = 0xB800, // 184 + ID_AdjustDGCleaningUsageReq = 0xB80F, // 184 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDGCleaningUsageRsp = 0x8D0F, // 141 //// ----- @CRAPIZED: had to change to avoid duplication // RO Water Input Mode @@ -399,8 +406,8 @@ Q_ENUM(UF_Adjustments) Q_ENUM(UF_Commands) // Saline - Q_ENUM(Saline_Bolus_States) - Q_ENUM(Saline_Commands) + Q_ENUM(Fluid_Bolus_States) + Q_ENUM(Fluid_Bolus_Commands) // Heparin Q_ENUM(Heparin_States) Q_ENUM(Heparin_Commands) @@ -475,8 +482,8 @@ typedef GuiActions::UF_Commands GuiUFCommands; typedef GuiActions::UF_Adjustments GuiUFAdjustment; // Saline - typedef GuiActions::Saline_Bolus_States GuiSalineStates; - typedef GuiActions::Saline_Commands GuiSalineCommands; + typedef GuiActions::Fluid_Bolus_States GuiSalineStates; + typedef GuiActions::Fluid_Bolus_Commands GuiSalineCommands; // Heparin typedef GuiActions::Heparin_States GuiHeparinStates; typedef GuiActions::Heparin_Commands GuiHeparinCommands;