Services

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

Removed #define. Thanks!

Removed #define. Thanks!

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

  1. … 1 more file in changeset.
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DIAL-280: code review comments.

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

DEN-14706: changed override condition for pending ack

Add blank line between functions.

Add blank line between functions.

Add blank line between banner comment and prototype.

Add blank line between banner comment and prototype.

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.
I think override should be OR'd with timeout only. The used condition should still have to be true even if override is in place.

I think override should be OR'd with timeout only. The used condition should still have to be true even if override is in place.

I don't see where this #define is ever used. Remove if not needed.

I don't see where this #define is ever used. Remove if not needed.

DIAL-280: Reservoir broadcast interval override.

DG-DIAL-280_Reservoir Broadcast Override
DG-DIAL-280_Reservoir Broadcast Override
DEN-14706: DG ACK pending override message handling and implementation.

DG-DEN-14706_Need Mechanism For Alarm ID Can Message Not Acked And Alarm ID DG Can Message Not Acked
DG-DEN-14706_Need Mechanism For Alarm ID Can Message Not Acked And Alarm ID DG Can Message Not Acked
DG-DEN-16093_Alarm 97 Conductivity Out OF Range Triggered ON First Fill OF Treatment
DG-DEN-16093_Alarm 97 Conductivity Out OF Range Triggered ON First Fill OF Treatment
DG-DEN-16250_Flow Check Alarm 207 When Filling With Pause State
DG-DEN-16250_Flow Check Alarm 207 When Filling With Pause State
Merged DEN-15964

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

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