hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14689: fixed compiler warning.

DEN-14689: updated message protocols to be contained within structs. Fixed <32 bit fields to be compiled as their respective byte size.

Merge branch 'staging' into DEN-14689-messaging-bugs

    • -27
    • +18
    /firmware/App/Controllers/SyringePump.c
DEN-14763 changed the sizeof of message 0x98 to be able to pick up with the script

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

Fixed merge conflict.

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered

    • -11
    • +34
    /firmware/App/Controllers/DGInterface.c
    • -4
    • +5
    /firmware/App/Controllers/DGInterface.h
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.h
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
Merged DEN-13154 into staging.

Fixed merge conflicts from local merge from staging.

    • -22
    • +29
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
DEN-13154: Addressed code review comments.

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.h
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-14689-messaging-bugs' into develop

DEN-14689: updated naming msg_id naming in relation to common changes

Merge branch 'staging' into DEN-14689-messaging-bugs

    • -13
    • +48
    /firmware/App/Modes/ModePreTreat.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflict.

    • -10
    • +33
    /firmware/App/Controllers/DGInterface.c
    • -13
    • +3
    /firmware/App/Controllers/DGInterface.h
    • -6
    • +5
    /firmware/App/Controllers/DialInFlow.c
    • -0
    • +8
    /firmware/App/Controllers/SyringePump.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-14830-incorrect-dialysate-temperature-alarm-triggered' into develop

    • -20
    • +53
    /firmware/App/Controllers/DGInterface.c
    • -11
    • +12
    /firmware/App/Controllers/DGInterface.h
    • -13
    • +48
    /firmware/App/Modes/ModePreTreat.c
more compiler fixes

    • -0
    • +1
    /firmware/App/Controllers/DGInterface.h
DEN-14830: compiler fixes for develop.

    • -0
    • +10
    /firmware/App/Controllers/DGInterface.h
DEN-14830: Implemented temperature recovery to be set at +-2 C of target temp. Implemented dialysate temperature alarms to have a clear period of 30s.

    • -6
    • +37
    /firmware/App/Controllers/DGInterface.c
Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered

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

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

Merge branch 'DEN-14689-final-post-test-sending-many-times' into staging

DEN-13154: Use raw FMD measured flow for alarm 312. Added capture of raw dialysate flow to facilitate this.

    • -10
    • +33
    /firmware/App/Controllers/DGInterface.c
    • -12
    • +3
    /firmware/App/Controllers/DGInterface.h
    • -6
    • +5
    /firmware/App/Controllers/DialInFlow.c
Merge branch 'staging' into DEN-14689-final-post-test-sending-many-times

DEN-13154: Add syringe pump stall check to preload and seek states.

    • -0
    • +8
    /firmware/App/Controllers/SyringePump.c