firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'STT-1965-srshd-1395-the-hd-software-shall-trigger-alarm-98-if-an-error-is-detected-on-the-battery' into develop

# Conflicts:

# firmware/App/Controllers/DGInterface.c

# firmware/App/HDCommon.h

Merge branch 'staging' into DIAL-276-dg-event-event-id-15-prints-duplicate-events-with-different-state-time

    • -19
    • +13
    ./App/Services/SystemCommMessages.c
STT-1965 Update per code review comments

STT-1965 Allow reset of override state in getI2CStatusRegister

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

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

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

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

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

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

STT-1965 batteryI2CStatusRegister overide now reasets when value is read and is in an overriden state.

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

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

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

Merge branch 'DEN-15980-pressure-alarm-windows-widened-for-extended-period-of-time-due-to-frequency-of-air' into develop

DEN-15980 Code review comment update

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

DENBUG-59: Fixed merge conflict.

    • -4
    • +120
    ./App/Services/SystemCommMessages.c
DIAL-276: STT-2891: implemented short filtered pressure overrides

    • -10
    • +10
    ./App/Services/SystemCommMessages.c
DIAL-276: fixed op status event duplicating on op mode change only.

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

Merge branch 'DEN-15980-pressure-alarm-windows-widened-for-extended-period-of-time-due-to-frequency-of-air' into develop

DEN-15980 Remove TODO code. Will add time window alarm later if needed.

DEN-15980 Code review update 4.

DEN-15980 Code review update 3.

DEN-15980 Code review update 2.

DEN-16179 Lock out pressure checks in Treat Recirculate substate.

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 rinseback resume after HD fluid leak alarm issue.