hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:

# firmware/App/HDCommon.h

Merge branch 'DEN-16245-hd.valves.cmd_set_hd_valve_current_override-rejects-any-value' into develop

# Conflicts:

# firmware/App/HDCommon.h

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Merge branch 'DIAL-278-fan-pwm-override' into develop

DIAL-278: changed Fan PWM timing to fit requirement of 40uS

DEN-16203: changed dopMeasuredRate to handle set flow rate in open loop state.

    • -3
    • +11
    /firmware/App/Controllers/DialOutFlow.c
HD-DIAL-278_Fan Pwm Override
HD-DIAL-278_Fan Pwm Override
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

DEN-16093 merge in to develop

    • -0
    • +15
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +1
    /firmware/App/Controllers/DGInterface.h
Please check comment column alignment

Please check comment column alignment

Done.

Done.

Done.

Done.

DEN-16093 DG park concetrate pump command response handled

DEN-15980 Air pump mods: longer ON time, shorter stabilize pressure time, add alarm framework for air pump on too much.

    • -2
    • +13
    /firmware/App/Controllers/AirTrap.c
    • -11
    • +43
    /firmware/App/Controllers/PresOccl.c
Merge branch 'staging' into DEN-16164-fw-pre-treatment-pressure-test-failures-vent-to-saline-bag

HD-STT-2897_Bug Alarm 104 Alarm ID HD Air Trap Illegal Levels Triggers Before 2S
HD-STT-2897_Bug Alarm 104 Alarm ID HD Air Trap Illegal Levels Triggers Before 2S
STT-2897 Correct alarm persistence

Consider following up on this command's success once we're in complete state (would need to add a handler function for complete state). There is a getDGCommandResponse() function in DGInterface tha...

Consider following up on this command's success once we're in complete state (would need to add a handler function for complete state). There is a getDGCommandResponse() function in DGInterface that we're using for other DG commands to make sure DG got and accepted the command (and sometimes retrying if not).

I think we have been trying to have these types of message IDs end in "_CMD_REQUEST".

I think we have been trying to have these types of message IDs end in "_CMD_REQUEST".

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

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

HD-DEN-16245_Hd.Valves.Cmd Set HD Valve Current Override Rejects Any Value
HD-DEN-16245_Hd.Valves.Cmd Set HD Valve Current Override Rejects Any Value
Merge branch 'DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked' into staging

DEN-16245 Valve override valide for both RELEASE and DEBUG

DEN-16093-added DG park concentrate pumps

    • -0
    • +15
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +1
    /firmware/App/Controllers/DGInterface.h