dd-firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-2198 test config update

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

Merge branch 'develop' of bitbucket.org:diality-cloud/dd-firmware into develop

LDT-2329 test config fix

LDT-2329 concentrate pump test config update

LDT-2198: updates to level monitor merge. Added FP overrides that were missing in messaging table.

    • -21
    • +107
    /firmware/App/Monitors/Level.c
LDT-2198: Addressed code review comments. Minor formatting fixes.

    • -1
    • +0
    /firmware/App/Drivers/PressureSensor.c
    • -3
    • +0
    /firmware/App/Drivers/SafetyShutdown.c
    • -3
    • +1
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -0
    • +1
    /firmware/App/Modes/FPModes/FlushConcentrate.h
    • -1
    • +1
    /firmware/App/Modes/FPModes/FlushFilter.h
    • -1
    • +0
    /firmware/App/Modes/ModePreGenDialysate.c
  1. … 11 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: Updates to ADC channels. Added voltage monitor and overrides.

    • -0
    • +329
    /firmware/App/Monitors/Voltages.c
    • -0
    • +76
    /firmware/App/Monitors/Voltages.h
LDT-2198: updated comments in task general

LDT-2198: added enum markers for iofp level sensor

LDT-2198: removed FPcommon.h and replaced includes to DDcommon.h

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.h
    • -1
    • +1
    /firmware/App/Modes/FPModes/FPModeFault.h
    • -1
    • +1
    /firmware/App/Modes/FPModes/FPModeInitPOST.h
    • -1
    • +1
    /firmware/App/Modes/FPModes/FPOperationModes.h
    • -1
    • +1
    /firmware/App/Modes/FPModes/FlushConcentrate.h
    • -1
    • +1
    /firmware/App/Modes/FPModes/FlushFilter.h
    • -1
    • +1
    /firmware/App/Modes/FPModes/ModeGenPermeate.h
  1. … 6 more files in changeset.
LDT-2198: renamed DD op mode executive function

LDT-2198: fixed compiler err

LDT-2198: code review comments

    • -14
    • +31
    /firmware/App/Services/AlarmMgmtDD.c
LDT-2198: Level sensor updates

LDT-2198 removed blank lines.

    • -1
    • +0
    /firmware/App/Drivers/PressureSensor.c
LDT-2198 updated TemperatureSensors removed Baro sensor

    • -64
    • +0
    /firmware/App/Drivers/PressureSensor.c
    • -1
    • +0
    /firmware/App/Drivers/PressureSensor.h
LDT-2198 codre review comments fix

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