Index: AlarmMapping.csv =================================================================== diff -u -rdf0329c47627ceb1fe460cda2ae3ff8c9c851106 -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf --- AlarmMapping.csv (.../AlarmMapping.csv) (revision df0329c47627ceb1fe460cda2ae3ff8c9c851106) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) @@ -91,7 +91,7 @@ 90,"This alarm ID is available for use." 91,"HD No dialysate flow data receive in the last 3 seconds." 92,"DG conductivity sensor bad status." - 93,"This alarm ID is available for use." + 93,"DG outlet primary conductivity out of range." 94,"This alarm ID is available for use." 95,"This alarm ID is available for use." 96,"Inlet water temperature in high range." @@ -141,7 +141,7 @@ 140,"Dialysate generator communication timeout." 141,"Air trap fill timeout during treatment." 142,"Blood pump occlusion detected." - 143,"DG dialysate temperature sensors drift timeout." + 143,"DG dialysate temperature sensors out of range." 144,"DG software configuration record invalid CRC." 145,"Concentrate conductivity after adding acid out of range alarm." 146,"Dialysate conductivity out of range." @@ -199,7 +199,7 @@ 198,"DG heaters cold junction temperature out of range." 199,"DG heaters fault." 200,"DG thermistors/sensors temperature out of range." - 201,"Inlet water quality is bad (temperature, conductivity, pressure)." + 201,"This alarm ID is available for use." 202,"Inlet water pressure fault." 203,"Pressure sensor fault." 204,"RO rejection ratio out of range." Index: denali.pro.user =================================================================== diff -u -rad9c5d96d9288d685a0ff4e41e087258b5a4c91f -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf --- denali.pro.user (.../denali.pro.user) (revision ad9c5d96d9288d685a0ff4e41e087258b5a4c91f) +++ denali.pro.user (.../denali.pro.user) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -rdf0329c47627ceb1fe460cda2ae3ff8c9c851106 -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf --- en_US.udic (.../en_US.udic) (revision df0329c47627ceb1fe460cda2ae3ff8c9c851106) +++ en_US.udic (.../en_US.udic) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) @@ -208,3 +208,4 @@ VDGValves MHDAccelerometer MVC +Jahnavi Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r5605f930ab5cd1a62b96347f4b4300ef30a830ee -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 5605f930ab5cd1a62b96347f4b4300ef30a830ee) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 05-Apr-2022 + * \date (last) 11-Apr-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -126,7 +126,7 @@ /*0090*/case GuiAlarmID::ALARM_ID____AVAILABLE_25 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 90*/ /*0091*/case GuiAlarmID::ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE : { result = QObject::tr("HD No dialysate flow data receive in the last 3 seconds." ); break; } /* 91*/ /*0092*/case GuiAlarmID::ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS : { result = QObject::tr("DG conductivity sensor bad status." ); break; } /* 92*/ -/*0093*/case GuiAlarmID::ALARM_ID____AVAILABLE_15 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 93*/ +/*0093*/case GuiAlarmID::ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("DG outlet primary conductivity out of range." ); break; } /* 93*/ /*0094*/case GuiAlarmID::ALARM_ID____AVAILABLE_16 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 94*/ /*0095*/case GuiAlarmID::ALARM_ID____AVAILABLE_17 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 95*/ /*0096*/case GuiAlarmID::ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE : { result = QObject::tr("Inlet water temperature in high range." ); break; } /* 96*/ @@ -176,7 +176,7 @@ /*0140*/case GuiAlarmID::ALARM_ID_DG_COMM_TIMEOUT : { result = QObject::tr("Dialysate generator communication timeout." ); break; } /* 140*/ /*0141*/case GuiAlarmID::ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT : { result = QObject::tr("Air trap fill timeout during treatment." ); break; } /* 141*/ /*0142*/case GuiAlarmID::ALARM_ID_OCCLUSION_BLOOD_PUMP : { result = QObject::tr("Blood pump occlusion detected." ); break; } /* 142*/ -/*0143*/case GuiAlarmID::ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_DRIFT_TIMEOUT : { result = QObject::tr("DG dialysate temperature sensors drift timeout." ); break; } /* 143*/ +/*0143*/case GuiAlarmID::ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE : { result = QObject::tr("DG dialysate temperature sensors out of range." ); break; } /* 143*/ /*0144*/case GuiAlarmID::ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC : { result = QObject::tr("DG software configuration record invalid CRC." ); break; } /* 144*/ /*0145*/case GuiAlarmID::ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("Concentrate conductivity after adding acid out of range alarm." ); break; } /* 145*/ /*0146*/case GuiAlarmID::ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("Dialysate conductivity out of range." ); break; } /* 146*/ @@ -234,7 +234,7 @@ /*0198*/case GuiAlarmID::ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE : { result = QObject::tr("DG heaters cold junction temperature out of range." ); break; } /* 198*/ /*0199*/case GuiAlarmID::ALARM_ID_DG_HEATERS_FAULT : { result = QObject::tr("DG heaters fault." ); break; } /* 199*/ /*0200*/case GuiAlarmID::ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE : { result = QObject::tr("DG thermistors/sensors temperature out of range." ); break; } /* 200*/ -/*0201*/case GuiAlarmID::ALARM_ID_DG_BAD_INLET_WATER_QUALITY : { result = QObject::tr("Inlet water quality is bad (temperature, conductivity, pressure)." ); break; } /* 201*/ +/*0201*/case GuiAlarmID::ALARM_ID____AVAILABLE_29 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 201*/ /*0202*/case GuiAlarmID::ALARM_ID_INLET_WATER_PRESSURE_FAULT : { result = QObject::tr("Inlet water pressure fault." ); break; } /* 202*/ /*0203*/case GuiAlarmID::ALARM_ID_PRESSURE_SENSOR_FAULT : { result = QObject::tr("Pressure sensor fault." ); break; } /* 203*/ /*0204*/case GuiAlarmID::ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE : { result = QObject::tr("RO rejection ratio out of range." ); break; } /* 204*/ Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r0c983aea7de7480e86739469f5a64ad18b244634 -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) @@ -23,6 +23,9 @@ #include "Logger.h" #include "MSettings.h" +#include "GuiGlobals.h" +#include "MAlarmStatusData.h" + using namespace Storage; #define NONE "N/A" @@ -88,8 +91,10 @@ _values.clear(); for (int i = 0; i < eTreatmentLogIndexCount; i++) _values << ""; + _deviceID = mStrText.arg(vData.mDeviceID ); + _values[ePatientID ] = vPatientID.trimmed() ; - _values[eDeviceID ] = mStrText.arg(vData.mDeviceID ); +// _values[eDeviceID ] = mStrText.arg(vData.mDeviceID ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. _values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate ); _values[eDialysateFlowRate ] = mStrText.arg(vData.mDialysateFlowRate ); _values[eTreatmentDuration ] = mTreatmentDuration ; @@ -119,11 +124,11 @@ _values[eTargetUFRate ] = mStrText.arg(vData.mTargetUFRate ,FLOAT3 ); _values[eActualUFRate ] = mStrText.arg(vData.mActualUFRate ,FLOAT3 ); _values[eSalineBolusVolume ] = mStrText.arg(vData.mSalineBolusVolume ); - _values[eAverageBloodFlow ] = mStrText.arg(vData.mAverageBloodFlow ,FLOAT3 ); - _values[eAverageDialysateFlow ] = mStrText.arg(vData.mAverageDialysateFlow ,FLOAT3 ); - _values[eAverageDialysateTemp ] = mStrText.arg(vData.mAverageDialysateTemp ,FLOAT3 ); - _values[eAverageArterialPressure ] = mStrText.arg(vData.mAverageArterialPressure ,FLOAT3 ); - _values[eAverageVenousPressure ] = mStrText.arg(vData.mAverageVenousPressure ,FLOAT3 ); +// _values[eAverageBloodFlow ] = mStrText.arg(vData.mAverageBloodFlow ,FLOAT3 ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// _values[eAverageDialysateFlow ] = mStrText.arg(vData.mAverageDialysateFlow ,FLOAT3 ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// _values[eAverageDialysateTemp ] = mStrText.arg(vData.mAverageDialysateTemp ,FLOAT3 ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// _values[eAverageArterialPressure ] = mStrText.arg(vData.mAverageArterialPressure ,FLOAT3 ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// _values[eAverageVenousPressure ] = mStrText.arg(vData.mAverageVenousPressure ,FLOAT3 ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. } /*! @@ -212,9 +217,9 @@ ADDTITLE("Title"); ADDTOLOG( ePatientID ); - ADDTOLOG( eDeviceID ); +// ADDTOLOG( eDeviceID ); PRS 180: will be used only for the name not in the content. - ADDTITLE("Treatment Prescription" ); + ADDTITLE("Treatment Parameters" ); ADDTOLOG( eTreatmentDuration ); ADDTOLOG( eBloodFlowRate ); ADDTOLOG( eDialysateFlowRate ); @@ -232,35 +237,35 @@ ADDTOLOG( eHeparinDispenseRate ); ADDTOLOG( eHeparinStop ); - ADDTITLE("Treatment Parameters" ); + ADDTITLE("Treatment Time" ); ADDTOLOG( eTreatmentStartDateTime ); ADDTOLOG( eTreatmentEndDateTime ); ADDTOLOG( eActualTreatmentDuration ); - ADDTITLE("Post-Treatment Data" ); + ADDTITLE("Device Treatment Data" ); ADDTOLOG( eDialysateVolumeUsed ); ADDTOLOG( eOriginUFVolume ); ADDTOLOG( eTargetUFVolume ); ADDTOLOG( eActualUFVolume ); + ADDTOLOG( eOriginUFRate ); + ADDTOLOG( eTargetUFRate ); + ADDTOLOG( eActualUFRate ); ADDTOLOG( eSalineBolusVolume ); ADDTOLOG( eHeparinDeliveredVolume ); ADDTITLE("Extra" ); ADDTOLOG( eWaterSampleTestResult ); - ADDTOLOG( eOriginUFRate ); - ADDTOLOG( eTargetUFRate ); - ADDTOLOG( eActualUFRate ); - ADDTOLOG( eAverageBloodFlow ); - ADDTOLOG( eAverageDialysateFlow ); - ADDTOLOG( eAverageDialysateTemp ); - ADDTOLOG( eAverageArterialPressure ); - ADDTOLOG( eAverageVenousPressure ); +// ADDTOLOG( eAverageBloodFlow ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// ADDTOLOG( eAverageDialysateFlow ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// ADDTOLOG( eAverageArterialPressure ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// ADDTOLOG( eAverageVenousPressure ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// ADDTOLOG( eAverageDialysateTemp ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. ADDTITLE("Treatment Data" ); for ( const TreatmentLogAvrgeData &item : _treatmentLogAvrgeData ) { QString line; line += csv.arg(item.mTimeStamp ); - line += csv.arg(NONE ); +// line += csv.arg(NONE ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. line += csv.arg(item.mBloodFlowRate ); line += csv.arg(item.mDialysateFlowRate ); line += csv.arg(item.mUFRate ,FLOAT3 ); @@ -275,10 +280,11 @@ ADDTITLE("Treatment Alarms" ); for ( const TreatmentLogAlarmData &item : _treatmentLogAlarmData ) { QString line; + // TODO : QString alarmText = Model::MAlarmStatus::toText(static_cast(item.mAlarmID)); line += csv.arg(item.mTimeStamp ); - line += csv.arg(item.mAlarmID ); - line += csv.arg(item.mParam1 ); - line += end.arg(item.mParam2 ); + line += csv.arg(item.mAlarmID ); // may need to change, during our discussion with Sean and I 04/11/2022. to alarmText + line += csv.arg(item.mParam1 ); // may need to remove, during our discussion with Sean and I 04/11/2022. + line += end.arg(item.mParam2 ); // may need to remove, during our discussion with Sean and I 04/11/2022. ADDALINE(line); } @@ -298,7 +304,7 @@ _lastTxInfo.mDateTime.replace(":", "" ); // remove time separator _lastTxInfo.mDateTime.replace(" ", "_"); // replace spaces - _lastTxInfo.mDeviceID = _values[eDeviceID]; + _lastTxInfo.mDeviceID = _deviceID; _lastTxInfo.mPatientID = _values[ePatientID]; _lastTxInfo.mFileName = QString("%1%2_%3.log") .arg(_treatmentLogPath) Index: sources/storage/TreatmentLog.h =================================================================== diff -u -rad9c5d96d9288d685a0ff4e41e087258b5a4c91f -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision ad9c5d96d9288d685a0ff4e41e087258b5a4c91f) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) @@ -78,6 +78,8 @@ _lastTxInfo; + QString _deviceID = ""; + enum Role { eValue, eTitle, @@ -86,7 +88,7 @@ enum TreatmentLogIndex { ePatientID , - eDeviceID , +// eDeviceID , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. eBloodFlowRate , eDialysateFlowRate , eTreatmentDuration , @@ -116,18 +118,18 @@ eTargetUFRate , eActualUFRate , eSalineBolusVolume , - eAverageBloodFlow , - eAverageDialysateFlow , - eAverageDialysateTemp , - eAverageArterialPressure , - eAverageVenousPressure , +// eAverageBloodFlow , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// eAverageDialysateFlow , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// eAverageDialysateTemp , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// eAverageArterialPressure , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// eAverageVenousPressure , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. eTreatmentLogIndexCount }; const QStringList _titles { tr("Patient ID" ), // ePatientID - tr("Device ID" ), // eDeviceID +// tr("Device ID" ), // eDeviceID // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. tr("Blood Flow Rate" ), // eBloodFlowRate tr("Dialysate Flow Rate" ), // eDialysateFlowRate tr("Treatment Duration" ), // eTreatmentDuration @@ -157,16 +159,16 @@ tr("Target UF Rate" ), // eTargetUFRate tr("Actual UF Rate" ), // eActualUFRate tr("Saline Bolus Volume" ), // eSalineBolusVolume - tr("Average Blood Flow" ), // eAverageBloodFlow - tr("Average Dialysate Flow" ), // eAverageDialysateFlow - tr("Average Dialysate Temp" ), // eAverageDialysateTemp - tr("Average Arterial Pressure" ), // eAverageArterialPressure - tr("Average Venous Pressure" ), // eAverageVenousPressure +// tr("Average Blood Flow" ), // eAverageBloodFlow // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// tr("Average Dialysate Flow" ), // eAverageDialysateFlow // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// tr("Average Dialysate Temp" ), // eAverageDialysateTemp // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// tr("Average Arterial Pressure" ), // eAverageArterialPressure // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// tr("Average Venous Pressure" ), // eAverageVenousPressure // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. }; const QStringList _units { "" , // ePatientID - "" , // eDeviceID +// "" , // eDeviceID // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. _unitTextFlowRate , // eBloodFlowRate _unitTextFlowRate , // eDialysateFlowRate _unitTextDurationMin , // eTreatmentDuration @@ -196,11 +198,11 @@ _unitTextFlowRate , // eTargetUFRate _unitTextFlowRate , // eActualUFRate _unitTextFluid , // eSalineBolusVolume - _unitTextFlowRate , // eAverageBloodFlow - _unitTextFlowRate , // eAverageDialysateFlow - _unitTextTemperature , // eAverageDialysateTemp - _unitTextBloodPressure , // eAverageArterialPressure - _unitTextBloodPressure , // eAverageVenousPressure +// _unitTextFlowRate , // eAverageBloodFlow // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// _unitTextFlowRate , // eAverageDialysateFlow // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// _unitTextTemperature , // eAverageDialysateTemp // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// _unitTextBloodPressure , // eAverageArterialPressure // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. +// _unitTextBloodPressure , // eAverageVenousPressure // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. }; QString title(quint8 vIndex) const { Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -rdf0329c47627ceb1fe460cda2ae3ff8c9c851106 -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision df0329c47627ceb1fe460cda2ae3ff8c9c851106) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) @@ -66,11 +66,7 @@ if ( mSelfTestNoCartridge ) { selfTestNoCartridge_start ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_START_STATE ); selfTestNoCartridge_waitDoorClose ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); - selfTestNoCartridge_occlusionSensors ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE ); - selfTestNoCartridge_bloodFlowMeters ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE ); - selfTestNoCartridge_dialysateFlowMeters ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE ); - // FIXME: It has been removed : selfTestNoCartridge_leakDetectors ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE ); - selfTestNoCartridge_boardTemperature ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE ); + selfTestNoCartridge_pressureCheck ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE ); selfTestNoCartridge_homeValves ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_STATE ); selfTestNoCartridge_homeSyringePump ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE ); selfTestNoCartridge_pumps ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PUMPS_STATE ); Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -rdf0329c47627ceb1fe460cda2ae3ff8c9c851106 -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision df0329c47627ceb1fe460cda2ae3ff8c9c851106) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) @@ -72,14 +72,9 @@ STATE ( bool , selfTestConsumables_acidPump , false ) ///< CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE , Consumable self-tests acid concentrate pump check state STATE ( bool , selfTestConsumables_complete , false ) ///< CONSUMABLE_SELF_TESTS_COMPLETE_STATE , Consumable self-tests complete state - // Self tests with no cartridge state PROPERTY( bool , selfTestNoCartridge_start , false ) ///< NO_CART_SELF_TESTS_START_STATE , No cartridge self-tests starting state. PROPERTY( bool , selfTestNoCartridge_waitDoorClose , false ) ///< NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE , Wait for door to be closed before running self-tests. - PROPERTY( bool , selfTestNoCartridge_occlusionSensors , false ) ///< NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE , No cartridge occlusion sensors self-test state. - PROPERTY( bool , selfTestNoCartridge_bloodFlowMeters , false ) ///< NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE , No cartridge blood flow meter self-test state. - PROPERTY( bool , selfTestNoCartridge_dialysateFlowMeters , false ) ///< NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE , No cartridge dialysate flow meter self-test state. - PROPERTY( bool , selfTestNoCartridge_leakDetectors , false ) ///< NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE , No cartridge leak detectors self-test state. - PROPERTY( bool , selfTestNoCartridge_boardTemperature , false ) ///< NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE , No cartridge board temperature self-test state. + PROPERTY( bool , selfTestNoCartridge_pressureCheck , false ) ///< NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE , No cartridge pressure sensors self-test state PROPERTY( bool , selfTestNoCartridge_homeValves , false ) ///< NO_CART_SELF_TESTS_HOME_VALVES_STATE , No cartridge home valves state PROPERTY( bool , selfTestNoCartridge_homeSyringePump , false ) ///< NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE , No cartridge home syringe pump state PROPERTY( bool , selfTestNoCartridge_pumps , false ) ///< NO_CART_SELF_TESTS_PUMPS_STATE , No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state.