Index: .gitignore =================================================================== diff -u -rf68b226e67eb500758ee94fe015df48931240013 -re699d00afc964052ec0e91ca72e101d21aa00413 --- .gitignore (.../.gitignore) (revision f68b226e67eb500758ee94fe015df48931240013) +++ .gitignore (.../.gitignore) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -5,3 +5,5 @@ resources/settings denali.pro.* denali.pro.user.* + +*.sh~ Index: imake.sh =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413 --- imake.sh (.../imake.sh) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ imake.sh (.../imake.sh) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -15,6 +15,14 @@ # ############################################################################ -./alarmMapping.sh -./cppcheck.sh +if [ "$1" != 0 ]; then + ./alarmMapping.sh $1 +else + echo " ********** bypassed alarmMapping" +fi +if [ "$2" != 0 ]; then + ./cppcheck.sh $2 +else + echo " ********** bypassed cppcheck" +fi Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413 --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -55,7 +55,7 @@ Connections { target: vPreTreatmentStates function onSelfTestConsumables_installChanged ( vValue ) { page( _preTreatmentConsumablesInstall , vValue )} - function onSelfTestConsumables_waterQualityEntered ( vValue ) {/* _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vValue )*/ } + function onselfTestConsumables_primeEntered ( vValue ) {/* _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vValue )*/ } function onSelfTestConsumables_biCarbPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vValue )} function onSelfTestConsumables_acidPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItem( 1, vValue )} } Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413 --- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -97,7 +97,6 @@ } Connections { target: vPreTreatmentStates - function onSelfTestNoCartridge_startChanged ( vValue ) { /* , vValue */ } // FW does not go all the time to start so the main state change should be sufficient to update the disposables stack. function onSelfTestNoCartridgeChanged ( vValue ) { page( _preTreatmentDisposablesSelfTest , vValue )} function onInstallationChanged ( vValue ) { page( _preTreatmentDisposablesCartridgeInstallation , vValue )} Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -109,7 +109,7 @@ function onSelfTestDry_startChanged ( vValue ) {} function onSelfTestDry_waitDoorCloseChanged ( vValue ) {} function onSelfTestDry_usedCartridgeEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(0, vValue )} - function onSelfTestDry_occlusionSensorsEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(1, vValue )} + function onSelfTestDry_cartridgeLoadedEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(1, vValue )} function onSelfTestDry_pressureSensorsNormalSetupEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(2, true )} function onSelfTestDry_pressureSensorsVenousSetupEntered ( vValue ) {} function onSelfTestDry_pressureSensorsVenousEntered ( vValue ) {} Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413 --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -35,7 +35,7 @@ PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack ;objectName: "_preTreatmentWaterSampleStack" } PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack ;objectName: "_preTreatmentConsumablesStack" } PreTreatmentDisposablesStack{ id: _preTreatmentDisposablesStack ;objectName: "_preTreatmentDisposablesStack" } - PreTreatmentPrimeStack { id: _pretreatmentPrimeStack ;objectName: "_pretreatmentPrimeStack " } + PreTreatmentPrimeStack { id: _pretreatmentPrimeStack ;objectName: "_pretreatmentPrimeStack" } PreTreatmentConnectionStack { id: _pretreatmentConnectionStack ;objectName: "_pretreatmentConnectionStack " } Connections { target: vPreTreatmentStates Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -37,10 +37,6 @@ recirculateState ( vData.mRecirculateState ); patientConnectionState ( vData.mPatientConnectionState ); - // start state - start ( vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_START_STATE ); - - // water sample state bool mWaterSample = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_WATER_SAMPLE_STATE ; if ( mWaterSample ) { @@ -53,7 +49,7 @@ bool mSelfTestConsumables = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE ; if ( mSelfTestConsumables ) { selfTestConsumables_install ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_INSTALL_STATE ); - selfTestConsumables_waterQuality ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE ); + selfTestConsumables_prime ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_PRIME_STATE ); selfTestConsumables_biCarbPump ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE ); selfTestConsumables_acidPump ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE ); selfTestConsumables_complete ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_COMPLETE_STATE ); @@ -64,7 +60,6 @@ // Self tests with no cartridge state bool mSelfTestNoCartridge = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE ; 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_pressureCheck ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE ); selfTestNoCartridge_homeValves ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_STATE ); @@ -92,7 +87,7 @@ 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_cartridgeLoaded ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_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 ); @@ -112,7 +107,6 @@ // Prime blood and dialysate circuits and run wet self-tests state bool mPrime = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_PRIME_STATE ; if ( mPrime ) { - prime_start ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_START_STATE ); prime_waitUserStart ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_WAIT_FOR_USER_START_STATE ); prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_SETUP_STATE ); prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_PURGE_AIR_STATE ); Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -40,7 +40,7 @@ // Be careful it is always triggered on each message. TRIGGER ( bool , state , false ) // changes in case any message received. - PROPERTY( quint8 , subMode , 0 ) ///< HD_PRE_TREATMENT_START_STATE , Start pre-treatment mode state + PROPERTY( quint8 , subMode , 0 ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE , Water sample state PROPERTY( quint8 , waterSampleState , 0 ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE , Water sample state PROPERTY( quint8 , selfTestConsumablesState , 0 ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE, , Consumable self-tests state PROPERTY( quint8 , selfTestNoCartridgeState , 0 ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE , Self tests with no cartridge state @@ -51,7 +51,6 @@ PROPERTY( quint8 , patientConnectionState , 0 ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE , Patient connection state // Start pre-treatment mode state - PROPERTY( bool , start , false ) ///< HD_PRE_TREATMENT_START_STATE , Start pre-treatment mode state PROPERTY( bool , waterSample , false ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE , Water sample state PROPERTY( bool , selfTestConsumables , false ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE, , Consumable self-tests state PROPERTY( bool , selfTestNoCartridge , false ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE , Self tests with no cartridge state @@ -67,12 +66,11 @@ // Self tests consumables state PROPERTY( bool , selfTestConsumables_install , false ) ///< CONSUMABLE_SELF_TESTS_INSTALL_STATE , Consumable self-tests install state - STATE ( bool , selfTestConsumables_waterQuality , false ) ///< CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE , Consumable self-tests water quality check state + STATE ( bool , selfTestConsumables_prime , false ) ///< CONSUMABLE_SELF_PRIME_STATE , Consumable self-tests prime concentrate lines state STATE ( bool , selfTestConsumables_biCarbPump , false ) ///< CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE , Consumable self-tests bicarbonate concentrate pump check state 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 - 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_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 @@ -90,7 +88,7 @@ PROPERTY( bool , selfTestDry_start , false ) ///< DRY_SELF_TESTS_START_STATE , Dry self-tests starting state. 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_cartridgeLoaded , false ) ///< DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE , Cartridge loaded check dry self-test 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 @@ -107,7 +105,6 @@ STATE ( bool , selfTestDry_complete , false ) ///< DRY_SELF_TESTS_COMPLETE_STATE , Dry self-test complete state. // Prime blood and dialysate circuits and run wet self-tests state - PROPERTY( bool , prime_start , false ) ///< HD_PRIME_START_STATE , Prime start state STATE ( bool , prime_waitUserStart , false ) ///< HD_PRIME_WAIT_FOR_USER_START_STATE , Wait for user to start prime state STATE ( bool , prime_salineSetup , false ) ///< HD_PRIME_SALINE_SETUP_STATE , Saline setup state STATE ( bool , prime_salinePurgeAir , false ) ///< HD_PRIME_SALINE_PURGE_AIR_STATE , Saline purge air state Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -62,11 +62,9 @@ // Ultrafiltration states ENUM_CHECK_O( GuiUFStates, vData.mUFState ) { - ENUM_CHECK ( GuiUFStates, UF_START_STATE ) ENUM_CHECK ( GuiUFStates, UF_PAUSED_STATE ) ENUM_CHECK ( GuiUFStates, UF_RUNNING_STATE ) ENUM_CHECK_C( GuiUFStates, NUM_OF_UF_STATES ) } - ENUM_READ ( GuiUFStates, UF_START_STATE , ufStart ); ENUM_READ ( GuiUFStates, UF_PAUSED_STATE , ufPaused ); ENUM_READ ( GuiUFStates, UF_RUNNING_STATE, ufRunning ); @@ -209,11 +207,9 @@ { // Ultrafiltration states ENUM_CHECK_O( GuiUFStates, vData.mUFState ) { - ENUM_CHECK ( GuiUFStates, UF_START_STATE ) ENUM_CHECK ( GuiUFStates, UF_PAUSED_STATE ) ENUM_CHECK ( GuiUFStates, UF_RUNNING_STATE ) ENUM_CHECK_C( GuiUFStates, NUM_OF_UF_STATES ) } - ENUM_READ ( GuiUFStates, UF_START_STATE , ufStart ); ENUM_READ ( GuiUFStates, UF_PAUSED_STATE , ufPaused ); ENUM_READ ( GuiUFStates, UF_RUNNING_STATE, ufRunning ); } Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision e699d00afc964052ec0e91ca72e101d21aa00413) @@ -71,11 +71,6 @@ // disabled coco end // ---- Ultrafiltration states - // disabled coco begin validated: Manually tested - // not useful for UI more FW state entry - // kept for consistency - PROPERTY( bool , ufStart , false) ///< UF_START_STATE = 0 # Start state of the ultrafiltration state machine - // disabled coco end PROPERTY( bool , ufPaused , false) ///< UF_PAUSED_STATE = 1 # Paused state of the ultrafiltration state machine PROPERTY( bool , ufRunning , false) ///< UF_RUNNING_STATE = 2 # Running state of the ultrafiltration state machine