Index: denali.pro =================================================================== diff -u -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 -r6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e --- denali.pro (.../denali.pro) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) +++ denali.pro (.../denali.pro) (revision 6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e) @@ -165,6 +165,7 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ @@ -424,6 +425,7 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r46e35d6624fa2daa5e05e869d5285c21fe1d9c9f -r6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 46e35d6624fa2daa5e05e869d5285c21fe1d9c9f) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e) @@ -72,12 +72,13 @@ {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_BloodPrime , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes - + {Gui::GuiActionType::ID_HDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_HDAirTrapData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_HDBloodLeakData , 10 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_PreTreatmentStates , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_TreatmentStates , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_TreatmentStates , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_PostTreatmentStates , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_DisinfectStates , 3 * 4 }, // 3 parameter each 4bytes @@ -92,6 +93,7 @@ {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGTemperaturesData , 12 * 4 }, // 12 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_DGConductivityData , 5 * 4 }, // 9 parameters each 4bytes // HD Data Messages {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 -r6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e) @@ -375,7 +375,7 @@ switch (identifySource(vMessage.can_id)) { case Can_Source::eCan_HD: ok = interpretMessage_HD(vMessage, vData); break; case Can_Source::eCan_DG: ok = interpretMessage_DG(vMessage, vData); break; - default : break; + default : logUnhandledMessage(vMessage ); break; // ok is still false. } return ok; } @@ -444,6 +444,7 @@ case Gui::GuiActionType::ID_AdjustInitTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustInitTreatmentRsp ); break; case Gui::GuiActionType::ID_AdjustParametersValidationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustParametersValidationRsp ); break; case Gui::GuiActionType::ID_AdjustWaterSampleRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleRsp ); break; + case Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp ); break; case Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp ); break; case Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp ); break; @@ -678,10 +679,10 @@ bool MessageInterpreter::logUnhandledMessage(const Message &vMessage) const { bool ok = false; quint16 id = vMessage.actionId; + QString logString; if (_messageList.contains(id)) { ok = true; QStringList items = _messageList[id]; - QString logString; int index = 0; for ( int i = 0; i < items.count(); i++ ) { QString item = items[i]; @@ -732,5 +733,8 @@ } LOG_DATUM(logString); } + else { + LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(id, 0, 16)); + } return ok; } Index: sources/gui/GuiGlobals.h =================================================================== diff -u -red9ea343a2a22623796045d9e1229a2cbfa8c970 -r6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e) @@ -193,12 +193,15 @@ ID_DGLoadCellReadingsData = 0x0C00, // 12 ID_DGTemperaturesData = 0x2D00, // 45 ID_DGAccelerometerData = 0x3400, // 52 + ID_DGConductivityData = 0x3100, // 49 // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 ID_HDSyringePumpData = 0x6900, // 105 + ID_HDBloodLeakData = 0x6C00, // 108 + ID_HDAirBubbleData = 0x9300, // 147 + ID_HDAirTrapData = 0x3E00, // 62 - // In-Treatment Adjustables ID_AdjustDurationReq = 0x1600, // 22 ID_AdjustDurationRsp = 0x1B00, // 27 Index: sources/gui/qml/main.qml =================================================================== diff -u -r93dbee7bb0b6e799a602735d54c01aeebd0a2074 -r6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e --- sources/gui/qml/main.qml (.../main.qml) (revision 93dbee7bb0b6e799a602735d54c01aeebd0a2074) +++ sources/gui/qml/main.qml (.../main.qml) (revision 6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e) @@ -24,7 +24,9 @@ // View classes import VHDAccelerometer 0.1 import VHDSyringePump 0.1 - +import VHDBloodLeak 0.1 +import VHDAirTrap 0.1 +import VHDAirBubble 0.1 // POST import VHDPOSTData 0.1 import VDGPOSTData 0.1 @@ -87,6 +89,7 @@ import VDGValvesStates 0.1 import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 +import VDGConductivity 0.1 // In-Treatment - Adjustemnt import VTreatmentAdjustmentDuration 0.1 import VTreatmentAdjustmentFlows 0.1 @@ -147,6 +150,7 @@ interval : vTreatmentCreate.bloodPressureMeasureInterval } + VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } @@ -157,6 +161,9 @@ VTreatmentStop { id: vTreatmentStop } VHDAccelerometer { id: vHDAccelerometer } VHDSyringePump { id: vHDSyringePump } + VHDAirBubble { id: vHDAirBubble } + VHDBloodLeak { id: vHDBloodLeak } + VHDAirTrap { id: vHDAirTrap } // ---- DG VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } @@ -168,7 +175,7 @@ VDGTemperatures { id: vDGTemperatures } VDGValvesStates { id: vDGValvesStates } VDGAccelerometer { id: vDGAccelerometer } - + VDGConductivity { id: vDGConductivity } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } VDGFilterFlush { id: vDGFilterFlush } Index: sources/model/MModel.h =================================================================== diff -u -rb6d23ac9f339d36f9c68000ecc59dcc07fec8838 -r6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e --- sources/model/MModel.h (.../MModel.h) (revision b6d23ac9f339d36f9c68000ecc59dcc07fec8838) +++ sources/model/MModel.h (.../MModel.h) (revision 6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e) @@ -102,6 +102,7 @@ #include "MPreTreatmentAdjustWaterSampleResponse.h" #include "MPreTreatmentSelfTestNoCartridgeData.h" #include "MPreTreatmentSelfTestDryData.h" +#include "MPreTreatmentAdjustDisposablesConfirmResponse.h" #include "MPreTreatmentAdjustDisposablesPrimeResponse.h" #include "MPreTreatmentDisposablesPrimeData.h" #include "MPreTreatmentAdjustPatientConnectionBeginResponse.h" @@ -394,6 +395,7 @@ REGISTER_METATYPE( AdjustInitTreatmentResponseData ) \ REGISTER_METATYPE( AdjustParametersValidationResponseData ) \ REGISTER_METATYPE( AdjustWaterSampleResponseData ) \ + REGISTER_METATYPE( AdjustDisposablesConfirmResponseData ) \ REGISTER_METATYPE( AdjustDisposablesPrimeResponseData ) \ REGISTER_METATYPE( AdjustPatientConnectionBeginResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationInitResponseData ) \ @@ -519,6 +521,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustParametersValidationResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionBeginResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitResponseData ) \ @@ -695,6 +698,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustParametersValidationResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionBeginResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationInitResponseData ) \ @@ -955,6 +959,7 @@ ACTION_RECEIVE_SIGNAL( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustParametersValidationResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionBeginResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationInitResponseData ) \ Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r30a3a58cde0e82d66c8c5f242ec550007e20b694 -r6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 6a4027856dfbe2ff3a4d44a2140ce78bd9bcfc2e) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 24-Feb-2022 + * \date (last) 03-Mar-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -118,7 +118,7 @@ /*0082*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR : { result = QObject::tr("HD syringe pump DAC write failure." ); break; } /* 82*/ /*0083*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR : { result = QObject::tr("HD syringe pump is running while the BP is off." ); break; } /* 83*/ /*0084*/case GuiAlarmID::ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR : { result = QObject::tr("HD venous pressure sensor not being read." ); break; } /* 84*/ -/*0085*/case GuiAlarmID::ALARM_ID_____AVAILABLE_25 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 85*/ +/*0085*/case GuiAlarmID::ALARM_ID_PUMP_TRACK_LATCH_OPENED : { result = QObject::tr("HD pump track latch opened alarm." ); break; } /* 85*/ /*0086*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR : { result = QObject::tr("HD BP occlusion sensor not being read." ); break; } /* 86*/ /*0087*/case GuiAlarmID::ALARM_ID_DG_HEATING_INVALID_CAL_RECORD : { result = QObject::tr("DG heating invalid calibration record." ); break; } /* 87*/ /*0088*/case GuiAlarmID::ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE : { result = QObject::tr("DG concentrate pumps hall sensor out of range." ); break; } /* 88*/