hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

Fixed merge conflicts.

    • -2
    • +6
    /firmware/App/Controllers/DGInterface.c
    • -21
    • +33
    /firmware/App/Services/SystemComm.c
DEN-7605: Added support for UI clock sync.

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
DEN-7860: Addressed code review comments

DEN-7605: Added POST messaging.

    • -23
    • +31
    /firmware/App/Services/SystemComm.c
DEN-7860: Corrected spelling issue

DEN-8103: Added persistent to alarm no new treatment flag

    • -19
    • +24
    /firmware/App/Modes/ModeStandby.c
DEN-8103: Added calibration alarms

    • -4
    • +13
    /firmware/App/Controllers/BloodFlow.c
    • -4
    • +14
    /firmware/App/Controllers/DialInFlow.c
Addressed merge conflicts with staging

    • -0
    • +12
    /firmware/App/Services/SystemComm.c
DEN-7860: Addressed integration issues

    • -99
    • +78
    /firmware/App/Controllers/Bubble.c
DEN-8103: Added DG restart check to sample water sub-mode

DEN-8103: Added fpga timer count

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-7860: Fixed polarity on FPGA signal for air bubble detection

DEN-7605: Updated UF loadcell acceleration check.

    • -2
    • +6
    /firmware/App/Controllers/DGInterface.c
DEN-7860: Fixed initialization of variable in fpga.c code

DEN-7860: Addressed CppCheck comments

Changed to use treatmentTimeMS to increase the log time.

Changed to use treatmentTimeMS to increase the log time.

DEN-8103: Added dg restarted fault to sample water and reject treatment start if DG not ready

DEN-8103: Shorten a code line