Index: sources/model/mmodel.h
===================================================================
diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -reece7acacf84e8cc34b830f6b5ab3f112823a905
--- sources/model/mmodel.h	(.../mmodel.h)	(revision b798668f16ad0967ab97e96f5f9a2cdd821e899f)
+++ sources/model/mmodel.h	(.../mmodel.h)	(revision eece7acacf84e8cc34b830f6b5ab3f112823a905)
@@ -23,9 +23,17 @@
 #include "mtreatmentflows.h"
 #include "mtreatmentoutletflow.h"
 #include "mtreatmentpressureocclusion.h"
+#include "mtreatmentranges.h"
+
+#include "mloadcellreadings.h"
+#include "mtemperaturesensors.h"
+
 #include "mtreatmentadjustblooddialysateresponse.h"
 #include "mtreatmentadjustdurationresponse.h"
-#include "mtreatmentranges.h"
+#include "mtreatmentadjustultrafiltrationstateresponse.h"
+#include "mtreatmentadjustultrafiltrationeditresponse.h"
+#include "mtreatmentadjustultrafiltrationconfirmresponse.h"
+#include "mtreatmentadjustrequests.h"
 
 /*!
  * \brief Message interpretation instruction
@@ -104,69 +112,126 @@
  *
  */
 
+/*!
+ * Simple request models
+ * These are models to send the request for the doAdjustmet
+ * The the only reason thy have been defined to help overloadding the adjusmtent methods
+ * Otherwise the parameters are so tiny models.
+ */
+
 //--------------------------------------------------------------------------------//
 //-------- Please add the model type to the lists below to register them ---------//
 //--------------------------------------------------------------------------------//
-#define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                              \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         BloodFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     DialysateFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        OutletFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     TreatmentTimeData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 PressureOcclusionData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       AlarmStatusData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          PowerOffData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   TreatmentRangesData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,      AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,            AdjustDurationResponseData )
+#define REGISTER_MODEL_METATYPES                                                               \
+    REGISTER_METATYPE(                                                         BloodFlowData ) \
+    REGISTER_METATYPE(                                                     DialysateFlowData ) \
+    REGISTER_METATYPE(                                                        OutletFlowData ) \
+    REGISTER_METATYPE(                                                     TreatmentTimeData ) \
+    REGISTER_METATYPE(                                                 PressureOcclusionData ) \
+    REGISTER_METATYPE(                                                       AlarmStatusData ) \
+    REGISTER_METATYPE(                                                       AlarmStatusFlag ) \
+    REGISTER_METATYPE(                                                          PowerOffData ) \
+    REGISTER_METATYPE(                                                   TreatmentRangesData ) \
+                                                                                               \
+    REGISTER_METATYPE(                                                  LoadCellReadingsData ) \
+    REGISTER_METATYPE(                                                TemperatureSensorsData ) \
+                                                                                               \
+    REGISTER_METATYPE(                                       AdjustBloodDialysateRequestData ) \
+    REGISTER_METATYPE(                                             AdjustDurationRequestData ) \
+    REGISTER_METATYPE(                                 AdjustUltrafiltrationStateRequestData ) \
+    REGISTER_METATYPE(                                  AdjustUltrafiltrationEditRequestData ) \
+    REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmRequestData ) \
+                                                                                               \
+    REGISTER_METATYPE(                                      AdjustBloodDialysateResponseData ) \
+    REGISTER_METATYPE(                                            AdjustDurationResponseData ) \
+    REGISTER_METATYPE(                                AdjustUltrafiltrationStateResponseData ) \
+    REGISTER_METATYPE(                                 AdjustUltrafiltrationEditResponseData ) \
+    REGISTER_METATYPE(                              AdjustUltrafiltrationConfirmResponseData )
 
+//===============================================================================//
+#define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                                       \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                  BloodFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DialysateFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 OutletFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              TreatmentTimeData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          PressureOcclusionData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                AlarmStatusData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   PowerOffData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                            TreatmentRangesData ) \
+                                                                                               \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           LoadCellReadingsData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         TemperatureSensorsData ) \
+                                                                                               \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,         AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustUltrafiltrationEditResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,       AdjustUltrafiltrationConfirmResponseData )
 //--------------------------------------------------------------------------------//
-#define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS                                       \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                 BloodFlowData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                             DialysateFlowData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                OutletFlowData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                             TreatmentTimeData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                         PressureOcclusionData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                               AlarmStatusData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                  PowerOffData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                           TreatmentRangesData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(              AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                    AdjustDurationResponseData )
+#define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                                       \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustBloodDialysateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AdjustDurationRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,          AdjustUltrafiltrationStateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,        AdjustUltrafiltrationConfirmRequestData )
+//===============================================================================//
+#define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS                                                 \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                           BloodFlowData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                       DialysateFlowData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                          OutletFlowData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                       TreatmentTimeData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                   PressureOcclusionData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         AlarmStatusData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                            PowerOffData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentRangesData ) \
+                                                                                                \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                    LoadCellReadingsData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                  TemperatureSensorsData ) \
+                                                                                                \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                  AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                              AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationEditResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustUltrafiltrationConfirmResponseData )
 //--------------------------------------------------------------------------------//
-#define REGISTER_MODEL_METATYPES                                                      \
-    REGISTER_METATYPE(                                                BloodFlowData ) \
-    REGISTER_METATYPE(                                            DialysateFlowData ) \
-    REGISTER_METATYPE(                                               OutletFlowData ) \
-    REGISTER_METATYPE(                                            TreatmentTimeData ) \
-    REGISTER_METATYPE(                                        PressureOcclusionData ) \
-    REGISTER_METATYPE(                                              AlarmStatusData ) \
-    REGISTER_METATYPE(                                              AlarmStatusFlag ) \
-    REGISTER_METATYPE(                                                 PowerOffData ) \
-    REGISTER_METATYPE(                                          TreatmentRangesData ) \
-    REGISTER_METATYPE(                             AdjustBloodDialysateResponseData ) \
-    REGISTER_METATYPE(                                   AdjustDurationResponseData )
+#define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS                                                 \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustBloodDialysateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                               AdjustDurationRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                   AdjustUltrafiltrationStateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustUltrafiltrationEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                 AdjustUltrafiltrationConfirmRequestData )
 //--------------------------------------------------------------------------------//
-#define ACTION_RECEIVE_INTERPRETER_CONNECTIONS                                        \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                    BloodFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                DialysateFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                   OutletFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                TreatmentTimeData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,            PressureOcclusionData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                  AlarmStatusData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                     PowerOffData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,              TreatmentRangesData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,       AdjustDurationResponseData )
+#define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT                                          \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustBloodDialysateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        AdjustDurationRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(            AdjustUltrafiltrationStateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustUltrafiltrationEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          AdjustUltrafiltrationConfirmRequestData )
 //--------------------------------------------------------------------------------//
-#define ACTION_RECEIVE_SIGNALS                                                        \
-    ACTION_RECEIVE_SIGNAL(                                            BloodFlowData ) \
-    ACTION_RECEIVE_SIGNAL(                                        DialysateFlowData ) \
-    ACTION_RECEIVE_SIGNAL(                                           OutletFlowData ) \
-    ACTION_RECEIVE_SIGNAL(                                        TreatmentTimeData ) \
-    ACTION_RECEIVE_SIGNAL(                                    PressureOcclusionData ) \
-    ACTION_RECEIVE_SIGNAL(                                          AlarmStatusData ) \
-    ACTION_RECEIVE_SIGNAL(                                             PowerOffData ) \
-    ACTION_RECEIVE_SIGNAL(                                      TreatmentRangesData ) \
-    ACTION_RECEIVE_SIGNAL(                         AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                               AdjustDurationResponseData )
+#define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC                                          \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                  AdjustBloodDialysateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        AdjustDurationRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(            AdjustUltrafiltrationStateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustUltrafiltrationEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          AdjustUltrafiltrationConfirmRequestData )
+//===============================================================================//
+#define ACTION_RECEIVE_SIGNALS                                                                  \
+    ACTION_RECEIVE_SIGNAL(                                                      BloodFlowData ) \
+    ACTION_RECEIVE_SIGNAL(                                                  DialysateFlowData ) \
+    ACTION_RECEIVE_SIGNAL(                                                     OutletFlowData ) \
+    ACTION_RECEIVE_SIGNAL(                                                  TreatmentTimeData ) \
+    ACTION_RECEIVE_SIGNAL(                                              PressureOcclusionData ) \
+    ACTION_RECEIVE_SIGNAL(                                                    AlarmStatusData ) \
+    ACTION_RECEIVE_SIGNAL(                                                       PowerOffData ) \
+    ACTION_RECEIVE_SIGNAL(                                                TreatmentRangesData ) \
+                                                                                                \
+    ACTION_RECEIVE_SIGNAL(                                               LoadCellReadingsData ) \
+    ACTION_RECEIVE_SIGNAL(                                             TemperatureSensorsData ) \
+                                                                                                \
+    ACTION_RECEIVE_SIGNAL(                             AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                   AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                         AdjustDurationResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationEditResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                           AdjustUltrafiltrationConfirmResponseData )
 //--------------------------------------------------------------------------------//
 //--------------------------------------------------------------------------------//