firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-12845 addressed code review comments and merges staging

    • -1
    • +0
    ./App/Controllers/ConductivitySensors.c
Merge branch 'staging' into DEN-12845-sw_dev_sprint_s71_steve

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

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

DEN-12931: Removed init persistence call for unused alarm.

    • -1
    • +0
    ./App/Controllers/ConductivitySensors.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

DEN-12845 addressed the code review comments

DEN-12931 DVT updates and SRS changes

    • -1
    • +0
    ./App/Controllers/ConductivitySensors.c
    • -6
    • +10
    ./App/Controllers/TemperatureSensors.c
    • -0
    • +1
    ./App/Controllers/TemperatureSensors.h
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Correct Flash programming configuration to NOT erase the configuration information.

DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs. DEN-12882 Unique minimum ro flow rate for uv reactors.

    • -28
    • +29
    ./App/Modes/ModeChemicalDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

DEN-12549 Correct state of valves before entering DRAIN_R1 from FLUSH_R2AND_DRAIN_R1.

DEN-12882 Change MIN_RO_FLOWRATE_LPM to 0.3/LPM. RO Pump is unable to achieve 0.2/LPM rate. May change later as requirements are firmed up.

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

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/DGCommon.h

    • -3
    • +2
    ./App/Controllers/ConductivitySensors.c
    • -238
    • +247
    ./App/Services/SystemCommMessages.c
DEN-12974 disbaled alarm 196.

    • -1
    • +1
    ./App/Controllers/TemperatureSensors.c
DEN-12974 disabled the ADC check of the temeperature sensors

    • -2
    • +4
    ./App/Controllers/TemperatureSensors.c
DEN-12549 changed UV reactor no flow timeout to 2 seconds.

DEN-12974 - Miscellaneous Flush Issues DEN-12959 - Flush dialysate wait time changed to 60 seconds DEN-12960 - Flush concentrate straws tim changed to 3 minutes

DEN-12931 updated the trimmer heater control

    • -0
    • +25
    ./App/Controllers/ConcentratePumps.c
    • -2
    • +4
    ./App/Controllers/TemperatureSensors.c
    • -2
    • +34
    ./App/Services/SystemCommMessages.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./App/Controllers/ConductivitySensors.c
    • -1
    • +1
    ./App/Controllers/ConductivitySensors.h
  1. … 39 more files in changeset.
DEN-12224 removed an alarm

    • -5
    • +0
    ./App/Controllers/TemperatureSensors.c
DEN-12224 addressed the code review comments

    • -214
    • +217
    ./App/Services/SystemCommMessages.c
DEN-12224 addressed the code review comments

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

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

DEN-12224 addressed the code review comments

    • -2
    • +1
    ./App/Controllers/ConductivitySensors.c
  1. … 5 more files in changeset.