Index: leahi.pro
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rded3d6d362defda4ee133b06c478e8633e551acf
--- leahi.pro	(.../leahi.pro)	(revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ leahi.pro	(.../leahi.pro)	(revision ded3d6d362defda4ee133b06c478e8633e551acf)
@@ -266,6 +266,7 @@
     sources/view/fp/data/VFPTemperatureData.h \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
     sources/view/settings/VAdvancedInstitutionalRecord.h \
+    sources/view/settings/VCalibrationSettings.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
     sources/view/td/data/VTDAirBubbleData.h \
     sources/view/td/data/VTDAirPumpData.h \
@@ -744,6 +745,7 @@
     \ # ---------- Views - TD - States Data
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
     sources/view/settings/VAdvancedInstitutionalRecord.cpp \
+    sources/view/settings/VCalibrationSettings.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
     sources/view/td/data/VTDAirBubbleData.cpp \
     sources/view/td/data/VTDAirPumpData.cpp \
Index: leahi.qrc
===================================================================
diff -u -r456da384df52c20ce45b2bec4317806ee11af1f6 -rded3d6d362defda4ee133b06c478e8633e551acf
--- leahi.qrc	(.../leahi.qrc)	(revision 456da384df52c20ce45b2bec4317806ee11af1f6)
+++ leahi.qrc	(.../leahi.qrc)	(revision ded3d6d362defda4ee133b06c478e8633e551acf)
@@ -30,6 +30,7 @@
         <file alias="SettingsAdvancedMode.qml">sources/gui/qml/pages/settings/SettingsAdvancedMode.qml</file>
         <file alias="SettingsFeatureConfigurations.qml">sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml</file>
         <file alias="SettingsAdvancedInstitutional.qml">sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml</file>
+        <file alias="SettingsCalibrationSettings.qml">sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml</file>
     </qresource>
     <qresource prefix="/dialogs">
         <file alias="ConfirmDialog.qml">sources/gui/qml/dialogs/ConfirmDialog.qml</file>
@@ -45,6 +46,7 @@
         <file alias="AlarmDialog.qml">sources/gui/qml/dialogs/AlarmDialog.qml</file>
         <file alias="DryDemoDialog.qml">sources/gui/qml/dialogs/DryDemoDialog.qml</file>
         <file alias="ConfirmPasswordDialog.qml">sources/gui/qml/dialogs/ConfirmPasswordDialog.qml</file>
+        <file alias="CalibrationDialog.qml">sources/gui/qml/dialogs/CalibrationDialog.qml</file>
     </qresource>
     <qresource prefix="/dialogs/diagnostics">
         <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml</file>
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rded3d6d362defda4ee133b06c478e8633e551acf
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision ded3d6d362defda4ee133b06c478e8633e551acf)
@@ -80,8 +80,8 @@
     {Gui::GuiActionType::ID_Ultrafiltration                         ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_IsolatedUF                              ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_Heparin                                 ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_Rinseback                               ,   6 * 4       }, // 6 parameters each 4bytes
-    {Gui::GuiActionType::ID_Recirculate                             ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_Rinseback                               ,   7 * 4       }, // 6 parameters each 4bytes
+    {Gui::GuiActionType::ID_Recirculate                             ,   1 * 4       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_BloodPrime                              ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_TreatmentStop                           ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_TDAirBubbleData                         ,   2 * 4       }, // 2 parameters each 4bytes
Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rded3d6d362defda4ee133b06c478e8633e551acf
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision ded3d6d362defda4ee133b06c478e8633e551acf)
@@ -75,7 +75,7 @@
  */
 void View::VAlarmStatus::doUserActionTemporaryBreak() {
     AlarmUserActionRequestData data;
-    data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_TEMPOARY_BREAK;
+    data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_TEMPORARY_BREAK;
     emit didAdjustment(data);
 }