Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-783-stop-state' into staging

  1. … 2 more files in changeset.
LDT-2364: Software Upgrade - SW - 01 - Qt6-LTS Investigation - R&I - 05: DEV - Feature Implementation

- Updated to build with Qt 6.8.3

  1. … 35 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

LDT-2273 Patient Vitals - SW - 01 - R&I - 09: SDD - Functions Documentation

add function documentation

  1. … 2 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

move numpad to compounds

    • -1
    • +1
    ./td/data/treatment/MTreatmentVitalsData.h
  1. … 4 more files in changeset.
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated various QMLs to fix whitespace alignment.

- Moved ultrafiltration models and views from TD to HD directories.

- Updated message IDs for UF messages.

    • -0
    • +67
    ./td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
    • -0
    • +92
    ./td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -0
    • +78
    ./td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
    • -0
    • +95
    ./td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -0
    • +49
    ./td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -0
    • +82
    ./td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 15 more files in changeset.
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated various QMLs to fix whitespace alignment.

- Moved ultrafiltration models and views from TD to HD directories.

- Updated message IDs for UF messages.

  1. … 15 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

update message id for blodd pressure

    • -2
    • +2
    ./td/data/treatment/MTreatmentVitalsData.h
  1. … 2 more files in changeset.
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

address cr comments

  1. … 13 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

code cleanup

  1. … 4 more files in changeset.
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated message ID enums for ID_AdjustPressuresLimitsReq, ID_AdjustPressuresLimitsRsp, ID_AdjustUltrafiltrationStateReq, ID_AdjustUltrafiltrationStateRsp, and ID_AdjustUltrafiltrationConfirmReq for leahi.

- Updated message sizes calculations for ID_AdjustUltrafiltrationStateRsp and ID_AdjustUltrafiltrationConfirmReq.

- Updated VTreatmentAdjustmentUltrafiltrationConfirm, MTreatmentAdjustUltrafiltrationStateResponse, MTreatmentAdjustUltrafiltrationStateResponse, and MTreatmentAdjustRequests for changes to messages for leahi.

- Updated TreatmentAdjustmentUltrafiltrationConfirm.qml and TreatmentUltrafiltrationItem.qml for UI design updates for UF volume settings chnage confirmation.

  1. … 7 more files in changeset.
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated message ID enums for ID_AdjustPressuresLimitsReq, ID_AdjustPressuresLimitsRsp, ID_AdjustUltrafiltrationStateReq, ID_AdjustUltrafiltrationStateRsp, and ID_AdjustUltrafiltrationConfirmReq for leahi.

- Updated message sizes calculations for ID_AdjustUltrafiltrationStateRsp and ID_AdjustUltrafiltrationConfirmReq.

- Updated VTreatmentAdjustmentUltrafiltrationConfirm, MTreatmentAdjustUltrafiltrationStateResponse, MTreatmentAdjustUltrafiltrationStateResponse, and MTreatmentAdjustRequests for changes to messages for leahi.

- Updated TreatmentAdjustmentUltrafiltrationConfirm.qml and TreatmentUltrafiltrationItem.qml for UI design updates for UF volume settings chnage confirmation.

  1. … 7 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

functionality working.

  1. … 4 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

Fixed issue of message sending out to sim

  1. … 5 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

LDT-2076 Solution Infusion - SW - 01 - R&I - 05: DEV - Feature Implementation

address cr commens

  1. … 1 more file in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

Initial upload of patient vitals

    • -0
    • +53
    ./td/data/treatment/MTreatmentVitalsData.cpp
    • -0
    • +80
    ./td/data/treatment/MTreatmentVitalsData.h
  1. … 26 more files in changeset.
LDT-2076 Solution Infusion - SW - 01 - R&I - 05: DEV - Feature Implementation

updated message id

  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

LDT-2076 Solution Infusion - SW - 01 - R&I - 05: DEV - Feature Implementation

address CR comments

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

Address CR comments

  1. … 2 more files in changeset.
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

Update acid concentrate adjustment to remove temp elements when cleared

  1. … 5 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

LDT-2074 Solution Infusion - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

Add SDD puml file

  1. … 1 more file in changeset.
LDT-2076 Solution Infusion - SW - 01 - R&I - 05: DEV - Feature Implementation

Update saline bolus command and file name changes

  1. … 6 more files in changeset.
LDT-931: Main Treatment Screen - SW - Diagnostics Screen-FP - 05: DEV - Feature Implementation

- Add FP Folder structure

- Add The following FP message implementation

Versions

Pressure

Flow

Conductivity

Temperature

Valves

ROPump

BoostPump

Level

-Add FP can channel to Can interpreter

-Implement FP diagnostics screen

    • -0
    • +65
    ./fp/adjustment/settings/MAdjustFPVersionsResponse.cpp
    • -0
    • +104
    ./fp/adjustment/settings/MAdjustFPVersionsResponse.h
    • -0
    • +70
    ./fp/data/MFPBoostPumpData.cpp
    • -0
    • +103
    ./fp/data/MFPBoostPumpData.h
    • -0
    • +49
    ./fp/data/MFPConductivityData.cpp
    • -0
    • +82
    ./fp/data/MFPConductivityData.h
    • -0
    • +55
    ./fp/data/MFPFlowData.cpp
    • -0
    • +88
    ./fp/data/MFPFlowData.h
    • -0
    • +46
    ./fp/data/MFPLevelData.cpp
    • -0
    • +79
    ./fp/data/MFPLevelData.h
    • -0
    • +70
    ./fp/data/MFPPressuresData.cpp
    • -0
    • +103
    ./fp/data/MFPPressuresData.h
    • -0
    • +70
    ./fp/data/MFPROPumpData.cpp
  1. … 35 more files in changeset.
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

address CR comments