Index: AlarmMapping.csv =================================================================== diff -u -r86acb3c49bfc7c4ed8fc860d895c0603b4816b3a -ra7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 86acb3c49bfc7c4ed8fc860d895c0603b4816b3a) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision a7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa) @@ -41,7 +41,7 @@ 40,"Dialysis outlet pump failed motor off check.\nMeasured speed while commanded off." 41,"Dialysis outlet pump failed motor direction check.\nMeasured vs commanded." 42,"Dialysis outlet pump failed rotor speed check.\nMismatch with rotor and motor speeds." - 43,"HD blood leak self test fault." + 43,"DG main primary heater FPGA fault." 44,"User interface communication timeout." 45,"HD too many bad communications CRC." 46,"System message that required acknowledgment was not acknowledged." @@ -61,8 +61,8 @@ 60,"HD valve not functional." 61,"HD valve current out of range." 62,"HD valve position out of target." - 63,"FPGA reports failure reading arterial pressure sensor." - 64,"FPGA reports failure reading venous pressure sensor." + 63,"HD blood leak FPGA fault." + 64,"DG barometric pressure sensor out of range." 65,"HD requests DG command with invalid parameter fault." 66,"HD blood leak sensor set point set failure." 67,"HD blood pump occlusion self-test failure alarm." @@ -72,7 +72,7 @@ 71,"HD venous pressure self-test failure alarm." 72,"HD No load cell data message receive at least once every 2 seconds." 73,"HD No dialysate temperature data message receive at least once every 2 seconds." - 74,"HD blood leak detector self-test transmit timeout." + 74,"DG inlet UV reactor is on with no flow." 75,"HD syringe pump self-test failure alarm." 76,"HD monitored voltage is out of range." 77,"DG monitored voltage is out of range." @@ -82,13 +82,13 @@ 81,"HD syringe pump over travel error." 82,"HD syringe pump DAC write failure." 83,"HD syringe pump is running while the BP is off." - 84,"HD venous pressure sensor not being read." + 84,"DG set RTC year is invalid." 85,"HD pump track latch opened alarm." - 86,"HD BP occlusion sensor not being read." + 86,"HD set RTC year is invalid." 87,"DG heating invalid calibration record." 88,"DG concentrate pumps hall sensor out of range." - 89,"HD BP occlusion sensor error." - 90,"DG load cells FPGA read error." + 89,"DG outlet UV reactor on with no flow." + 90,"DG load cells A1/B1 FPGA fault." 91,"HD No dialysate flow data receive in the last 3 seconds." 92,"DG conductivity sensor bad status." 93,"DG outlet primary conductivity out of range." @@ -106,12 +106,12 @@ 105,"DG invalid calibration CRC." 106,"DG dialysate flow sensor invalid calibration record." 107,"HD reports DG restarted fault." - 108,"HD syringe pump ADC error." + 108,"HD syringe pump ADC FPGA fault." 109,"HD syringe pump volume check error." 110,"HD syringe pump speed check error." 111,"HD syringe pump not stopped in off state error." - 112,"HD blood leak zero command transmit timeout." - 113,"HD blood leak zero command fault." + 112,"DG load cells A1/B1 FPGA fault." + 113,"DG Drain pump current out of range." 114,"HD venous air bubble detector self-test failure." 115,"DG temperature sensor out of range." 116,"DG temperature sensor ADC fault." @@ -167,7 +167,7 @@ 166,"HD in treatment re-circ sub-mode for too long." 167,"HD cartridge door opened alarm." 168,"HD active reservoir depletion timeout." - 169,"Dialysate flow rate out of range." + 169,"DG Dialysate flow rate out of maximum range." 170,"HD syringe empty alarm." 171,"HD syringe pump occlusion alarm." 172,"HD syringe pump not enough Heparin alarm." @@ -178,7 +178,7 @@ 177,"DG software fault.\nSoftware found itself in an unexpected state." 178,"HD communication timeout." 179,"DG FPGA communication down for too long." - 180,"DG load cell ADC error." + 180,"DG RO flow out of maximum range." 181,"DG load cells weight out of range for tare." 182,"DG load cells invalid calibration." 183,"DG invalid load cell value." @@ -194,8 +194,8 @@ 193,"HD dialysate temperature out of low safety range." 194,"DG RO pump duty cycle out of range." 195,"DG RO pump pressure out of range." - 196,"DG temperature sensor error bit fault." - 197,"DG temperature sensors FPGA fault." + 196,"DG CPi/CPo sensors FPGA fault." + 197,"DG CD1/CD2 sensors FPGA fault." 198,"RO flow too low while primary heater is on." 199,"Dialysate flow too low while trimmer heater is on." 200,"DG thermistors/sensors temperature out of range." @@ -220,8 +220,8 @@ 219,"HD syringe pump syringe removed alarm." 220,"DG THd sensors FPGA fault." 221,"HD Saline bag is empty." - 222,"HD dialysate temperature too high alarm." - 223,"HD dialysate temperature too low alarm." + 222,"HD occlusion sensor FPGA fault." + 223,"HD arterial sensor FPGA fault." 224,"Treatment stopped by user action." 225,"HD end of treatment warning." 226,"HD prime completed low priority alarm." @@ -278,7 +278,7 @@ 277,"HD BP occlusion sensor is reading out of range." 278,"HD active reservoir weight out of range." 279,"DG dialysate drain time out." - 280,"HD arterial pressure sensor read timeout error." + 280,"DG drain pump direction invalid." 281,"Acid concentration bottle low volume alarm." 282,"Bicarbonate concentration bottle low volume alarm." 283,"DG load cells weight out of range." @@ -288,7 +288,7 @@ 287,"HD processor clock speed checks against FPGA clock failure." 288,"HD load cells primary/back up drift out of range." 289,"DG dialysate or concentrate caps not closed." - 290,"DG flow too low while heater is on." + 290,"HD venous pressure sensor FPGA fault." 291,"HD processor is in Disinfect Flush mode." 292,"HD processor is in Disinfect Heat mode." 293,"HD processor is in Disinfect Chemical mode." @@ -297,11 +297,13 @@ 296,"DG TDi sensors FPGA fault." 297,"DG TRo sensors FPGA fault." 298,"DG baro sensor FPGA fault." - 299,"DG disinfect has been expired." - 300,"DG service time interval has elapsed." + 299,"DG invalid serial number." + 300,"HD invalid serial number." 301,"DG primary heater power voltage out of range." 302,"DG processor RAM error." - 303,"HD service time interval has elapsed." + 303,"DG drain pump direction FPGA fault." 304,"HD invalid usage record." 305,"HD processor RAM error." - 306,"Total number of alarms." + 306,"HD air trap over-fill alarm." + 307,"HD AC power lost second alarm." + 308,"Total number of alarms." Index: denali.pro.user =================================================================== diff -u -r7823da721f8041d6d39c37cd040e162ea9d35e7f -ra7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa --- denali.pro.user (.../denali.pro.user) (revision 7823da721f8041d6d39c37cd040e162ea9d35e7f) +++ denali.pro.user (.../denali.pro.user) (revision a7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1258,7 +1258,7 @@ true - staging + /home/denali/Projects/application/alarmMapping.sh %{sourceDir} Custom Process Step Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -ra7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 54c4136d95375116e6daf23b7d4179159cf13d0c) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision a7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa) @@ -105,34 +105,37 @@ } Connections { target: vPreTreatmentStates - onSelfTestDryChanged : { page( _preTreatmentDrySelfTest , vselfTestDry )} - onSelfTestDry_startChanged : {} - onSelfTestDry_waitDoorCloseChanged : {} - onSelfTestDry_usedCartridgeEntered : { _preTreatmentDrySelfTest .checkList.setItem(0, vselfTestDry_usedCartridge )} - onSelfTestDry_occlusionSensorsEntered : { _preTreatmentDrySelfTest .checkList.setItem(1, vselfTestDry_occlusionSensors )} - onSelfTestDry_pressureSensorsSetupEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, true )} - onSelfTestDry_pressureSensorsPressurizedEntered : {} - onSelfTestDry_pressureSensorsDecayEntered : {} - onSelfTestDry_pressureSensorsStabilityEntered : {} - onSelfTestDry_pressureSensorsNormalEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, vselfTestDry_pressureSensorsNormal )} - onSelfTestDry_syringePumpEntered : { _preTreatmentDrySelfTest .checkList.setItem(3, vselfTestDry_syringePump )} - onSelfTestDry_stoppedEntered : {} - onSelfTestDry_completeEntered : {} + onSelfTestDryChanged : { page( _preTreatmentDrySelfTest , vselfTestDry )} + onSelfTestDry_startChanged : {} + onSelfTestDry_waitDoorCloseChanged : {} + onSelfTestDry_usedCartridgeEntered : { _preTreatmentDrySelfTest .checkList.setItem(0, vselfTestDry_usedCartridge )} + onSelfTestDry_occlusionSensorsEntered : { _preTreatmentDrySelfTest .checkList.setItem(1, vselfTestDry_occlusionSensors )} + onSelfTestDry_pressureSensorsNormalSetupEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, true )} + onSelfTestDry_pressureSensorsVenousSetupEntered : {} + onSelfTestDry_pressureSensorsVenousEntered : {} + onSelfTestDry_pressureSensorsArterialSetupEntered : {} + onSelfTestDry_pressureSensorsArterialEntered : {} + onSelfTestDry_pressureSensorsDecayEntered : {} + onSelfTestDry_pressureSensorsStabilityEntered : {} + onSelfTestDry_pressureSensorsNormalEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, vselfTestDry_pressureSensorsNormal )} + onSelfTestDry_syringePumpEntered : { _preTreatmentDrySelfTest .checkList.setItem(3, vselfTestDry_syringePump )} + onSelfTestDry_stoppedEntered : {} + onSelfTestDry_completeEntered : {} } Connections { target: vPreTreatmentStates - onPrimeChanged : { page( _preTreatmentDisposablesPrime , vprime )} - onPrime_waitUserStartEntered : {} - onPrime_salineSetupEntered : { _preTreatmentDisposablesPrime .checkList.setItem(0, true )} - onPrime_salinePurgeAirEntered : {} - onPrime_salineCirculateBloodCircuitEntered : { _preTreatmentDisposablesPrime .checkList.setItem(0, vprime_salineCirculateBloodCircuit )} - onPrime_reservoiOneFillCompleteEntered : { _preTreatmentDisposablesPrime .checkList.setItem(1, true )} - onPrime_dialysateDialyzerEntered : {} - onPrime_reservoirTwoFillCompleteEntered : {} - onPrime_dialysateBypassEntered : { _preTreatmentDisposablesPrime .checkList.setItem(1, vprime_dialysateBypass )} - onPrime_wetSelfTestsEntered : { _preTreatmentDisposablesPrime .checkList.setItem(2, vprime_wetSelfTests )} - onPrime_pauseEntered : {} - onPrime_completeEntered : {} + onPrimeChanged : { page( _preTreatmentDisposablesPrime , vprime )} + onPrime_waitUserStartEntered : {} + onPrime_salineSetupEntered : { _preTreatmentDisposablesPrime .checkList.setItem(0, true )} + onPrime_salinePurgeAirEntered : {} + onPrime_salineCirculateBloodCircuitEntered : { _preTreatmentDisposablesPrime .checkList.setItem(0, vprime_salineCirculateBloodCircuit )} + onPrime_reservoiOneFillCompleteEntered : { _preTreatmentDisposablesPrime .checkList.setItem(1, true )} + onPrime_dialysateDialyzerEntered : {} + onPrime_reservoirTwoFillCompleteEntered : {} + onPrime_dialysateBypassEntered : { _preTreatmentDisposablesPrime .checkList.setItem(1, vprime_dialysateBypass )} + onPrime_wetSelfTestsEntered : { _preTreatmentDisposablesPrime .checkList.setItem(2, vprime_wetSelfTests )} + onPrime_pauseEntered : {} + onPrime_completeEntered : {} } Connections { target: vPreTreatmentAdjustmentDisposablesPrime Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r7992f1a517435b1801dbee84e5ffc38b8452d2dd -ra7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 7992f1a517435b1801dbee84e5ffc38b8452d2dd) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision a7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 24-Oct-2022 + * \date (last) 25-Oct-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -135,7 +135,7 @@ /*0099*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_STALL : { result = QObject::tr("HD syringe pump stall alarm." ); break; } /* 99*/ /*0100*/case GuiAlarmID::ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT : { result = QObject::tr("HD no cartridge self-test timeout." ); break; } /* 100*/ /*0101*/case GuiAlarmID::ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT : { result = QObject::tr("HD dry self-test timeout." ); break; } /* 101*/ -/*0102*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANAGE : { result = QObject::tr("DG heat disinfect temperature gradient out of range." ); break; } /* 102*/ +/*0102*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANGE : { result = QObject::tr("DG heat disinfect temperature gradient out of range." ); break; } /* 102*/ /*0103*/case GuiAlarmID::ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("HD invalid calibration CRC." ); break; } /* 103*/ /*0104*/case GuiAlarmID::ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS : { result = QObject::tr("Air trap level sensors reporting illegal combination of air/fluid." ); break; } /* 104*/ /*0105*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG invalid calibration CRC." ); break; } /* 105*/ @@ -336,7 +336,7 @@ /*0300*/case GuiAlarmID::ALARM_ID_HD_INVALID_SERIAL_NUMBER : { result = QObject::tr("HD invalid serial number." ); break; } /* 300*/ /*0301*/case GuiAlarmID::ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE : { result = QObject::tr("DG primary heater power voltage out of range." ); break; } /* 301*/ /*0302*/case GuiAlarmID::ALARM_ID_DG_CPU_RAM_ERROR : { result = QObject::tr("DG processor RAM error." ); break; } /* 302*/ -/*0303*/case GuiAlarmID::ALARM_ID__AVAILABLE_4 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 303*/ +/*0303*/case GuiAlarmID::ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_FAULT : { result = QObject::tr("DG drain pump direction FPGA fault." ); break; } /* 303*/ /*0304*/case GuiAlarmID::ALARM_ID_HD_INVALID_USAGE_RECORD_CRC : { result = QObject::tr("HD invalid usage record." ); break; } /* 304*/ /*0305*/case GuiAlarmID::ALARM_ID_HD_CPU_RAM_ERROR : { result = QObject::tr("HD processor RAM error." ); break; } /* 305*/ /*0306*/case GuiAlarmID::ALARM_ID_HD_AIR_TRAP_OVERFILL : { result = QObject::tr("HD air trap over-fill alarm." ); break; } /* 306*/ Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -ra7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 54c4136d95375116e6daf23b7d4179159cf13d0c) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision a7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa) @@ -87,21 +87,24 @@ // Self tests dry state - bool mSelfTestDry = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_SELF_TEST_DRY_STATE ; + bool mSelfTestDry = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_SELF_TEST_DRY_STATE ; if ( mSelfTestDry ) { - selfTestDry_start ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_START_STATE ); - selfTestDry_waitDoorClose ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); - selfTestDry_usedCartridge ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE ); - selfTestDry_occlusionSensors ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE ); - selfTestDry_pressureSensorsSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE ); - selfTestDry_pressureSensorsPressurized ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE ); - selfTestDry_pressureSensorsDecay ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE ); - selfTestDry_pressureSensorsStability ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE ); - selfTestDry_pressureSensorsNormal ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE ); - selfTestDry_syringePump ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE ); + selfTestDry_start ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_START_STATE ); + selfTestDry_waitDoorClose ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); + selfTestDry_usedCartridge ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE ); + selfTestDry_occlusionSensors ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE ); + selfTestDry_pressureSensorsNormalSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE ); + selfTestDry_pressureSensorsVenousSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE ); + selfTestDry_pressureSensorsVenous ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS ); + selfTestDry_pressureSensorsArterialSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE ); + selfTestDry_pressureSensorsArterial ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL ); + selfTestDry_pressureSensorsDecay ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE ); + selfTestDry_pressureSensorsStability ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE ); + selfTestDry_pressureSensorsNormal ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE ); + selfTestDry_syringePump ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE ); selfTestDry_syringePumpOcclusionDetection ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE ); - selfTestDry_stopped ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_STOPPED_STATE ); - selfTestDry_complete ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_COMPLETE_STATE ); + selfTestDry_stopped ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_STOPPED_STATE ); + selfTestDry_complete ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_COMPLETE_STATE ); } selfTestDry(mSelfTestDry); // it's the main even so moved last to have all the sub-states updated prior to. Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -ra7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision 54c4136d95375116e6daf23b7d4179159cf13d0c) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision a7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa) @@ -91,8 +91,13 @@ PROPERTY( bool , selfTestDry_waitDoorClose , false ) ///< DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE , Wait for door to close before executing self-tests. STATE ( bool , selfTestDry_usedCartridge , false ) ///< DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE , Used Cartridge self-test state. STATE ( bool , selfTestDry_occlusionSensors , false ) ///< DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE , Occlusion sensors dry self-test state. - STATE ( bool , selfTestDry_pressureSensorsSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE , Pressure sensors dry self-test setup valves and pump state. - STATE ( bool , selfTestDry_pressureSensorsPressurized , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE, Pressure sensors verify pressure readings state + + STATE ( bool , selfTestDry_pressureSensorsNormalSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE , Pressure sensor setup state. + STATE ( bool , selfTestDry_pressureSensorsVenousSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE , Venous pressure sensor dry self-test setup valves and pump state + STATE ( bool , selfTestDry_pressureSensorsVenous , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS , Venous pressure sensor dry self-test + STATE ( bool , selfTestDry_pressureSensorsArterialSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE , Arterial pressure sensor dry self-test setup valves and pump state + STATE ( bool , selfTestDry_pressureSensorsArterial , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL , Arterial pressure sensor dry self-test + STATE ( bool , selfTestDry_pressureSensorsDecay , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE , Pressure sensors verify pressure loss state STATE ( bool , selfTestDry_pressureSensorsStability , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE , Pressure sensors verify pressure stability state STATE ( bool , selfTestDry_pressureSensorsNormal , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE , Pressure sensors verify normal pressure readings state.