hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-16245-hd.valves.cmd_set_hd_valve_current_override-rejects-any-value' into staging

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

Merge branch 'STT-2897-bug-alarm-104-alarm_id_hd_air_trap_illegal_levels-triggers-before-2s' into develop

STT-2897 Replace alarm persistence counter with persistent alarm functions

    • -18
    • +16
    /firmware/App/Controllers/AirTrap.c
DEN-16203: code review comments

    • -1
    • +0
    /firmware/App/Controllers/DialOutFlow.c
DEN-16093-Changed function name aligned to state name

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

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

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

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

STT-2897 Correct alarm persistence

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-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
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

Merge remote-tracking branch 'origin/DEN-16278-hd-pretreatment-prime-start-state-does-not-allow-pause' into staging

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

Merge branch 'DENBUG-59-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow' into develop

DENBUG-59: Fixed expected msg payload length for a trigger alarm msg.