dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14999-alarm-table-updates-part-2' of ssh://dvm-linux02:7999/dg/dgfirmware into DEN-14999-alarm-table-updates-part-2

DEN-14999-2: Removed unused #define.

    • -1
    • +1
    /firmware/App/Controllers/FlowSensors.h
Merge branch 'DEN-14999-alarm-table-updates-part-2' of ssh://devapps.diality.us:7999/dg/dgfirmware into DEN-14999-alarm-table-updates-part-2

DEN-14999 updated the code based on the alarms table

    • -11
    • +11
    /firmware/App/Controllers/ROPump.c
DEN-14999-2: Addressed code review comments.

DEN-14999-2: Exempt fpga comm errors for 1st second after power up.

DEN-14999, DEN-15088 added persistent alarm to the DG fluid leak

DEN-14999 added 5-second delays prior to collecting acid and bicarb conductivity values during acid and bicarb priming

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

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

    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
  1. … 3 more files in changeset.
Merged DEN-14999

DEN-14999: merged staging

    • -27
    • +31
    /firmware/App/Controllers/Heaters.c
    • -14
    • +14
    /firmware/App/Controllers/Voltages.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Merge branch 'DEN-14646-fpga-alarm-properties-and-timing-3' into staging

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

    • -23
    • +28
    /firmware/App/Controllers/Heaters.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Merge remote-tracking branch 'origin/DEN-15016-system-faults-during-treatment-then-returns-to-the-standby-screen' into staging

DEN-14646 Correction per code review comments

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

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

Merge branch 'DEN-14788-DIAL-222-heater-duty-cycles' into staging

DG-DEN-15016_System Faults During Treatment Then Returns TO The Standby Screen

Update for code review.

DIAL-222: changed set heater duty cycle to consider overriden values on reset.

    • -19
    • +27
    /firmware/App/Controllers/Heaters.c
HD-DEN-15016_System Faults During Treatment Then Returns TO The Standby Screen

Closing code review comments.

Merge branch 'DEN-14999-alarm-table-updates' of ssh://devapps.diality.us:7999/dg/dgfirmware into DEN-14999-alarm-table-updates

DEN-14999 updated the code based on the alarms table changes

    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-14999: Small fix to DG WD POST.

DEN-14999 updated the code based on the alarms table update

    • -12
    • +0
    /firmware/App/Controllers/Heaters.c
    • -2
    • +6
    /firmware/App/Modes/ModeHeatDisinfect.c