Activity hdfirmware/

Merge branch 'DEN-6078-revisit-safety-functionality-of-pumps-valves' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-6078-revisit-safety-functionality-of-pumps-valves

8:24 pm

Dara Navaei

More
24a98ea
changed 5 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 366 more HD-DEN-6078-1 HD-DEN-6402-1

DEN-6078 addressed some of the merge issues

- -1
- +1
/firmware/App/Controllers/DGInterface.c
- History
- Source
- Diff
/firmware/App/Controllers/DGInterface.c
- -19
- +1
/firmware/App/Controllers/DGInterface.h
- History
- Source
- Diff
/firmware/App/Controllers/DGInterface.h
- -25
- +7
/firmware/App/Modes/ModeTreatment.c
- History
- Source
- Diff
/firmware/App/Modes/ModeTreatment.c
- -20
- +0
/firmware/App/Services/SystemComm.c
- History
- Source
- Diff
/firmware/App/Services/SystemComm.c
- -88
- +0
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c

10:53 am

Dara Navaei

More
33b65cd
changed 5 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 366 more HD-DEN-6078-1 HD-DEN-6402-1

DEN-6078 merged staging and ran the script

- -9
- +2
/firmware/App/Modes/ModePreTreat.c
- History
- Source
- Diff
/firmware/App/Modes/ModePreTreat.c
- -14
- +19
/results/Build_Status_Report.csv
- History
- Source
- Diff
/results/Build_Status_Report.csv
- -4563
- +6120
/results/VectorCAST.log
- History
- Source
- Diff
/results/VectorCAST.log
- -1
- +0
/results/cppcheck.log
- History
- Source
- Diff
/results/cppcheck.log
- -18
- +25
/results/cppcheckError.csv
- History
- Source
- Diff
/results/cppcheckError.csv

8:16 pm

Quang Nguyen <qnguyen@diality.com>

More
633861a
changed 8 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 360 more HD-DEN-7091-1

DEN-7091: Added Sample Water module

- -5
- +2
/firmware/App/Controllers/DGInterface.c
- History
- Source
- Diff
/firmware/App/Controllers/DGInterface.c
- -2
- +2
/firmware/App/Controllers/DGInterface.h
- History
- Source
- Diff
/firmware/App/Controllers/DGInterface.h
- -4
- +27
/firmware/App/Modes/ModePreTreat.c
- History
- Source
- Diff
/firmware/App/Modes/ModePreTreat.c
- -0
- +2
/firmware/App/Modes/Prime.c
- History
- Source
- Diff
/firmware/App/Modes/Prime.c
- -0
- +200
/firmware/App/Modes/SampleWater.c
- History
- Source
/firmware/App/Modes/SampleWater.c
- -0
- +43
/firmware/App/Modes/SampleWater.h
- History
- Source
/firmware/App/Modes/SampleWater.h
- -3
- +6
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c
- -1
- +1
/firmware/App/Services/SystemCommMessages.h
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.h

3:18 pm

Sean Nash

More
6b870cd
changed 15 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 364 more HD-DEN-6372-1

DEN-6372: Moved blood sitting timeout logic from alarm escalation to treatment stop sub-mode.

- -4
- +7
/firmware/App/Controllers/AirTrap.c
- History
- Source
- Diff
/firmware/App/Controllers/AirTrap.c
- -8
- +14
/firmware/App/Controllers/BloodFlow.c
- History
- Source
- Diff
/firmware/App/Controllers/BloodFlow.c
- -8
- +15
/firmware/App/Controllers/DialInFlow.c
- History
- Source
- Diff
/firmware/App/Controllers/DialInFlow.c
- -5
- +11
/firmware/App/Controllers/DialOutFlow.c
- History
- Source
- Diff
/firmware/App/Controllers/DialOutFlow.c
- -2
- +2
/firmware/App/Controllers/PresOccl.c
- History
- Source
- Diff
/firmware/App/Controllers/PresOccl.c
- -4
- +8
/firmware/App/Controllers/Valves.c
- History
- Source
- Diff
/firmware/App/Controllers/Valves.c
- -2
- +2
/firmware/App/Modes/BloodPrime.c
- History
- Source
- Diff
/firmware/App/Modes/BloodPrime.c
- -2
- +2
/firmware/App/Modes/Dialysis.c
- History
- Source
- Diff
/firmware/App/Modes/Dialysis.c
- -4
- +6
/firmware/App/Modes/ModeTreatment.c
- History
- Source
- Diff
/firmware/App/Modes/ModeTreatment.c
- -1
- +2
/firmware/App/Modes/OperationModes.c
- History
- Source
- Diff
/firmware/App/Modes/OperationModes.c
- -4
- +4
/firmware/App/Modes/Rinseback.c
- History
- Source
- Diff
/firmware/App/Modes/Rinseback.c
- -1
- +17
/firmware/App/Modes/TreatmentEnd.c
- History
- Source
- Diff
/firmware/App/Modes/TreatmentEnd.c
- -2
- +2
/firmware/App/Modes/TreatmentRecirc.c
- History
- Source
- Diff
/firmware/App/Modes/TreatmentRecirc.c
- -0
- +15
/firmware/App/Modes/TreatmentStop.c
- History
- Source
- Diff
/firmware/App/Modes/TreatmentStop.c
- -1
- +1
/firmware/App/Services/AlarmMgmt.c
- History
- Source
- Diff
/firmware/App/Services/AlarmMgmt.c

8:53 am

Dara Navaei

More
a5d0cc8
changed 7 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 360 more HD-DEN-5980-1

DEN-5980 disbaled some of the execs to be able to test NVDataMgmt

- -1
- +1
/firmware/App/Controllers/DGInterface.c
- History
- Source
- Diff
/firmware/App/Controllers/DGInterface.c
- -11
- +1
/firmware/App/Controllers/DGInterface.h
- History
- Source
- Diff
/firmware/App/Controllers/DGInterface.h
- -0
- +1
/firmware/App/HDCommon.h
- History
- Source
- Diff
/firmware/App/HDCommon.h
- -1
- +1
/firmware/App/Modes/ModeInitPOST.c
- History
- Source
- Diff
/firmware/App/Modes/ModeInitPOST.c
- -1
- +1
/firmware/App/Modes/ModePreTreat.c
- History
- Source
- Diff
/firmware/App/Modes/ModePreTreat.c
- -1
- +1
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c
- -3
- +3
/firmware/App/Tasks/TaskGeneral.c
- History
- Source
- Diff
/firmware/App/Tasks/TaskGeneral.c

10:39 pm

Sean Nash

More
c282822
changed 14 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 367 more HD-DEN-5887-1 HD-DEN-6372-1 HD-DEN-6402-1 HD-DEN-6078-1

DEN-5887: Fixed merge conflicts from staging.

- -47
- +106
/firmware/App/Controllers/DGInterface.c
- History
- Source
- Diff
/firmware/App/Controllers/DGInterface.c
- -24
- +17
/firmware/App/Controllers/DGInterface.h
- History
- Source
- Diff
/firmware/App/Controllers/DGInterface.h
- -77
- +72
/firmware/App/Controllers/DialOutFlow.c
- History
- Source
- Diff
/firmware/App/Controllers/DialOutFlow.c
- -100
- +78
/firmware/App/Modes/Dialysis.c
- History
- Source
- Diff
/firmware/App/Modes/Dialysis.c
- -15
- +207
/firmware/App/Modes/ModePreTreat.c
- History
- Source
- Diff
/firmware/App/Modes/ModePreTreat.c
- -96
- +144
/firmware/App/Modes/ModeTreatment.c
- History
- Source
- Diff
/firmware/App/Modes/ModeTreatment.c
- -5
- +7
/firmware/App/Modes/ModeTreatment.h
- History
- Source
- Diff
/firmware/App/Modes/ModeTreatment.h
- -16
- +16
/firmware/App/Services/PIControllers.c
- History
- Source
- Diff
/firmware/App/Services/PIControllers.c
- -181
- +169
/firmware/App/Services/SystemComm.c
- History
- Source
- Diff
/firmware/App/Services/SystemComm.c
- -361
- +468
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c
- -7
- +29
/firmware/App/Services/SystemCommMessages.h
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.h
- -0
- +173
/results/Build_Status_Report.csv
- History
- Source
- Diff
/results/Build_Status_Report.csv
- -8
- +32
/results/cppcheck.log
- History
- Source
- Diff
/results/cppcheck.log
- -6
- +45
/results/cppcheckError.csv
- History
- Source
- Diff
/results/cppcheckError.csv

1:55 pm

Quang Nguyen <qnguyen@diality.com>

More
c7f1426
changed 2 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 365 more HD-DEN-6402-1

DEN-6402: Fixed static analysis warning

- -0
- +3
/firmware/App/Modes/ModePreTreat.c
- History
- Source
- Diff
/firmware/App/Modes/ModePreTreat.c
- -2
- +2
/firmware/App/Modes/SelfTests.c
- History
- Source
- Diff
/firmware/App/Modes/SelfTests.c

1:53 pm

Sean Nash

More
89f4c7f
changed 7 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 364 more HD-DEN-6372-1

DEN-6372: Changed alarm stop approach from signal push to mode pull to ensure alarm stop always occurs.

- -22
- +3
/firmware/App/Modes/ModeTreatment.c
- History
- Source
- Diff
/firmware/App/Modes/ModeTreatment.c
- -17
- +2
/firmware/App/Modes/Rinseback.c
- History
- Source
- Diff
/firmware/App/Modes/Rinseback.c
- -1
- +0
/firmware/App/Modes/Rinseback.h
- History
- Source
- Diff
/firmware/App/Modes/Rinseback.h
- -17
- +2
/firmware/App/Modes/TreatmentEnd.c
- History
- Source
- Diff
/firmware/App/Modes/TreatmentEnd.c
- -1
- +0
/firmware/App/Modes/TreatmentEnd.h
- History
- Source
- Diff
/firmware/App/Modes/TreatmentEnd.h
- -16
- +1
/firmware/App/Modes/TreatmentRecirc.c
- History
- Source
- Diff
/firmware/App/Modes/TreatmentRecirc.c
- -1
- +0
/firmware/App/Modes/TreatmentRecirc.h
- History
- Source
- Diff
/firmware/App/Modes/TreatmentRecirc.h

1:25 pm

Sean Nash

More
631ae13
changed 4 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 367 more HD-DEN-5887-1

DEN-5887: ran local test script.

- -156
- +5
/results/Build_Status_Report.csv
- History
- Source
- Diff
/results/Build_Status_Report.csv
- -39331
- +4815
/results/VectorCAST.log
- History
- Source
- Diff
/results/VectorCAST.log
- -48
- +48
/results/cppcheck.log
- History
- Source
- Diff
/results/cppcheck.log
- -16
- +19
/results/cppcheckError.csv
- History
- Source
- Diff
/results/cppcheckError.csv

5:13 pm

Sean Nash

More
d42ac7a
changed 1 file
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 364 more HD-DEN-6372-1

DEN-6372: Added TODO.

- -0
- +1
/firmware/App/Modes/ModeTreatment.c
- History
- Source
- Diff
/firmware/App/Modes/ModeTreatment.c

1:14 pm

Sean Nash

More
161a564
changed 8 files
DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 364 more HD-DEN-6372-1

DEN-6372: Fixes per lab testing. Added function to AlarmMgmt to determine whether any alarms w/ stop property are active. Changed treatment mode handling of alarm stop from signal to modes approach to modes polling alarm mgmt approach. Added f/w support for override of treatment time remaining.