ro-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.

Merge branch 'LDT-828-stop-state-fp' into develop

LDT-828: fixed pressure sensor conversions for alpha units

    • -7
    • +8
    /firmware/App/Drivers/PressureSensor.c
Addressed review comments.

    • -7
    • +7
    /firmware/App/Modes/InletPressureCheck.c
    • -4
    • +5
    /firmware/App/Modes/InletPressureCheck.h
    • -0
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
Addressed review comments to remove unwanted code lines and handled state assignment.

    • -4
    • +1
    /firmware/App/Modes/InletPressureCheck.c
    • -1
    • +0
    /firmware/App/Modes/InletPressureCheck.h
    • -0
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
declared result at the top of the scope for test functions

LDT-1242: updated permeate tank control to change based on low level.

    • -6
    • +10
    /firmware/App/Controllers/PermeateTank.c
    • -3
    • +4
    /firmware/App/Drivers/PressureSensor.c
Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.

LDT-566: reverted publishing change for fine tuning.

Merge branch 'LDT-566-water-treatment-ro-pump-tuning' into develop

LDT-566: fixed RO Pump publishing to no longer have debug data for PI control

Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.

Merge branch 'LDT-566-water-treatment-ro-pump-tuning' into develop

LDT-2003: 1st stage of flow control. still wip. moved event from bad crc error to all faults.

    • -18
    • +35
    /firmware/App/Controllers/ROPump.c
Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.

Merge branch 'LDT-566-water-treatment-ro-pump-tuning' into develop

LDT-566: increased permeate flush timer to 5 minutes to support conductivity testing.

Removed commented code lines

Addressed review comments and modified the override behavior as discussed.

    • -174
    • +161
    /firmware/App/Controllers/ROPump.c
LDT-566: moved valve enum from ro firmware repo to common repo

    • -20
    • +20
    /firmware/App/Controllers/Valves.c
LDT-566: moved valve enum from ro firmware repo to common repo

    • -20
    • +20
    /firmware/App/Controllers/Valves.c
LDT-566: added an event trigger for bad crc alarm to assist in debugging.

Implemented Inlet Pressure check functionality with Boost Pump

    • -0
    • +371
    /firmware/App/Modes/InletPressureCheck.c
    • -0
    • +53
    /firmware/App/Modes/InletPressureCheck.h
    • -1
    • +6
    /firmware/App/Modes/ModePreGenPermeate.c
Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.

Merge branch 'LDT-566-water-treatment-ro-pump-tuning' into develop

LDT-566: removed alarm trigger for bad crc's in order to unblock sys testing.

Addressed review comments to remove blank lines

Fix for RO Pump override set and reset.

    • -75
    • +239
    /firmware/App/Controllers/ROPump.c
Modified handlers to change state based on data value rather than using get functions.

    • -11
    • +11
    /firmware/App/Controllers/ROPump.c
Fixed the override reset behavior in test function