Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r2f0d1d22a15f0ddb459c6527b4746439f66bfe1b -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2f0d1d22a15f0ddb459c6527b4746439f66bfe1b) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -67,9 +67,7 @@ {Gui::GuiActionType::ID_Rinseback , 5 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_BloodPrime , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_PreTreatmentStates , 9 * 4 }, // 9 parameters each 4bytes @@ -78,7 +76,7 @@ {Gui::GuiActionType::ID_PostTreatmentStates , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_DisinfectStates , 3 * 4 }, // 3 parameter each 4bytes - // ---- + // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGPressuresData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGDrainPumpData , 4 * 4 }, // 4 parameters each 4bytes @@ -89,6 +87,9 @@ {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGTemperaturesData , 12 * 4 }, // 12 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes + // HD Data Messages + {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DON'T NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes @@ -205,11 +206,14 @@ {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes // ---- Versions - {Gui::GuiActionType::ID_AdjustVersionsReq ,1+1+1+2+4 }, // variable length parameters + {Gui::GuiActionType::ID_AdjustVersionsUIReq ,1+1+1+2+4 }, // variable length parameters {Gui::GuiActionType::ID_AdjustVersionsHDRsp ,1+1+1+2+1+1+1+1}, // variable length parameters {Gui::GuiActionType::ID_AdjustVersionsDGRsp ,1+1+1+2+1+1+1+1}, // variable length parameters {Gui::GuiActionType::ID_AdjustSerialHDRsp , 15 * 1 }, // 1 parameter 15bytes {Gui::GuiActionType::ID_AdjustSerialDGRsp , 15 * 1 }, // 1 parameter 15bytes + // ---- + {Gui::GuiActionType::ID_AdjustVersionsHDReq , 0 * 4 }, // 0 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustVersionsUIRsp ,1+1+1+2+4 }, // variable length parameters // ---- Service Information {Gui::GuiActionType::ID_AdjustServiceReq , 0 }, // 4 parameters each 4bytes