Dashboard

LDT-5384 worked on the confirm messages in between the alarms

    • -6
    • +17
    /sources/drydemo/StateController.cpp
    • -18
    • +28
    /sources/drydemo/StateController.h
    • -3
    • +5
    /sources/drydemo/StateControllerTreatmentBroadcasts.cpp
fixed merge conflicts

fixed merge conflicts

fixed merge conflicts

Merge branch 'staging' into LDT-4049-standby---fw-implementation---2

Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Adding AlarmMapping for now for the develop.

    • -9
    • +9
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge remote-tracking branch 'origin/develop' into develop

Removing the layers and dropshadow and the diagnostics screen

    • -13
    • +13
    /sources/gui/qml/components/ModalDialog.qml
    • -11
    • +11
    /sources/gui/qml/dialogs/AlarmDialog.qml
  1. … 3 more files in changeset.
LDT-5157: Added FP service and usage records

    • -3
    • +3
    /firmware/App/Services/NVMessagingDD.c
    • -56
    • +254
    /firmware/App/Services/NVRecordsDD.c
    • -8
    • +79
    /firmware/App/Services/NVRecordsDD.h
LDT-5157: Added alarms for FP service and usage

LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

bug fix from merge clonflict

LDT-4040: Resolved CR comments, merged latest staging and updated new uf vol logic

    • -9
    • +28
    /firmware/App/Modes/ModeTreatment.c
    • -10
    • +25
    /firmware/App/Modes/OperationModes.c
    • -16
    • +10
    /firmware/App/Modes/StateTxPaused.c
    • -17
    • +101
    /firmware/App/Services/Messaging.c
LDT-4040: Merged latest staging into LDt-4040 & removed unused generic confirmation ids

No need, in a different CR I have a module that pulls the Alarm ID, Reject Reason and Msg Ids directly from the FW. After that's merged, this file won't be needed any more manual update. For more ...

No need, in a different CR I have a module that pulls the Alarm ID, Reject Reason and Msg Ids directly from the FW. After that's merged, this file won't be needed any more manual update.

For more information check LDT-5205 CR, file: utils\ enum_updater.py

Test code

    • -114
    • +112
    /firmware/App/Services/FpgaTD.c
Merge branch 'staging' into bugfix/LDT-4500-dd-alarm-75-and-pressure-build-

staging sync and addressing comments

    • -2
    • +2
    /firmware/App/Modes/ModeGenDialysate.c
push fixes

    • -60
    • +27
    /sources/gui/qml/compounds/CheckListView.qml
    • -3
    • +3
    /sources/gui/qml/globals/Variables.qml
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

push finishing steps to prime

    • -60
    • +27
    /sources/gui/qml/compounds/CheckListView.qml
    • -3
    • +3
    /sources/gui/qml/globals/Variables.qml
space allignment2

space allignment

Corrected in latest commit

Corrected in latest commit

Merge conflicts

    • -19
    • +133
    /firmware/App/Services/FpgaTD.c
Staging Sync and resolve issues