Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-1809 Resolved conflicts while merging staging

  1. … 3 more files in changeset.
LDT-1242: code review comments. comment aligning. fix ro pump control calling set pwm pct when it should have been pwm cnt

  1. … 4 more files in changeset.
LDT-1242: reverted RO controller publishing to no longer contain controller debug data

LDT-1242: reverted flow control output for develop builds as pwm output requires tuning

LDT-1242: converted RO flow control back to outputting PWM percentages instead of target mL/min.

LDT-1242: updated flow control curve. Renamed fp def op modes. Closing P39 on TANK FULL state

  1. … 5 more files in changeset.
Fixed indentation and review comments

fixed review comments

  1. … 2 more files in changeset.
Fixed the issue to set targets to zero when a firmware call is made for set functions per review comments.

  1. … 5 more files in changeset.
LDT-566: updated RO pwm flow curve from linear to logarithmic.

removed commented code per review comments

declared result at the top of the scope for test functions

LDT-566: reverted publishing change for fine tuning.

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

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

  1. … 2 more files in changeset.
Removed commented code lines

Addressed review comments and modified the override behavior as discussed.

  1. … 2 more files in changeset.
Addressed review comments to remove blank lines

Fix for RO Pump override set and reset.

LDT-566: code review comments

  1. … 13 more files in changeset.
LDT-566: Code review comments. added reset calls in ro pump controllers when leaving off states. removed pressure check for boost pump.

  1. … 7 more files in changeset.
LDT-566: fixed macro calls

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

  1. … 5 more files in changeset.
LDT-566: code review comments.

  1. … 19 more files in changeset.
LDT-566: FP Safety shutdown override. fixed includes.

  1. … 12 more files in changeset.
WIP on develop

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

  1. … 39 more files in changeset.
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.

  1. … 12 more files in changeset.
LDT-566: Implemented hard stop commands for water pumps. Added valve actuation for RO recovery settings in gen permeate, set to med.

  1. … 7 more files in changeset.
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.

  1. … 13 more files in changeset.
LDT-566: generate water modes both defeatured and ro featured

  1. … 28 more files in changeset.