Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rc8263f48423cf7791f5ef7d46157b9278708d663 -r3c30d57c6cba7595b1e1d6b806d90ca151bc8db2 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c8263f48423cf7791f5ef7d46157b9278708d663) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 3c30d57c6cba7595b1e1d6b806d90ca151bc8db2) @@ -76,7 +76,7 @@ {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 - {Gui::GuiActionType::ID_DGOperationModeData , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 }, // 1 parameters each 2bytes {Gui::GuiActionType::ID_DGHeatersData , 3 * 4 }, // 3 parameters each 4bytes @@ -94,6 +94,10 @@ {Gui::GuiActionType::ID_AlarmClearedConditionRsp , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameter each 1bytes {Gui::GuiActionType::ID_AlarmUserActionReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmActiveListReq , 0 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmActiveListRsp , 12 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmVolumeSetReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmVolumeSetRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TreatmentRanges , 6 * 4 }, // 6 parameters each 4bytes @@ -192,6 +196,9 @@ // ---- Treatment Log {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 35 * 4 }, //35 parameter each 4bytes + {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 5 * 4 }, // 5 parameter each 4bytes + {Gui::GuiActionType::ID_TreatmentLogAlarmData , 3 * 4 }, // 3 parameter each 4bytes + {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes // ---- Versions {Gui::GuiActionType::ID_AdjustVersionsReq , 0 * 4 }, // 0 parameters each 4bytes @@ -285,6 +292,16 @@ }; /*! + * \brief The Can_Source enum + * \details The allowable sources of the CANBus messages. + */ +enum Can_Source { + eCan_Unknown = -1, + eCan_HD = 0, + eCan_DG = 1, +}; + +/*! * \brief The Message struct * \details The message structure after it's been converted form hex bytes to meaningful struct for UI. */