Index: denali.pro
===================================================================
diff -u -r5b68ba0e456eb8667195ce78d280868c389310ea -r0496c87b453757b962366a43bb4dce9b7941ec13
--- denali.pro (.../denali.pro) (revision 5b68ba0e456eb8667195ce78d280868c389310ea)
+++ denali.pro (.../denali.pro) (revision 0496c87b453757b962366a43bb4dce9b7941ec13)
@@ -120,6 +120,7 @@
sources/device/DeviceController.h \
sources/storage/Settings.h \
sources/storage/TreatmentLog.h \
+ sources/view/settings/VAdjustmentInstitutionalRecord.h \
sources/wifi/WifiInterface.h \
sources/bluetooth/BluetoothInterface.h \
sources/cloudsync/CloudSyncController.h \
@@ -146,6 +147,7 @@
sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \
sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \
sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \
+ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \
sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \
\ # ---------- Models - Alarm
sources/model/hd/alarm/MAlarmStatusData.h \
@@ -398,6 +400,7 @@
sources/storage/Settings.cpp \
sources/storage/TreatmentLog.cpp \
sources/view/hd/data/post/VHDPOSTData.cpp \
+ sources/view/settings/VAdjustmentInstitutionalRecord.cpp \
sources/wifi/WifiInterface.cpp \
sources/bluetooth/BluetoothInterface.cpp \
sources/cloudsync/CloudSyncController.cpp \
@@ -421,6 +424,7 @@
sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp \
sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \
sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \
+ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \
sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \
\ # ---------- Models - Alarm
sources/model/hd/alarm/MAlarmStatusData.cpp \
Index: denali.qrc
===================================================================
diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -r0496c87b453757b962366a43bb4dce9b7941ec13
--- denali.qrc (.../denali.qrc) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f)
+++ denali.qrc (.../denali.qrc) (revision 0496c87b453757b962366a43bb4dce9b7941ec13)
@@ -33,6 +33,7 @@
sources/gui/qml/dialogs/NotificationDialog.qml
sources/gui/qml/dialogs/AlarmListDialog.qml
sources/gui/qml/dialogs/DiagnosticsDialog.qml
+ sources/gui/qml/dialogs/StatusDialog.qml
resources/images/Logo d.png
@@ -70,6 +71,10 @@
resources/images/chevron-left.png
resources/images/chevron-right.png
resources/images/DenaliDevice.png
+ resources/images/BTLogoNotConnected.png
+ resources/images/BTLogoConnected.png
+ resources/images/WifiLogoConnected.png
+ resources/images/WifiLogoNotConnected.png
sources/gui/qml/components/MainMenu.qml
@@ -147,6 +152,8 @@
sources/gui/qml/KeyboardItem.qml
sources/gui/qml/SDCProgressItem.qml
sources/gui/qml/USBProgressItem.qml
+ sources/gui/qml/BluetoothStatusIndicator.qml
+ sources/gui/qml/WifiStatusIndicator.qml
sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/backspace.svg
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -r0496c87b453757b962366a43bb4dce9b7941ec13
--- sources/gui/qml/main.qml (.../main.qml) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 0496c87b453757b962366a43bb4dce9b7941ec13)
@@ -300,21 +300,6 @@
font.pixelSize: 14
}
- Text { // TEST : Wireless IP
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 325
- }
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
-
- height : 15
- text : "W:" + vNetwork.wirelessIP
- font.pixelSize: 15
- }
-
Text { // TEST : Ethernet IP
color : Colors.textMain
anchors {
@@ -330,21 +315,6 @@
font.pixelSize: 15
}
- Text { // TEST : BluetoothStatus
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 615
- }
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
-
- height : 15
- text : "B:" + vBluetooth.pairedAddr
- font.pixelSize: 14
- }
-
Text { // TEST : The treatment vital dialog countdown time
color : Colors.textMain
anchors {
@@ -364,8 +334,10 @@
color : Colors.textMain
anchors {
top : parent.top
- left : parent.left
- leftMargin : 1080
+ topMargin : 10
+
+ right : parent.right
+ rightMargin : 75
}
horizontalAlignment : Text.Alignleft
verticalAlignment : Text.AlignBottom
@@ -379,8 +351,10 @@
color : Colors.textMain
anchors {
top : parent.top
- left : parent.left
- leftMargin : 1220
+ topMargin : 10
+
+ right : parent.right
+ rightMargin : 25
}
horizontalAlignment : Text.Alignleft
verticalAlignment : Text.AlignBottom
@@ -390,8 +364,32 @@
font.pixelSize: 14
}
+ WifiStatusIndicator { id: _wifiStatusIndicator
+ anchors {
+ top : parent.top
+ topMargin : 5
+
+ right : _bluetoothStatusIndicator.right
+ rightMargin : 50
+ }
+ }
+ BluetoothStatusIndicator { id: _bluetoothStatusIndicator
+ anchors {
+ top : parent.top
+ right : parent.right
+ topMargin : 5
+ rightMargin : 300
+ }
+ }
+
SDCProgressItem { id: _sdcProgressItem
// TODO: disable this later. this is only for diagnostic purpose.
+ anchors {
+ top : parent.top
+ right : parent.right
+ topMargin : 5
+ rightMargin : 250
+ }
onDoubleClicked : {
if ( _GuiView.dryDemoMode ) {
let dryDemoTempID = 99
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r83f16184cf4674dc517cf474ad06e6c6282f1598 -r0496c87b453757b962366a43bb4dce9b7941ec13
--- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 83f16184cf4674dc517cf474ad06e6c6282f1598)
+++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 0496c87b453757b962366a43bb4dce9b7941ec13)
@@ -290,7 +290,7 @@
/*0254*/case GuiAlarmID::ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC : { result = QObject::tr("DG invalid service record." ); break; } /* 254*/
/*0255*/case GuiAlarmID::ALARM_ID_HD_UI_COMPATIBILITY_ERROR : { result = QObject::tr("HD and UI software builds are not compatible." ); break; } /* 255*/
/*0256*/case GuiAlarmID::ALARM_ID_HD_DISINFECT_CHEM_FLUSH : { result = QObject::tr("HD processor is in Disinfect Chemical Flush mode." ); break; } /* 256*/
-/*0257*/case GuiAlarmID::ALARM_ID_AVAILABLE_8 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 257*/
+/*0257*/case GuiAlarmID::ALARM_ID_HD_INVALID_INSTITUTIONAL_RECORD_CRC : { result = QObject::tr("HD invalid institutional record." ); break; } /* 257*/
/*0258*/case GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_OS_VERSION : { result = QObject::tr("HD UI POST OS version compatibility failure." ); break; } /* 258*/
/*0259*/case GuiAlarmID::ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE : { result = QObject::tr("HD temperatures out of range." ); break; } /* 259*/
/*0260*/case GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SHASUM : { result = QObject::tr("HD UI POST Application Integrity (Sha256Sum) failure." ); break; } /* 260*/