Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-2185 latest from staging

resolved merge conflicts

    • -5
    • +13
    ./Modes/FPModes/ModePreGenPermeate.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

LDT-3159 fixed return description

LDT-3159 addressed CR review comments

LDT-3159 added dialin test funcion to return FP defeatured status

LDT-2185 CR comments

LDT-2185 added struct packing

LDT-2185 updated def filter flush broadcast message

    • -3
    • +3
    ./Modes/FPModes/FlushFilterDefeatured.c
    • -1
    • +1
    ./Modes/FPModes/FlushFilterDefeatured.h
LDT-2185 updated test function naming and messaging

LDT-2185 resolved CR comments

LDT-2185 resolved compile errors

    • -2
    • +2
    ./Modes/FPModes/FlushFilterDefeatured.c
    • -3
    • +3
    ./Modes/FPModes/FlushFilterDefeatured.h
LDT-2185 addressed review comments

LDT-2185 updated macro comments

    • -18
    • +19
    ./Monitors/WaterQualityMonitor.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

LDT-3091 added fw code to skip filters flush with test config

    • -3
    • +11
    ./Modes/FPModes/ModePreGenPermeate.c
LDT-2185 fixed typo.

LDT-2185 resolved comments and updated fw per new SRS changes.

LDT-2185 removed insufficient flow check and added M3 temp check

    • -26
    • +16
    ./Monitors/WaterQualityMonitor.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

  1. … 107 more files in changeset.
LDT-2801 addressed a code review comment

LDT-2185 implemented review comments

    • -0
    • +1
    ./Modes/FPModes/FlushFilterDefeatured.c
LDT-2801 addressed the code review comments

LDT-2185 iofp alpha updates + new requirements

    • -38
    • +67
    ./Modes/FPModes/InletPressureCheck.c
    • -3
    • +101
    ./Monitors/WaterQualityMonitor.c
LDT-2185 code fixes for alarms and start GENP from standby

    • -4
    • +3
    ./Modes/FPModes/FlushFilterDefeatured.c
    • -0
    • +10
    ./Modes/FPModes/ModePreGenPermeate.c
LDT-2801 added the rinse pump speed feedback FPGA register

LDT-2801 merged staging and resolved the conflicts