Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r128121958d87699685bd88261e39bb968a0de204 -r72289d4b682e419df5d6f7210eca83d97cd657ae --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 128121958d87699685bd88261e39bb968a0de204) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) @@ -106,18 +106,18 @@ // Service Information ID_AdjustServiceDatesReq = 0x8900, // 137 - ID_AdjustServiceDatesHDRsp = 0x8A00, // 138 - ID_AdjustServiceDatesDGRsp = 0x8C00, // 140 + ID_AdjustServiceDatesHDRsp = 0x8A0F, // 138 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustServiceDatesDGRsp = 0x8C0F, // 140 //// ----- @CRAPIZED: had to change to avoid duplication // HD/DG Usage Counter ID_HDUsageInfoReq = 0xA000, // 160 - ID_HDUsageInfoRsp = 0x8B00, // 139 + ID_HDUsageInfoRsp = 0x8B0F, // 139 //// ----- @CRAPIZED: had to change to avoid duplication // RTC - ID_AdjustHDDateTimeReq = 0x6D00, // 109 - ID_AdjustHDDateTimeRsp = 0x6E00, // 110 - ID_AdjustDGDateTimeReq = 0x6F00, // 111 - ID_AdjustDGDateTimeRsp = 0x7000, // 112 + ID_AdjustTDDateTimeReq = 0x6C00, // 108 + ID_AdjustTDDateTimeRsp = 0x6D00, // 109 + ID_AdjustDDDateTimeReq = 0x6E00, // 110 + ID_AdjustDDDateTimeRsp = 0x6F00, // 111 ID_HDRTCEpochData = 0x0A0F, // 10 //// ----- @CRAPIZED // State Messages @@ -136,11 +136,12 @@ ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED - ID_Heparin = 0x4D00, // 77 + ID_Heparin = 0x8C00, // 140 ID_Rinseback = 0x5600, // 86 ID_Recirculate = 0x5A00, // 90 ID_BloodPrime = 0x5900, // 89 ID_TreatmentStop = 0x4900, // 73 + ID_Vitals = 0x6500, // 101 // Alarm Messages ID_AlarmStatus = 0x0100, // 01 //// ----- @LEAHIZED @@ -174,20 +175,20 @@ 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_AdjustDisposablesConfirmRsp = 0xAD00, // 173 // 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 = 0x630F, // 99 //// ----- @CRAPIZED: had to change to avoid duplication // Pre-Treatment Disposable Priming ID_AdjustDisposablesPrimeReq = 0x3C0F, // 60 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisposablesPrimeRsp = 0x3D0F, // 61 //// ----- @CRAPIZED: had to change to avoid duplication ID_DisposablesPrimeData = 0x43FF, // ?? //// ----- @CRAPIZED - FFed // Pre-Treatment Patient Connection Begin - ID_AdjustPatientConnectionBeginReq = 0x6400, // 100 - ID_AdjustPatientConnectionBeginRsp = 0x6500, // 101 + ID_AdjustPatientConnectionBeginReq = 0x640F, // 100 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustPatientConnectionBeginRsp = 0x650F, // 101 //// ----- @CRAPIZED: had to change to avoid duplication // Pre-Treatment Ultrafiltration initial volume ID_AdjustUltrafiltrationInitReq = 0x4F0F, // 79 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 // Pre-Treatment Patient Connection Confirm - ID_AdjustPatientConnectionConfirmReq = 0x6600, // 102 - ID_AdjustPatientConnectionConfirmRsp = 0x6700, // 103 + ID_AdjustPatientConnectionConfirmReq = 0x660F, // 102 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustPatientConnectionConfirmRsp = 0x670F, // 103 //// ----- @CRAPIZED: had to change to avoid duplication // Pre-Treatment Start Treatment ID_AdjustStartTreatmentReq = 0x7100, // 113 ID_AdjustStartTreatmentRsp = 0x7200, // 114 @@ -211,7 +212,7 @@ ID_DDBloodLeakData = 0x6000, // 96 //// ----- TODO: Payload subject to change given FW implementation // FP Data Messages - ID_FPValvesStatesData = 0x3100, // 49 //// ----- @LEAHIZED + ID_FPValvesStatesData = 0x310F, // 49 //// ----- @OBSOLETE. REMOVE? ID_FPROPumpData = 0x3200, // 50 //// ----- @LEAHIZED ID_FPPressuresData = 0x3400, // 52 //// ----- @LEAHIZED ID_FPLevelData = 0x3500, // 53 //// ----- @LEAHIZED @@ -223,7 +224,7 @@ // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 ID_HDSyringePumpData = 0x6900, // 105 - ID_HDBloodLeakData = 0x6C00, // 108 + ID_HDBloodLeakData = 0x6C0F, // 108 //// ----- @CRAPIZED: had to change to avoid duplication ID_TDAirBubbleData = 0x1E00, // 30 //// ----- @LEAHIZED ID_TDAirPumpData = 0x2000, // 32 //// ----- @LEAHIZED ID_TDAirTrapData = 0x2A00, // 42 //// ----- @LEAHIZED @@ -237,29 +238,32 @@ // In-Treatment Adjustables ID_AdjustDurationReq = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustDurationRsp = 0x1B00, // 27 + ID_AdjustDurationRsp = 0x1B0F, // 27 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustBloodDialysateReq = 0x1700, // 23 ID_AdjustBloodDialysateRsp = 0x1800, // 24 - ID_AdjustPressuresLimitsReq = 0x4600, // 70 - ID_AdjustPressuresLimitsRsp = 0x4700, // 71 + ID_AdjustPressuresLimitsReq = 0x470F, // 70 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustPressuresLimitsRsp = 0x480F, // 71 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustSalineReq = 0x5F00, // 95 ID_AdjustSalineRsp = 0x6000, // 96 - ID_AdjustHeparinReq = 0x4B00, // 75 - ID_AdjustHeparinRsp = 0x4C00, // 76 + ID_AdjustVitalsReq = 0x6300, // 99 + ID_AdjustVitalsRsp = 0x6400, // 100 + ID_AdjustHeparinReq = 0x8A00, // 138 + ID_AdjustHeparinRsp = 0x8B00, // 139 + // Ultrafiltration - ID_AdjustUltrafiltrationStateReq = 0x100F, // 16 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 + ID_AdjustUltrafiltrationStateReq = 0x4700, // 71 //// ----- @LEAHIZED + ID_AdjustUltrafiltrationStateRsp = 0x4800, // 72 //// ----- @LEAHIZED - ID_AdjustUltrafiltrationEditReq = 0x110F, // 17 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 + ID_AdjustUltrafiltrationEditReq = 0x4100, // 65 //// ----- @LEAHIZED + ID_AdjustUltrafiltrationEditRsp = 0x4200, // 66 //// ----- @LEAHIZED - ID_AdjustUltrafiltrationConfirmReq = 0x150F, // 21 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 + ID_AdjustUltrafiltrationConfirmReq = 0x6600, // 102 //// ----- @LEAHIZED + ID_AdjustUltrafiltrationConfirmRsp = 0x6700, // 103 //// ----- @LEAHIZED // End-Treatment // Rinseback @@ -402,7 +406,6 @@ Q_ENUM(DD_Valves) #include "FPDefs.h" - Q_ENUM(FP_Valves) }; // to be able to use the enum as signal/slot parameter @@ -478,9 +481,6 @@ // DD Valves typedef GuiActions::DD_Valves GuiDDValves; - // FP Valves - typedef GuiActions::FP_Valves GuiFPValves; - typedef QMap GuiStringIndexMap; typedef QPair GuiStringIndexMapItem; typedef QMapIterator GuiStringIndexMapIterator; @@ -521,4 +521,4 @@ void registerQmlTypes(); bool startGui(); -} + }