Index: sources/canbus/messageinterpreter.h
===================================================================
diff -u -rec77306c5375f80f46e76940361c5e96064a0690 -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616
--- sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision ec77306c5375f80f46e76940361c5e96064a0690)
+++ sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616)
@@ -41,70 +41,45 @@
     friend class ::tst_messaging;
     friend class ::tst_logging;
 
-    bool                      isType(const Message &vMessage, Gui::GuiActionType vType) const;
-    bool           isPayloadLenValid(const Message &vMessage, Gui::GuiActionType vType) const;
+    bool                          isType(const Message &vMessage, Gui::GuiActionType vType) const;
+    bool               isPayloadLenValid(const Message &vMessage, Gui::GuiActionType vType) const;
+    bool                  isValidMessage(const Message &vMessage, Gui::GuiActionType vType) const;
+    void                  printUnhandled(const Message &vMessage                          ) const;
 
-    void              printUnhandled(const Message &vMessage);
+    bool             interpretMessage_HD(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool             interpretMessage_DG(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    bool         interpretMessage_HD(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-    bool         interpretMessage_DG(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    // ----- Debug
+    bool            canbusFaultCountData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- PowerOff
-    bool             getPowerOffData(const Message &vMessage, Model::MPowerOff          &vData) __attribute_warn_unused_result__;
-    bool                powerOffData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    // ----- Data
+    // ----- - HD
+    bool               treatmentTimeData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool                   bloodFlowData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool          dialysateInletFlowData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool         dialysateOutletFlowData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool             treatmentRangesData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool           pressureOcclusionData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool              treatmentStateData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- BloodFlowData
-    bool            getBloodFlowData(const Message &vMessage, Model::MBloodFlow         &vData) __attribute_warn_unused_result__;
-    bool               bloodFlowData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    // ----- - DG
+    bool            loadCellReadingsData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool          temperatureSensorsData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- Dialysate Inlet FlowData
-    bool   getDialysateInletFlowData(const Message &vMessage, Model::MDialysateFlow     &vData) __attribute_warn_unused_result__;
-    bool      dialysateInletFlowData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    // ----- Events
+    // ----- - HD
+    bool                        powerOff(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool                     alarmStatus(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool                  alarmTriggered(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool                    alarmCleared(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- Dialysate Outlet FlowData
-    bool  getDialysateOutletFlowData(const Message &vMessage, Model::MOutletFlow        &vData) __attribute_warn_unused_result__;
-    bool     dialysateOutletFlowData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    // ----- Adjustments
+    bool adjustDuration                 (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool adjustBloodDialysate           (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool adjustUltrafiltrationState     (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool adjustUltrafiltrationEdit      (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool adjustUltrafiltrationConfirm   (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- AlarmStatus
-    bool              getAlarmStatus(const Message &vMessage, Model::MAlarmStatus       &vData) __attribute_warn_unused_result__;
-    bool                 alarmStatus(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Time
-    bool            getTreatmentTime(const Message &vMessage, Model::MTreatmentTime     &vData) __attribute_warn_unused_result__;
-    bool               treatmentTime(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Pressure/Occlusion
-    bool    getPressureOcclusionData(const Message &vMessage, Model::MPressureOcclusion &vData) __attribute_warn_unused_result__;
-    bool       pressureOcclusionData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Ranges
-    bool         treatmentRangesData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Load Cell Readings
-    bool        loadCellReadingsData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- canbus Fault Count
-    bool        canbusFaultCountData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Temperature Sensors
-    bool      temperatureSensorsData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ~~~~ Adjustments ~~~~
-    // ---- Treatment Adjust response for Blood/Dialysate Flow Rate
-    bool    adjustBloodDialysateData            (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Adjust response for Treatment Duration
-    bool    adjustDurationData                  (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Adjust response for Treatment Ultrafiltration
-    bool    adjustUltrafiltrationEditData       (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Adjust response for Treatment Ultrafiltration
-    bool    adjustUltrafiltrationConfirmData    (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Adjust response for Treatment Ultrafiltration state (Pause / Resume) change
-    bool    adjustUltrafiltrationStateData      (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
 public:
     explicit MessageInterpreter(QObject *parent = nullptr);