Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r50d6907ed1bef8273ad246a823073153016997e1 -r7f62ca31bd7823affed99cda268e1e93c9caec3d --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 50d6907ed1bef8273ad246a823073153016997e1) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 7f62ca31bd7823affed99cda268e1e93c9caec3d) @@ -74,7 +74,7 @@ readonly property bool visibleAdvancedInstitutional : loggedIn readonly property bool visibleLocalization : loggedIn readonly property bool visibleAdvancedModes : loggedIn - readonly property bool visibleCalibrationSettings : true// loggedIn + readonly property bool visibleCalibrationSettings : loggedIn readonly property string settingsTitle : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : _GuiView.updateSetup ? qsTr("Software Update") : qsTr("Device Settings") Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -r64d551143d898bf2ce79cb564e5a3389eb9be91e -r7f62ca31bd7823affed99cda268e1e93c9caec3d --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 7f62ca31bd7823affed99cda268e1e93c9caec3d) @@ -28,52 +28,12 @@ void VPreTreatmentStates::onActionReceive(const PreTreatmentStatesData &vData) { subMode ( vData.mSubMode ); - waterSampleState ( vData.mWaterSampleState ); - selfTestConsumablesState( vData.mSelfTestConsumablesState ); - selfTestNoCartridgeState( vData.mSelfTestNoCartridgeState ); installationState ( vData.mInstallationState ); selfTestDryState ( vData.mSelfTestDryState ); primeState ( vData.mPrimeState ); recirculateState ( vData.mRecirculateState ); patientConnectionState ( vData.mPatientConnectionState ); - wetSelfTestsState ( vData.mWetSelfTestsState ); - preTreatmentRsrvrState ( vData.mPreTreatmentRsrvrState ); - // water sample state - bool mWaterSample = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_WATER_SAMPLE_STATE ; - if ( mWaterSample ) { - waterSample_setup ( vData.mWaterSampleState == GuiPreTreatmentWaterSampleStates ::SAMPLE_WATER_SETUP_STATE ); - waterSample_running ( vData.mWaterSampleState == GuiPreTreatmentWaterSampleStates ::SAMPLE_WATER_STATE ); - } - waterSample( mWaterSample ); // it's the main even so moved last to have all the sub-states updated prior to. - - // Self tests consumables state - bool mSelfTestConsumables = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE ; - if ( mSelfTestConsumables ) { - selfTestConsumables_install ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_INSTALL_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 ); - } - selfTestConsumables(mSelfTestConsumables); // it's the main even so moved last to have all the sub-states updated prior to. - - - // Self tests with no cartridge state - bool mSelfTestNoCartridge = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE ; - if ( mSelfTestNoCartridge ) { - 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 ); - selfTestNoCartridge_homeSyringePump ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE ); - selfTestNoCartridge_pumps ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PUMPS_STATE ); - selfTestNoCartridge_homeIdle ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_IDLE_STATE ); - selfTestNoCartridge_stopped ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_STOPPED_STATE ); - selfTestNoCartridge_complete ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_COMPLETE_STATE ); - } - selfTestNoCartridge(mSelfTestNoCartridge); // it's the main even so moved last to have all the sub-states updated prior to. - - // Consumable and cartridge installation state bool mInstallation = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE ; if ( mInstallation ) { @@ -82,7 +42,6 @@ } installation(mInstallation); // it's the main even so moved last to have all the sub-states updated prior to. - // Self tests dry state bool mSelfTestDry = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_DRY_STATE ; if ( mSelfTestDry ) { Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -rc3fb36648391c5b7738adfd0062ad2ac0b8e4749 -r7f62ca31bd7823affed99cda268e1e93c9caec3d --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision c3fb36648391c5b7738adfd0062ad2ac0b8e4749) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision 7f62ca31bd7823affed99cda268e1e93c9caec3d) @@ -41,19 +41,13 @@ TRIGGER ( bool , state , false ) // changes in case any message received. 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 PROPERTY( quint8 , installationState , 0 ) ///< HD_PRE_TREATMENT_CART_INSTALL_STATE , Consumable and cartridge installation state PROPERTY( quint8 , selfTestDryState , 0 ) ///< HD_PRE_TREATMENT_SELF_TEST_DRY_STATE , Self tests dry state PROPERTY( quint8 , primeState , 0 ) ///< HD_PRE_TREATMENT_PRIME_STATE , Prime blood and dialysate circuits and run wet self-tests state PROPERTY( quint8 , recirculateState , 0 ) ///< HD_PRE_TREATMENT_RECIRCULATE_STATE , Re-circulate blood and dialysate circuits state PROPERTY( quint8 , patientConnectionState , 0 ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE , Patient connection state - PROPERTY( quint8 , wetSelfTestsState , 0 ) ///< ??? , ??? - PROPERTY( quint8 , preTreatmentRsrvrState , 0 ) ///< ??? , ??? // 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 PROPERTY( bool , installation , false ) ///< HD_PRE_TREATMENT_CART_INSTALL_STATE , Consumable and cartridge installation state @@ -62,26 +56,7 @@ PROPERTY( bool , recirculate , false ) ///< HD_PRE_TREATMENT_RECIRCULATE_STATE , Re-circulate blood and dialysate circuits state PROPERTY( bool , patientConnection , false ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE , Patient connection state - // Water sample state - PROPERTY( bool , waterSample_setup , false ) ///< SAMPLE_WATER_SETUP_STATE , Sample water setup state of the sample water sub-mode state machine - PROPERTY( bool , waterSample_running , false ) ///< SAMPLE_WATER_STATE , Sample water state of the sample water sub-mode state machine - // Self tests consumables state - PROPERTY( bool , selfTestConsumables_install , false ) ///< CONSUMABLE_SELF_TESTS_INSTALL_STATE , Consumable self-tests install 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_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 - 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. - PROPERTY( bool , selfTestNoCartridge_homeIdle , false ) ///< NO_CART_SELF_TESTS_HOME_IDLE_STATE , Wait for valves and pumps finish homing state. - PROPERTY( bool , selfTestNoCartridge_stopped , false ) ///< NO_CART_SELF_TESTS_STOPPED_STATE , No cart self-test stopped state. - PROPERTY( bool , selfTestNoCartridge_complete , false ) ///< NO_CART_SELF_TESTS_COMPLETE_STATE , No cartridge self-test complete state. - // Consumable and cartridge installation state // There is not state(enum) for this and it is always 0 for now. but will be used to notify UI about being in this state. PROPERTY( bool , installation_start , false ) ///< Consumable and cartridge installation state Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -rfd13750406289b7fd9d49c7827ad143fe246278f -r7f62ca31bd7823affed99cda268e1e93c9caec3d --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision fd13750406289b7fd9d49c7827ad143fe246278f) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 7f62ca31bd7823affed99cda268e1e93c9caec3d) @@ -47,7 +47,7 @@ switch (vIndex) { case ePressure : { - QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; // DD Pressure sensors _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Outlet Pressure")}, { eRole_Component, tr("D9" )}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Dry Bicarb Pressure")}, { eRole_Component, tr("D66")}, {eRole_Payload, initPayloadValues }}); @@ -65,7 +65,7 @@ } case eTemperature : { - QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Inlet")}, { eRole_Component, tr("D1" )}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Outlet")}, { eRole_Component, tr("D78")}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Primary Heater")}, { eRole_Component, tr("D4" )}, {eRole_Payload, initPayloadValues }}); @@ -76,21 +76,21 @@ } case eConcentratePump : { - QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Acid")}, { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Bicarbonate")}, { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Ultrafiltration")}, { eRole_Component, tr("D76" )}, {eRole_Payload, initPayloadValues }}); break; } case eDialysatePumpD12 : { - QVariantList initPayloadValues = initList ( { tr("Target Speed"), tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Target Pump Speed"), tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pump")}, { eRole_Component, tr("D12" )}, {eRole_Payload, initPayloadValues }}); break; } case eDialysatePumpD48 : { - QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pump")}, { eRole_Component, tr("D48" )}, {eRole_Payload, initPayloadValues }}); break; } @@ -122,7 +122,7 @@ } case eConductivity : { - QVariantList initPayloadValues = initList ( { tr("1"),tr("2"),tr("3"),tr("4"),tr("5"),tr("6"),tr("7"), tr("8"),tr("9"),tr("10"),tr("11"),tr("12"),tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Coeff 1"),tr("Coeff 2"),tr("Coeff 3"),tr("Coeff 4"),tr("Coeff 5"),tr("Coeff 6"),tr("Coeff 7"), tr("Coeff 8"),tr("Coeff 9"),tr("Coeff 10"),tr("Coeff 11"),tr("Coeff 12"),tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Closed Loop Control of Dosing")}, { eRole_Component, tr("D17")}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Closed Loop Control of Dosing")}, { eRole_Component, tr("D27")}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Water, Bicarbonate, and Acid")}, { eRole_Component, tr("D29")}, {eRole_Payload, initPayloadValues }}); @@ -139,9 +139,10 @@ // static int test = 0; // rejectionReasons ({0,0,0,0,test = ! test,0}); + // epoch for fw payload quint32 calTime = getEpochUTC(); - // set cal time to payload. + // set cal time epoch to readble for UI if ( ! vPayload.isEmpty()) { vPayload.last() = Format::fromEpoch( calTime, "yyyy/MM/dd, HH:mm" );