Fisheye on dialin/

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 merged staging

Dara Navaei — Wed, 03 Aug 2022 14:25:28 -0700

Dara Navaei committed 03accf3 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 merged staging

· /dialin/hd/alarms.py	(-15, +4)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-117, +79)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931: Added commands to request f/w to re-send alarm trigger messages for each active alarm.

Sean Nash — Fri, 29 Jul 2022 14:07:33 -0700

Sean Nash committed b53475c on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931: Added commands to request f/w to re-send alarm trigger messages for each active alarm.

· /dialin/common/msg_ids.py	(-0, +3)	\| History	\| Source	\| Diff
· /dialin/dg/hd_proxy.py	(-0, +22)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-0, +23)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 added the arterial pressure sensor temperature sensor to the calibration records

Dara Navaei — Tue, 26 Jul 2022 17:02:02 -0700

Dara Navaei committed 920d1a0 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 added the arterial pressure sensor temperature sensor to the calibration records

· /dialin/dg/dialysate_flow_sensor.py	(-1, +0)	\| History	\| Source	\| Diff
· /dialin/dg/reservoirs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/calibration_record.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-9, +28)	\| History	\| Source	\| Diff
· /tests/hd_nvm_scripts.py	(-3, +3)	\| History	\| Source	\| Diff
· /tests/test_flush.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 updated the dialysate flow driver

Dara Navaei — Thu, 21 Jul 2022 10:40:57 -0700

Dara Navaei committed 5ec5102 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 updated the dialysate flow driver

· /dialin/common/msg_ids.py	(-0, +4)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_flow_sensor.py	(-0, +17)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-1, +13)	\| History	\| Source	\| Diff
· /tests/hd_nvm_scripts.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 updated the DG calibration record to include the barometric pressure sensor

Dara Navaei — Wed, 20 Jul 2022 08:53:03 -0700

Dara Navaei committed 6c9c54b on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 updated the DG calibration record to include the barometric pressure sensor

· /dialin/dg/calibration_record.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/heaters.py	(-1, +0)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-14, +20)	\| History	\| Source	\| Diff
· /tests/hd_nvm_scripts.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-12931-dg_hd_dev-hd_dg_dvt-update' of ssh://dvm-linux02:7999/vv/dialin into DEN-12931-dg_hd_dev-hd_dg_d...

Sean Nash — Wed, 20 Jul 2022 07:52:14 -0700

Sean Nash committed 510f199 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

Merge branch 'DEN-12931-dg_hd_dev-hd_dg_dvt-update' of ssh://dvm-linux02:7999/vv/dialin into DEN-12931-dg_hd_dev-hd_dg_dvt-update

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931: added handling of HD alarm priority, rank and clear top only properties from alarm trigger messages.

Sean Nash — Wed, 20 Jul 2022 07:52:11 -0700

Sean Nash committed e336299 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931: added handling of HD alarm priority, rank and clear top only properties from alarm trigger messages.

· /dialin/dg/events.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-6, +48)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 19 Jul 2022 10:41:24 -0700

Dara Navaei committed 2c3670b on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

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

· /dialin/common/alarm_defs.py	(-6, +6)	\| History	\| Source	\| Diff
· /dialin/common/hd_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/ro_pump.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/treatment.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/valves.py	(-2, +2)	\| History	\| Source	\| Diff
· /setup.py	(-2, +2)	\| History	\| Source	\| Diff
· /tests/unit_tests/test_ui_proxy.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-12609-sw_dev-sprint-69_mg' into staging

Michael Garthwaite — Tue, 19 Jul 2022 10:38:36 -0700

Michael Garthwaite committed 2a3b3f1 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

Merge branch 'DEN-12609-sw_dev-sprint-69_mg' into staging

· /dialin/common/hd_defs.py	(-2, +27)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-13, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 updated the DG POST states

Dara Navaei — Fri, 15 Jul 2022 17:07:49 -0700

Dara Navaei committed 4c63e56 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 updated the DG POST states

· /dialin/common/dg_defs.py	(-6, +7)	\| History	\| Source	\| Diff
· /dialin/hd/calibration_record.py	(-4, +2)	\| History	\| Source	\| Diff
· /dialin/utils/nv_ops_utils.py	(-1, +0)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-2, +2)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-1, +6)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 updated the NV data file structure

Dara Navaei — Tue, 12 Jul 2022 18:06:28 -0700

Dara Navaei committed 72d37ae on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 updated the NV data file structure

· /dialin/utils/nv_ops_utils.py	(-12, +14)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-5, +5)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931: Added clear event list commands.

Sean Nash — Mon, 11 Jul 2022 15:17:10 -0700

Sean Nash committed 07c40d6 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931: Added clear event list commands.

· /dialin/dg/events.py	(-0, +11)	\| History	\| Source	\| Diff
· /dialin/hd/hd_events.py	(-0, +11)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931: Added DG reservoir tare command.

Sean Nash — Mon, 11 Jul 2022 13:28:45 -0700

Sean Nash committed 9790d4c on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931: Added DG reservoir tare command.

· /dialin/common/msg_ids.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/dg/reservoirs.py	(-0, +20)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931: Added DG service mode cmd.

Sean Nash — Fri, 08 Jul 2022 18:00:55 -0700

Sean Nash committed 099d683 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931: Added DG service mode cmd.

· /dialin/common/msg_ids.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-0, +45)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-169: changed ui_proxy's request version from dialin - hd to ui broadcast to get the DG to reply

Michael Garthwaite — Fri, 01 Jul 2022 15:42:34 -0700

Michael Garthwaite committed 975c47d on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DIAL-169: changed ui_proxy's request version from dialin - hd to ui broadcast to get the DG to reply

· /dialin/hd/ui_proxy.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 updated the disinfect names and the system and software configuration modules

Dara Navaei — Tue, 28 Jun 2022 16:51:50 -0700

Dara Navaei committed 31c0b4a on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 updated the disinfect names and the system and software configuration modules

· /dialin/dg/hd_proxy.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/sw_configs.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/dg/system_record.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-2, +2)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-58, +41)	\| History	\| Source	\| Diff
· /tests/peter/set_RTCs.py	(-1, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Auto stash before revert of "DEN-13080: DIAL-169: updated UI proxy's request version to send a UI_VERSION struct instea...

Michael Garthwaite — Fri, 24 Jun 2022 14:48:33 -0700

Michael Garthwaite committed 71020a3 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

Auto stash before revert of "DEN-13080: DIAL-169: updated UI proxy's request version to send a UI_VERSION struct instead of a 0 byte message."

· /dialin/hd/ui_proxy.py

(-2, +11)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13080: DIAL-169: updated UI proxy's request version to send a UI_VERSION struct instead of a 0 byte message.

Michael Garthwaite — Fri, 24 Jun 2022 14:35:32 -0700

Michael Garthwaite committed e3ff2de on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-13080: DIAL-169: updated UI proxy's request version to send a UI_VERSION struct instead of a 0 byte message.

· /dialin/dg/dg_debug.py

(-0, +58)

| History

| Source

dialin (DEN-16693-institutional-settings-implementation-2): Revert "DEN-13080: DIAL-169: updated UI proxy's request version to send a UI_VERSION struct instead of a 0 byte message...

Michael Garthwaite — Fri, 24 Jun 2022 14:35:32 -0700

Michael Garthwaite committed 623ee31 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

Revert "DEN-13080: DIAL-169: updated UI proxy's request version to send a UI_VERSION struct instead of a 0 byte message."

This reverts commit e3ff2de340f3484e70b48ed21e05a8dfb2402a5c.

· /dialin/dg/dg_debug.py

(-58, +0)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 removed the Disable_UI_POST_CONFIG

Dara Navaei — Thu, 23 Jun 2022 14:13:58 -0700

Dara Navaei committed cdafac7 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 removed the Disable_UI_POST_CONFIG

· /dialin/hd/sw_configs.py

(-1, +0)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 renamed the build switch

Dara Navaei — Thu, 23 Jun 2022 12:43:06 -0700

Dara Navaei committed 7c0215e on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 renamed the build switch

· /dialin/hd/sw_configs.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-12931 updated the system record and added a software configuration

Dara Navaei — Thu, 23 Jun 2022 12:29:11 -0700

Dara Navaei committed f822b55 on branch DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dialin

DEN-12931 updated the system record and added a software configuration

· /dialin/dg/calibration_record.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/system_record.py	(-3, +52)	\| History	\| Source	\| Diff
· /dialin/hd/sw_configs.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/utils/nv_ops_utils.py	(-3, +3)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-3, +22)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-4, +10)	\| History	\| Source	\| Diff
· /tests/hd_blood_leak_data.py	(-7, +5)	\| History	\| Source	\| Diff
· /tests/peter/test_dg_records.py	(-4, +5)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Mon, 20 Jun 2022 20:26:13 -0700

Dara Navaei committed 7ea4b93 on branch DEN-12358-sw_dev-sprint-67_mg, DEN-12931-dg_hd_dev-hd_dg_dvt-update and 185 more in dialin

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

· /dialin/common/dg_defs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/common/hd_defs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/common/msg_ids.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/chemical_disinfect.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/concentrate_pumps.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/conductivity_sensors.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/fans.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/flush.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/pressures.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/sw_configs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/switches.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/system_record.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/usage_info_record.py

(-3, +3)

| History

| Source

| Diff

… 20 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-12224 updated the heaters

Dara Navaei — Mon, 20 Jun 2022 15:16:09 -0700

Dara Navaei committed 6b1fd68 on branch DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more in dialin

DEN-12224 updated the heaters

· /dialin/dg/heaters.py	(-9, +5)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-6, +6)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-7, +7)	\| History	\| Source	\| Diff
· /tests/hd_nvm_scripts.py	(-6, +2)	\| History	\| Source	\| Diff
· /tests/peter/set_RTCs.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'staging' into DEN-12224-dg_hd_dev-switches-monitor

Dara Navaei — Mon, 20 Jun 2022 14:05:00 -0700

Dara Navaei committed 0c84db7 on branch DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more in dialin

Merge branch 'staging' into DEN-12224-dg_hd_dev-switches-monitor

· /dialin/common/dg_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/conductivity_sensors.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/utils/conversions.py	(-2, +16)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/hd_nvm_scripts.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-12224 addressed the code review comments

Dara Navaei — Sat, 18 Jun 2022 14:56:10 -0700

Dara Navaei committed 830aaa0 on branch DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more in dialin

DEN-12224 addressed the code review comments

· /dialin/hd/pretreatment.py

(-41, +15)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-12224 updated the test scripts for various tests

Dara Navaei — Sat, 18 Jun 2022 14:45:35 -0700

Dara Navaei committed c7c9198 on branch DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more in dialin

DEN-12224 updated the test scripts for various tests

· /tests/dg_nvm_scripts.py	(-3, +3)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-3, +6)	\| History	\| Source	\| Diff
· /tests/hd_blood_leak_data.py	(-1, +3)	\| History	\| Source	\| Diff
· /tests/peter/set_RTCs.py	(-8, +10)	\| History	\| Source	\| Diff
· /tests/peter/test_dg_records.py	(-3, +3)	\| History	\| Source	\| Diff
· /tests/peter/test_hd_records.py	(-3, +5)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-12224 updated the blood leak observer class

Dara Navaei — Wed, 15 Jun 2022 10:16:13 -0700

Dara Navaei committed e8e24c9 on branch DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more in dialin

DEN-12224 updated the blood leak observer class

· /dialin/hd/blood_leak.py	(-2, +8)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-3, +4)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/hd_blood_leak_data.py	(-4, +30)	\| History	\| Source	\| Diff
· /tests/hd_nvm_scripts.py	(-1, +6)	\| History	\| Source	\| Diff
· /tests/peter/test_hd_records.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-12224 updated the debug event

Dara Navaei — Wed, 01 Jun 2022 11:05:45 -0700

Dara Navaei committed e6c27d8 on branch DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more in dialin

DEN-12224 updated the debug event

· /dialin/hd/hemodialysis_device.py	(-7, +6)	\| History	\| Source	\| Diff
· /dialin/hd/pretreatment.py	(-2, +21)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-2, +4)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-12931 updated the flush state

Dara Navaei — Tue, 31 May 2022 18:55:21 -0700

Dara Navaei committed 2c6d0a9 on branch DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more in dialin

DEN-12931 updated the flush state

· /dialin/dg/flush.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-2, +2)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-8, +9)	\| History	\| Source	\| Diff