ro-firmware

Clone Tools

Stats

Commits this week: 0
Total Committers: 6
Last Commit: 24 Nov
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 22 Jul
2:58 pm

Michael Garthwaite

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

Options
2:51 pm

Michael Garthwaite

WIP on develop

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

Options
    • -2
    • +0
    /firmware/App/Controllers/Valves.h
    • -2
    • +0
    /firmware/App/Modes/ModeFault.c
    • -2
    • +0
    /firmware/App/Modes/ModeGenPermeate.c
    • -2
    • +0
    /firmware/App/Modes/ModeStandby.c
2:08 pm

Michael Garthwaite

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

Options
2:08 pm

Michael Garthwaite

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

Options
    • -24
    • +24
    /firmware/App/Controllers/Heaters.c
    • -35
    • +2
    /firmware/App/Drivers/TemperatureSensor.c
    • -30
    • +6
    /firmware/App/Monitors/Temperature.c
    • -0
    • +1
    /firmware/App/Services/FpgaFP.h
    • -0
    • +1
    /firmware/App/Services/Messaging.c
    • -2
    • +4
    /firmware/source/sys_main.c
1:47 pm

Michael Garthwaite

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

Options
1:47 pm

Michael Garthwaite

LDT-566: Changed temperature handling back to their respective drivers. Kept combined published temperature value.

Options
    • -10
    • +0
    /firmware/App/Monitors/Pressure.c
    • -9
    • +9
    /firmware/App/Monitors/Temperature.c
12:40 pm

Michael Garthwaite

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

Options
    • -5
    • +3
    /firmware/App/Drivers/TemperatureSensor.h
    • -9
    • +0
    /firmware/App/Monitors/Pressure.h
    • -5
    • +12
    /firmware/App/Monitors/Temperature.c
    • -3
    • +9
    /firmware/App/Monitors/Temperature.h
    • -2
    • +2
    /firmware/App/Services/FpgaFP.c
12:10 pm

Michael Garthwaite

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

Options
12:09 pm

Michael Garthwaite

LDT-566: Project renaming. Created version request handler. Updated mix max for fluid pumps

Options
    • -1
    • +1
    /firmware/.project
    • -1
    • +1
    /firmware/App/Drivers/FluidPump.h
    • -2
    • +2
    /firmware/App/FPCommon.h
    • -27
    • +33
    /firmware/App/Services/Messaging.c
    • -0
    • +1
    /firmware/App/Services/Messaging.h
Thursday 17 Jul
3:47 pm

Michael Garthwaite

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

Options
3:47 pm

Michael Garthwaite

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.

Options
    • -2
    • +2
    /firmware/App/Controllers/BoostPump.c
    • -1
    • +3
    /firmware/App/Controllers/BoostPump.h
    • -2
    • +2
    /firmware/App/Controllers/ROPump.c
    • -3
    • +5
    /firmware/App/Controllers/ROPump.h
    • -1
    • +1
    /firmware/App/Drivers/FluidPump.c
    • -3
    • +3
    /firmware/App/Drivers/FluidPump.h
    • -3
    • +0
    /firmware/App/Drivers/PressureSensor.c
    • -1
    • +0
    /firmware/App/Drivers/PressureSensor.h
    • -17
    • +12
    /firmware/App/Modes/ModeGenPermeate.c
    • -2
    • +0
    /firmware/App/Monitors/Pressure.c
    • -3
    • +1
    /firmware/App/Monitors/Pressure.h
    • -1
    • +1
    /firmware/App/Services/AlarmMgmtFP.c
    • -0
    • +2
    /firmware/source/sys_main.c
Tuesday 15 Jul
4:31 pm

Michael Garthwaite

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

Options
    • -3
    • +22
    /firmware/App/Controllers/BoostPump.c
    • -0
    • +1
    /firmware/App/Controllers/BoostPump.h
    • -0
    • +19
    /firmware/App/Controllers/ROPump.c
    • -0
    • +1
    /firmware/App/Controllers/ROPump.h
    • -0
    • +5
    /firmware/App/Modes/ModeFault.c
    • -4
    • +10
    /firmware/App/Modes/ModeGenPermeate.c
    • -2
    • +2
    /firmware/App/Modes/ModePreGenPermeate.c
    • -0
    • +2
    /firmware/App/Services/Messaging.c
3:54 pm

Michael Garthwaite

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.

Options
    • -45
    • +84
    /firmware/App/Controllers/BoostPump.c
    • -0
    • +1
    /firmware/App/Controllers/BoostPump.h
    • -59
    • +88
    /firmware/App/Controllers/ROPump.c
    • -0
    • +11
    /firmware/App/Controllers/ROPump.h
    • -15
    • +25
    /firmware/App/FPCommon.h
    • -2
    • +21
    /firmware/App/Modes/ModeFault.c
    • -12
    • +23
    /firmware/App/Modes/ModeGenPermeate.c
    • -1
    • +2
    /firmware/App/Modes/ModePreGenPermeate.c
    • -2
    • +2
    /firmware/App/Modes/ModePreGenPermeateDefeatured.c
    • -0
    • +21
    /firmware/App/Modes/ModeStandby.c
    • -1
    • +1
    /firmware/App/Modes/OperationModes.c
    • -1
    • +1
    /firmware/App/Services/AlarmMgmtFP.c
    • -21
    • +8
    /firmware/App/Services/DDInterface.c
    • -5
    • +50
    /firmware/App/Services/Messaging.c
Wednesday 09 Jul
2:23 pm

Michael Garthwaite

LDT-566: fixed compiiler err

Options
    • -2
    • +2
    /firmware/App/Modes/FlushFilter.c
2:23 pm

Michael Garthwaite

LDT-566: updated flush exec functions to only call the transition function in one location.

Options
    • -5
    • +7
    /firmware/App/Modes/FlushConcentrate.c
    • -6
    • +7
    /firmware/App/Modes/FlushFilter.c
    • -4
    • +6
    /firmware/App/Modes/FlushPermeate.c
2:14 pm

Michael Garthwaite

LDT-566: generate water modes both defeatured and ro featured

Options
    • -4
    • +31
    /firmware/App/Controllers/BoostPump.c
    • -1
    • +5
    /firmware/App/Controllers/BoostPump.h
    • -2
    • +28
    /firmware/App/Controllers/ROPump.c
    • -1
    • +5
    /firmware/App/Controllers/ROPump.h
    • -1
    • +15
    /firmware/App/Drivers/FluidPump.c
    • -0
    • +1
    /firmware/App/Drivers/FluidPump.h
    • -39
    • +0
    /firmware/App/Drivers/TemperatureSensor.c
    • -1
    • +1
    /firmware/App/Drivers/TemperatureSensor.h
    • -0
    • +395
    /firmware/App/Modes/FlushConcentrate.c
    • -7
    • +48
    /firmware/App/Modes/FlushConcentrate.h
    • -0
    • +6
    /firmware/App/Modes/FlushFilter.c
    • -5
    • +17
    /firmware/App/Modes/FlushPermeate.c
    • -21
    • +121
    /firmware/App/Modes/ModeGenPermeate.c
    • -0
    • +4
    /firmware/App/Modes/ModeGenPermeate.h
    • -5
    • +299
    /firmware/App/Modes/ModeGenPermeateDefeatured.c
  16. … 14 more files in changeset.
Thursday 03 Jul
9:52 am

Michael Garthwaite

LDT-566: filtered conductivity implementation

Options
    • -14
    • +125
    /firmware/App/Monitors/Conductivity.c
    • -0
    • +1
    /firmware/App/Services/AlarmMgmtSWFaults.h
Wednesday 02 Jul
12:06 pm

Michael Garthwaite

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

Options
12:04 pm

Michael Garthwaite

LDT-566: updated naming across the project. Renamed files some fits to fit naming. Filter flush and permeate flush implemented.

Options
    • -30
    • +34
    /firmware/App/Controllers/BoostPump.c
    • -1
    • +1
    /firmware/App/Controllers/BoostPump.h
    • -3
    • +3
    /firmware/App/Controllers/Heaters.c
    • -6
    • +6
    /firmware/App/Controllers/ROPump.c
    • -2
    • +2
    /firmware/App/Controllers/Valves.c
    • -1
    • +1
    /firmware/App/Drivers/ConductivitySensor.c
    • -2
    • +2
    /firmware/App/Drivers/FlowSensor.c
    • -1
    • +1
    /firmware/App/Drivers/FluidPump.c
    • -2
    • +2
    /firmware/App/Drivers/PressureSensor.c
    • -1
    • +1
    /firmware/App/Drivers/TemperatureSensor.c
    • -139
    • +0
    /firmware/App/Modes/FilterFlush.c
    • -51
    • +0
    /firmware/App/Modes/FilterFlush.h
    • -0
    • +0
    /firmware/App/Modes/FlushConcentrate.c
    • -0
    • +15
    /firmware/App/Modes/FlushConcentrate.h
    • -0
    • +365
    /firmware/App/Modes/FlushFilter.c
  16. … 56 more files in changeset.
Tuesday 01 Jul
4:55 pm

Michael Garthwaite

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

Options
3:12 pm

Michael Garthwaite

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

Options
    • -0
    • +62
    /firmware/App/FPCommon.h
Monday 30 Jun
5:32 pm

Michael Garthwaite

LDT-566: code review comments

Options
    • -2
    • +0
    /firmware/App/Controllers/BoostPump.c
    • -7
    • +8
    /firmware/App/Drivers/FluidPump.c
    • -53
    • +1
    /firmware/App/Drivers/PressureSensor.c
    • -2
    • +0
    /firmware/App/Drivers/PressureSensor.h
    • -3
    • +3
    /firmware/App/Drivers/TemperatureSensor.h
    • -0
    • +1
    /firmware/App/Modes/ModeWaterPreGen.c
    • -10
    • +0
    /firmware/App/Services/FpgaRO.h
    • -1
    • +0
    /firmware/App/Services/Messaging.c
2:07 pm

Michael Garthwaite

LDT-566: formatting

Options
    • -1
    • +1
    /firmware/App/Drivers/TemperatureSensor.c
2:06 pm

Michael Garthwaite

LDT-566: code review comments

Options
    • -0
    • +1
    /firmware/App/Drivers/TemperatureSensor.c
1:59 pm

Michael Garthwaite

LDT-566: code review comments

Options
    • -13
    • +23
    /firmware/App/Drivers/FluidPump.c
    • -16
    • +16
    /firmware/App/Drivers/FluidPump.h
    • -3
    • +0
    /firmware/App/Drivers/SafetyShutdown.h
    • -1
    • +1
    /firmware/App/Drivers/TemperatureSensor.h
    • -3
    • +1
    /firmware/App/Modes/FilterFlush.c
    • -0
    • +1
    /firmware/App/Modes/ModeStandby.c
    • -1
    • +0
    /firmware/App/Modes/ModeWaterGen.c
    • -2
    • +2
    /firmware/App/Modes/ModeWaterPreGen.c
    • -11
    • +9
    /firmware/App/Modes/OperationModes.c
    • -1
    • +0
    /firmware/App/Modes/OperationModes.h
    • -1
    • +0
    /firmware/App/Monitors/Temperature.c
    • -2
    • +0
    /firmware/App/Services/DDInterface.c
    • -1
    • +0
    /firmware/App/Services/DDInterface.h
    • -1
    • +0
    /firmware/source/sys_main.c
1:24 pm

Michael Garthwaite

LDT-566: code review comments. S32 override implementations. Changed flow rates from FPGA to S32

Options
    • -27
    • +27
    /firmware/App/Controllers/BoostPump.c
    • -7
    • +7
    /firmware/App/Controllers/BoostPump.h
    • -28
    • +28
    /firmware/App/Controllers/ROPump.c
    • -5
    • +5
    /firmware/App/Controllers/ROPump.h
    • -3
    • +2
    /firmware/App/Drivers/ConductivitySensor.c
    • -10
    • +10
    /firmware/App/Drivers/FlowSensor.c
    • -1
    • +4
    /firmware/App/Drivers/FlowSensor.h
    • -1
    • +1
    /firmware/App/Monitors/Flow.c
Wednesday 25 Jun
2:50 pm

Michael Garthwaite

LDT-566: implemented RO and boost control states between target pressure and target flow

Options
    • -6
    • +31
    /firmware/App/Controllers/BoostPump.c
    • -4
    • +28
    /firmware/App/Controllers/ROPump.c
11:25 am

Michael Garthwaite

LDT-566: code review comments. addressed formatting

Options
    • -31
    • +31
    /firmware/App/Controllers/BoostPump.c
    • -29
    • +29
    /firmware/App/Controllers/ROPump.c
11:11 am

Michael Garthwaite

LDT-566: code review comments.

Options
    • -1
    • +0
    /firmware/App/Controllers/Heaters.c
11:10 am

Michael Garthwaite

LDT-566: code review comments.

Options
    • -8
    • +6
    /firmware/App/Controllers/ROPump.c