Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-8052: posTx: Implementation [Messaging] (Disinfection)

- Disinfection MVC

- There is still a state message and also some parts in qml for the progress and states during the disinfection.

    • -0
    • +87
    ./adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
    • -0
    • +71
    ./adjustment/disinfect/VDisinfectAdjustDisinfect.h
  1. … 37 more files in changeset.
DEN-8057: posTx: Implementation [Messaging] (HD StandBy subMode)

  1. … 15 more files in changeset.
DEN-7833: Implementations [Merge the Wi-Fi, Date/Time into the code]

- Prepared the fundamentals of the Settings and Keyboard

- Added DateTime MVC and tested with the simulator.

- So many other debugging and improvement

    • -60
    • +0
    ./adjustment/VTreatmentAdjustmentVersions.cpp
    • -84
    • +0
    ./adjustment/VTreatmentAdjustmentVersions.h
    • -2
    • +2
    ./adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h
    • -2
    • +2
    ./adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
    • -2
    • +2
    ./adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h
    • -2
    • +2
    ./adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h
    • -2
    • +2
    ./adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h
    • -2
    • +2
    ./adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h
    • -2
    • +2
    ./adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h
    • -2
    • +2
    ./adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h
    • -2
    • +2
    ./adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h
  1. … 70 more files in changeset.
DEN-7829: posTx: Implementation [Messaging] ( 1 / ? )

    • -36
    • +0
    ./adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp
    • -59
    • +0
    ./adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h
    • -36
    • +0
    ./adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp
    • -59
    • +0
    ./adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h
    • -52
    • +0
    ./adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp
    • -60
    • +0
    ./adjustment/VPreTreatmentAdjustmentDisposablesPrime.h
    • -63
    • +0
    ./adjustment/VPreTreatmentAdjustmentInitTreatment.cpp
    • -62
    • +0
    ./adjustment/VPreTreatmentAdjustmentInitTreatment.h
    • -52
    • +0
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp
    • -60
    • +0
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h
    • -52
    • +0
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp
    • -60
    • +0
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h
    • -52
    • +0
    ./adjustment/VPreTreatmentAdjustmentStartTreatment.cpp
    • -60
    • +0
    ./adjustment/VPreTreatmentAdjustmentStartTreatment.h
    • -56
    • +0
    ./adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp
  1. … 319 more files in changeset.
DEN-7823: Meetings & Support - General purpose

- Added Alarm No Minimize so user can't minimize some alarms regarding the Alarm message received.

- Spell & doc correct

- Used MSG26 (Tx ranges) for the ultrafiltration pre-treatment max value.

- Fixed the Dynamic Instructions location on the device.

    • -2
    • +2
    ./data/VPreTreatmentSelfTestNoCartridgeData.h
    • -13
    • +13
    ./data/VPreTreatmentStatesData.cpp
  1. … 9 more files in changeset.
DEN-7832: Implementations [Saline and Heparin change request]

- Reverted back the ultrafiltration state removal. The UF requires the state in the response message since we don't have any specific ultrafiltration adjustment state message .

    • -0
    • +2
    ./adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp
    • -0
    • +8
    ./adjustment/VTreatmentAdjustmentUltrafiltrationState.h
  1. … 2 more files in changeset.
DEN-7832: Implementations [Saline and Heparin change request]

- Also removed the UF state from response.

    • -15
    • +14
    ./adjustment/VTreatmentAdjustmentHeparin.cpp
    • -9
    • +2
    ./adjustment/VTreatmentAdjustmentHeparin.h
    • -14
    • +19
    ./adjustment/VTreatmentAdjustmentSaline.cpp
    • -9
    • +2
    ./adjustment/VTreatmentAdjustmentSaline.h
    • -2
    • +0
    ./adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp
    • -8
    • +0
    ./adjustment/VTreatmentAdjustmentUltrafiltrationState.h
  1. … 13 more files in changeset.
DEN-7147: Fixed a bug on Sub-StepIndicator on bottom of the instructions

- Which was causing that to not to show correct number of the steps and titles.

- removed #include "MModel.h" in all the possible cases and include the specific model since the MModel has too much include.

- Showing the Heparin setup in the CART_INSTALL state only if we have a heparin volume setup.

- created a common template function name enumString in Gui namespace to get the enum name as string.

    • -1
    • +0
    ./adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h
    • -1
    • +0
    ./adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h
    • -1
    • +1
    ./adjustment/VPreTreatmentAdjustmentDisposablesPrime.h
    • -1
    • +1
    ./adjustment/VPreTreatmentAdjustmentInitTreatment.h
    • -1
    • +1
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h
    • -1
    • +1
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h
    • -1
    • +1
    ./adjustment/VPreTreatmentAdjustmentStartTreatment.h
    • -1
    • +1
    ./adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h
    • -1
    • +1
    ./adjustment/VPreTreatmentAdjustmentWaterSample.h
    • -2
    • +1
    ./adjustment/VTreatmentAdjustmentDuration.h
    • -0
    • +1
    ./adjustment/VTreatmentAdjustmentEnd.h
    • -1
    • +1
    ./adjustment/VTreatmentAdjustmentFlows.h
    • -0
    • +1
    ./adjustment/VTreatmentAdjustmentHeparin.h
    • -1
    • +1
    ./adjustment/VTreatmentAdjustmentPressuresLimits.h
    • -0
    • +1
    ./adjustment/VTreatmentAdjustmentRecirculate.h
  1. … 58 more files in changeset.
DEN-7147: preTx: Code Review 0

- The little count down progress circles become bigger.

- The completed text on the bottom of some screens with check marks become settable by code.

- Duplicate group removed from instruction file

- "Recirculate ..." text has been removed from the priming screen

- Added syringe pump state

  1. … 9 more files in changeset.
DEN-7461: Meetings & Support - Pre-Treatment Integration

- Integration modifications

- UF Modifications request

- Saline Modification request

- Updated the validation mAccepted to be 1=true and 0=false.

- Heparin Stopped stated modification request

  1. … 28 more files in changeset.
DEN-7518: preTx: Implementation [Screens] ( 3 )

- The first round of the pre-treatment flow works.

    • -0
    • +36
    ./adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h
    • -0
    • +36
    ./adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h
    • -0
    • +52
    ./adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentDisposablesPrime.h
    • -0
    • +63
    ./adjustment/VPreTreatmentAdjustmentInitTreatment.cpp
    • -0
    • +62
    ./adjustment/VPreTreatmentAdjustmentInitTreatment.h
    • -0
    • +52
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h
    • -0
    • +52
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h
    • -0
    • +52
    ./adjustment/VPreTreatmentAdjustmentStartTreatment.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentStartTreatment.h
    • -0
    • +56
    ./adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp
  1. … 52 more files in changeset.
DEN-7420: preTx: Implementation [Messaging] ( 3 )

    • -0
    • +27
    ./data/VPreTreatmentDisposablePrimeData.cpp
    • -0
    • +45
    ./data/VPreTreatmentDisposablePrimeData.h
  1. … 61 more files in changeset.
DEN-7139: preTx: Implementation [Screens] ( 2 )

    • -11
    • +11
    ./data/VPreTreatmentStatesData.h
  1. … 39 more files in changeset.
DEN-7138: preTx: Implementation [Screens] ( 1 )

7138 preTx: Implementation [Screens] ( 1 )

7143 preTx: Implementation [Navigation] ( 2 )

  1. … 26 more files in changeset.
DEN-7143: preTx: Implementation [Navigation] ( 2 )

- Added the pre-treatment Consumables states

- Made the Step bullet multi orientation state

- Made the Step indicator multi orientation state

- Added the component WaitDone which has a rotating circle for wait state and a check mark when set as done.

- Added the consumables stack and two screens [self test is done, installation needs work]

- Updated PreTreatmentMainStack to navigate for waterSample and consumables.

- Added the Water Sample fail screen

- Added the Water Sample result screen

- Added the Water Sample stack

- Added the Water Sample, Sample Screen

- Added the STATE property type for the State boolean types which will not initiated if the value has not been changed.

-

    • -44
    • +56
    ./data/VPreTreatmentStatesData.cpp
  1. … 47 more files in changeset.
DEN-7140: Implementation [Messaging] ( 1 )

- Added progress data Model/View which are:

ID_DGFilterFlush = 0x6000, // 96

ID_SelfTestNoCartridge = 0x6100, // 97

ID_SelfTestDry = 0x6300, // 99

ID_DisposablesPrime = 0x4300, // 67

    • -0
    • +27
    ./data/VPreTreatmentPrimeData.cpp
    • -0
    • +45
    ./data/VPreTreatmentPrimeData.h
    • -0
    • +27
    ./data/VPreTreatmentSelfTestDryData.cpp
    • -0
    • +45
    ./data/VPreTreatmentSelfTestDryData.h
    • -0
    • +27
    ./data/VPreTreatmentSelfTestNoCartridgeData.cpp
    • -0
    • +45
    ./data/VPreTreatmentSelfTestNoCartridgeData.h
  1. … 29 more files in changeset.
DEN-7140: Implementation [Messaging] ( 1 )

- PreTreatmentStates message has been added

    • -0
    • +137
    ./data/VPreTreatmentStatesData.cpp
    • -0
    • +124
    ./data/VPreTreatmentStatesData.h
  1. … 13 more files in changeset.
DEN-7142: preTx: Implementation [Navigation] ( 1 )

- Added HD_OP_MODE to navigate to the treatment home screen.

- Note : there is an issue with the create treatment implementation which won't let to reset the stack and needs to be fixed.

- Added some Rinseback modification requests.

  1. … 6 more files in changeset.
DEN-7041: Fixed compilation issues with latest common master.

  1. … 1 more file in changeset.
Merge master into staging

  1. … 37 more files in changeset.
DEN-6638: ptTx-RB: Code Review 0

- Added an ability for now to ask for versions.

  1. … 2 more files in changeset.
DEN-6638: ptTx-RB: Code Review 0

- Fixed typo

  1. … 3 more files in changeset.
DEN-6635: Update Design Documents

- Code has been updated while the SDDUI was written.

- DEN-6638: Code Review 0

    • -3
    • +0
    ./adjustment/VTreatmentAdjustmentRecirculate.cpp
    • -16
    • +16
    ./adjustment/VTreatmentAdjustmentVersions.cpp
    • -16
    • +16
    ./adjustment/VTreatmentAdjustmentVersions.h
  1. … 7 more files in changeset.
DEN-6869: Added Accelerometer Dialin API and a Simulator plugin

- After adding the simulator plugin find out a bug in the code and fixed.

  1. … 4 more files in changeset.
DEN-6877: Merging the Versions/Acceleration

    • -0
    • +60
    ./adjustment/VTreatmentAdjustmentVersions.cpp
    • -0
    • +81
    ./adjustment/VTreatmentAdjustmentVersions.h
    • -0
    • +32
    ./data/VHDAccelerometerData.cpp
    • -0
    • +49
    ./data/VHDAccelerometerData.h
  1. … 35 more files in changeset.
DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

- Added Model/View for the messages "Treatment End" Req/Res (87/88)

    • -0
    • +46
    ./adjustment/VTreatmentAdjustmentEnd.cpp
    • -0
    • +64
    ./adjustment/VTreatmentAdjustmentEnd.h
  1. … 15 more files in changeset.
DEN-6863 , DEN-6865 , DEN-6866 : psTx

- Added Recirculate timeout Model/View.

- Added Rinseback timeout to the Model/View.

- Added three more parameter to the Treatment State Message 15 for the "Blood Prime", "Treatment End", "Treatment Stop"

- Renamed the StackItem method "back" to "page".

- Renamed the "End" button label to "End Treatment"

- Renamed the "TreatmentComplete" Screen to "TreatmentEnd" to be more consistent with the states.

- Added the "TreatmentEndPause" screen for "Treatment End Pause" state

- Added the recirculate timeout to the screens.

- Added the rinseback timeout to the screens.

- Refactored the "txDialysisRunning" to "txDialysis" to match the state with the same name.

-

    • -14
    • +33
    ./data/VHDTreatmentStatesData.cpp
    • -0
    • +26
    ./data/VTreatmentRecirculateData.cpp
    • -0
    • +44
    ./data/VTreatmentRecirculateData.h
  1. … 36 more files in changeset.
DEN-6862 , DEN-6865 : Blood Prime && Rinseback && Ricirculate

- Moved all the the imports into the main.qml since find out it doesn't make any difference until the module is loaded dynamically at runtime which we don't since it is slow.

- Added PostTreatmentAdditional for Additional Rinseback.

- Added RinsebackInit for Rinseback setup

- Code Clean up & refactoring

    • -2
    • +2
    ./adjustment/VTreatmentAdjustmentRecirculate.cpp
    • -4
    • +4
    ./adjustment/VTreatmentAdjustmentRecirculate.h
    • -1
    • +1
    ./adjustment/VTreatmentAdjustmentRinseback.h
  1. … 9 more files in changeset.
DEN-6862, DEN-6865 Blood Prime Screen

- Added Blood Prime Screen/Message

- Cleaned up the code a little.

    • -0
    • +26
    ./data/VTreatmentBloodPrimeData.cpp
    • -0
    • +44
    ./data/VTreatmentBloodPrimeData.h
  1. … 14 more files in changeset.
DEN-6862: ptTx-RB: Implementation [Screens] Rinseback Complete

- DEN-6864: ptTx-RB: Implementation [Messaging] (1/2)

- DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

- Added ImageText Componenet for the rinseback in progress screen

- Added Flow rate as well to the message ID_Rinseback as 3rd parameter.

- Connected Recirculate message to the Recirculate screen in progress.

- Connected Rinseback (Adj/Data) messages to the Rinseback screen in progress.

- Updated TreatmentStack Screen navigation for the Rinseback, Recirculate, TreatmentComplete and so on.

    • -0
    • +35
    ./adjustment/VTreatmentAdjustmentRecirculate.cpp
    • -4
    • +4
    ./adjustment/VTreatmentAdjustmentRecirculate.h
    • -2
    • +2
    ./adjustment/VTreatmentAdjustmentRinseback.cpp
    • -12
    • +12
    ./adjustment/VTreatmentAdjustmentRinseback.h
  1. … 11 more files in changeset.