ro-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-828: fixed pressure sensor conversions for alpha units

    • -7
    • +8
    /firmware/App/Drivers/PressureSensor.c
Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into staging

LDT-566: code review comments.

    • -2
    • +0
    /firmware/App/Controllers/PermeateTank.c
LDT-566: code review comments

    • -8
    • +7
    /firmware/App/Controllers/PermeateTank.c
    • -2
    • +0
    /firmware/App/Modes/FlushConcentrate.c
    • -1
    • +0
    /firmware/App/Modes/ModePreGenPermeate.c
LDT-566: code review comments.

    • -2
    • +4
    /firmware/App/Modes/ModeGenPermeateDefeatured.c
    • -7
    • +6
    /firmware/App/Modes/ModeGenPermeateDefeatured.h
LDT-566: Code review comments. added reset calls in ro pump controllers when leaving off states. removed pressure check for boost pump.

    • -3
    • +3
    /firmware/App/Drivers/PressureSensor.c
    • -0
    • +1
    /firmware/App/Modes/FlushConcentrate.c
    • -15
    • +0
    /firmware/App/Modes/PressureCheck.h
LDT-566: fixed macro calls

LDT-566: changed permeate flush to target flow. fixed output scaling for fluid pump. Target flow fixes

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c
LDT-566: code review comments.

    • -11
    • +5
    /firmware/App/Controllers/BoostPump.c
    • -650
    • +0
    /firmware/App/Controllers/Heaters.c
    • -60
    • +0
    /firmware/App/Controllers/Heaters.h
    • -18
    • +20
    /firmware/App/Controllers/ROPump.c
    • -399
    • +0
    /firmware/App/Drivers/TemperatureSensor.c
    • -59
    • +0
    /firmware/App/Drivers/TemperatureSensor.h
    • -19
    • +24
    /firmware/App/Modes/FlushConcentrate.c
    • -2
    • +1
    /firmware/App/Modes/FlushConcentrate.h
    • -10
    • +11
    /firmware/App/Modes/FlushFilter.c
    • -9
    • +13
    /firmware/App/Modes/FlushPermeate.c
    • -30
    • +13
    /firmware/App/Modes/ModeGenPermeate.c
  1. … 5 more files in changeset.
LDT-566: Permeate tank implementation. Changed RO control from pressure to flow for various sub modes. Alarm state and clear alarm overrides. Reworked temperature monitor to only publish.

    • -5
    • +350
    /firmware/App/Controllers/PermeateTank.c
    • -7
    • +10
    /firmware/App/Controllers/PermeateTank.h
    • -5
    • +6
    /firmware/App/Modes/FlushConcentrate.c
    • -123
    • +11
    /firmware/App/Modes/ModeGenPermeate.c
    • -4
    • +4
    /firmware/App/Modes/ModeGenPermeateDefeatured.c
    • -24
    • +25
    /firmware/App/Modes/ModePreGenPermeate.c
    • -12
    • +12
    /firmware/App/Modes/ModePreGenPermeateDefeatured.c
    • -1
    • +66
    /firmware/App/Monitors/Temperature.c
    • -0
    • +20
    /firmware/App/Monitors/Temperature.h
    • -18
    • +26
    /firmware/App/Services/AlarmMgmtFP.c
  1. … 6 more files in changeset.
LDT-566: fixed messaging ACK

LDT-566: Implemented FP fault mode. Removed math includes from flush modes.

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c
    • -19
    • +245
    /firmware/App/Modes/FPModeFault.c
    • -3
    • +0
    /firmware/App/Modes/FlushConcentrate.c
LDT-566: FP Safety shutdown override. fixed includes.

    • -0
    • +52
    /firmware/App/Controllers/PermeateTank.c
    • -0
    • +65
    /firmware/App/Controllers/PermeateTank.h
    • -39
    • +22
    /firmware/App/Drivers/SafetyShutdown.c
    • -2
    • +1
    /firmware/App/Drivers/SafetyShutdown.h
    • -2
    • +2
    /firmware/App/Modes/FPOperationModes.h
WIP on develop

LDT-566: develop fixes

    • -1
    • +1
    /firmware/App/Modes/FlushConcentrate.c
    • -1
    • +1
    /firmware/App/Modes/ModeGenPermeateDefeatured.c
    • -5
    • +5
    /firmware/App/Modes/ModePreGenPermeate.c
WIP on develop

LDT-566: code review comments. updated common naming to have a FP prefix.

    • -12
    • +11
    /firmware/App/Drivers/PressureSensor.c
    • -1
    • +1
    /firmware/App/Drivers/TemperatureSensor.c
    • -0
    • +88
    /firmware/App/Modes/FPModeFault.c
    • -0
    • +40
    /firmware/App/Modes/FPModeFault.h
    • -0
    • +66
    /firmware/App/Modes/FPModeInitPOST.c
    • -0
    • +44
    /firmware/App/Modes/FPModeInitPOST.h
    • -0
    • +149
    /firmware/App/Modes/FPModeStandby.c
    • -0
    • +47
    /firmware/App/Modes/FPModeStandby.h
    • -0
    • +475
    /firmware/App/Modes/FPOperationModes.c
    • -0
    • +62
    /firmware/App/Modes/FPOperationModes.h
    • -1
    • +2
    /firmware/App/Modes/FlushConcentrate.c
  1. … 25 more files in changeset.
LDT-566: fixed valve order

LDT-566: fixed valve ordering

Revert "LDT-566: permeate tank file creation"

This reverts commit 6e65344e6675394118806ce98dc428c27920e1cb.

    • -428
    • +0
    /firmware/App/Controllers/PermeateTank.c
    • -60
    • +0
    /firmware/App/Controllers/PermeateTank.h
LDT-566: permeate tank file creation

    • -0
    • +428
    /firmware/App/Controllers/PermeateTank.c
    • -0
    • +60
    /firmware/App/Controllers/PermeateTank.h
LDT-566: partial rework of alarm monitoring for water quality based on code review. updated valves to be in sync with latest HDD

    • -0
    • +6
    /firmware/App/Modes/FlushConcentrate.c
    • -0
    • +6
    /firmware/App/Modes/ModeGenPermeateDefeatured.c
    • -0
    • +3
    /firmware/App/Modes/ModePreGenPermeate.c
    • -25
    • +125
    /firmware/App/Monitors/Conductivity.c
    • -167
    • +2
    /firmware/App/Monitors/Pressure.c
    • -308
    • +2
    /firmware/App/Monitors/Temperature.c
  1. … 6 more files in changeset.
WIP on develop

LDT-566: LDT-676: Removed M7 and P20 valves.

LDT-566: fixes for removing P22 and P23. fix warnings

    • -24
    • +24
    /firmware/App/Controllers/Heaters.c
    • -35
    • +2
    /firmware/App/Drivers/TemperatureSensor.c
    • -30
    • +6
    /firmware/App/Monitors/Temperature.c
LDT-566: Changed temperature handling back to their respective drivers. Kept combined published temperature value.

LDT-566: merge pressure temperatures and conductivity temperature sensors into the temperature sensor broadcast

    • -5
    • +3
    /firmware/App/Drivers/TemperatureSensor.h
    • -5
    • +12
    /firmware/App/Monitors/Temperature.c
LDT-566: Project renaming. Created version request handler. Updated mix max for fluid pumps

    • -27
    • +33
    /firmware/App/Services/Messaging.c
LDT-566: removed unneeded defines. Added percentage values for pwm to RO and boost broadcasts. Removed X5 from pressure sensors. Fixed Pre-Generate mode rushing through sub states.

    • -3
    • +0
    /firmware/App/Drivers/PressureSensor.c
    • -1
    • +0
    /firmware/App/Drivers/PressureSensor.h
    • -17
    • +12
    /firmware/App/Modes/ModeGenPermeate.c
LDT-566: Implemented hard stop commands for water pumps. Added valve actuation for RO recovery settings in gen permeate, set to med.

    • -3
    • +22
    /firmware/App/Controllers/BoostPump.c
    • -4
    • +10
    /firmware/App/Modes/ModeGenPermeate.c
    • -2
    • +2
    /firmware/App/Modes/ModePreGenPermeate.c
LDT-566: transitioning to standby mode and fault mode will now shut off pumps and close valves. updates in naming. fixed pre-gen transitioning. removed some checks for when gen water request it received.

    • -45
    • +84
    /firmware/App/Controllers/BoostPump.c
    • -59
    • +88
    /firmware/App/Controllers/ROPump.c
    • -12
    • +23
    /firmware/App/Modes/ModeGenPermeate.c
    • -1
    • +2
    /firmware/App/Modes/ModePreGenPermeate.c
    • -21
    • +8
    /firmware/App/Services/DDInterface.c
LDT-566: fixed compiiler err