Activity common/

9:11 am

Vinayakam Mani

More
f7c47c7
changed 1 file
develop

DEN-16093-Merge in to develop

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

2:23 pm

Vinayakam Mani

More
e083277
changed 1 file
DEN-15792-hd-software-design-description, DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment and 78 more HD-DEN-16093-1

DEN-16093-renamed enum to maintain consistency on cmd request

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

11:48 am

Dara Navaei

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

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

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

11:23 am

Michael Garthwaite

More
895f04d
changed 0 files
DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 81 more

Merge branch 'DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked' into staging

1:53 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
8b80a3b
changed 1 file
DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 73 more DG-DEN-15973-1

DEN-15973 Rename alarm

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

1:32 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
2860c68
changed 1 file
DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 73 more DG-DEN-15973-1

DEN-15973 Add RO Pump max PWM alarm. NOTE: Descriptive text needs to be verified

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

1:27 pm

Vinayakam Mani

More
2ce7b23
changed 2 files
DEN-15792-hd-software-design-description, DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment and 78 more HD-DEN-16093-1

DEN-16093-added DG park concentrate pumps

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

6:21 pm

Michael Garthwaite

More
fe3359b
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 82 more DG-DEN-14706-1

DEN-14706: MSG IDs for upcoming overrides

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

1:30 pm

Dara Navaei

More
72dc58d
changed 2 files
develop

Merged staging

- -2
- +2
/AlarmDefs.h
- History
- Source
- Diff
/AlarmDefs.h
- -3
- +2
/DGDefs.h
- History
- Source
- Diff
/DGDefs.h

11:06 am

Dara Navaei

More
459e42d
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 83 more

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

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

10:38 am

Dara Navaei

More
66a10cc
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 83 more

Merged DEN-16215

10:30 am

Dara Navaei

More
52aac96
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 'staging' into DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state

10:22 am

Dara Navaei

More
6c8c013
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

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

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

10:12 am

Dara Navaei

More
7162193
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 DG-DEN-16215-1

DEN-16215 removed the start state of mode fill

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

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

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)

Vinayakam Mani

Vinayakam Mani

Dara Navaei

Michael Garthwaite

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>

Vinayakam Mani

Michael Garthwaite

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

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