Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -79,10 +79,11 @@ {Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_IsolatedUF , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_BloodPrime , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_BloodPrime , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDAirPumpData , 2 * 4 }, // 2 parameters each 4bytes @@ -113,7 +114,6 @@ {Gui::GuiActionType::ID_DDGenDialysateData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DDBloodLeakData , 1 * 4 }, // 1 parameters each 4bytes //FP Data Messages - {Gui::GuiActionType::ID_FPValvesStatesData , 2 * 1 + 10 }, // 1 parameter 16bits & 10 parameters each 1 byte {Gui::GuiActionType::ID_FPROPumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_FPPressuresData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_FPLevelData , 1 * 4 }, // 1 parameters each 4bytes @@ -150,14 +150,40 @@ {Gui::GuiActionType::ID_TreatmentRanges , 6 * 4 }, // 6 parameters each 4bytes // ---- + {Gui::GuiActionType::ID_AdjustBloodPrimeReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustBloodPrimeRsp , 2 * 4 }, // 2 parameters each 4bytes + + // ---- {Gui::GuiActionType::ID_AdjustBloodDialysateReq , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_AdjustBloodDialysateRsp , 4 * 4 }, // 4 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_AdjustDurationReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustDurationRsp , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustBolusVolumeReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustBolusVolumeRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- + {Gui::GuiActionType::ID_AdjustDurationEditReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDurationEditRsp , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDurationConfirmReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDurationConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustSetPointsReq , 5 * 4 }, // 5 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustSetPointsRsp , 2 * 4 }, // 2 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustBloodFlowRateReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustBloodFlowRateRsp , 2 * 4 }, // 2 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustDialysateFlowRateReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDialysateFlowRateRsp , 2 * 4 }, // 2 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustDialysateTemperatureReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDialysateTemperatureRsp , 2 * 4 }, // 2 parameters each 4bytes + + // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp , 2 * 4 }, // 2 parameter each 4bytes @@ -167,12 +193,28 @@ // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_AdjustPressuresLimitsReq , 3 * 4 }, // 3 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp , 3 * 4 }, // 3 parameters each 4bytes + // ---- + {Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditReq , 2 * 4 }, // 2 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp , 5 * 4 }, // 5 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustIsolatedUFConfirmReq , 0 * 4 }, // 0 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustPressuresLimitsReq , 4 * 4 }, // 4 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 2 * 4 }, // 2 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustPressuresWideningReq , 0 * 4 }, // 0 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustPressuresWideningRsp , 2 * 4 }, // 2 parameters each 4bytes + // Pre-Treatment // Create Parameters // Pre-Treatment Initiate Treatment @@ -234,7 +276,7 @@ {Gui::GuiActionType::ID_AdjustRecirculateRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- Treatment End - {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 0 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustTreatmentEndRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- Post-Treatment @@ -300,9 +342,18 @@ {Gui::GuiActionType::ID_HDGeneralEvent , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DGGeneralEvent , 5 * 4 }, // 5 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustInstitutionalRecordReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp , 27 * 4 }, //27 parameters each 4 bytes + {Gui::GuiActionType::ID_InstitutionalRecordReq , 0 * 4 }, // 0 parameter + {Gui::GuiActionType::ID_InstitutionalRecordRsp , 60 * 4 }, // 60 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustInstitutionalRecordReq , 58 * 4 }, // 58 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp , 59 * 4 }, // 59 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdvancedInstitutionalRecordReq , 0 * 4 }, // 0 parameter + {Gui::GuiActionType::ID_AdvancedInstitutionalRecordRsp , 24 * 4 }, // 24 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordReq , 22 * 4 }, // 22 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordRsp , 23 * 4 }, // 23 parameters each 4 bytes + // HD reset request in service mode {Gui::GuiActionType::ID_ResetHDInServiceModeReq , 0 * 4 }, // 0 parameters each 4bytes };