Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -raa0772fe1b0ff6b07e9f64e8c38acad66ad5468d -rd2035a8728794afeefaa244bf8d1597926d945f5
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision aa0772fe1b0ff6b07e9f64e8c38acad66ad5468d)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision d2035a8728794afeefaa244bf8d1597926d945f5)
@@ -1,15 +1,16 @@
 /*!
- *
+ * 
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- * \copyright                                                       \n
- *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,  \n
- *          IN PART OR IN WHOLE,                                    \n
- *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
- *
- * \file    SettingsHome.qml
- * \date    2019/10/21
- * \author  Behrouz NematiPour
- *
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ * 
+ * \file SettingsHome.qml
+ * \author (last) Peter Lucia
+ * \date (last) 01-Jul-2020
+ * \author (original) Behrouz NematiPour
+ * \date (original) 21-Oct-2019
+ * 
  */
 
 // Qt
@@ -27,7 +28,6 @@
  * which is the default screen in the "Settings" stack
  */
 ScreenItem { id: _root
-
     Text { id : _titleText
         visible: true
         anchors {
@@ -50,18 +50,6 @@
             rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
         }
     }
-
-    ExportButton { id: _exportButton
-        width: 150
-        height: 50
-        anchors {
-            top         : parent.top
-            right       : _poweroffButton.left
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
-        }
-    }
-
     TouchRect { id : _poweroffButton
         width: 150
         height: Variables.logoHeight
@@ -76,31 +64,13 @@
         button.onPressed: {
             _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData)
         }
-    }
-
-    Text { id : _canbusFaultCountText
-        property int count: 0
-        visible: true
-        anchors {
-            top         : parent.top
-            left        : parent.left
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            leftMargin  : (Variables.headerHeight - Variables.logoHeight) / 2
-        }
-        text: qsTr("CAN Faults : %1").arg(count)
-        horizontalAlignment: Text.AlignLeft
-        color: Colors.textMain
-        font.pixelSize: Fonts.fontPixelTitle
-    }
-
     Connections { target: _GuiView
         onDidActionReceive: {
             if (vAction === GuiActions.ID_CANBusFaultCount ) {
                 _canbusFaultCountText.count = vData[0]
             }
         }
     }
-
     Column { id: _BloodFlowColumn
         width       : 150
         spacing     : 20
@@ -114,27 +84,6 @@
             color: Colors.textMain
             font.pixelSize: Fonts.fontPixelTitle
             font.underline: true
-        }
-        Repeater {
-            model: [
-                      vTreatmentBloodFlow.bloodFlow_FlowSetPoint                 ,
-                      vTreatmentBloodFlow.bloodFlow_MeasuredFlow     .toFixed(2) ,
-                      vTreatmentBloodFlow.bloodFlow_RotorSpeed       .toFixed(2) ,
-                      vTreatmentBloodFlow.bloodFlow_MotorSpeed       .toFixed(2) ,
-                      vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed    .toFixed(2) ,
-                      vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent  .toFixed(2) ,
-                "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle     .toFixed(2)
-            ]
-            Text {
-                text: modelData
-                width: _BloodFlowColumn.width
-                horizontalAlignment: Text.AlignRight
-                color: Colors.textMain
-                font.pixelSize: Fonts.fontPixelTitle
-            }
-        }
-    }
-
     Column { id: _DialysateInletFlowColumn
         width       : 150
         spacing     : 20
@@ -168,7 +117,6 @@
             }
         }
     }
-
     Column { id: _DialysateOutletFlowColumn
         width       : 150
         spacing     : 20
@@ -261,3 +209,34 @@
         }
     }
 }
+
+/*
+    TitleText { id: _titleText
+        anchors.horizontalCenter: parent.horizontalCenter;
+        anchors.top: parent.top
+        anchors.topMargin: 150
+
+        width: parent.width
+        text: qsTr("Device Settings")
+
+
+    }
+
+    Diagnostics {
+        id: _diagnostics
+        onBackClicked: pop()
+    }
+
+    Column {
+        anchors.centerIn: parent;
+
+        // add each settings page here.
+        SettingsItem { id: _item_diagnostics
+            title   : qsTr("Diagnostics")
+            onClicked: push(_diagnostics);
+        }
+    }
+*/
+
+
+