Activity common/

10:00 am

James Walter Taylor <jtaylor@diality.com>

More
043a630
changed 1 file
DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 84 more

Merge remote-tracking branch 'origin/DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override' into staging

- -1
- +2
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

9:43 am

Dara Navaei

More
29f5e7b
changed 2 files
DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 84 more HD-DENBUG-59-1

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

- -2
- +2
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h
- -1
- +1
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

9:03 am

Michael Garthwaite

More
e5fc54b
changed 0 files
DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 84 more

Merge branch 'DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error' into staging

8:17 am

Michael Garthwaite

More
f7eb9c9
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more HD-DEN-14692-1

DEN-14692: Changed stop property for alarm 216 to true

- -1
- +1
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h

3:39 pm

Michael Garthwaite

More
eb2e0d9
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more HD-DEN-14692-1

DEN-14692: fixed DG RAM status override message ID.

- -1
- +1
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

1:58 pm

Michael Garthwaite

More
006da41
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more HD-DEN-14692-1

DEN-14692: RAM status override message IDs for HD and DG.

- -0
- +2
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

9:08 am

Dara Navaei

More
e10e8dd
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more

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

- -1
- +1
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

8:45 am

Michael Garthwaite

More
3b1603d
changed 0 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more

Merge branch 'DIAL-269-pure-water-mode-not-able-to-turn-on-off' into staging

3:33 pm

Michael Garthwaite

More
8aac4d6
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 86 more DG-DIAL-269-1

Merge branch 'staging' into DIAL-269-pure-water-mode-not-able-to-turn-on-off

- -4
- +4
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

2:05 pm

Dara Navaei

More
ccea08d
changed 2 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 86 more DG-DIAL-269-1

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

- -2
- +2
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h
- -2
- +2
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

1:45 pm

Sean Nash

More
408afb1
changed 0 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 86 more

Merged DEN-14815 to staging.

1:35 pm

Sean Nash

More
ea9e516
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 87 more

Merging staging to DEN-14815.

- -2
- +4
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

4:57 pm

Sean Nash

More
9bc17c8
changed 0 files
develop

Fixed merge conflict.

4:14 pm

Sean Nash

More
db2e60b
changed 1 file
develop UI-UCOMMITS-25

Fixed merge conflict.

- -1
- +1
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h

4:00 pm

Sean Nash

More
b0b74fa
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 87 more HD-DEN-14815-1

DEN-14815: Addressed DEN-15885.

- -1
- +1
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h

2:12 pm

Michael Garthwaite

More
9020fed
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 86 more DG-DIAL-269-1

DIAL-269: added DG dialin get ro only mode.

- -0
- +1
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

10:26 am

Sean Nash

More
540a5c3
changed 1 file
develop

Merge branch 'DEN-14815-cartridge-removal-screen-is-displayed-prematurely' into develop

- -2
- +2
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

9:31 am

Sean Nash

More
0d28d92
changed 1 file
DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 81 more HD-DENBUG-59-1

DENBUG-59: Addressed code review comments.

- -1
- +1
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h

12:52 pm

Dara Navaei

More
2534a2b
changed 3 files
develop UI-UCOMMITS-25

Merged staging

- -3
- +3
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h
- -2
- +3
/HDDefs.h
- History
- Source
- Diff
/HDDefs.h
- -2
- +4
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

8:36 am

Dara Navaei

More
e380d07
changed 2 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 87 more

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

- -2
- +2
/HDDefs.h
- History
- Source
- Diff
/HDDefs.h
- -2
- +2
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

8:19 am

Michael Garthwaite

More
b16f2f8
changed 0 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 87 more

Merge branch 'DEN-16166-event-message-for-pass-fail-bld-self-test' into staging

8:18 am

Michael Garthwaite

More
2deba02
changed 0 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 88 more

Merge branch 'staging' into DEN-16166-event-message-for-pass-fail-bld-self-test

8:16 am

Michael Garthwaite

More
ec93483
changed 0 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 88 more

Merge branch 'DEN-15634-bad-fill-states-and-signal-updating-inconsistently' into staging

5:22 pm

Sean Nash

More
1bcdcce
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 87 more HD-DEN-14815-1

DEN-14815: Added new message IDs for request/response for post-tx next button.

- -2
- +2
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

1:37 pm

Michael Garthwaite

More
4cd4c19
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 88 more HD-DEN-16166-1

DEN-16166: updated hd defs for blood leak self test event.

- -0
- +1
/HDDefs.h
- History
- Source
- Diff
/HDDefs.h

10:04 am

Sean Nash

More
086dd21
changed 1 file
develop UI-UCOMMITS-25

Fixed merge conflicts.

- -2
- +4
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h

6:38 pm

Sean Nash

More
9530fb6
changed 1 file
develop

Fixed merge conflict.

- -339
- +339
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h

3:52 pm

Sean Nash

More
d3ef9cd
changed 1 file
DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 81 more HD-DENBUG-59-1

DENBUG-59: Added new alarm properties to block alarm trigger in rinseback or post-tx states.

- -337
- +339
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h

1:12 pm

Michael Garthwaite

More
e63916a
changed 0 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 89 more

Merge branch 'staging' into DEN-15634-bad-fill-states-and-signal-updating-inconsistently

1:12 pm

Michael Garthwaite

More
d8e3fad
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 89 more DG-DEN-15634-1

DEN-15634: added override for drain mode broadcast interval override.

- -0
- +1
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

common

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

James Walter Taylor <jtaylor@diality.com>

Dara Navaei

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Dara Navaei

Michael Garthwaite

Michael Garthwaite

Dara Navaei

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Michael Garthwaite

Sean Nash

Sean Nash

Dara Navaei

Dara Navaei

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Sean Nash

Michael Garthwaite

Sean Nash

Sean Nash

Sean Nash

Michael Garthwaite

Michael Garthwaite