Activity dialin/

10:56 am

Dara Navaei

More
a8e8b4a
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

Bamboo Commit: generated the code change report

- -0
- +1
/tools/Code_Report.csv
- History
- Source
- Diff
/tools/Code_Report.csv

10:54 am

Michael Garthwaite

More
a2fc360
changed 4 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

Merge branch 'DEN-14786-dialin-not-tread-safe-with-canbus-messages' into develop

- -2
- +1
/dialin/dg/dialysate_generator.py
- History
- Source
- Diff
/dialin/dg/dialysate_generator.py
- -2
- +1
/dialin/hd/hemodialysis_device.py
- History
- Source
- Diff
/dialin/hd/hemodialysis_device.py
- -6
- +10
/dialin/ui/dg_simulator.py
- History
- Source
- Diff
/dialin/ui/dg_simulator.py
- -18
- +31
/dialin/ui/hd_simulator.py
- History
- Source
- Diff
/dialin/ui/hd_simulator.py

10:54 am

Michael Garthwaite

More
458f1c2
changed 3 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: CAN timestamps for hd_sim and dg_sim.

- -1
- +1
/dialin/protocols/CAN.py
- History
- Source
- Diff
/dialin/protocols/CAN.py
- -6
- +10
/dialin/ui/dg_simulator.py
- History
- Source
- Diff
/dialin/ui/dg_simulator.py
- -18
- +31
/dialin/ui/hd_simulator.py
- History
- Source
- Diff
/dialin/ui/hd_simulator.py

4:19 pm

Michael Garthwaite

More
da00dd6
changed 3 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: fixed mutex position in the wrong bracket. Fixed event handling to create at timestamp instead of using the socketcan timestamp.

- -4
- +3
/dialin/dg/events.py
- History
- Source
- Diff
/dialin/dg/events.py
- -3
- +3
/dialin/hd/hd_events.py
- History
- Source
- Diff
/dialin/hd/hd_events.py
- -1
- +1
/dialin/protocols/CAN.py
- History
- Source
- Diff
/dialin/protocols/CAN.py

2:08 pm

Michael Garthwaite

More
c14945c
changed 0 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more

Merge branch 'staging' into DEN-14662-nfr-battery-related

2:08 pm

Michael Garthwaite

More
120e61c
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more DIALIN-DEN-14662-1

DEN-14662: Updated air pump documentation to display enum for air pump states.

- -0
- +9
/dialin/hd/air_pump.py
- History
- Source
- Diff
/dialin/hd/air_pump.py

1:13 pm

Michael Garthwaite

More
e1a940b
changed 2 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: fixed missing event handler to display the sub mode event change when no op mode change has been received.

- -7
- +12
/dialin/dg/events.py
- History
- Source
- Diff
/dialin/dg/events.py
- -6
- +10
/dialin/hd/hd_events.py
- History
- Source
- Diff
/dialin/hd/hd_events.py

12:52 pm

Sean Nash

More
cd6edb2
changed 1 file
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device and 146 more DIALIN-DEN-13154-1

DEN-13154: Added raw flow rates to DG flow rates broadcast message.

- -2
- +26
/dialin/dg/flow_sensors.py
- History
- Source
- Diff
/dialin/dg/flow_sensors.py

11:42 am

Michael Garthwaite

More
d223289
changed 4 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: removed log can from dg and hd objects. Fixed missing events that happen when no op mode was previously received .

- -2
- +1
/dialin/dg/dialysate_generator.py
- History
- Source
- Diff
/dialin/dg/dialysate_generator.py
- -5
- +38
/dialin/dg/events.py
- History
- Source
- Diff
/dialin/dg/events.py
- -2
- +35
/dialin/hd/hd_events.py
- History
- Source
- Diff
/dialin/hd/hd_events.py
- -2
- +1
/dialin/hd/hemodialysis_device.py
- History
- Source
- Diff
/dialin/hd/hemodialysis_device.py

11:16 am

Michael Garthwaite

More
ac5801c
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: removed log_can feature. Moved mutex lock and acquires to encapsulate the entire message processing than only callback handling.

- -9
- +3
/dialin/protocols/CAN.py
- History
- Source
- Diff
/dialin/protocols/CAN.py

11:10 am

Michael Garthwaite

More
cee26db
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

Merge branch 'DEN-14786-dialin-not-tread-safe-with-canbus-messages' into develop

- -1
- +1
/dialin/hd/ui_proxy.py
- History
- Source
- Diff
/dialin/hd/ui_proxy.py

11:10 am

Michael Garthwaite

More
ace0d2c
changed 2 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: fixed tests

- -1
- +1
/dialin/hd/ui_proxy.py
- History
- Source
- Diff
/dialin/hd/ui_proxy.py
- -4
- +4
/tests/unit_tests/test_ui_proxy.py
- History
- Source
- Diff
/tests/unit_tests/test_ui_proxy.py

10:58 am

Michael Garthwaite

More
e4056c3
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

Added MSG_ID_DG_SET_DIALYSATE_MIXING_RATIOS msg_id

- -0
- +1
/dialin/common/msg_ids.py
- History
- Source
- Diff
/dialin/common/msg_ids.py

10:18 am

Dara Navaei

More
ed79922
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

Bamboo Commit: generated the code change report

- -8
- +112
/tools/Code_Report.csv
- History
- Source
- Diff
/tools/Code_Report.csv

10:17 am

Michael Garthwaite

More
cadb919
changed 17 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

Merge branch 'DEN-14786-dialin-not-tread-safe-with-canbus-messages' into develop

- -5
- +10
/dialin/dg/chemical_disinfect.py
- History
- Source
- Diff
/dialin/dg/chemical_disinfect.py
- -2
- +5
/dialin/dg/dialysate_fill.py
- History
- Source
- Diff
/dialin/dg/dialysate_fill.py
- -4
- +8
/dialin/dg/dialysate_generator.py
- History
- Source
- Diff
/dialin/dg/dialysate_generator.py
- -2
- +4
/dialin/dg/drain_pump.py
- History
- Source
- Diff
/dialin/dg/drain_pump.py
- -6
- +10
/dialin/dg/heat_disinfect.py
- History
- Source
- Diff
/dialin/dg/heat_disinfect.py
- -2
- +4
/dialin/dg/reservoirs.py
- History
- Source
- Diff
/dialin/dg/reservoirs.py
- -2
- +5
/dialin/dg/temperatures.py
- History
- Source
- Diff
/dialin/dg/temperatures.py
- -11
- +22
/dialin/hd/alarms.py
- History
- Source
- Diff
/dialin/hd/alarms.py
- -5
- +10
/dialin/hd/battery.py
- History
- Source
- Diff
/dialin/hd/battery.py
- -2
- +3
/dialin/hd/blood_flow.py
- History
- Source
- Diff
/dialin/hd/blood_flow.py
- -1
- +4
/dialin/hd/dialysate_inlet_flow.py
- History
- Source
- Diff
/dialin/hd/dialysate_inlet_flow.py
- -2
- +4
/dialin/hd/fans.py
- History
- Source
- Diff
/dialin/hd/fans.py
- -5
- +13
/dialin/hd/hemodialysis_device.py
- History
- Source
- Diff
/dialin/hd/hemodialysis_device.py
- -4
- +16
/dialin/hd/pretreatment.py
- History
- Source
- Diff
/dialin/hd/pretreatment.py
- -2
- +5
/dialin/hd/rtc.py
- History
- Source
- Diff
/dialin/hd/rtc.py
- -10
- +32
/dialin/hd/treatment.py
- History
- Source
- Diff
/dialin/hd/treatment.py
- -16
- +58
/dialin/hd/ui_proxy.py
- History
- Source
- Diff
/dialin/hd/ui_proxy.py

10:14 am

Michael Garthwaite

More
ceb2d67
changed 37 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: implemented socket can timestamps to DG module and submodules

- -2
- +4
/dialin/dg/accelerometer.py
- History
- Source
- Diff
/dialin/dg/accelerometer.py
- -9
- +17
/dialin/dg/alarms.py
- History
- Source
- Diff
/dialin/dg/alarms.py
- -2
- +5
/dialin/dg/calibration_record.py
- History
- Source
- Diff
/dialin/dg/calibration_record.py
- -5
- +10
/dialin/dg/chemical_disinfect.py
- History
- Source
- Diff
/dialin/dg/chemical_disinfect.py
- -4
- +5
/dialin/dg/chemical_disinfect_flush.py
- History
- Source
- Diff
/dialin/dg/chemical_disinfect_flush.py
- -2
- +4
/dialin/dg/concentrate_pumps.py
- History
- Source
- Diff
/dialin/dg/concentrate_pumps.py
- -3
- +7
/dialin/dg/conductivity_sensors.py
- History
- Source
- Diff
/dialin/dg/conductivity_sensors.py
- -2
- +5
/dialin/dg/cpld.py
- History
- Source
- Diff
/dialin/dg/cpld.py
- -2
- +5
/dialin/dg/dialysate_fill.py
- History
- Source
- Diff
/dialin/dg/dialysate_fill.py
- -4
- +8
/dialin/dg/dialysate_generator.py
- History
- Source
- Diff
/dialin/dg/dialysate_generator.py
- -2
- +4
/dialin/dg/drain_pump.py
- History
- Source
- Diff
/dialin/dg/drain_pump.py
- -2
- +4
/dialin/dg/events.py
- History
- Source
- Diff
/dialin/dg/events.py
- -2
- +4
/dialin/dg/fans.py
- History
- Source
- Diff
/dialin/dg/fans.py
- -2
- +4
/dialin/dg/flow_sensors.py
- History
- Source
- Diff
/dialin/dg/flow_sensors.py
- -2
- +4
/dialin/dg/fluid_leak.py
- History
- Source
- Diff
/dialin/dg/fluid_leak.py
… 22 more files in changeset.

9:21 am

Michael Garthwaite

More
fbd7116
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

Merge branch 'staging' into DEN-14786-dialin-not-tread-safe-with-canbus-messages

- -7
- +6
/dialin/hd/blood_leak.py
- History
- Source
- Diff
/dialin/hd/blood_leak.py

12:45 pm

Dara Navaei

More
85ed964
changed 3 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 142 more DIALIN-DEN-14763-1

DEN-14763 applied the stashed changes from staging

- -1
- +1
/tests/dg_nvm_scripts.py
- History
- Source
- Diff
/tests/dg_nvm_scripts.py
- -8
- +11
/tests/dg_tests.py
- History
- Source
- Diff
/tests/dg_tests.py
- -1
- +1
/tests/test_nelson_labs_disinfect.py
- History
- Source
- Diff
/tests/test_nelson_labs_disinfect.py

2:53 pm

Dara Navaei

More
99de977
changed 1 file
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device and 146 more

Bamboo Commit: generated the code change report

- -1
- +1
/tools/Code_Report.csv
- History
- Source
- Diff
/tools/Code_Report.csv

2:52 pm

Dara Navaei

More
4b3fc3c
changed 1 file
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device and 146 more DIALIN-DEN-14786-1

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

- -2
- +2
/dialin/hd/blood_leak.py
- History
- Source
- Diff
/dialin/hd/blood_leak.py

2:50 pm

James Walter Taylor <jtaylor@diality.com>

More
fed4f22
changed 0 files
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device and 146 more

Merge branch 'DEN-14160-hd-blood-leak-override-not-working' into staging

9:56 am

Michael Garthwaite

More
1701afa
changed 9 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: remaining HD submodules for timestamp implementation.

- -2
- +5
/dialin/hd/service_record.py
- History
- Source
- Diff
/dialin/hd/service_record.py
- -2
- +4
/dialin/hd/sw_configs.py
- History
- Source
- Diff
/dialin/hd/sw_configs.py
- -2
- +4
/dialin/hd/switches.py
- History
- Source
- Diff
/dialin/hd/switches.py
- -2
- +5
/dialin/hd/syringe_pump.py
- History
- Source
- Diff
/dialin/hd/syringe_pump.py
- -2
- +4
/dialin/hd/system_record.py
- History
- Source
- Diff
/dialin/hd/system_record.py
- -2
- +4
/dialin/hd/temperatures.py
- History
- Source
- Diff
/dialin/hd/temperatures.py
- -16
- +58
/dialin/hd/ui_proxy.py
- History
- Source
- Diff
/dialin/hd/ui_proxy.py
- -2
- +4
/dialin/hd/valves.py
- History
- Source
- Diff
/dialin/hd/valves.py
- -2
- +4
/dialin/hd/voltages.py
- History
- Source
- Diff
/dialin/hd/voltages.py

9:10 am

Michael Garthwaite

More
36a7662
changed 5 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: Sub modules H-R. removed unused data fields in pressure_occlusion

- -2
- +4
/dialin/hd/hd_events.py
- History
- Source
- Diff
/dialin/hd/hd_events.py
- -3
- +3
/dialin/hd/post_treatment.py
- History
- Source
- Diff
/dialin/hd/post_treatment.py
- -5
- +4
/dialin/hd/pressure_occlusion.py
- History
- Source
- Diff
/dialin/hd/pressure_occlusion.py
- -2
- +5
/dialin/hd/reservoirs.py
- History
- Source
- Diff
/dialin/hd/reservoirs.py
- -2
- +5
/dialin/hd/rtc.py
- History
- Source
- Diff
/dialin/hd/rtc.py

8:56 am

Michael Garthwaite

More
1a02639
changed 9 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: timestamp implmenation for submodules B-F

- -5
- +10
/dialin/hd/battery.py
- History
- Source
- Diff
/dialin/hd/battery.py
- -3
- +4
/dialin/hd/blood_flow.py
- History
- Source
- Diff
/dialin/hd/blood_flow.py
- -4
- +8
/dialin/hd/blood_leak.py
- History
- Source
- Diff
/dialin/hd/blood_leak.py
- -2
- +4
/dialin/hd/buttons.py
- History
- Source
- Diff
/dialin/hd/buttons.py
- -1
- +3
/dialin/hd/calibration_record.py
- History
- Source
- Diff
/dialin/hd/calibration_record.py
- -1
- +4
/dialin/hd/dialysate_inlet_flow.py
- History
- Source
- Diff
/dialin/hd/dialysate_inlet_flow.py
- -1
- +4
/dialin/hd/dialysate_outlet_flow.py
- History
- Source
- Diff
/dialin/hd/dialysate_outlet_flow.py
- -2
- +4
/dialin/hd/fans.py
- History
- Source
- Diff
/dialin/hd/fans.py
- -2
- +4
/dialin/hd/fluid_leak.py
- History
- Source
- Diff
/dialin/hd/fluid_leak.py

8:43 am

Michael Garthwaite

More
eed13dd
changed 4 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: fixed air bubbles publish. timestamp implementation for A submodules.

- -1
- +4
/dialin/hd/accelerometer.py
- History
- Source
- Diff
/dialin/hd/accelerometer.py
- -2
- +4
/dialin/hd/air_bubbles.py
- History
- Source
- Diff
/dialin/hd/air_bubbles.py
- -2
- +4
/dialin/hd/air_pump.py
- History
- Source
- Diff
/dialin/hd/air_pump.py
- -2
- +4
/dialin/hd/air_trap.py
- History
- Source
- Diff
/dialin/hd/air_trap.py

8:35 am

Michael Garthwaite

More
21cc5bf
changed 6 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more DIALIN-DEN-14786-1

DEN-14786: updated messages to handle timestamps directly from socket can

- -11
- +22
/dialin/hd/alarms.py
- History
- Source
- Diff
/dialin/hd/alarms.py
- -5
- +13
/dialin/hd/hemodialysis_device.py
- History
- Source
- Diff
/dialin/hd/hemodialysis_device.py
- -3
- +4
/dialin/hd/post_treatment.py
- History
- Source
- Diff
/dialin/hd/post_treatment.py
- -4
- +16
/dialin/hd/pretreatment.py
- History
- Source
- Diff
/dialin/hd/pretreatment.py
- -10
- +32
/dialin/hd/treatment.py
- History
- Source
- Diff
/dialin/hd/treatment.py
- -1
- +1
/dialin/protocols/CAN.py
- History
- Source
- Diff
/dialin/protocols/CAN.py

7:37 am

Michael Garthwaite

More
8ab23ed
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more

DEN-14786: implemented mutexes around CAN callbacks and sync_response dictionary.

- -3
- +7
/dialin/protocols/CAN.py
- History
- Source
- Diff
/dialin/protocols/CAN.py

1:12 pm

Michael Garthwaite

More
d113073
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

Merge branch 'DEN-14662-nfr-battery-related' into develop

- -2
- +2
/dialin/hd/battery.py
- History
- Source
- Diff
/dialin/hd/battery.py

1:11 pm

Michael Garthwaite

More
fa61750
changed 0 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more

Merge branch 'DEN-14647-get_battery_manager_values' into DEN-14662-nfr-battery-related

3:33 pm

Michael Garthwaite

More
b32aa50
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more DIALIN-DEN-14662-1

DEN-14647: fixed battery fields to have the correct data description.

- -2
- +2
/dialin/hd/battery.py
- History
- Source
- Diff
/dialin/hd/battery.py

dialin

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

Dara Navaei

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Sean Nash

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Dara Navaei

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Dara Navaei

Dara Navaei

Dara Navaei

James Walter Taylor <jtaylor@diality.com>

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite