Index: leahi.pro
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- leahi.pro (.../leahi.pro) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ leahi.pro (.../leahi.pro) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -131,6 +131,11 @@
\ # Controllers
sources/ApplicationController.h \
sources/device/DeviceController.h \
+ sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h \
+ sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.h \
+ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h \
+ sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.h \
+ sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.h \
sources/storage/Settings.h \
sources/storage/TreatmentLog.h \
sources/bluetooth/BluetoothInterface.h \
@@ -158,8 +163,6 @@
sources/model/settings/MBluetooth.h \
sources/model/ui/data/MUIBloodPressureData.h \
sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \
- sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \
- 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 \
@@ -178,8 +181,6 @@
sources/model/hd/adjustment/MAdjustPowerOff.h \
sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
\ # ---------- Models - HD - Adjustment - Settings
- sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h \
- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \
sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \
sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \
\ # ---------- Models - HD - Adjustment - Pre-Treatment
@@ -227,7 +228,14 @@
sources/model/hd/data/MHDAccelerometerData.h \
sources/model/hd/data/MHDSyringePumpData.h \
sources/model/hd/data/MHDAirBubbleData.h \
- sources/model/hd/data/MHDAirTrapData.h \
+ sources/model/hd/data/MTDAirTrapData.h \
+ sources/model/hd/data/MTDBloodPumpData.h \
+ sources/model/hd/data/MTDVoltageData.h \
+ sources/model/hd/data/MTDTemperatureData.h \
+ sources/model/hd/data/MTDValvesData.h \
+ sources/model/hd/data/MTDBatteryData.h \
+ sources/model/hd/data/MTDSwitchesData.h \
+ sources/model/hd/data/MTDEjectorData.h \
sources/model/hd/data/MHDBloodLeakData.h \
sources/model/hd/data/MTreatmentRangesData.h \
sources/model/hd/data/treatment/MTreatmentTimeData.h \
@@ -251,7 +259,6 @@
sources/model/dg/adjustment/settings/MAdjustDGRequests.h \
sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \
\ # ---------- Models - DG - Adjustment - Settings
- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \
sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \
\ # ---------- Models - DG - Data - Pre-Treatment - Progress
sources/model/dg/data/pretreatment/MDGFilterFlushData.h \
@@ -294,6 +301,12 @@
\ # ---------- Views - POST
sources/view/dg/data/post/VDGPOSTData.h \
\ # ---------- Views - Settings
+ sources/view/hd/data/VTDBatteryData.h \
+ sources/view/hd/data/VTDBloodPumpData.h \
+ sources/view/hd/data/VTDEjectorData.h \
+ sources/view/hd/data/VTDSwitchesData.h \
+ sources/view/hd/data/VTDTemperatureData.h \
+ sources/view/hd/data/VTDValvesData.h \
sources/view/settings/VDateTime.h \
sources/view/settings/VSettings.h \
sources/view/settings/VLocalization.h \
@@ -356,9 +369,10 @@
sources/view/hd/data/VHDAccelerometerData.h \
sources/view/hd/data/VHDSyringePumpData.h \
sources/view/hd/data/VHDAirBubbleData.h \
- sources/view/hd/data/VHDAirTrapData.h \
sources/view/hd/data/VHDBloodLeakData.h \
sources/view/hd/data/VTreatmentRanges.h \
+ sources/view/hd/data/VTDAirTrapData.h \
+ sources/view/hd/data/VTDVoltageData.h \
sources/view/hd/data/treatment/VTreatmentTime.h \
sources/view/hd/data/treatment/VTreatmentBloodFlow.h \
sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \
@@ -409,9 +423,20 @@
\ # Controllers
sources/ApplicationController.cpp \
sources/device/DeviceController.cpp \
+ sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \
+ sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.cpp \
+ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \
+ sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp \
+ sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.cpp \
sources/model/ui/data/MUIBloodPressureData.cpp \
sources/storage/Settings.cpp \
sources/storage/TreatmentLog.cpp \
+ sources/view/hd/data/VTDBatteryData.cpp \
+ sources/view/hd/data/VTDBloodPumpData.cpp \
+ sources/view/hd/data/VTDEjectorData.cpp \
+ sources/view/hd/data/VTDSwitchesData.cpp \
+ sources/view/hd/data/VTDTemperatureData.cpp \
+ sources/view/hd/data/VTDValvesData.cpp \
sources/view/hd/data/post/VHDPOSTData.cpp \
sources/bluetooth/BluetoothInterface.cpp \
sources/cloudsync/CloudSyncController.cpp \
@@ -433,8 +458,6 @@
sources/model/settings/MSettings.cpp \
sources/model/settings/MBluetooth.cpp \
sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \
- sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \
- 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 \
@@ -452,8 +475,6 @@
\ # ---------- Models - HD - Adjustment
sources/model/hd/adjustment/MAdjustPowerOff.cpp \
\ # ---------- Models - HD - Adjustment - Settings
- sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp \
- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \
sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \
sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \
\ # ---------- Models - HD - Adjustment - Pre-Treatment
@@ -492,7 +513,14 @@
sources/model/hd/data/MHDAccelerometerData.cpp \
sources/model/hd/data/MHDSyringePumpData.cpp \
sources/model/hd/data/MHDAirBubbleData.cpp \
- sources/model/hd/data/MHDAirTrapData.cpp \
+ sources/model/hd/data/MTDAirTrapData.cpp \
+ sources/model/hd/data/MTDBloodPumpData.cpp \
+ sources/model/hd/data/MTDVoltageData.cpp \
+ sources/model/hd/data/MTDTemperatureData.cpp \
+ sources/model/hd/data/MTDValvesData.cpp \
+ sources/model/hd/data/MTDBatteryData.cpp \
+ sources/model/hd/data/MTDSwitchesData.cpp \
+ sources/model/hd/data/MTDEjectorData.cpp \
sources/model/hd/data/MHDBloodLeakData.cpp \
sources/model/hd/data/MTreatmentRangesData.cpp \
sources/model/hd/data/treatment/MTreatmentTimeData.cpp \
@@ -518,7 +546,6 @@
sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \
\ # ---------- Models - DG - Adjustment
\ # ---------- Models - DG - Adjustment - Settings
- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \
sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \
sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \
\ # ---------- Models - DG - Data - Pre-Treatment - Progress
@@ -619,8 +646,9 @@
sources/view/hd/data/VHDAccelerometerData.cpp \
sources/view/hd/data/VHDSyringePumpData.cpp \
sources/view/hd/data/VHDAirBubbleData.cpp \
- sources/view/hd/data/VHDAirTrapData.cpp \
sources/view/hd/data/VHDBloodLeakData.cpp \
+ sources/view/hd/data/VTDAirTrapData.cpp \
+ sources/view/hd/data/VTDVoltageData.cpp \
\ # ---------- Views - HD - Data - Pre-Treatment
sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \
sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \
Index: leahi.pro.user
===================================================================
diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- leahi.pro.user (.../leahi.pro.user) (revision a245272e6d8eee5c3658245570b6d31bd039af74)
+++ leahi.pro.user (.../leahi.pro.user) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -529,6 +529,7 @@
/opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux
/opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux
/opt/b2qt/3.1.18/sysroots
+ /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux
/opt/b2qt/3.1.18/sysroots
/opt/b2qt/3.1.18/sysroots
/opt/b2qt/3.1.18/sysroots
@@ -539,12 +540,12 @@
/opt/b2qt/3.1.18/sysroots
/opt/b2qt/3.1.18/sysroots
/opt/b2qt/3.1.18/sysroots
- /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux
/opt/b2qt/3.1.18/sysroots
- /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux
/opt/b2qt/3.1.18/sysroots
- /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux
/opt/b2qt/3.1.18/sysroots
+ /opt/b2qt/3.1.18/sysroots
+ /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux
+ /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux
2023-01-27T10:15:15.423
@@ -563,7 +564,7 @@
2023-02-02T02:30:48.337
2023-02-02T01:52:20.307
2023-01-18T17:47:08.797
- 2023-02-02T09:06:00.862
+ 2023-02-01T03:23:15.710
2023-01-17T18:18:03.749
2023-02-01T03:23:15.710
@@ -584,7 +585,7 @@
2023-02-02T02:31:01.000
2023-02-02T01:52:16.000
2023-01-18T17:47:04.000
- 2023-02-02T09:05:22.000
+ 2023-02-01T03:23:28.000
2023-01-17T18:17:25.000
2023-02-01T03:23:28.000
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r5f69bb944ed9b2186528f726def2630544bd0de6 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5f69bb944ed9b2186528f726def2630544bd0de6)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -51,7 +51,7 @@
// ----
{Gui::GuiActionType::ID_PowerOff , 1 }, // 1 byte
{Gui::GuiActionType::ID_ShuttingDown , 0 },
- {Gui::GuiActionType::ID_TDCheckIn , 255 }, // 0 => 255 to be able to run a multi-frame test.
+ {Gui::GuiActionType::ID_TDCheckIn , 0 }, //// ----- @LEAHIZED
// Generic Confirm
{Gui::GuiActionType::ID_DuetConfirmHDi , 3 * 4 }, // 3 parameters each 4bytes
@@ -86,7 +86,7 @@
{Gui::GuiActionType::ID_TDAirTrapData , 6 * 4 }, // 6 parameters each 4bytes
{Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes
// ----
- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes
+ {Gui::GuiActionType::ID_TDOpModeData , 2 * 4 }, // 2 parameter each 4bytes
{Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes
{Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, //10 parameters each 4bytes
{Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes
@@ -117,7 +117,7 @@
{Gui::GuiActionType::ID_TDTemperatureData , 1 * 4 }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
// ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE.
- {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes
+ {Gui::GuiActionType::ID_AlarmStatus , 4 * 3 + 2 }, // 3 parameters each 4bytes + 1 parameter 2bytes
{Gui::GuiActionType::ID_AlarmTriggered , 8 * 4 }, // 5 parameters each 4bytes
{Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes
{Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameter each 1bytes
@@ -233,10 +233,10 @@
// ---- Versions
{Gui::GuiActionType::ID_AdjustVersionsUIReq ,1+1+1+2+4 }, // variable length parameters
- {Gui::GuiActionType::ID_AdjustVersionsTDRsp ,3*1+2+4*1+4 }, // variable length parameters
- {Gui::GuiActionType::ID_AdjustVersionsDDRsp ,3*1+2+4*1+4 }, // variable length parameters
- {Gui::GuiActionType::ID_AdjustSerialTDRsp , 1 * 1 }, // minimum 1 parameter 1 byte
- {Gui::GuiActionType::ID_AdjustSerialDDRsp , 1 * 1 }, // minimum 1 parameter 1 byte
+ {Gui::GuiActionType::ID_AdjustVersionsHDRsp ,3*1+2+4*1+4 }, // variable length parameters
+ {Gui::GuiActionType::ID_AdjustVersionsDGRsp ,3*1+2+4*1+4 }, // variable length parameters
+ {Gui::GuiActionType::ID_AdjustSerialHDRsp , 1 * 1 }, // minimum 1 parameter 1 byte
+ {Gui::GuiActionType::ID_AdjustSerialDGRsp , 1 * 1 }, // minimum 1 parameter 1 byte
// ----
{Gui::GuiActionType::ID_AdjustVersionsTDReq , 0 * 4 }, // 0 parameter
{Gui::GuiActionType::ID_AdjustVersionsUIRsp ,1+1+1+2+4 }, // variable length parameters
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r5f69bb944ed9b2186528f726def2630544bd0de6 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5f69bb944ed9b2186528f726def2630544bd0de6)
+++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -469,7 +469,7 @@
case Gui::GuiActionType::ID_HDUsageInfoRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp ); break;
case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp ); break;
// ----- States
- case Gui::GuiActionType::ID_HDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData ); break;
+ case Gui::GuiActionType::ID_TDOpModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDOpModeData ); break;
case Gui::GuiActionType::ID_PreTreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates ); break;
case Gui::GuiActionType::ID_TreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates ); break;
case Gui::GuiActionType::ID_PostTreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PostTreatmentStates ); break;
@@ -579,7 +579,7 @@
vData.clear();
switch (vMessage.actionId) { // notice we are in receive mode
case Gui::GuiActionType::ID_Acknow : ok = true; /* TODO : implement notify<>() */ break;
- LOG_APPED(QString("DG,CheckIn," + QVariant(vData).toStringList().join(','))); break;
+ LOG_APPED(QString("DD,CheckIn," + QVariant(vData).toStringList().join(','))); break;
// ----- POST
case Gui::GuiActionType::ID_DGPostSingleResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostSingleResultData ); break;
case Gui::GuiActionType::ID_DGPostFinalResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostFinalResultData ); break;
@@ -724,24 +724,25 @@
*/
bool MessageInterpreter::logUnhandledMessage(const Message &vMessage) const {
bool ok = false;
- quint16 id = vMessage.actionId;
- QString logString = QString("%1,").arg(id,4,16);
- if (_messageList.contains(id)) {
+ quint16 msg_id = vMessage.actionId;
+ QString logString = QString("%1,").arg(msg_id,4,16);
+ QString can_id;
+ QString item = "";
+
+ identifySource(vMessage.can_id, &can_id); // Message Can Channel.
+ logString += can_id + ",";
+ // qDebug() << __FUNCTION__ << logString;
+
+ if (_messageList.contains(msg_id)) {
ok = true;
- QStringList items = _messageList[id];
+ QStringList items = _messageList[msg_id];
int index = 0;
for ( int i = 0; i < items.count(); i++ ) {
- QString item = items[i];
- if (i == 0) {
- QString ID;
- switch (identifySource(vMessage.can_id, &ID)) {
- case Can_Source::eCan_TD: logString += ID + ",~" + item; break;
- case Can_Source::eCan_DD: logString += ID + ",~" + item; break;
- case Can_Source::eCan_DI: logString += ID + ",~" + item; break;
- default : logString += ID + ",~" + item; break;
- }
+ item = items[i];
+ if (i == 0) { // Message Name/Identifier
+ logString += "~" + item;
}
- else {
+ else { // Message payload data
if ( item == "F32" ) {
Types::F32 param;
if (! GetValue(vMessage.data, index, param )) logString += ",?";
@@ -784,12 +785,12 @@
}
}
}
- LOG_APPED(logString);
}
else {
if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return.
- LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(id, 0, 16));
+ LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(msg_id, 0, 16));
}
}
+ LOG_APPED(logString + item);
return ok;
}
Index: sources/cloudsync/CloudSyncController.cpp
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -782,8 +782,8 @@
}
break;
- case GuiActionType::ID_AdjustSerialHDRsp :
- case GuiActionType::ID_AdjustSerialDGRsp :
+ case GuiActionType::ID_AdjustSerialTDRsp :
+ case GuiActionType::ID_AdjustSerialDDRsp :
// this message is not complete in one step and saves only the received info and waits for the other if complete will send.
saveDeviceInfo(vAction, vData);
break;
@@ -1237,14 +1237,14 @@
// if both values received
initDeviceInfoWait();
- if ( vAction == GuiActionType::ID_AdjustSerialHDRsp ) {
+ if ( vAction == GuiActionType::ID_AdjustSerialTDRsp ) {
if ( vData.count() ) {
_deviceInfoHD = vData[eDeviceInfo_Ix].toString();
} else {
_deviceInfoHD = "";
}
}
- if ( vAction == GuiActionType::ID_AdjustSerialDGRsp ) {
+ if ( vAction == GuiActionType::ID_AdjustSerialDDRsp ) {
if ( vData.count() ) {
_deviceInfoDG = vData[eDeviceInfo_Ix].toString();
} else {
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -89,7 +89,14 @@
#include "VHDSyringePumpData.h"
#include "VHDBloodLeakData.h"
#include "VHDAirBubbleData.h"
-#include "VHDAirTrapData.h"
+#include "VTDAirTrapData.h"
+#include "VTDVoltageData.h"
+#include "VTDBloodPumpData.h"
+#include "VTDValvesData.h"
+#include "VTDBatteryData.h"
+#include "VTDSwitchesData.h"
+#include "VTDEjectorData.h"
+#include "VTDTemperatureData.h"
// DG data
#include "VDGDrainPumpData.h"
#include "VDGHeatersData.h"
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r5f69bb944ed9b2186528f726def2630544bd0de6 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5f69bb944ed9b2186528f726def2630544bd0de6)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -117,22 +117,21 @@
ID_AdjustHDDateTimeRsp = 0x6E00, // 110
ID_AdjustDGDateTimeReq = 0x6F00, // 111
ID_AdjustDGDateTimeRsp = 0x7000, // 112
- ID_HDRTCEpochData = 0x0A00, // 10
+ ID_HDRTCEpochData = 0x0A0F, // 10 //// ----- @CRAPIZED
// State Messages
- ID_HDOperationModeData = 0x1200, // 18 //// ----- @LEAHIZED
+ ID_TDOpModeData = 0x1200, // 18 //// ----- @LEAHIZED
ID_PreTreatmentStates = 0x5C00, // 92
ID_TreatmentStates = 0x0F0F, // 15 //// ----- @CRAPIZED: had to change to avoid duplication
ID_PostTreatmentStates = 0x7700, // 119
// -----
- ID_PowerOff = 0x0100,
+ ID_PowerOff = 0x010F, // 010F //// ----- @CRAPIZED
ID_ShuttingDown = 0x0E0F, // 35 //// ----- @CRAPIZED: had to change to avoid duplication
ID_TreatmentTime = 0x0D0F, // //// ----- @CRAPIZED: had to change to avoid duplication
ID_BloodFlow = 0x0500,
ID_DialysateInletFlow = 0x0800,
ID_DialysateOutletFlow = 0x0B00,
- ID_TreatmentRanges = 0x1A00, // 26
ID_PressureOcclusion = 0x0900,
ID_Saline = 0x2F00, // 47
ID_Heparin = 0x4D00, // 77
@@ -142,24 +141,24 @@
ID_TreatmentStop = 0x4900, // 73
// Alarm Messages
- ID_AlarmStatus = 0x0200,
- ID_AlarmTriggered = 0x0300,
- ID_AlarmCleared = 0x0400,
- ID_AlarmSilenceReq = 0x3200, // 50
- ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD
- ID_AlarmActiveListReq = 0x9700, // 151
- ID_AlarmActiveListRsp = 0x9800, // 152
- ID_AlarmVolumeSetReq = 0x4E00, // 78
- ID_AlarmVolumeSetRsp = 0x7C00, // 124
+ ID_AlarmStatus = 0x0100, // 01 //// ----- @LEAHIZED
+ ID_AlarmTriggered = 0x0200, // 02 //// ----- @LEAHIZED
+ ID_AlarmCleared = 0x0300, // 03 //// ----- @LEAHIZED
+ ID_AlarmSilenceReq = 0x0500, // 05 //// ----- @LEAHIZED
+ ID_AlarmUserActionReq = 0x0600, // 06 //// ----- @LEAHIZED
+ ID_AlarmActiveListReq = 0x0900, // 09 //// ----- @LEAHIZED
+ ID_AlarmActiveListRsp = 0x0A00, // 10 //// ----- @LEAHIZED
+ ID_AlarmVolumeSetReq = 0x0B00, // 11 //// ----- @LEAHIZED
+ ID_AlarmVolumeSetRsp = 0x0C00, // 12 //// ----- @LEAHIZED
- // Pre-Treatment
- // Pre-Treatment Initiate Treatment
- ID_AdjustInitTreatmentReq = 0x3800, // 56
- ID_AdjustInitTreatmentRsp = 0x3900, // 57
- // Pre-Treatment Parameters Validation/Confirm
- ID_AdjustParametersValidationReq = 0x3500, // 53
- ID_AdjustParametersValidationRsp = 0x3600, // 54
- ID_AdjustParametersConfirmReq = 0x3B00, // 59
+ // Create Rx
+ ID_AdjustInitTreatmentReq = 0x4500, // 69 //// ----- @LEAHIZED
+ ID_AdjustInitTreatmentRsp = 0x4600, // 70 //// ----- @LEAHIZED
+ ID_AdjustParametersValidationReq = 0x3F00, // 63 //// ----- @LEAHIZED
+ ID_AdjustParametersValidationRsp = 0x4000, // 64 //// ----- @LEAHIZED
+ ID_AdjustParametersConfirmReq = 0x4400, // 68 //// ----- @LEAHIZED
+ ID_TreatmentRanges = 0x4300, // 67 //// ----- @LEAHIZED
+
// Pre-Treatment Water Sample
ID_DGFilterFlushData = 0x6000, // 96
ID_AdjustWaterSampleReq = 0x5D00, // 93
@@ -177,7 +176,7 @@
// Pre-Treatment Disposable Priming
ID_AdjustDisposablesPrimeReq = 0x3C00, // 60
ID_AdjustDisposablesPrimeRsp = 0x3D00, // 61
- ID_DisposablesPrimeData = 0x4300, // 67
+ ID_DisposablesPrimeData = 0x43FF, // ?? //// ----- @CRAPIZED - FFed
// Pre-Treatment Patient Connection Begin
ID_AdjustPatientConnectionBeginReq = 0x6400, // 100
ID_AdjustPatientConnectionBeginRsp = 0x6500, // 101
@@ -260,7 +259,7 @@
// Post-Treatment
// Patient Disconnect
ID_AdjustPatientDisconnectNotifyReq = 0x4A00, // 74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
- ID_AdjustPatientDisconnectConfirmReq = 0x0600, // 6
+ ID_AdjustPatientDisconnectConfirmReq = 0x060F, // 060f //// ----- @CRAPIZED
ID_AdjustPatientDisconnectConfirmRsp = 0x7E00, // 126
// Disposables Removal
Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -59,375 +59,170 @@
onClicked : close()
}
- DebugDataColumn { id: _DGROPumpColumn
- textObjectName :"_DGROPumpData"
- title : qsTr(" ROP ")
+ DebugDataColumn { id: _TDBloodPumpColumn
+ textObjectName :"_TDBloodPumpData"
+ title : qsTr(" BP ")
x: col(0)
y: row(0)
model: [
- vDGROPump.pressure .toFixed(2) ,
- vDGROPump.flowRate .toFixed(2) ,
- vDGROPump.pwm .toFixed(2) ,
- vDGROPump.state
- ]
- label: [
- "MaxPrs",
- "Flow" ,
- "PWM" ,
- "stt" ,
- ]
- }
+ vTDBloodPump.setFlow ,
+ vTDBloodPump.measFlow .toFixed(2) ,
+ vTDBloodPump.rotorSpeed .toFixed(2) ,
+ vTDBloodPump.motorSpeed .toFixed(2) ,
+ vTDBloodPump.currMotor .toFixed(2) ,
+ vTDBloodPump.setRPM .toFixed(2) ,
+ vTDBloodPump.pressureFlow ,
+ vTDBloodPump.rotationCount ,
+ vTDBloodPump.rotorHallState ,
- DebugDataColumn { id: _DGDrainPumpColumn
- textObjectName :"_DGDrainPumpData"
- title : qsTr(" DRP ")
- x: col(1)
- y: row(0)
- model: [
- vDGDrainPump.rpmi ,
- vDGDrainPump.dac ,
- vDGDrainPump.state ,
- vDGDrainPump.rpmo ,
- vDGDrainPump.targetFLPMO .toFixed(2) ,
- vDGDrainPump.currentA .toFixed(2) ,
- vDGDrainPump.direction ,
- vDGDrainPump.maxonRPM ,
]
label: [
- "TgtSpd",
- "DAC" ,
- "stt" ,
- "Spd" ,
- "tgt" ,
- "cur" ,
- "dir" ,
- "mxn" ,
+ "sFLow ",
+ "mFlow ",
+ "rSpd ",
+ "mSpd ",
+ "cMot ",
+ "RPM ",
+ "pFlow ",
+ "rCnt ",
+ "state ",
]
}
- DebugDataColumn { id: _DGPressuresColumn
- textObjectName :"_DGPressuresData"
- title : qsTr(" Prssr ")
- x: col(2)
+ DebugDataColumn { id: _TDAirTrapCoulumn
+ textObjectName :"_TDAirTrapData"
+ title : qsTr(" Air Trap ")
+ x: col(1.5)
y: row(0)
model: [
- vDGPressures.roInletPSI .toFixed(2) ,
- vDGPressures.roOutletPSI .toFixed(2) ,
- vDGPressures.drainInletPSI .toFixed(2) ,
- vDGPressures.drainOutletPSI .toFixed(2) ,
- vDGPressures.barometricPSI .toFixed(2) ,
+ vTDAirTrap.lowLevel ,
+ vTDAirTrap.upLevel ,
+ vTDAirTrap.lowLevelRaw ,
+ vTDAirTrap.upLevelRaw ,
+ vTDAirTrap.valveState ,
+ vTDAirTrap.controlling ,
]
label: [
- "PPi",
- "PPo",
- "PRd",
- "PDr",
- "bar",
+ "ATL",
+ "ATU",
+ "rATL",
+ "rATU",
+ "state",
+ "ctrl",
]
}
- DebugDataColumn { id: _DGReservoirColumn
- textObjectName :"_DGReservoirData"
- title : qsTr(" Rsrvr ")
+ DebugDataColumn { id: _TDValvesColumn
+ textObjectName :"_TDValvesData"
+ title : qsTr(" Vlv ")
x: col(3)
y: row(0)
model: [
- vDGReservoir.activeReservoir ,
- vDGReservoir.fillToVol ,
- vDGReservoir.drainToVol ,
- ]
- label: [
- "Act",
- "Fil",
- "Drn",
- ]
- }
+ vTDValves.valveId ,
+ vTDValves.state ,
+ vTDValves.posName ,
+ vTDValves.posCount ,
+ vTDValves.nextPos ,
- DebugDataColumn { id: _DGHeatersColumn
- textObjectName :"_DGHeatersData"
- title : qsTr(" Heatrs ")
- x: col(4)
- y: row(0)
- model: [
- vDGHeaters.mainPrimayHeaterDC .toFixed(2),
- vDGHeaters.smallPrimaryHeaterDC .toFixed(2),
- vDGHeaters.trimmerHeaterDC .toFixed(2),
]
label: [
- "HP1",
- "HP2",
- "HR" ,
+ "ID ",
+ "state ",
+ "Name ",
+ "Cnt ",
+ "nPos ",
]
}
- Text { id : _mouseEventCountText
- text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ )
- .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ )
- x: col(3.5)
- y: row(1.5)
- visible: true
- horizontalAlignment: Text.AlignLeft
- color: Colors.textMain
- font.pixelSize: Fonts.fontPixelDebugText
- MouseArea {
- anchors.fill: _mouseEventCountText
- onClicked: GuiEventSpy.doTouchReset()
- }
- }
-
- Text { id : _canbusFaultCountText
- property int count: 0
- text: qsTr("CANerr: %1").arg(count)
- x: col(5.0)
- y: row(1.5)
- visible: true
- horizontalAlignment: Text.AlignLeft
- color: Colors.textMain
- font.pixelSize: Fonts.fontPixelDebugText
- }
-
- DebugDataColumn { id: _DGLoadCellReadingsColumn
- textObjectName :"_DGLoadCellReadingsData"
- title : qsTr(" LoadCl ")
- x: col(5)
+ DebugDataColumn { id: _TDEjectorColumn
+ textObjectName :"_TDEjectorData"
+ title : qsTr(" Ejt ")
+ x: col(4.5)
y: row(0)
model: [
- vDGLoadCellReadings.reservoir1Prim .toFixed(2) ,
- vDGLoadCellReadings.reservoir1Bkup .toFixed(2) ,
- vDGLoadCellReadings.reservoir2Prim .toFixed(2) ,
- vDGLoadCellReadings.reservoir2Bkup .toFixed(2) ,
+ vTDEjector.state ,
+ vTDEjector.setSpeed .toFixed(2) ,
+
]
label: [
- "A1",
- "A2",
- "B1",
- "B2",
+ "state ",
+ "Spd " ,
]
}
- DebugDataColumn { id: _DGTemperaturesColumn
- textObjectName :"_DGTemperaturesData"
- title : qsTr(" Tmprtr ")
+ DebugDataColumn { id: _TDSwitchesColumn
+ textObjectName :"_TDSwitchesData"
+ title : qsTr(" Switches ")
x: col(6)
y: row(0)
model: [
- vDGTemperatures.inletPrimaryHeater .toFixed(2) ,
- vDGTemperatures.heatDisinfect .toFixed(2) ,
- vDGTemperatures.outletPrimaryHeater .toFixed(2) ,
- vDGTemperatures.conductivitySensor1 .toFixed(2) ,
- vDGTemperatures.conductivitySensor2 .toFixed(2) ,
- vDGTemperatures.outletRedundancy .toFixed(2) ,
- vDGTemperatures.inletDialysate .toFixed(2) ,
- vDGTemperatures.primaryHeaterThermoCouple .toFixed(2) ,
- vDGTemperatures.trimmerHeaterThermoCouple .toFixed(2) ,
- vDGTemperatures.primaryHeaterColdJunction .toFixed(2) ,
- vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) ,
- vDGTemperatures.primaryHeaterInternal .toFixed(2) ,
- vDGTemperatures.trimmerHeaterInternal .toFixed(2) ,
- vDGTemperatures.fpgaBoard .toFixed(2) ,
- vDGTemperatures.loadCellA1B1 .toFixed(2) ,
- vDGTemperatures.loadCellA2B2 .toFixed(2) ,
- vDGTemperatures.internalTHDORTD .toFixed(2) ,
- vDGTemperatures.internalTDIRTD .toFixed(2) ,
- vDGTemperatures.interalTHDRTD .toFixed(2) ,
- vDGTemperatures.internalCondSnsrTemp .toFixed(2) ,
- vDGTemperatures.baroTempSensor .toFixed(2) ,
- // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen
- //vDGTemperatures.dialysateInletMvngAvg .toFixed(2) ,
- //vDGTemperatures.redundantOutletMvngAvg .toFixed(2) ,
- ]
- label: [
- "TPi" ,
- "THd" ,
- "TPo" ,
- "TD1" ,
- "TD2" ,
- "TRo" ,
- "TDi" ,
- "HP.Trm",
- "HR.Trm",
- "HP.Cld",
- "HR.Cld",
- "HP.Int",
- "HR.Int",
- "fpga" ,
- "cell11",
- "cell22",
- "iTHDO" ,
- "iTDI" ,
- "iTHD" ,
- "iCond" ,
- "baro" ,
- // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen
- // TDiAvg,
- // TROAvg,
- ]
- }
+ vTDSwitches.door ,
- DebugDataColumn { id: _DGConductivityColumn
- textObjectName :"_DGConductivityData"
- title : qsTr(" Conduct ")
- x: col(3.7)
- y: row(3.2)
- model: [
- vDGConductivity.RORejectionRatio .toFixed(3),
- vDGConductivity.CPi .toFixed(1),
- vDGConductivity.CPo .toFixed(1),
- vDGConductivity.CD1 .toFixed(1),
- vDGConductivity.CD2 .toFixed(1),
- vDGConductivity.CPiRaw .toFixed(1),
- vDGConductivity.CPoRaw .toFixed(1),
- vDGConductivity.CD1Raw .toFixed(1),
- vDGConductivity.CD2Raw .toFixed(1),
- vDGConductivity.CPiSensorStatus .toFixed(1),
- vDGConductivity.CPoSensorStatus .toFixed(1),
- vDGConductivity.CD1SensorStatus .toFixed(1),
- vDGConductivity.CD2SensorStatus .toFixed(1),
]
label: [
- "ROrr" ,
- "CPi" ,
- "CPo" ,
- "CD1" ,
- "CD2" ,
- "CPir" ,
- "CPor" ,
- "CD1r" ,
- "CD2r" ,
- "CPis" ,
- "CPos" ,
- "CD1s" ,
- "CD2s" ,
+ "door ",
]
}
- DebugDataColumn { id: _HDAirColumn
- textObjectName :"_HDAirData"
- title : qsTr("Air Status")
- x: col(2.4)
- y: row(5.5)
- model: [
- vHDAirBubble .venousAirBubbleStatus ,
- vHDAirTrap .airTrapLowerLevel ,
- vHDAirTrap .airTrapUpperLevel ,
- vHDAirTrap .airTrapRawLowerLevel ,
- vHDAirTrap .airTrapRawUpperLevel ,
- ]
- label: [
- "ADV" ,
- "ATll" ,
- "ATul" ,
- "ATRll" ,
- "ATRul" ,
- ]
- }
- DebugDataColumn { id: _DGOperationModeColumn
- textObjectName :"_DGOperationModeData"
- title : qsTr(" DG Mode ")
- x: col(2.5)
- y: row(1.9)
- model: [
- vDGOperationMode.text ,
- ]
- fontPixelSizeText: Fonts.fontPixelDebugTitle
- }
-
- // --- HD ---
- DebugDataColumn { id: _HDBloodFlowColumn
- textObjectName :"_HDBloodFlowData"
- title : qsTr(" BP ")
+ DebugDataColumn { id: _TDBatteryCoulumn
+ textObjectName :"_TDBatterypData"
+ title : qsTr(" Battery ")
x: col(0)
- y: row(2.5)
+ y: row(3.5)
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) ,
- vTreatmentBloodFlow.bloodFlow_RotorCount .toFixed(2) ,
- vTreatmentBloodFlow.bloodFlow_PresFlow .toFixed(2) ,
+ vTDBattery.aCPower ,
+ vTDBattery.capacity ,
]
label: [
- "Tgt.Flow" ,
- "Msr.Flow" ,
- "Rot.Spd" ,
- "Mot.Spd" ,
- "MC.Spd" ,
- "MC.Cur" ,
- "PWM" ,
- "Rtr.Cnt" ,
- "Prs.Flow" ,
+ "AC ",
+ "cap ",
]
}
- DebugDataColumn { id: _HDDialysateInletFlowColumn
- textObjectName :"_HDDialysateInletFlowData"
- title : qsTr(" DPi ")
- x: col(1.2)
- y: row(2.5)
+ DebugDataColumn { id: _TDVoltageCoulumn
+ textObjectName :"_TDVoltageData"
+ title : qsTr(" Vol ")
+ x: col(1.5)
+ y: row(3.5)
model: [
- vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) ,
- vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) ,
- vTreatmentDialysateFlow.dialysateFlow_RotorSpeed .toFixed(2) ,
- vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) ,
- vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) ,
- vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent.toFixed(2) ,
- "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) ,
- vTreatmentDialysateFlow.dialysateFlow_RotorCount .toFixed(2) ,
- vTreatmentDialysateFlow.dialysateFlow_PresFlow .toFixed(2) ,
+ vTDVoltage.line_1_2V .toFixed(2) ,
+ vTDVoltage.line_3_3V .toFixed(2) ,
+ vTDVoltage.logic5V .toFixed(2) ,
+ vTDVoltage.sensors5V .toFixed(2) ,
+ vTDVoltage.line_24V .toFixed(2) ,
+ vTDVoltage.regen24V .toFixed(2) ,
+ vTDVoltage.fpgaAdcRef .toFixed(2) ,
+ vTDVoltage.presRef .toFixed(2) ,
+ vTDVoltage.fpgaVcc .toFixed(2) ,
+ vTDVoltage.fpgaVaux .toFixed(2) ,
+ vTDVoltage.fpgaVpvn .toFixed(2)
]
label: [
- "Tgt.Flow" ,
- "Msr.Flow" ,
- "Rot.Spd" ,
- "Mot.Spd" ,
- "MC.Spd" ,
- "MC.Cur" ,
- "PWM" ,
- "Rtr.Cnt" ,
- "Prs.Flow" ,
+ "1.2V",
+ "3.3V" ,
+ "L5V" ,
+ "S5V" ,
+ "24V" ,
+ "R24V" ,
+ "ADC" ,
+ "Ref" ,
+ "VCC" ,
+ "Vaux" ,
+ "VPN"
]
}
- DebugDataColumn { id: _HDDialysateOutletFlowColumn
- textObjectName :"_HDDialysateOutletFlowData"
- title : qsTr(" UF/DPo ")
- x: col(2.4)
- y: row(2.5)
+ DebugDataColumn { id: _TDTemperatureCoulumn
+ textObjectName :"_TDTemperatureData"
+ title : qsTr(" Temp ")
+ x: col(3)
+ y: row(3.5)
model: [
- vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) ,
- vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) ,
- vTreatmentUltrafiltration.ultrafiltration_RotorSpeed .toFixed(2) ,
- vTreatmentUltrafiltration.ultrafiltration_MotorSpeed .toFixed(2) ,
- vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) ,
- vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) ,
- "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) ,
- vTreatmentUltrafiltration.ultrafiltration_DopCorrOffset .toFixed(2) ,
- vTreatmentUltrafiltration.ultrafiltration_DopCalcRate .toFixed(2) ,
- vTreatmentUltrafiltration.ultrafiltration_UfCalcRate .toFixed(2) ,
- // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen
- //vTreatmentUltrafiltration.ultrafiltration_RotorHall .toFixed(2) ,
- //vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate .toFixed(2) ,
- //vTreatmentUltrafiltration.ultrafiltration_dialOutPumpState.toFixed(2) ,
+ vTDTemperature.boardTemp .toFixed(2)
]
label: [
- "UFRef" ,
- "UFMeas" ,
- "Rot.Spd" ,
- "Mot.Spd" ,
- "MC.Spd" ,
- "MC.Cur" ,
- "PWM" ,
- "DopOfst" ,
- "DopRate" ,
- "UFcRate" ,
- // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen
- //"RotorHall" ,
- //"CUFRate" ,
- //"DOPumpSt" ,
+ "board",
]
}
@@ -560,10 +355,10 @@
// TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version.
TouchRect {
- x : col(5.0)
+ x : col(6.0)
y : row(6.4)
width : 425
- height : 80
+ height : 160
onClicked : vAdjustmentVersions.doAdjustment()
radius : 10
Column {
@@ -573,84 +368,46 @@
anchors.leftMargin: 5
spacing: -30
- DebugDataColumn { id: _HDVersionsColumn
- textObjectName :"_HDVersionsData"
+ DebugDataColumn { id: _TDVersionsColumn
+ textObjectName :"_TDVersionsData"
title : ""
horizontalAlignmentText: Text.AlignLeft
fontPixelSizeText: Fonts.fontPixelDebugTitle
- model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9"
- .arg(vAdjustmentVersions.hdVerMajor )
- .arg(vAdjustmentVersions.hdVerMinor )
- .arg(vAdjustmentVersions.hdVerMicro )
- .arg(vAdjustmentVersions.hdVerBuild )
- .arg(vAdjustmentVersions.hdVerFPGAMajor )
- .arg(vAdjustmentVersions.hdVerFPGAMinor )
- .arg(vAdjustmentVersions.hdVerFPGALab )
- .arg(vAdjustmentVersions.hdVerFPGAId )
- .arg(vAdjustmentVersions.hdVerCompatibilityRev )
+ model: [ "TD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nTD Serial#: %10"
+ .arg(vAdjustmentVersions.tdVerMajor )
+ .arg(vAdjustmentVersions.tdVerMinor )
+ .arg(vAdjustmentVersions.tdVerMicro )
+ .arg(vAdjustmentVersions.tdVerBuild )
+ .arg(vAdjustmentVersions.tdVerFPGAMajor )
+ .arg(vAdjustmentVersions.tdVerFPGAMinor )
+ .arg(vAdjustmentVersions.tdVerFPGALab )
+ .arg(vAdjustmentVersions.tdVerFPGAId )
+ .arg(vAdjustmentVersions.tdVerCompatibilityRev )
+ .arg(vAdjustmentVersions.tdSerial )
]
}
- DebugDataColumn { id: _DGVersionsColumn
- textObjectName :"_DGVersionsData"
+ DebugDataColumn { id: _DDVersionsColumn
+ textObjectName :"_DDVersionsData"
title : ""
horizontalAlignmentText: Text.AlignLeft
fontPixelSizeText: Fonts.fontPixelDebugTitle
- model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9"
- .arg(vAdjustmentVersions.dgVerMajor )
- .arg(vAdjustmentVersions.dgVerMinor )
- .arg(vAdjustmentVersions.dgVerMicro )
- .arg(vAdjustmentVersions.dgVerBuild )
- .arg(vAdjustmentVersions.dgVerFPGAMajor )
- .arg(vAdjustmentVersions.dgVerFPGAMinor )
- .arg(vAdjustmentVersions.dgVerFPGALab )
- .arg(vAdjustmentVersions.dgVerFPGAId )
- .arg(vAdjustmentVersions.dgVerCompatibilityRev )
+ model: [ "DD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nDD Serial#: %10"
+ .arg(vAdjustmentVersions.ddVerMajor )
+ .arg(vAdjustmentVersions.ddVerMinor )
+ .arg(vAdjustmentVersions.ddVerMicro )
+ .arg(vAdjustmentVersions.ddVerBuild )
+ .arg(vAdjustmentVersions.ddVerFPGAMajor )
+ .arg(vAdjustmentVersions.ddVerFPGAMinor )
+ .arg(vAdjustmentVersions.ddVerFPGALab )
+ .arg(vAdjustmentVersions.ddVerFPGAId )
+ .arg(vAdjustmentVersions.ddVerCompatibilityRev )
+ .arg(vAdjustmentVersions.ddSerial )
]
}
- }
}
- DebugDataColumn { id: _PreTreatmentStatesColumn
- textObjectName :"_PreTreatmentStatesData"
- title : qsTr(" PreTx States ")
- x: col(1.5)
- y: row(5.5)
- model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9,%10,%11"
- .arg(vPreTreatmentStates.subMode )
- .arg(vPreTreatmentStates.waterSampleState )
- .arg(vPreTreatmentStates.selfTestConsumablesState)
- .arg(vPreTreatmentStates.selfTestNoCartridgeState)
- .arg(vPreTreatmentStates.installationState )
- .arg(vPreTreatmentStates.selfTestDryState )
- .arg(vPreTreatmentStates.primeState )
- .arg(vPreTreatmentStates.recirculateState )
- .arg(vPreTreatmentStates.patientConnectionState )
- .arg(vPreTreatmentStates.wetSelfTestsState )
- .arg(vPreTreatmentStates.preTreatmentRsrvrState )
- ]
- }
- Text { id : _hdResetInformation
- x: col(0.2)
- y: row(6.4)
- visible: true
- text: "HDrst:" + vGeneralEvent.hdReset
- horizontalAlignment: Text.AlignLeft
- color: Colors.textMain
- font.pixelSize: Fonts.fontPixelDebugText
- }
-
- Text { id : _dgResetInformation
- x: col(0.2)
- y: row(6.8)
- visible: true
- text: "DGrst:" + vGeneralEvent.dgReset
- horizontalAlignment: Text.AlignLeft
- color: Colors.textMain
- font.pixelSize: Fonts.fontPixelDebugText
- }
-
Connections { target: _GuiView
function onDidActionReceive( vAction, vData ) {
// DEBUG: console.debug("onDidActionReceive", vAction, vData)
@@ -661,3 +418,4 @@
}
}
+}
Index: sources/gui/qml/main.qml
===================================================================
diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/gui/qml/main.qml (.../main.qml) (revision a245272e6d8eee5c3658245570b6d31bd039af74)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -14,7 +14,7 @@
*/
// Qt
-import QtQuick 2.12
+import QtQuick 2.12
// Project
// C++ imports
@@ -56,7 +56,7 @@
import VHDUsageInfo 0.1
import VAdjustmentInstitutionalRecord 0.1
// States views
-import VHDOperationMode 0.1
+import VTDOpMode 0.1 //// ----- @LEAHIZED
import VPreTreatmentStates 0.1
import VHDTreatmentStates 0.1
import VPostTreatmentStates 0.1
@@ -158,9 +158,9 @@
VAdjustmentInstitutionalRecord { id: vAdjustmentInstitutionalRecord }
//VAdjustIn
// ---- States
- VHDOperationMode { id: vHDOperationMode
+ VTDOpMode { id: vTDOpMode
onStandbyChanged: {
- if(vHDOperationMode.standby) {
+ if(vTDOpMode.standby) {
vTreatmentVitals.doReset()
}
}
@@ -172,7 +172,7 @@
VTreatmentBloodFlow { id: vTreatmentBloodFlow }
VTreatmentVitals { id: vTreatmentVitals
interval : vTreatmentCreate.bloodPressureMeasureInterval
- enableDialog: vHDOperationMode.inTreatment && vHDTreatmentStates.txTreatment
+ enableDialog: vTDOpMode.inTreatment && vHDTreatmentStates.txTreatment
// As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval.
onEnableDialogChanged : {
if ( vTreatmentVitals.enableDialog ) {
@@ -293,129 +293,157 @@
}
}
- Connections { target: vHDOperationMode
+ Connections { target: vTDOpMode
function onStandbyWaitDisinfectChanged ( vValue ) { _mainMenu.isTreatment() }
}
// 9 - Others
- Text { // TEST : Application version should be moved into the information screen later.
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 10
+ Rectangle { //TODO:@LEAHI: make this the statusbar/headerbar component.
+ anchors.top: parent.top
+ width : Variables.applicationWidth
+ height : Variables.notificationHeight
+ color : Colors.backgroundMainMenu
+ gradient: Gradient { //TODO:@LEAHI: make this a component.
+ GradientStop { position: 0.2; color: Qt.lighter(Colors.backgroundMain, 1.1) }
+ GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.1) }
}
- horizontalAlignment : Text.AlignRight
- verticalAlignment : Text.AlignBottom
- height : 15
- text : Qt.application.version //DEBUG: + "[" + _GuiView.platform + "]"
- font.pixelSize: 14
- }
-
- Text { // TEST : Wireless IP
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 325
+ Item {
+ width : 200
+ anchors {
+ top : parent.top
+ left : parent.left
+ bottom : parent.bottom
+ margins : 10
+ }
+ Column {
+ spacing : 0
+ anchors.fill: parent
+ Text {
+ color : Colors.textMain
+ width : parent.width
+ height : parent.height * 3/5
+ horizontalAlignment : Text.AlignHCenter
+ verticalAlignment : Text.AlignVCenter
+ text : vDateTime.time
+ font.pixelSize: 40
+ }
+ Text {
+ color : Colors.textMain
+ width : parent.width
+ height : parent.height * 2/5
+ horizontalAlignment : Text.AlignHCenter
+ verticalAlignment : Text.AlignVCenter
+ text : vDateTime.date
+ font.pixelSize: 25
+ }
+ }
}
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
+ Text { // TEST : Application version should be moved into the information screen later.
+ color : Colors.textMain
+ anchors {
+ top : parent.top
+ left : parent.left
+ leftMargin : 100
- height : 15
- text : "W:" // + vNetwork.wirelessIP // ===================== Device Controller: FIXME
- font.pixelSize: 15
- }
+ }
+ horizontalAlignment : Text.AlignRight
+ verticalAlignment : Text.AlignBottom
- Text { // TEST : Ethernet IP
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 475
+ height : 15
+ text : Qt.application.version //DEBUG: + "[" + _GuiView.platform + "]"
+ font.pixelSize: 14
}
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
- height : 15
- text : "E:" // + vNetwork.ethernetIP // ===================== Device Controller: FIXME
- font.pixelSize: 15
- }
+ Text { // TEST : Wireless IP
+ color : Colors.textMain
+ anchors {
+ top : parent.top
+ left : parent.left
+ leftMargin : 325
+ }
+ horizontalAlignment : Text.Alignleft
+ verticalAlignment : Text.AlignBottom
- Text { // TEST : BluetoothStatus
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 615
+ height : 15
+ text : "W:" // + vNetwork.wirelessIP // ===================== Device Controller: FIXME
+ font.pixelSize: 15
}
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
- height : 15
- text : "B:" + vBluetooth.pairedAddr
- font.pixelSize: 14
- }
+ Text { // TEST : Ethernet IP
+ color : Colors.textMain
+ anchors {
+ top : parent.top
+ left : parent.left
+ leftMargin : 475
+ }
+ horizontalAlignment : Text.Alignleft
+ verticalAlignment : Text.AlignBottom
- Text { // TEST : The treatment vital dialog countdown time
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 900
+ height : 15
+ text : "E:" // + vNetwork.ethernetIP // ===================== Device Controller: FIXME
+ font.pixelSize: 15
}
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
- height : 15
- //DEBUG text : "Vital Timer: " + vTreatmentVitals.min_left + " : " + vTreatmentVitals.sec_left
- font.pixelSize: 14
- }
+ Text { // TEST : BluetoothStatus
+ color : Colors.textMain
+ anchors {
+ top : parent.top
+ left : parent.left
+ leftMargin : 615
+ }
+ horizontalAlignment : Text.Alignleft
+ verticalAlignment : Text.AlignBottom
- Text { // TEST : Current Date/Time
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 1080
+ height : 15
+ text : "B:" + vBluetooth.pairedAddr
+ font.pixelSize: 14
}
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
- height : 15
- text : vDateTime.current
- font.pixelSize: 14
- }
+ Text { // TEST : The treatment vital dialog countdown time
+ color : Colors.textMain
+ anchors {
+ top : parent.top
+ left : parent.left
+ leftMargin : 900
+ }
+ horizontalAlignment : Text.Alignleft
+ verticalAlignment : Text.AlignBottom
- Text { // TEST : Current timezone
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 1220
+ height : 15
+ //DEBUG text : "Vital Timer: " + vTreatmentVitals.min_left + " : " + vTreatmentVitals.sec_left
+ font.pixelSize: 14
}
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
- height : 15
- text : vDateTime.timezone
- font.pixelSize: 14
- }
+ Text { // TEST : Current timezone
+ color : Colors.textMain
+ anchors {
+ top : parent.top
+ left : parent.left
+ leftMargin : 1220
+ }
+ horizontalAlignment : Text.Alignleft
+ verticalAlignment : Text.AlignBottom
- SDCProgressItem { id: _sdcProgressItem
- // TODO: disable this later. this is only for diagnostic purpose.
- onDoubleClicked : {
- if ( _GuiView.dryDemoMode ) {
- let dryDemoTempID = 99
- let id = vConfirm.id
- vConfirm.id = dryDemoTempID
- vConfirm.doConfirm( true )
- vConfirm.id = id
+ height : 15
+ text : vDateTime.timezone
+ font.pixelSize: 14
+ }
+
+ SDCProgressItem { id: _sdcProgressItem
+ // TODO: disable this later. this is only for diagnostic purpose.
+ onDoubleClicked : {
+ if ( _GuiView.dryDemoMode ) {
+ let dryDemoTempID = 99
+ let id = vConfirm.id
+ vConfirm.id = dryDemoTempID
+ vConfirm.doConfirm( true )
+ vConfirm.id = id
+ }
+ else {
+ _diagnosticsDialog.open()
+ }
}
- else {
- _diagnosticsDialog.open()
- }
}
}
@@ -438,12 +466,12 @@
textPixelSize : Fonts.fontPixelAlarmBarTitle
isSilenced : _alarmItem.isSilenced
timeout : _alarmItem.timeout
- backgroundFading : vHDOperationMode.fault
+ backgroundFading : vTDOpMode.fault
}
GuiView { id: _GuiView
-// Component.onCompleted: {
-// console.debug("GuiView - complete")
-// }
+ // Component.onCompleted: {
+ // console.debug("GuiView - complete")
+ // }
}
}
Index: sources/model/MModel.h
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/model/MModel.h (.../MModel.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/model/MModel.h (.../MModel.h) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -59,12 +59,20 @@
#include "MTreatmentStopData.h"
#include "MHDAccelerometerData.h"
#include "MHDSyringePumpData.h"
-#include "MHDAirTrapData.h"
#include "MHDBloodLeakData.h"
#include "MHDAirBubbleData.h"
#include "MHDRTCEpochData.h"
#include "MHDUsageInfoResponse.h"
+#include "MTDAirTrapData.h"
+#include "MTDVoltageData.h"
+#include "MTDBloodPumpData.h"
+#include "MTDValvesData.h"
+#include "MTDBatteryData.h"
+#include "MTDSwitchesData.h"
+#include "MTDEjectorData.h"
+#include "MTDTemperatureData.h"
+
// Debugging Messages
#include "MHDDebugText.h"
#include "MDGDebugText.h"
@@ -74,11 +82,11 @@
// Settings
#include "MAdjustHDRequests.h"
#include "MAdjustDGRequests.h"
-#include "MAdjustHDVersionsRequest.h"
-#include "MAdjustHDVersionsResponse.h"
-#include "MAdjustDGVersionsResponse.h"
-#include "MAdjustHDSerialNumberResponse.h"
-#include "MAdjustDGSerialNumberResponse.h"
+#include "MAdjustTDVersionsRequest.h"
+#include "MAdjustTDVersionsResponse.h"
+#include "MAdjustDDVersionsResponse.h"
+#include "MAdjustTDSerialNumberResponse.h"
+#include "MAdjustDDSerialNumberResponse.h"
#include "MAdjustHDServiceModeResponse.h"
#include "MAdjustHDServiceDatesResponse.h"
#include "MAdjustDGServiceDatesResponse.h"
@@ -326,7 +334,14 @@
REGISTER_METATYPE( HDSyringePumpData ) \
REGISTER_METATYPE( HDAccelerometerData ) \
REGISTER_METATYPE( HDBloodLeakData ) \
- REGISTER_METATYPE( HDAirTrapData ) \
+ REGISTER_METATYPE( TDAirTrapData ) \
+ REGISTER_METATYPE( TDVoltageData ) \
+ REGISTER_METATYPE( TDBloodPumpData ) \
+ REGISTER_METATYPE( TDValvesData ) \
+ REGISTER_METATYPE( TDBatteryData ) \
+ REGISTER_METATYPE( TDSwitchesData ) \
+ REGISTER_METATYPE( TDEjectorData ) \
+ REGISTER_METATYPE( TDTemperatureData ) \
REGISTER_METATYPE( HDAirBubbleData ) \
REGISTER_METATYPE( HDUsageInfoResponseData ) \
REGISTER_METATYPE( HDUsageInfoRequestData ) \
@@ -438,11 +453,11 @@
REGISTER_METATYPE( AdjustRecirculateResponseData ) \
REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \
REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \
- REGISTER_METATYPE( AdjustVersionsHDRequestData ) \
- REGISTER_METATYPE( AdjustVersionsHDResponseData ) \
- REGISTER_METATYPE( AdjustVersionsDGResponseData ) \
- REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \
- REGISTER_METATYPE( AdjustSerialNumberDGResponseData ) \
+ REGISTER_METATYPE( AdjustVersionsTDRequestData ) \
+ REGISTER_METATYPE( AdjustVersionsTDResponseData ) \
+ REGISTER_METATYPE( AdjustVersionsDDResponseData ) \
+ REGISTER_METATYPE( AdjustSerialNumberTDResponseData ) \
+ REGISTER_METATYPE( AdjustSerialNumberDDResponseData ) \
REGISTER_METATYPE( AdjustServiceModeResponseData ) \
REGISTER_METATYPE( AdjustServiceDatesHDResponseData ) \
REGISTER_METATYPE( AdjustServiceDatesDGResponseData ) \
@@ -508,7 +523,14 @@
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDBloodLeakData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAirBubbleData ) \
- ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAirTrapData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDAirTrapData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDVoltageData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDBloodPumpData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDTemperatureData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDEjectorData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDSwitchesData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDBatteryData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDValvesData ) \
/* Treatment Log */ \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAlarmData ) \
@@ -569,11 +591,11 @@
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \
- ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDRequestData ) \
- ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDResponseData ) \
- ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \
- ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberHDResponseData ) \
- ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDGResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDDResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberTDResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDDResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesHDResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesDGResponseData ) \
@@ -701,7 +723,14 @@
ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( HDBloodLeakData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( HDAirBubbleData ) \
- ACTION_RECEIVE_BRIDGE_DEFINITION( HDAirTrapData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TDAirTrapData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TDVoltageData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TDBloodPumpData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TDValvesData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TDBatteryData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TDSwitchesData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TDEjectorData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TDTemperatureData ) \
/* Treatment Log */ \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAlarmData ) \
@@ -762,11 +791,11 @@
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \
- ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDRequestData ) \
- ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDResponseData ) \
- ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \
- ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberHDResponseData ) \
- ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDGResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDDResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberTDResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDDResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceModeResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesHDResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesDGResponseData ) \
@@ -997,7 +1026,14 @@
ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \
ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \
ACTION_RECEIVE_SIGNAL( HDBloodLeakData ) \
- ACTION_RECEIVE_SIGNAL( HDAirTrapData ) \
+ ACTION_RECEIVE_SIGNAL( TDAirTrapData ) \
+ ACTION_RECEIVE_SIGNAL( TDVoltageData ) \
+ ACTION_RECEIVE_SIGNAL( TDBloodPumpData ) \
+ ACTION_RECEIVE_SIGNAL( TDValvesData ) \
+ ACTION_RECEIVE_SIGNAL( TDBatteryData ) \
+ ACTION_RECEIVE_SIGNAL( TDSwitchesData ) \
+ ACTION_RECEIVE_SIGNAL( TDEjectorData ) \
+ ACTION_RECEIVE_SIGNAL( TDTemperatureData ) \
ACTION_RECEIVE_SIGNAL( HDAirBubbleData ) \
/* Alarms */ \
ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \
@@ -1060,11 +1096,11 @@
ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \
- ACTION_RECEIVE_SIGNAL( AdjustVersionsHDRequestData ) \
- ACTION_RECEIVE_SIGNAL( AdjustVersionsHDResponseData ) \
- ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \
- ACTION_RECEIVE_SIGNAL( AdjustSerialNumberHDResponseData ) \
- ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDGResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustVersionsDDResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberTDResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDDResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustServiceModeResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustServiceDatesHDResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustServiceDatesDGResponseData ) \
Index: sources/storage/Logger.cpp
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/storage/Logger.cpp (.../Logger.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -342,7 +342,7 @@
else {
fileName = _logFileNameDate
+ _fileSeparator + _logFileNameTime
- + _fileSeparator + _logFileNameHDSN
+ + _fileSeparator + _logFileNameTDSN
+ _fileSeparator + _logFileNameMode
;
}
@@ -577,11 +577,11 @@
}
break;
- case GuiActionType::ID_AdjustSerialHDRsp : {
+ case GuiActionType::ID_AdjustSerialTDRsp : {
if ( vData.length() >= 1 ) {
- QString hdSerial= vData[0].toString();
- if ( hdSerial.trimmed().isEmpty() ) hdSerial = "Unknown";
- _logFileNameHDSN = hdSerial;
+ QString tdSerial= vData[0].toString();
+ if ( tdSerial.trimmed().isEmpty() ) tdSerial = "Unknown";
+ _logFileNameTDSN = tdSerial;
}
}
break;
Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -31,7 +31,7 @@
ADJUST_VIEW_CONNECTION(AdjustParametersValidationRequestData )
ACTION_VIEW_CONNECTION(AdjustParametersValidationResponseData )
ADJUST_VIEW_CONNECTION(AdjustParametersConfirmRequestData )
- ACTION_VIEW_CONNECTION(AdjustSerialNumberHDResponseData )
+ ACTION_VIEW_CONNECTION(AdjustSerialNumberTDResponseData )
}
@@ -144,8 +144,8 @@
* This class keeps the serial for any treatment Code (txCode) generation
* \param data - the message model data
*/
-void VTreatmentCreate::onActionReceive(const AdjustSerialNumberHDResponseData &data) {
- _HDSerialNumber = data.mSerialNumber;
+void VTreatmentCreate::onActionReceive(const AdjustSerialNumberTDResponseData &data) {
+ _tdSerialNumber = data.mSerialNumber;
}
/*!
@@ -156,7 +156,7 @@
void VTreatmentCreate::generateTxCode() {
QDateTime datetime = QDateTime::currentDateTime();
QString today = datetime.toString("yyyyMMddHHmmss");
- txCode(_HDSerialNumber + today);
+ txCode(_tdSerialNumber + today);
_TreatmentLog.gTxCode(_txCode);
LOG_APPED_UI(QString("Generated Treatment Code is %1").arg(_txCode));
}
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -24,7 +24,7 @@
// Project
#include "MPreTreatmentAdjustParametersValidationResponse.h"
-#include "MAdjustHDSerialNumberResponse.h"
+#include "MAdjustTDSerialNumberResponse.h"
#include "GuiController.h"
#include "StorageGlobals.h"
@@ -74,7 +74,7 @@
// friends
friend class::tst_views;
- QString _HDSerialNumber = "";
+ QString _tdSerialNumber = "";
PROPERTY(bool , heparinDispensingRateOff , true)
PROPERTY(bool , heparinBolusVolumeOff , true)
@@ -127,7 +127,7 @@
VIEW_DEC_CLASS(VTreatmentCreate)
VIEW_DEC_SLOT(AdjustParametersValidationResponseData)
- VIEW_DEC_SLOT(AdjustSerialNumberHDResponseData)
+ VIEW_DEC_SLOT(AdjustSerialNumberTDResponseData)
private:
QString enumToString(GuiRequestReasons vEnum);
Index: sources/view/VView.h
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/view/VView.h (.../VView.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/view/VView.h (.../VView.h) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -170,7 +170,14 @@
REGISTER_TYPE( VHDSyringePump ) \
REGISTER_TYPE( VHDBloodLeak ) \
REGISTER_TYPE( VHDAirBubble ) \
- REGISTER_TYPE( VHDAirTrap ) \
+ REGISTER_TYPE( VTDAirTrap ) \
+ REGISTER_TYPE( VTDVoltage ) \
+ REGISTER_TYPE( VTDBloodPump ) \
+ REGISTER_TYPE( VTDValves ) \
+ REGISTER_TYPE( VTDBattery ) \
+ REGISTER_TYPE( VTDSwitches ) \
+ REGISTER_TYPE( VTDEjector ) \
+ REGISTER_TYPE( VTDTemperature ) \
/* DG - Data */ \
REGISTER_TYPE( VDGDrainPump ) \
REGISTER_TYPE( VDGHeaters ) \