Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r59a1b4dceeb629ed08a434775d819ce108fe894b --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) @@ -276,6 +276,9 @@ ID_AdjustVitalsReq = 0x6300, // 99 ID_AdjustVitalsRsp = 0x6400, // 100 + ID_AdjustVitalsAlarmLimitsReq = 0xB800, // 184 + ID_AdjustVitalsAlarmLimitsRsp = 0xB900, // 100 + ID_AdjustHeparinReq = 0x8A00, // 138 ID_AdjustHeparinRsp = 0x8B00, // 139 @@ -339,7 +342,7 @@ 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 @@ -406,8 +409,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) @@ -482,8 +485,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;