common

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed merge conflicts.

Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

DEN-7605: Added new HD pump alarm for FPGA reported direction error. Added enum for HD pumps.

DEN:7860: Resolved merge conflicts

DEN-7860: Finished implementing HD Air Bubble Detectors

DEN-7605: Fixed merge conflicts.

DEN-7605: Added more flow sensor faults.

Merge branch 'develop' of ssh://dvm-linux02:7999/comm/common into develop

Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

DEN-7860: First pass at HD air bubble detectors code

DEN-8103: Added battery comm fault

DEN-8103: Removed unused alarms

DEN-7860: Updated alarm table

DEN-7860: Updated alarm table

Merge branch 'develop' of ssh://dvm-linux02:7999/comm/common into develop

Merge branch 'staging' into develop

Merge branch 'staging' into develop

DEN-8030 updated the alarm table

DEN-8030 updated alarm table

DEN-8103: Added new alarms property

Merge branch 'staging' into develop

DEN-7860: Updated alarm table for HD air bubble detectors

Merge branch 'staging' into develop

DEN-7605: Reduced minimum HD FPGA minor rev.

Need to remove this comment.

Need to remove this comment.

Need to remove this comment.

Need to remove this comment.

Same as comment from DialinFlow.c

Same as comment from DialinFlow.c

We can't have 3 calls to isPersistentAlarmTriggered() on same alarm. If the first call starts the timer and the second or third call is good, it will reset the timer to 0 again. Suggest creating a ...

We can't have 3 calls to isPersistentAlarmTriggered() on same alarm. If the first call starts the timer and the second or third call is good, it will reset the timer to 0 again.
Suggest creating a BOOL variable to have all three conditions or with each other and call isPersistentAlarmTriggered() only once.

Merge branch 'staging' into develop

Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging