Clone
Tools

 

james walter taylor <jtaylor@diality.com> in dgfirmware

About

42 commits
  • Committer is not mapped to a user
  • First commit: 30 November 2022
  • Last commit: 15 September 2023
Last Week All Time
Commits: 0 42

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 
Friday 15 Sep 2023
4:18 pm

James Walter Taylor <jtaylor@diality.com>

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into staging

Options
Wednesday 13 Sep 2023
9:53 am

James Walter Taylor <jtaylor@diality.com>

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

Options
    • -17
    • +12
    /firmware/App/Modes/ModeFill.c
9:52 am

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

On Dara's advice, ifdef'ed code for fill state treatment recovery

Options
    • -17
    • +12
    /firmware/App/Modes/ModeFill.c
Tuesday 12 Sep 2023
11:06 am

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Correcting issue with develop RESERVOIR_DATA_T

Options
    • -3
    • +0
    /firmware/App/Services/Reservoirs.h
10:59 am

James Walter Taylor <jtaylor@diality.com>

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

Options
    • -3
    • +5
    /firmware/App/Modes/ModeFill.c
10:55 am

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Reset timers when doing a test recover state, or returning from a (reset) fault condition.

Options
    • -3
    • +5
    /firmware/App/Modes/ModeFill.c
Friday 08 Sep 2023
5:29 pm

James Walter Taylor <jtaylor@diality.com>

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

Options
    • -3
    • +6
    /firmware/App/Modes/ModeFill.c
5:23 pm

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Reintroduced reservoir data structure change.

Corrected the setModeFillStateTransition semantics.

Options
    • -2
    • +3
    /firmware/App/Modes/ModeFill.c
    • -3
    • +0
    /firmware/App/Services/Reservoirs.h
2:57 pm

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Structure out of sync between HD/DG. Corrected.

Options
    • -0
    • +3
    /firmware/App/Services/Reservoirs.h
2:18 pm

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Modification to test DG comm issues.

Options
    • -0
    • +3
    /firmware/App/Services/Reservoirs.h
1:27 pm

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Corrected spacing in the file per CR comments

Options
    • -1
    • +3
    /firmware/App/Modes/ModeFill.c
10:47 am

James Walter Taylor <jtaylor@diality.com>

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

Options
    • -50
    • +24
    /firmware/App/Modes/ModeFill.c
10:45 am

James Walter Taylor <jtaylor@diality.com>

Merge remote-tracking branch 'origin/staging' into develop

Options
10:42 am

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Follow up for changes, simplifications suggested by Sean.

Options
    • -50
    • +24
    /firmware/App/Modes/ModeFill.c
Thursday 07 Sep 2023
3:41 pm

James Walter Taylor <jtaylor@diality.com>

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

Options
    • -24
    • +62
    /firmware/App/Modes/ModeFill.c
3:34 pm

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Updated headers

Options
    • -1
    • +1
    /firmware/App/Modes/ModeFill.c
3:27 pm

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

fill time allowance for time spent in pause state

Cleared fill timer on transition to generate

Added removed unused (and uninitialized) variables from broadcast data structure.

Options
    • -2
    • +38
    /firmware/App/Modes/ModeFill.c
    • -3
    • +0
    /firmware/App/Services/Reservoirs.h
Friday 01 Sep 2023
4:38 pm

James Walter Taylor <jtaylor@diality.com>

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Initial changes for alarm 206 timer

Options
    • -21
    • +23
    /firmware/App/Modes/ModeFill.c
    • -1
    • +1
    /firmware/App/Services/Reservoirs.c
Wednesday 23 Aug 2023
11:55 am

James Walter Taylor <jtaylor@diality.com>

Merge remote-tracking branch 'origin/DEN-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears' into develop

Options
    • -1
    • +5
    /firmware/App/Controllers/ConductivitySensors.c
    • -3
    • +2
    /firmware/App/Modes/ModeFill.c
    • -23
    • +88
    /firmware/App/Services/Reservoirs.c
    • -3
    • +56
    /firmware/App/Services/SystemComm.c
    • -1
    • +65
    /firmware/App/Services/SystemCommMessages.c
    • -1
    • +7
    /firmware/App/Services/SystemCommMessages.h
11:51 am

James Walter Taylor <jtaylor@diality.com>

DEN-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears

Incorporated HD mode check, to clear alarm 150/151

Options
    • -1
    • +5
    /firmware/App/Controllers/ConductivitySensors.c
Wednesday 16 Aug 2023
10:16 am

James Walter Taylor <jtaylor@diality.com>

Merge remote-tracking branch 'origin/staging' into staging

Options
    • -1
    • +1
    /firmware/App/Services/SystemComm.c
10:04 am

James Walter Taylor <jtaylor@diality.com>

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

Options
    • -1
    • +1
    /firmware/App/Services/SystemComm.c
Thursday 03 Aug 2023
3:15 pm

James Walter Taylor <jtaylor@diality.com>

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

Options
    • -1
    • +1
    /firmware/App/Services/SystemComm.c
8:15 am

James Walter Taylor <jtaylor@diality.com>

DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override

changed override name

Options
    • -1
    • +1
    /firmware/App/Services/SystemComm.c
Wednesday 28 Jun 2023
4:57 pm

James Walter Taylor <jtaylor@diality.com>

Merge branch 'DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it' into staging

Options
4:56 pm

James Walter Taylor <jtaylor@diality.com>

Merge branch 'DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it' into develop

Timeout increased from 5 to 10 seconds

Options
    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
4:13 pm

James Walter Taylor <jtaylor@diality.com>

DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it

Corrected comment alignment

Options
    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
4:10 pm

James Walter Taylor <jtaylor@diality.com>

DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it

Undated 5second timeout to 10 seconds

Options
    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
Friday 14 Apr 2023
11:22 am

James Walter Taylor <jtaylor@diality.com>

Merge branch 'DEN-15077-fmp-flow-vs-load-cell-comparison-to-use-load-cells-as-actual-value' into staging

Options
Tuesday 11 Apr 2023
10:09 am

James Walter Taylor <jtaylor@diality.com>

DEN-15077-fmp-flow-vs-load-cell-comparison-to-use-load-cells-as-actual-value

converted error relative to integrated flow, to error relative to load cell, as the load cell mass is a more accurate measurement.

Options
    • -1
    • +1
    /firmware/App/Modes/ModeFill.c