Index: sources/canbus/messageglobals.h =================================================================== diff -u -r426208cdb707400759bdc663b871ece9d1208aed -r4836b003eb45d7f8cb98ea4c7999d068f0beb0d2 --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision 426208cdb707400759bdc663b871ece9d1208aed) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision 4836b003eb45d7f8cb98ea4c7999d068f0beb0d2) @@ -30,14 +30,19 @@ typedef Types::S16 Sequence_Bytes; #define SEQUENCE_MAX INT16_MAX +// stl +#include +#define FrameCount_MAX UINT64_MAX +typedef quint64 FrameCount; + /*! * \brief Payload Length * \details List of each ActionID required data (in byte) length in the message. * So the data collector has to collect this amount of bytes as payload of a message. */ const QHash payloadLen { {Gui::GuiActionType::PowerOff , 1 }, - {Gui::GuiActionType::KeepAlive , 0 }, + {Gui::GuiActionType::KeepAlive , 255 }, // 0 => 255 to be able to run a multi-frame test. {Gui::GuiActionType::BloodFlow , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::DialysateInletFlow , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::DialysateOutletFlow, 7 * 4 }, // 7 parameters each 4bytes @@ -81,12 +86,15 @@ * \details The Valid Can Bus MessageID of each frame */ enum Can_Id : quint16 { + eChlid_LOWEST = 0x7FF, + eChlid_NONE = 0x000, // Broadcasts //// Alarm eChlid_HD_Alarm = 0x001, ///< HD alarm broadcast eChlid_DG_Alarm = 0x002, ///< DG alarm broadcast eChlid_UI_Alarm = 0x004, ///< UI alarm broadcast [Out] + //// Sync eChlid_HD_Sync = 0x040, ///< HD sync broadcast eChlid_DG_Sync = 0x080, ///< DG sync broadcast