dd-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
RK addressed review comments.

    • -26
    • +24
    /firmware/App/Monitors/Pressure.c
LDT-2198 cond sensor update

    • -241
    • +411
    /firmware/App/Drivers/ConductivitySensors.c
    • -15
    • +345
    /firmware/App/Monitors/Conductivity.c
    • -2
    • +16
    /firmware/App/Monitors/Conductivity.h
Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/dd-firmware into LDT-2198-beta-1.0-fw-integration---dd-im

Aligned comments

    • -14
    • +14
    /firmware/App/Monitors/Temperature.h
Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/dd-firmware into LDT-2198-beta-1.0-fw-integration---dd-im

RK Fixed minor typo on type declaration

    • -2
    • +2
    /firmware/App/Drivers/PressureSensor.c
Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/dd-firmware into LDT-2198-beta-1.0-fw-integration---dd-im

LDT-2198: Updated ADC channels to schematic.

    • -40
    • +41
    /firmware/App/Drivers/InternalADC.c
    • -8
    • +11
    /firmware/App/Drivers/InternalADC.h
LDT-2198: added inits and execs for FP modules. Added alarm source parameter to alarm mgmt dd broadcast functions. Added overrides to flow sensors and alarm overrides for FP.

    • -23
    • +99
    /firmware/App/Services/AlarmMgmtDD.c
RK Resolved merge conflicts and addressed review comments

Updated override functions to handle only FP and addressed review comments.

    • -29
    • +27
    /firmware/App/Drivers/PressureSensor.c
    • -2
    • +2
    /firmware/App/Drivers/PressureSensor.h
    • -46
    • +44
    /firmware/App/Monitors/Pressure.c
    • -28
    • +15
    /firmware/App/Monitors/Temperature.c
LDT-2198: fixed merge conflicts. Removed unused valves.

    • -0
    • +397
    /firmware/App/Controllers/PermeateTank.c
    • -0
    • +311
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -0
    • +146
    /firmware/App/Modes/FPModes/FPModeStandby.c
    • -0
    • +402
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -0
    • +372
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -0
    • +437
    /firmware/App/Modes/FPModes/FlushPermeate.c
LDT-2198: Continued import of IOFP valves to valve unit.

    • -29
    • +134
    /firmware/App/Controllers/Valves.c
RK moved temperature payload data from pressure to temperature

RK updated temperature.c under monitors.

    • -35
    • +99
    /firmware/App/Monitors/Temperature.c
    • -2
    • +17
    /firmware/App/Monitors/Temperature.h
    • -16
    • +17
    /firmware/App/Services/Messaging.c
RK added dialin overrides for FP pressure and temp in pressure.c

Removed X sensors. Updated DD Pressure and messaging for adding FP pressure functions.

    • -15
    • +6
    /firmware/App/Drivers/PressureSensor.c
    • -6
    • +2
    /firmware/App/Drivers/PressureSensor.h
    • -49
    • +108
    /firmware/App/Monitors/Pressure.c
Merge remote-tracking branch 'origin/LDT-2198-beta-1.0-fw-integration---dd-im' into LDT-2198-beta-1.0-fw-integration---dd-im

LDT-2198: added permeate tank. added flow driver and flow monitor. added water quality monitor. updated FP interface to no longer require CAN. compiler fixes for labeling. reduced number of warnings where possible.

    • -0
    • +401
    /firmware/App/Controllers/PermeateTank.c
    • -0
    • +68
    /firmware/App/Controllers/PermeateTank.h
    • -0
    • +186
    /firmware/App/Drivers/FlowSensor.c
    • -0
    • +58
    /firmware/App/Drivers/FlowSensor.h
    • -2
    • +10
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -2
    • +2
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -3
    • +4
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
    • -0
    • +438
    /firmware/App/Monitors/Flow.c
    • -0
    • +58
    /firmware/App/Monitors/Flow.h
  1. … 6 more files in changeset.
LDT-2198 updated FPGA changes

RK committed changes to Drivers PressureSensor and Services Messaging.

    • -235
    • +102
    /firmware/App/Drivers/PressureSensor.c
    • -11
    • +21
    /firmware/App/Drivers/PressureSensor.h
LDT-2198: added FP modes, Boost Pump controller, RO Pump controller, Fluild pump driver.

    • -0
    • +4
    /firmware/.settings/com.ti.ccstudio.project.core.prefs
    • -0
    • +754
    /firmware/App/Controllers/BoostPump.c
    • -0
    • +84
    /firmware/App/Controllers/BoostPump.h
    • -0
    • +891
    /firmware/App/Controllers/ROPump.c
    • -0
    • +90
    /firmware/App/Controllers/ROPump.h
    • -0
    • +443
    /firmware/App/Drivers/FluidPump.c
    • -0
    • +72
    /firmware/App/Drivers/FluidPump.h
    • -0
    • +62
    /firmware/App/FPCommon.h
    • -0
    • +313
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -0
    • +44
    /firmware/App/Modes/FPModes/FPModeFault.h
    • -0
    • +66
    /firmware/App/Modes/FPModes/FPModeInitPOST.c
    • -0
    • +45
    /firmware/App/Modes/FPModes/FPModeInitPOST.h
    • -0
    • +148
    /firmware/App/Modes/FPModes/FPModeStandby.c
  1. … 24 more files in changeset.
Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/dd-firmware into LDT-2198-beta-1.0-fw-integration---dd-im

LDT-2198: Imported IOFP valves into valves controller. Still more to be done.

    • -5
    • +5
    /firmware/App/Modes/ModeGenDialysate.c
    • -1
    • +1
    /firmware/App/Modes/ModePreGenDialysate.c
LDT-2198: Beta CAN changes for FP merge.

    • -34
    • +0
    /firmware/App/Services/FPInterface.c
LDT-2198 beta FPGA changes

    • -4
    • +4
    /firmware/App/Drivers/PressureSensor.c
    • -658
    • +1048
    /firmware/App/Services/FpgaDD.c
    • -37
    • +108
    /firmware/App/Services/FpgaDD.h
LDT-2156 test

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

LDT-1873 resolving merge issues

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