Fisheye on ro-firmware/firmware/App/Controllers

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-1809 Resolved conflicts while merging staging

Raghu Kallala — Thu, 04 Sep 2025 13:19:55 -0700

Raghu Kallala committed 60df6fd on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

LDT-1809 Resolved conflicts while merging staging

· /firmware/App/Controllers/ROPump.c	(-16, +35)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FlushConcentrate.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FlushPermeate.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePreGenPermeate.c	(-1, +1)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-1242: code review comments. comment aligning. fix ro pump control calling set pwm pct when it should have been pwm c...

Michael Garthwaite — Wed, 03 Sep 2025 09:44:56 -0700

Michael Garthwaite committed 30c175a on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 3 more in ro-firmware

LDT-1242: code review comments. comment aligning. fix ro pump control calling set pwm pct when it should have been pwm cnt

· /firmware/App/Controllers/PermeateTank.c	(-8, +11)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-11, +11)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FlushPermeate.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/InletPressureCheck.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePreGenPermeate.c	(-1, +1)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-1242: reverted RO controller publishing to no longer contain controller debug data

Michael Garthwaite — Wed, 03 Sep 2025 08:49:21 -0700

Michael Garthwaite committed e612f51 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 3 more in ro-firmware

LDT-1242: reverted RO controller publishing to no longer contain controller debug data

· /firmware/App/Controllers/ROPump.c

(-5, +5)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-1242: updated tank full timing

Michael Garthwaite — Fri, 29 Aug 2025 09:12:06 -0700

Michael Garthwaite committed 37ffdfd on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 3 more in ro-firmware

LDT-1242: updated tank full timing

· /firmware/App/Controllers/PermeateTank.c

(-2, +2)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-1242: reverted flow control output for develop builds as pwm output requires tuning

Michael Garthwaite — Fri, 29 Aug 2025 08:56:43 -0700

Michael Garthwaite committed 85c2344 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 3 more in ro-firmware

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

· /firmware/App/Controllers/ROPump.c

(-7, +9)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-1242: opening P34 on tank full state.

Michael Garthwaite — Thu, 28 Aug 2025 09:39:25 -0700

Michael Garthwaite committed 78ae224 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 3 more in ro-firmware

LDT-1242: opening P34 on tank full state.

· /firmware/App/Controllers/PermeateTank.c

(-2, +2)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-1242: converted RO flow control back to outputting PWM percentages instead of target mL/min.

Michael Garthwaite — Thu, 28 Aug 2025 09:30:22 -0700

Michael Garthwaite committed 66880a5 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 3 more in ro-firmware

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

· /firmware/App/Controllers/ROPump.c

(-13, +12)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-1242: updated flow control curve. Renamed fp def op modes. Closing P39 on TANK FULL state

Michael Garthwaite — Thu, 28 Aug 2025 08:51:16 -0700

Michael Garthwaite committed af6229d on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 3 more in ro-firmware

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

· /firmware/App/Controllers/PermeateTank.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FPOperationModes.c	(-6, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeGenPermeateDefeatured.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePreGenPermeateDefeatured.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/DDInterface.c	(-1, +1)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): Fixed indentation and review comments

Raghu Kallala — Wed, 27 Aug 2025 14:54:27 -0700

Raghu Kallala committed 98b3a57 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

Fixed indentation and review comments

· /firmware/App/Controllers/ROPump.c

(-18, +18)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): fixed review comments

Raghu Kallala — Tue, 26 Aug 2025 14:54:23 -0700

Raghu Kallala committed 71ea7fe on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

fixed review comments

· /firmware/App/Controllers/ROPump.c	(-30, +53)	\| History	\| Source	\| Diff
· /firmware/App/Drivers/FluidPump.c	(-0, +55)	\| History	\| Source	\| Diff
· /firmware/App/Drivers/FluidPump.h	(-0, +2)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): Fixed the issue to set targets to zero when a firmware call is made for set functions per review comments.

Raghu Kallala — Tue, 26 Aug 2025 10:37:51 -0700

Raghu Kallala committed ba9341b on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

Fixed the issue to set targets to zero when a firmware call is made for set functions per review comments.

· /firmware/App/Controllers/ROPump.c	(-100, +62)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.h	(-3, +3)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FlushConcentrate.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FlushPermeate.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeGenPermeate.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePreGenPermeate.c	(-1, +1)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-566: updated RO pwm flow curve from linear to logarithmic.

Michael Garthwaite — Mon, 25 Aug 2025 12:40:16 -0700

Michael Garthwaite committed 617a2fa on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 3 more in ro-firmware

LDT-566: updated RO pwm flow curve from linear to logarithmic.

· /firmware/App/Controllers/ROPump.c

(-6, +7)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): removed commented code per review comments

Raghu Kallala — Wed, 20 Aug 2025 08:59:24 -0700

Raghu Kallala committed ff3e2e3 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

removed commented code per review comments

· /firmware/App/Controllers/ROPump.c

(-1, +0)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): declared result at the top of the scope for test functions

Raghu Kallala — Tue, 19 Aug 2025 10:14:41 -0700

Raghu Kallala committed 4dec0c9 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

declared result at the top of the scope for test functions

· /firmware/App/Controllers/ROPump.c

(-3, +6)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-1242: updated permeate tank control to change based on low level.

Michael Garthwaite — Tue, 19 Aug 2025 09:42:22 -0700

Michael Garthwaite committed 7e4bcfd on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 3 more in ro-firmware

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

· /firmware/App/Controllers/PermeateTank.c	(-6, +10)	\| History	\| Source	\| Diff
· /firmware/App/Drivers/PressureSensor.c	(-3, +4)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-566: reverted publishing change for fine tuning.

Michael Garthwaite — Thu, 14 Aug 2025 13:08:58 -0700

Michael Garthwaite committed 73fb203 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 4 more in ro-firmware

LDT-566: reverted publishing change for fine tuning.

· /firmware/App/Controllers/ROPump.c

(-5, +5)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-566: fixed RO Pump publishing to no longer have debug data for PI control

Michael Garthwaite — Thu, 14 Aug 2025 13:07:41 -0700

Michael Garthwaite committed a4ca1bc on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 4 more in ro-firmware

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

· /firmware/App/Controllers/ROPump.c

(-5, +5)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-2003: 1st stage of flow control. still wip. moved event from bad crc error to all faults.

Michael Garthwaite — Thu, 14 Aug 2025 11:11:06 -0700

Michael Garthwaite committed cabd756 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 4 more in ro-firmware

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

· /firmware/App/Controllers/ROPump.c	(-18, +35)	\| History	\| Source	\| Diff
· /firmware/App/Services/AlarmMgmtFP.c	(-2, +6)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommFP.c	(-4, +1)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): Removed commented code lines

Raghu Kallala — Wed, 13 Aug 2025 15:00:35 -0700

Raghu Kallala committed 5b95672 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

Removed commented code lines

· /firmware/App/Controllers/ROPump.c

(-2, +0)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): Addressed review comments and modified the override behavior as discussed.

Raghu Kallala — Wed, 13 Aug 2025 13:46:21 -0700

Raghu Kallala committed d305dff on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

Addressed review comments and modified the override behavior as discussed.

· /firmware/App/Controllers/ROPump.c	(-174, +161)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.h	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Drivers/FluidPump.h	(-1, +1)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-566: moved valve enum from ro firmware repo to common repo

Michael Garthwaite — Wed, 13 Aug 2025 12:34:01 -0700

Michael Garthwaite committed e8d9c00 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

LDT-566: moved valve enum from ro firmware repo to common repo

· /firmware/App/Controllers/Valves.c	(-20, +20)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.h	(-21, +5)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FPModeFault.c	(-2, +2)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): LDT-566: moved valve enum from ro firmware repo to common repo

Michael Garthwaite — Wed, 13 Aug 2025 12:34:01 -0700

Michael Garthwaite committed 014dc3d on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 4 more in ro-firmware

LDT-566: moved valve enum from ro firmware repo to common repo

· /firmware/App/Controllers/Valves.c	(-20, +20)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.h	(-21, +5)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FPModeFault.c	(-2, +2)	\| History	\| Source	\| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): Addressed review comments to remove blank lines

Raghu Kallala — Mon, 11 Aug 2025 10:15:49 -0700

Raghu Kallala committed 04a86b2 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

Addressed review comments to remove blank lines

· /firmware/App/Controllers/ROPump.c

(-6, +0)

| History

| Source

| Diff

ro-firmware (LDT-1773-iofp-valve-pwm): Fix for RO Pump override set and reset.

Raghu Kallala — Fri, 08 Aug 2025 11:53:01 -0700

Raghu Kallala committed 75ccce2 on branch LDT-1773-iofp-valve-pwm, LDT-1809-iofp-ws-setup-and-bug-fixing and 2 more in ro-firmware

Fix for RO Pump override set and reset.

· /firmware/App/Controllers/ROPump.c

(-75, +239)

| History

| Source

| Diff

ro-firmware (LDT-566-water-treatment-ro-pump-tuning): LDT-566: code review comments.

Michael Garthwaite — Mon, 04 Aug 2025 09:26:42 -0700

Michael Garthwaite committed 9cbb00a on branch LDT-1735-test-config-support-for-dd, LDT-1773-iofp-valve-pwm and 8 more in ro-firmware

LDT-566: code review comments.

· /firmware/App/Controllers/PermeateTank.c	(-2, +0)	\| History	\| Source	\| Diff
· /firmware/App/Services/DDInterface.c	(-1, +0)	\| History	\| Source	\| Diff
· /firmware/App/Services/Messaging.c	(-1, +1)	\| History	\| Source	\| Diff

ro-firmware (LDT-566-water-treatment-ro-pump-tuning): LDT-566: code review comments

Michael Garthwaite — Fri, 01 Aug 2025 15:56:30 -0700

Michael Garthwaite committed 6d85a90 on branch LDT-1735-test-config-support-for-dd, LDT-1773-iofp-valve-pwm and 8 more in ro-firmware

LDT-566: code review comments

· /firmware/App/Controllers/PermeateTank.c	(-8, +7)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-3, +0)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FPModeStandby.c	(-1, +0)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FlushConcentrate.c	(-2, +0)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePreGenPermeate.c	(-1, +0)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePreGenPermeateDefeatured.h	(-1, +0)	\| History	\| Source	\| Diff
· /firmware/App/Monitors/Pressure.c	(-1, +0)	\| History	\| Source	\| Diff
· /firmware/App/Monitors/Temperature.c	(-4, +0)	\| History	\| Source	\| Diff
· /firmware/App/Services/AlarmMgmtFP.h	(-1, +0)	\| History	\| Source	\| Diff
· /firmware/App/Services/DDInterface.c	(-6, +0)	\| History	\| Source	\| Diff
· /firmware/App/Services/DDInterface.h	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/FpgaFP.c	(-1, +0)	\| History	\| Source	\| Diff
· /firmware/App/Services/Messaging.c	(-4, +3)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommFP.c	(-1, +0)	\| History	\| Source	\| Diff

ro-firmware (LDT-566-water-treatment-ro-pump-tuning): LDT-566: Code review comments. added reset calls in ro pump controllers when leaving off states. removed pressure check ...

Michael Garthwaite — Fri, 01 Aug 2025 12:08:14 -0700

Michael Garthwaite committed 3a5cc58 on branch LDT-1735-test-config-support-for-dd, LDT-1773-iofp-valve-pwm and 8 more in ro-firmware

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

· /firmware/App/Controllers/BoostPump.c	(-1, +3)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-4, +6)	\| History	\| Source	\| Diff
· /firmware/App/Drivers/ConductivitySensor.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Drivers/PressureSensor.c	(-3, +3)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FlushConcentrate.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/PressureCheck.c	(-0, +0)	\| History	\| Source	\| Diff
· /firmware/App/Modes/PressureCheck.h	(-15, +0)	\| History	\| Source	\| Diff
· /firmware/App/Monitors/WaterQualityMonitor.c	(-5, +0)	\| History	\| Source	\| Diff

ro-firmware (LDT-566-water-treatment-ro-pump-tuning): LDT-566: fixed macro calls

Michael Garthwaite — Thu, 31 Jul 2025 11:51:36 -0700

Michael Garthwaite committed 27566fb on branch LDT-1735-test-config-support-for-dd, LDT-1773-iofp-valve-pwm and 8 more in ro-firmware

LDT-566: fixed macro calls

· /firmware/App/Controllers/ROPump.c

(-4, +4)

| History

| Source

| Diff

ro-firmware (LDT-566-water-treatment-ro-pump-tuning): LDT-566: changed permeate flush to target flow. fixed output scaling for fluid pump. Target flow fixes

Michael Garthwaite — Thu, 31 Jul 2025 11:49:31 -0700

Michael Garthwaite committed b92c26d on branch LDT-1735-test-config-support-for-dd, LDT-1773-iofp-valve-pwm and 8 more in ro-firmware

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

· /firmware/App/Controllers/BoostPump.c	(-3, +3)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/PermeateTank.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-7, +7)	\| History	\| Source	\| Diff
· /firmware/App/Drivers/FluidPump.h	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/FlushPermeate.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/source/sys_main.c	(-4, +5)	\| History	\| Source	\| Diff

ro-firmware (LDT-566-water-treatment-ro-pump-tuning): LDT-566: code review comments.

Michael Garthwaite — Wed, 30 Jul 2025 13:30:55 -0700

Michael Garthwaite committed 2652d50 on branch LDT-1735-test-config-support-for-dd, LDT-1773-iofp-valve-pwm and 8 more in ro-firmware

LDT-566: code review comments.

· /firmware/App/Controllers/BoostPump.c

(-11, +5)

| History

| Source

| Diff

· /firmware/App/Controllers/Heaters.c

(-650, +0)

| History

| Source

| Diff

· /firmware/App/Controllers/Heaters.h

(-60, +0)

| History

| Source

| Diff

· /firmware/App/Controllers/ROPump.c

(-18, +20)

| History

| Source

| Diff

· /firmware/App/Controllers/ROPump.h

(-3, +0)

| History

| Source

| Diff

· /firmware/App/Drivers/TemperatureSensor.c

(-399, +0)

| History

| Source

| Diff

· /firmware/App/Drivers/TemperatureSensor.h

(-59, +0)

| History

| Source

| Diff

· /firmware/App/Modes/FPModeStandby.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/FlushConcentrate.c

(-19, +24)

| History

| Source

| Diff

· /firmware/App/Modes/FlushConcentrate.h

(-2, +1)

| History

| Source

| Diff

· /firmware/App/Modes/FlushFilter.c

(-10, +11)

| History

| Source

| Diff

· /firmware/App/Modes/FlushPermeate.c

(-9, +13)

| History

| Source

| Diff

· /firmware/App/Modes/ModeGenPermeate.c

(-30, +13)

| History

| Source

| Diff

· /firmware/App/Modes/ModeGenPermeate.h

(-9, +4)

| History

| Source

| Diff

· /firmware/App/Monitors/Conductivity.c

(-1, +0)

| History

| Source

| Diff

… 5 more files in changeset.