Services

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-15979-fw-investigate-dg-rtc-synchronization-failure

Merge branch 'DIAL-281-requesting-heat-disinfect-timer-overrides' into develop

DIAL-278: implementation of heat disinfection state timer overrides.

  1. … 2 more files in changeset.
DEN-16093 fixed merging conflicts

  1. … 2 more files in changeset.
take latest changes from staging

  1. … 1 more file in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

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

  1. … 4 more files in changeset.
Merged staging to DENBUG-59.

DEN-16308 updated the DG watchdog and safety shutdown POSTs

  1. … 3 more files in changeset.
Merge branch 'DENBUG-59-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow' into develop

DENBUG-59: Fixed DG handling of HD op mode broadcast messages.

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

  1. … 2 more files in changeset.
DEN-16093 merge in to develop

  1. … 1 more file in changeset.
DENBUG-59: attempted fix to DG recognition of HD mode.

DEN-16093 handler for DG park concnetrate pump added

  1. … 2 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'DIAL-280-reservoir-broadcast-override' into staging

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

Merge branch 'staging' into DIAL-280-reservoir-broadcast-override

DEN-16093-added DG park concentrate pumps

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

  1. … 2 more files in changeset.
DEN-16250 removed the voltage check code

  1. … 1 more file in changeset.
Merge branch 'DENBUG-59-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow' into develop

DENBUG-59: Fix alarm trigger msg payload length.

DEN-14706: removed #define

DEN-16250 updated the voltages in the watchdog and safety shutdown

  1. … 1 more file in changeset.
DIAL-280: code review comments.

DEN-14706: changed override condition for pending ack

DEN-16250 fixed the logic in the voltages check in watchdog and safety shutdown

  1. … 1 more file in changeset.
DEN-16250 added the isolated voltage to the watchdog and safety shutdown POSTs

  1. … 1 more file in changeset.