Clone
 

behrouz nematipour <bnematipour@diality.com> in hdfirmware

Merge branch 'DEN-10602_UI_DEV_Add_PatientID_PreTreatment' into staging

Merge branch 'DEN-10602_UI_DEV_Add_PatientID_PreTreatment' into develop

    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
Merge branch 'DEN-10602_UI_DEV_Add_PatientID_PreTreatment' into develop

    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
DEN-11543: Unable proceed to the Confirm Treatment when "08-3251-9" Acid Concentrate is selected

The HD FW updated to accept up to 4 acid concentration type index.

Below is the UI DataList.conf for acid concentrate.

[Acid Concentrate]

Fres. Naturalyte

08-1251-1

08-2251-0

08-3251-9

    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
Merge branch 'DEN-10602_UI_DEV_Add_PatientID_PreTreatment' into develop

    • -0
    • +33
    /firmware/App/Modes/ModeTreatmentParams.c
    • -0
    • +3
    /firmware/App/Modes/ModeTreatmentParams.h
    • -5
    • +11
    /firmware/App/Services/SystemComm.c
Finishing up the story for firmware

DEN-10607: Implementation [Screen]

DEN-10609: Implementation [Treatment Log]

    • -0
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
    • -0
    • +1
    /firmware/App/Modes/ModeTreatmentParams.h
Merge remote-tracking branch 'origin/staging' into staging

Merge branch 'DEN-10153_Treatment_Log_Prescribed_UF' into staging

    • -0
    • +32
    /firmware/App/Modes/ModeTreatmentParams.c
    • -0
    • +2
    /firmware/App/Modes/ModeTreatmentParams.h
Merge branch 'DEN-10247_UI_Initial_Acknow_Timeout' into staging

DEN-10247: UI Acknow timeouts on HD side, due to the delay of almost 2 seconds.

- Added another timeout of 5000 ms ( same value as UI_COMM_TIMEOUT_IN_MS ) only for the INIT state in which UI has a delayed response.

HD-DEN-10153: HD-DEN-10153-1

- Addressed code review comments.

    • -25
    • +8
    /firmware/App/Modes/ModeTreatmentParams.c
    • -4
    • +2
    /firmware/App/Modes/ModeTreatmentParams.h
DEN-10153: Treatment log's prescribed ultrafiltration volume and rate

- band-aid the staging branch to be able to build

- updated the volume treatmentLogData struct to provide original ultrafiltration volume(L) and rate(mL/min), to includ in the treatment log response in the post-treatment mode.

- updated the originTreatmentParams to store original ultrafiltration volume(L) and rate(mL/min) (set by user during the pre-treatment mode), to query later for the treatment log.

- stored the original ultrafiltration volume if the user set volume is accepted in the pre-treatment mode.

- modified the sendTreatmentLogData function to use the correct type of accepted value from F32 to Bool (although both are the same updated to be consistent.)

    • -0
    • +49
    /firmware/App/Modes/ModeTreatmentParams.c
    • -0
    • +4
    /firmware/App/Modes/ModeTreatmentParams.h