Fisheye on hdfirmware/firmware

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): HD-DEN-10153: HD-DEN-10153-1...

Behrouz NematiPour — Tue, 26 Oct 2021 14:02:03 -0700

Behrouz NematiPour committed db79d76 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 342 more in hdfirmware

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

- Addressed code review comments.

· /firmware/App/Modes/ModeTreatmentParams.c	(-25, +8)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeTreatmentParams.h	(-4, +2)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-10153: Treatment log's prescribed ultrafiltration volume and rate...

Behrouz NematiPour — Mon, 25 Oct 2021 23:23:24 -0700

Behrouz NematiPour committed 9bb9f9b on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 342 more in hdfirmware

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.)

· /firmware/App/Controllers/AirTrap.c	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/HDCommon.h	(-1, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeInitPOST.c	(-0, +5)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePostTreat.c	(-1, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePostTreat.h	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeTreatmentParams.c	(-0, +49)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeTreatmentParams.h	(-0, +4)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-2, +2)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Sun, 12 Sep 2021 15:39:38 -0700

Dara Navaei committed ccfd155 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 345 more in hdfirmware

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

· /firmware/App/Controllers/AirTrap.c

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/AirTrap.h

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/AlarmLamp.c

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/AlarmLamp.h

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/BloodFlow.c

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/BloodFlow.h

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/BloodLeak.c

(-5, +5)

| History

| Source

| Diff

· /firmware/App/Controllers/BloodLeak.h

(-5, +5)

| History

| Source

| Diff

· /firmware/App/Controllers/Bubble.c

(-5, +5)

| History

| Source

| Diff

· /firmware/App/Controllers/Bubble.h

(-5, +5)

| History

| Source

| Diff

· /firmware/App/Controllers/Buttons.c

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/Buttons.h

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/DGInterface.c

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/DGInterface.h

(-6, +6)

| History

| Source

| Diff

· /firmware/App/Controllers/DialInFlow.c

(-6, +6)

| History

| Source

| Diff

… 97 more files in changeset.

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Sun, 12 Sep 2021 15:30:26 -0700

Dara Navaei committed 36470d2 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 345 more in hdfirmware

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

· /firmware/App/HDCommon.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Wed, 01 Sep 2021 13:40:51 -0700

Dara Navaei committed fbb0840 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 345 more in hdfirmware

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

· /firmware/App/HDCommon.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Merge branch 'DEN-7802-dg_dev-dialysate-generation' into staging

Wed, 01 Sep 2021 13:31:33 -0700

Quang Nguyen committed 54a3b80 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 345 more in hdfirmware

Merge branch 'DEN-7802-dg_dev-dialysate-generation' into staging

· /firmware/App/Modes/Rinseback.c

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-7802: Added check for processor clock speed against FPGA clock speed

Mon, 30 Aug 2021 17:55:25 -0700

Quang Nguyen committed 935694e on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 346 more in hdfirmware

DEN-7802: Added check for processor clock speed against FPGA clock speed

· /firmware/App/Services/FPGA.c	(-0, +34)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.h	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Tasks/TaskPriority.c	(-0, +3)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-7802: Removed dialysate temp check for treatment end sub-mode

Fri, 27 Aug 2021 10:27:29 -0700

Quang Nguyen committed 2b868e4 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 346 more in hdfirmware

DEN-7802: Removed dialysate temp check for treatment end sub-mode

· /firmware/App/Modes/ModeTreatment.c

(-1, +4)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-7802: Renamed re-circ mode to gene mode

Tue, 24 Aug 2021 16:21:09 -0700

Quang Nguyen committed 2a60f0e on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 346 more in hdfirmware

DEN-7802: Renamed re-circ mode to gene mode

· /firmware/App/Controllers/DGInterface.c	(-8, +8)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ConsumableSelfTest.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePostTreat.c	(-5, +5)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePreTreat.c	(-3, +3)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-1, +1)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-7802: Fixed temperature alarm trigger

Tue, 24 Aug 2021 11:15:51 -0700

Quang Nguyen committed 184261d on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 346 more in hdfirmware

DEN-7802: Fixed temperature alarm trigger

· /firmware/App/Controllers/Temperatures.c

(-9, +11)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-7802: Fixed alarm condition clear for DG comm timeout

Mon, 23 Aug 2021 14:25:32 -0700

Quang Nguyen committed 0eb9161 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 346 more in hdfirmware

DEN-7802: Fixed alarm condition clear for DG comm timeout

· /firmware/App/Services/SystemComm.c

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-7802: Fixed battery pack error codes

Thu, 19 Aug 2021 15:09:25 -0700

Quang Nguyen committed 885cb03 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 346 more in hdfirmware

DEN-7802: Fixed battery pack error codes

· /firmware/App/Drivers/Battery.c

(-1, +2)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-7802: Removed test success status on integrity test

Thu, 19 Aug 2021 14:09:14 -0700

Quang Nguyen committed fbec5d2 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 346 more in hdfirmware

DEN-7802: Removed test success status on integrity test

· /firmware/App/Controllers/DGInterface.c	(-4, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeInitPOST.c	(-5, +0)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Thu, 19 Aug 2021 13:45:52 -0700

Dara Navaei committed a64f4bd on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 347 more in hdfirmware

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

· /firmware/App/HDCommon.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: second local merge from staging. Fixed merge conflicts.

Sean Nash — Thu, 19 Aug 2021 11:18:43 -0700

Sean Nash committed 844f988 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: second local merge from staging. Fixed merge conflicts.

· /firmware/App/Controllers/PresOccl.c	(-2, +3)	\| History	\| Source	\| Diff
· /firmware/App/HDCommon.h	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/TreatmentEnd.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/TreatmentStop.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/AlarmMgmtSWFaults.h	(-0, +4)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-6, +38)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.h	(-1, +4)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-0, +20)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-5, +185)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.h	(-1, +24)	\| History	\| Source	\| Diff
· /firmware/App/Tasks/TaskGeneral.c	(-3, +11)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: Fixed bug DEN-9827.

Sean Nash — Thu, 19 Aug 2021 11:02:12 -0700

Sean Nash committed 2637b1a on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: Fixed bug DEN-9827.

· /firmware/App/Modes/Rinseback.c

(-7, +4)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-7802: Disabled battery charge monitor when battery comm disabled

Thu, 19 Aug 2021 09:05:55 -0700

Quang Nguyen committed db72e39 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 346 more in hdfirmware

DEN-7802: Disabled battery charge monitor when battery comm disabled

· /firmware/App/Modes/ModeStandby.c

(-0, +2)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: Addressed code review comments.

Sean Nash — Thu, 19 Aug 2021 08:52:24 -0700

Sean Nash committed e64816d on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: Addressed code review comments.

· /firmware/App/Controllers/DialInFlow.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/DialOutFlow.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/PresOccl.h	(-1, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/Dialysis.c	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/Rinseback.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/AlarmMgmt.c	(-7, +7)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-9, +3)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.h	(-1, +1)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Wed, 18 Aug 2021 17:06:42 -0700

Dara Navaei committed 401797b on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

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

· /firmware/App/HDCommon.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Wed, 18 Aug 2021 17:06:05 -0700

Dara Navaei committed e561474 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

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

· /firmware/App/HDCommon.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: Fixed bug DEN-9699.

Sean Nash — Wed, 18 Aug 2021 15:32:58 -0700

Sean Nash committed 58e7f41 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: Fixed bug DEN-9699.

· /firmware/App/Modes/ModeTreatment.c

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: Have disable UI POST build switch disable UI compaitiblity test too.

Sean Nash — Wed, 18 Aug 2021 13:51:41 -0700

Sean Nash committed 6287441 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: Have disable UI POST build switch disable UI compaitiblity test too.

· /firmware/App/Modes/ModeInitPOST.c

(-0, +2)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: Addressed bugs DEN-9832 and DEN-9897.

Sean Nash — Wed, 18 Aug 2021 11:52:10 -0700

Sean Nash committed c021768 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: Addressed bugs DEN-9832 and DEN-9897.

· /firmware/App/Modes/TreatmentEnd.c	(-1, +7)	\| History	\| Source	\| Diff
· /firmware/App/Modes/TreatmentRecirc.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/TreatmentStop.c	(-2, +8)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: Fixed typo in DPo speed check.

Sean Nash — Tue, 17 Aug 2021 17:06:37 -0700

Sean Nash committed cce9dc0 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: Fixed typo in DPo speed check.

· /firmware/App/Controllers/DialOutFlow.c

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: Fixed bug DEN-9714.

Sean Nash — Tue, 17 Aug 2021 14:57:46 -0700

Sean Nash committed b9aa356 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: Fixed bug DEN-9714.

· /firmware/App/Modes/ModeTreatmentParams.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Tue, 17 Aug 2021 13:32:21 -0700

Dara Navaei committed e05aba2 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

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

· /firmware/App/HDCommon.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: Addressed code review feedback.

Sean Nash — Tue, 17 Aug 2021 11:33:38 -0700

Sean Nash committed b87b013 on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: Addressed code review feedback.

· /firmware/App/Controllers/PresOccl.h	(-5, +5)	\| History	\| Source	\| Diff
· /firmware/App/Modes/Dialysis.c	(-2, +0)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-9688: Fixed bug DEN-9715.

Sean Nash — Tue, 17 Aug 2021 10:48:08 -0700

Sean Nash committed 76350fb on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-9688: Fixed bug DEN-9715.

· /firmware/App/Modes/TreatmentStop.c

(-0, +2)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8886: Removed buzzer portion of safety shutdown POST.

Sean Nash — Tue, 17 Aug 2021 10:12:35 -0700

Sean Nash committed 85ee38d on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 348 more in hdfirmware

DEN-8886: Removed buzzer portion of safety shutdown POST.

· /firmware/App/Drivers/SafetyShutdown.c

(-15, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-8534 added code to raise the alarm in the fans and temperatrues drivers.

Dara Navaei — Mon, 16 Aug 2021 12:39:26 -0700

Dara Navaei committed 4a9872d on branch DEN-10153_Treatment_Log_Prescribed_UF, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 349 more in hdfirmware

DEN-8534 added code to raise the alarm in the fans and temperatrues drivers.

· /firmware/App/Controllers/Fans.c	(-9, +18)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Switches.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Temperatures.c	(-12, +17)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeInitPOST.c	(-0, +5)	\| History	\| Source	\| Diff