hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14689-messaging-bugs' into develop

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
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-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

FALSE will be determined by our automagic script to be ACK_REQUIRED in the excel sheet. This will cause discrepancies between the readers of that sheet and what the FW does.

FALSE will be determined by our automagic script to be ACK_REQUIRED in the excel sheet. This will cause discrepancies between the readers of that sheet and what the FW does.

Fixed.

Fixed.

Variable is also updated by receipts of DG flow broadcasts. I believe it is overridable on DG side.

Variable is also updated by receipts of DG flow broadcasts. I believe it is overridable on DG side.

Concern was originally just for retract due to highest speed. We ended up reducing retract speed to reduce likelihood of stalls. Still a good idea to check for it though and since retract, preload ...

Concern was originally just for retract due to highest speed. We ended up reducing retract speed to reduce likelihood of stalls. Still a good idea to check for it though and since retract, preload and seek all share same relatively high speed, these are the ops that have the check. For bolus and continuous, should not stall at these speeds and would catch with rate alarm if it did.

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

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

Fixed.

Fixed.

Fixed.

Fixed.